Commit Graph
200 Commits
Author SHA1 Message Date
Hunter a61257ee4a Actions: add pull_request event 2019-09-13 21:13:30 -04:00
Eliot Partridge 336b8a5e76 Merge pull request #120 from BytewaveMLP/hotfix-discord-login
Hotfix: Don't include email from Discord if we don't receive it
2019-09-13 16:45:22 -05:00
Eliot Partridge 09aa3614da Add TODO to code itself 2019-09-13 16:44:40 -05:00
Eliot Partridge be6e518a08 Don't include email from Discord if we don't receive it
TODO: diagnose *why* we aren't receiving the email from Discord
2019-09-13 12:12:07 -05:00
Eliot Partridge e39ab96d34 Merge pull request #85 from Stubenhocker1399/improved-chatlog
Add chat log colors, timestamp, filter & emoji box
2019-09-11 21:14:39 -05:00
Stubenhocker1399 6595caa8c2 Merge branch 'improved-chatlog' of github.com:Stubenhocker1399/pixel.horse into improved-chatlog 2019-09-11 17:05:18 +02:00
Stubenhocker1399 b75b2b7b18 Fix settings modal chat log range margin 2019-09-11 17:05:11 +02:00
Chris Multhaupt f59882eb61 Merge pull request #16 from terncode/master
Improved code
2019-09-11 15:17:32 +02:00
Terncode e12f135d36 removed unused code and improved imports 2019-09-11 15:07:54 +02:00
Stubenhocker1399 d78bf6b366 Fix filter bar on mobile & slim layout 2019-09-11 14:24:53 +02:00
Stubenhocker1399 b8595dce7f Fix filter text staying red after invalid search 2019-09-11 13:43:10 +02:00
Stubenhocker1399 7deecebe28 Add search icon to chat filter 2019-09-11 13:40:10 +02:00
Stubenhocker1399 4a39fb9bec Fix "onMouseEnter" -> "onMouseEnterEmojiButton" 2019-09-11 10:42:51 +02:00
Eliot Partridge e6116ab9b8 Merge pull request #108 from BytewaveMLP/fix-pt-team-credits
Add Wandeer to contributors
2019-09-10 14:40:05 -05:00
Eliot Partridge 23618b6f5f Add Wandeer to contributors 2019-09-10 14:37:35 -05:00
Stubenhocker1399 70eed8c686 Tweak some single line elseifs 2019-09-10 15:39:09 +02:00
Stubenhocker1399 cd27246069 Remove new line 2019-09-10 15:08:12 +02:00
Chris Multhaupt 846e9c8825 Merge pull request #15 from terncode/master
Improved code
2019-09-10 12:37:41 +02:00
Terncode e212d5e7c4 Improved code 2019-09-10 12:28:09 +02:00
Eliot Partridge 8304df32b0 Merge pull request #105 from Stubenhocker1399/update-compresspony
Apply fixed pony compression patches
2019-09-09 18:07:44 -05:00
Stubenhocker1399 af739fe3b5 Remove magic number in invalid version check 2019-09-10 00:55:56 +02:00
Pony Town Team 4671aa53f8 Apply fixed pony compression patches
Fixes issues with more than 32 mane sprites
Courtesy Pony Town Team
2019-09-10 00:29:24 +02:00
Eliot Partridge c316f24ac6 Merge pull request #91 from mathieucaroff/master
Provide git instructions to ignore a file that is part of the index
2019-09-09 15:56:10 -05:00
Eliot Partridge 309eeb207e Add sprites.ts ignore explanation
Content provided by Eliot Partridge:
https://github.com/ponydevs/pixel.horse/pull/91#issuecomment-529270365
2019-09-09 22:48:52 +02:00
Eliot Partridge 72bce0d0cc Merge pull request #100 from BytewaveMLP/init-sprites-build
Attempt to fix build, part 3
2019-09-09 13:20:26 -05:00
Eliot Partridge 34ed0a44b5 bale -> able 2019-09-09 12:58:39 -05:00
Eliot Partridge f4a32256f2 Attempt to fix build, part 3 2019-09-09 10:17:40 -05:00
Eliot Partridge 93cc84e626 Merge pull request #98 from BytewaveMLP/tools-map-season
Use season in entity draw options for map renderer tool
2019-09-08 23:40:30 -05:00
Eliot Partridge 8570ea160d Merge pull request #97 from BytewaveMLP/friend-request-message
Add feedback for when a friend request is sent
2019-09-08 23:34:07 -05:00
Eliot Partridge 53cfac5bf0 Use season in entity draw options for map renderer tool 2019-09-08 23:32:12 -05:00
Eliot Partridge 2251ad6a6d Add feedback for when a friend request is sent 2019-09-08 22:31:02 -05:00
Eliot Partridge c4b2e47e5c Merge pull request #96 from BytewaveMLP/team-credits
Add more team members to credits
2019-09-08 18:17:45 -05:00
Eliot Partridge d2a79bf7ed Add more team members to credits
@Terncode, @Keupoz, @LunarMist, @ZizzyDizzyMC
2019-09-08 18:14:44 -05:00
Stubenhocker1399 299619bb79 Cleanup diff 2019-09-08 20:50:39 +02:00
Stubenhocker1399 4eeaf3994c Fix timestamp setting not appearing on mobile 2019-09-08 20:44:52 +02:00
Stubenhocker1399 e0476cefb5 Merge branch 'terncode-improved-chatlog' into improved-chatlog 2019-09-08 20:20:56 +02:00
Stubenhocker1399 eb09e54034 Merge branch 'improved-chatlog' of https://github.com/terncode/pixel.horse into terncode-improved-chatlog 2019-09-08 20:20:20 +02:00
Mathieu CAROFF b4f224f5da Simplify the section about ignoring file in index 2019-09-08 19:19:39 +02:00
Terncode 0f4d2c36f7 fixed css for input 2019-09-08 19:08:01 +02:00
Terncode 3c801987bb Improved code 2019-09-08 18:57:30 +02:00
Mathieu CAROFF 67446feb6f Provide instructions to ignore file in README 2019-09-08 12:39:50 +02:00
Eliot Partridge 908ae36436 Merge pull request #90 from ponydevs/actions
Set up GitHub Actions 🎉
2019-09-07 23:26:48 -05:00
Hunter a6f703fb37 Actions: align branding 2019-09-08 00:23:35 -04:00
Hunter 47ea397424 Actions: lint and build jobs 2019-09-08 00:08:01 -04:00
Hunter 705de5f1c3 Actions: create ci-install-gulp.sh 2019-09-08 00:07:37 -04:00
Hunter 2178d83348 Actions: create ci-config.json 2019-09-08 00:07:03 -04:00
Eliot Partridge 3470eaf00c Merge pull request #87 from Stubenhocker1399/discord-button
Add "Join Discord" button
2019-09-07 18:16:59 -05:00
Stubenhocker1399 549f9df5f9 Add documentation on "Join discord" configuration 2019-09-08 00:34:00 +02:00
Stubenhocker1399 312238175d Update .gitignore to ignore /store/ 2019-09-07 17:03:19 -05:00
Stubenhocker1399 9f30d98895 Add "Join Discord" button
Based of the patreon supporter button.
Add a key "discordLink" to the config.json file and set it to your
Discord invite link.
2019-09-07 22:22:00 +02:00