704 Commits

Author SHA1 Message Date
Josh Goldberg 6d2b483b7a Merge remote-tracking branch 'refs/remotes/origin/master' into cycling 2016-04-02 14:37:25 -07:00
Josh Goldberg 32eac16931 Merge pull request #188 from blingenau/master
Fixing an error in documentation
2016-03-06 10:33:13 -08:00
Blake Lingenau cc062cfaed Fixing an error in documentation 2016-03-06 13:31:25 -05:00
Josh Goldberg 5415ab8b3f Merge pull request #184 from blingenau/cycling
Added bagActivate method for items and a SelectItem
2016-03-02 14:27:47 -08:00
Blake Lingenau e68a1a5aa9 Added bagActivate method for items and a SelectItem 2016-03-02 17:26:44 -05:00
Josh Goldberg 705188e15a Merge pull request #181 from FullScreenShenanigans/cycling
Cycling
2016-03-01 21:29:54 -08:00
Josh Goldberg 2906d961b4 Merge pull request #179 from blingenau/cycling
Added cycling sprite functionality/animation
2016-03-01 17:42:54 -08:00
Blake Lingenau 37a032cc33 Added cycling sprite functionality/animation 2016-03-01 20:41:45 -05:00
Josh Goldberg dc202d0fa7 Added TS compilation to settings files in grunt
Updated GameStartr to make it work.
2016-02-27 18:46:19 -08:00
blingenau 90b182102f Merge pull request #174 from blingenau/cycling
Changed errorMessage to displayMessage for more general functionality
2016-02-25 00:54:36 -05:00
Blake Lingenau 5bfa626b1d Changed errorMessage to displayMessage for more general functionality 2016-02-25 00:43:14 -05:00
Josh Goldberg 57526804a6 Merge pull request #173 from blingenau/cycling
Added small changes to cycling and message when you can't cycle in a …
2016-02-24 21:10:50 -08:00
Blake Lingenau 3518d43844 Added small changes to cycling and message when you can't cycle in a
certain Area. Fixed speed problem.
2016-02-25 00:04:03 -05:00
Josh Goldberg a6904cb962 Merge pull request #171 from blingenau/cycling
Added cycling input function, mapped to select
2016-02-22 10:08:03 -08:00
Blake Lingenau 735e86b33b Added cycling input function, mapped to select 2016-02-22 13:03:10 -05:00
blingenau 57dbcd7e9a Merge pull request #170 from blingenau/cycling
Fixed an error in the comments
2016-02-22 00:58:19 -05:00
Blake Lingenau ef3d396223 Fixed an error in the comments 2016-02-22 00:56:39 -05:00
Josh Goldberg 12f44a3de1 Merge pull request #169 from blingenau/cycling
Added functions to handle starting and stopping cycling
2016-02-21 21:18:19 -08:00
Blake Lingenau c4748964d6 Added functions to handle starting and stopping cycling 2016-02-21 23:51:11 -05:00
blingenau 9f85face64 Merge pull request #1 from FullScreenShenanigans/master
Pulling Josh's changes
2016-02-21 16:59:20 -05:00
Josh Goldberg eeda60d201 Merge pull request #168 from FullScreenShenanigans/documentation
Documentation
2016-02-21 12:59:31 -08:00
Josh Goldberg 3cc903066c Merge pull request #167 from tsitsop/Documentation
Added changes to make HMs show up in Pokemon Menu
2016-02-21 11:39:38 -08:00
tsitsop 509ba4b656 Added changes to make HMs show up in Pokemon Menu 2016-02-21 14:38:44 -05:00
tsitsop 5fb4f3a26d Merge remote-tracking branch 'refs/remotes/origin/documentation' into Documentation 2016-02-20 21:05:39 -05:00
Josh Goldberg d452aa812b Merge pull request #164 from FullScreenShenanigans/master
Bringing scrolling, player walking fixes from master to documentation
2016-02-17 22:02:30 -08:00