Commit graph

130 commits

Author SHA1 Message Date
Scott Erickson
853a80dd23 Fixed loading marks so they are positioned correctly when they load and the world is paused. 2014-03-12 12:43:51 -07:00
Scott Erickson
7e8f74f385 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-12 10:09:06 -07:00
Scott Erickson
fe93d31929 Fixed loading marks so they are positioned correctly when they load and the world is paused. 2014-03-12 10:08:57 -07:00
Nick Winter
f83fe6ce14 Fixed bugs with sprite rotation updating. 2014-03-12 09:31:45 -07:00
Scott Erickson
52733d5a1e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-12 09:15:48 -07:00
Scott Erickson
939c5faa1a Fixed a bug when a thang has multiple effects. 2014-03-12 09:15:37 -07:00
Nick Winter
2e354a7f11 Fixed #519, pressing esc while loading level, and CocoSprites updating actions and other things unnecessarily while paused. Watch for bugs with that last one. 2014-03-12 09:10:36 -07:00
Scott Erickson
da58b68fa0 Fixed a bug with the music player where sometimes it wouldn't loop. 2014-03-11 16:23:04 -07:00
Nick Winter
234b3f105d Reworked ladder game victory modal main call to action to actually submit game for ranking. 2014-03-10 10:36:28 -07:00
Nick Winter
c6b1d9089c Fixed sounds spamming on last frame. 2014-03-10 08:45:36 -07:00
Nick Winter
085fb82cc9 Fixed a multiplayer link and debug mark alpha. 2014-03-07 21:02:10 -08:00
Scott Erickson
2fa40fb2db Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-07 17:37:19 -08:00
Scott Erickson
fe2ced1a67 Gave the health bar a border, made it a little more high res. 2014-03-07 17:37:11 -08:00
Nick Winter
ec86a07906 Changed Camera min/max zoom. 2014-03-07 15:20:54 -08:00
Scott Erickson
34278a8648 Merge remote-tracking branch 'origin/master' 2014-03-06 17:27:01 -08:00
Scott Erickson
a4edb76c98 Fixed a couple of the bugs with marks. 2014-03-06 17:25:40 -08:00
Nick Winter
40e896868b Fixed CocoSprite getOffset to not apply scale to registration points. 2014-03-06 17:21:24 -08:00
Scott Erickson
5b11e132b2 Fixed the effect marks so they properly go away. 2014-03-06 17:13:16 -08:00
Nick Winter
b6335a30ae More fixes for empty string array serialization. 2014-03-06 16:32:13 -08:00
Scott Erickson
1b61b928b0 Couple tweaks to the cocosprite for effect marks. 2014-03-06 16:21:06 -08:00
Scott Erickson
041f4512e8 Set up marks to all load dynamically, and set up effect marks, which appear above a thang's head and rotate between them if there are multiple. 2014-03-06 15:52:09 -08:00
Akaza Akari
51d7bd656d Made updatePosition use getWorldPosition 2014-03-05 19:54:58 -08:00
Akaza Akari
99f43028a0 Add thang sound panning for #454 2014-03-05 19:39:14 -08:00
Scott Erickson
7a2d5b4bff Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-05 12:53:57 -08:00
Scott Erickson
af265ebee8 Tweaked an error message to be more generally useful. 2014-03-05 12:53:11 -08:00
Jayant Jain
db0fc82eb0 Minor bugfix for freezing editor due to out of bounds frame index 2014-03-06 01:54:09 +05:30
Nick Winter
86fd098159 Localized WizardSprite movement hey handling to WizardSprite file. 2014-03-03 07:28:40 -08:00
Nick Winter
f2f0a993af Merge branch 'thanish-move-wizard' of git://github.com/mnmtanish/codecombat 2014-03-03 07:22:44 -08:00
Muhammed Thanish
da2ebf857a Increase delay 2014-03-02 14:02:30 +05:30
Nick Winter
6c48660922 No save button when there's nothing to save. Messing with AudioPlayer playSound API a bit. 2014-03-01 16:57:29 -08:00
Muhammed Thanish
d7e031fd00 Use key.isPressed() to get movement direction 2014-03-02 03:27:06 +05:30
Muhammed Thanish
a092557973 Add camera zoomTo(pos) 2014-03-02 02:13:37 +05:30
Muhammed Thanish
7ea9260322 Use WizardSprite 2014-03-02 01:45:49 +05:30
Nick Winter
c2f82690b4 Put Archmage and Artisan avatars in GitHub README. 2014-03-01 11:21:24 -08:00
Nick Winter
2f130da090 HUD supports more hudProperties. Palette looks at programmableObjectProperties. Fixed bug with level editor frames advancing. 2014-03-01 11:06:44 -08:00
Muhammed Thanish
8cc8103288 Add keyboard shortcuts to move the wizard 2014-03-01 19:58:15 +05:30
Nick Winter
7855ca02d8 Hit a really bad victory modal image. 2014-02-28 21:29:14 -08:00
Nick Winter
71ebe7a0aa Lowered Surface framerate in the level editor, since ain't nobody got CPU time for 'dat. 2014-02-28 17:12:23 -08:00
Nick Winter
9b8eb6a296 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-28 11:27:36 -08:00
Nick Winter
3cee341887 Big performance improvements for scrubbing between frames; look out for bugs. 2014-02-28 11:27:32 -08:00
Scott Erickson
ef9c0a610f Fixed a bug with the casting screen. 2014-02-28 11:10:56 -08:00
Scott Erickson
d12b923eaf Made a casting progress bar on the canvas to test vs having it shown in the cast button. 2014-02-28 11:05:41 -08:00
Scott Erickson
7052b0600b Made mouse dragging not interrupt selecting units so much. 2014-02-26 18:42:39 -08:00
Scott Erickson
c86feb13e8 Fixed the region and point choosers for the level editor. 2014-02-26 15:56:05 -08:00
Scott Erickson
02d1dc2445 Added a screen for when playback ends. 2014-02-25 17:14:39 -08:00
Scott Erickson
eee434ab51 Tweaked the coordinate display position to be a bit more above the mouse. 2014-02-25 12:38:47 -08:00
Scott Erickson
356d1b55ed Added a property to prevent scripts from running after certain other scripts have run. 2014-02-25 11:59:23 -08:00
Scott Erickson
f4084ba5cc Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-25 10:50:53 -08:00
Scott Erickson
a1a5d5eea0 Fixed some script handling by not having playback changed when the first world is built. 2014-02-25 10:50:12 -08:00
Nick Winter
a440c4dff0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-25 10:48:33 -08:00