codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 16:17:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
1623 commits 27 branches 0 tags 134 MiB
Commit graph

352 commits

Author SHA1 Message Date
Nick Winter
b2efb1bba5 More work on the loading view. 2014-03-14 19:44:19 -07:00
Nick Winter
efd0d82dea Working on new loading view design. 2014-03-14 17:06:08 -07:00
Nick Winter
795bd8f63b Moved Glen from Archmages to About. 2014-03-13 18:27:08 -07:00
Nick Winter
42a8862fa9 Merge pull request #541 from dkundel/master 
Easy use of coordinates as discussed in #10 and minor fixes
 2014-03-13 18:05:04 -07:00
Nick Winter
8b572f0647 Using isThang instead of instanceof Thang. 2014-03-13 17:59:17 -07:00
Nick Winter
e2d2e96cf5 Fixed several bugs with Thang selection and the SpellView and HUD. 2014-03-13 15:35:28 -07:00
Nick Winter
9d8b8e7395 Probably too mean to tell users that their password is wrong three times, so just once will do. 2014-03-13 10:27:32 -07:00
Nick Winter
c8103154a9 Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n. 2014-03-13 09:02:19 -07:00
Nick Winter
2d848b4cce Merged some conflicts. 2014-03-13 08:39:53 -07:00
Nick Winter
4ad0fba860 Merge pull request #537 from jayant1992/master 
UI and UX improvements to editor
 2014-03-13 07:07:13 -07:00
Nick Winter
10e4bc737a Merge pull request #534 from Shrihari/fix-grid-toggle 
Fix Grid Toggle consistency
 2014-03-13 06:50:56 -07:00
Jayant Jain
17debf49e6 Implements smoother panning around the map for keyboard controls 2014-03-13 18:32:23 +05:30
Shrihari
fb7f64ddb0 Grid toggle consistent with the button and the shortcut 2014-03-13 15:21:00 +05:30
Dominik Kundel
5c97fea363 fixed issue of multiple insertions due to multiple event handlers 2014-03-13 03:38:34 +01:00
Dominik Kundel
60214abb41 Change cursor if moving on map with pressed 'shift' 2014-03-13 02:50:09 +01:00
Michael Schmatz
aea9e9d1a6 Spectate view is nearing completion 2014-03-12 17:51:13 -07:00
Dominik Kundel
8990b9d194 paste coordiante if click + shift 2014-03-13 01:50:59 +01:00
Ruben Vereecken
96ec29d80e Added the finishing touch. Solved issue #15 2014-03-13 01:07:47 +01:00
Ruben Vereecken
3856ac597f Finished perfecting i18n 2014-03-13 00:47:08 +01:00
Scott Erickson
660e9ceca5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-12 15:12:22 -07:00
Ruben Vereecken
dbc37b177a Working on test. 2014-03-12 22:48:27 +01:00
Nick Winter
cf663f6775 Merge pull request #530 from rubenvereecken/i18n 
Added i18n tags for new Ladder views
 2014-03-12 14:03:44 -07:00
Ruben Vereecken
8c7c49fdbb Reverted work done on wrong branch 2014-03-12 21:54:54 +01:00
Scott Erickson
68c5144838 Added AoE circles. 2014-03-12 13:49:36 -07:00
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
Ruben Vereecken
76110423c0 Created i18n utility function 2014-03-12 20:30:43 +01: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
9cb80783ff Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-11 22:01:47 -07:00
Nick Winter
b560827e32 Working on cleaning up some server errors. 2014-03-11 19:17:58 -07:00
Nick Winter
4f9db0a7f7 Merged in all names. 2014-03-11 18:11:48 -07:00
Darredevil
012c25a817 Added GetALLToLocations and KeepALLFromLocations 2014-03-12 01:57:30 +02:00
Alexandru
5f2587da18 Merge remote-tracking branch 'upstream/master' 2014-03-12 01:38:54 +02:00
Alexandru
4552455284 Merge branch 'master' of https://github.com/Darredevil/codecombat 2014-03-12 01:23:55 +02: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
Sam Epps
11ca60765d Added some additional names to names.coffee 2014-03-11 17:16:09 +01: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
Darredevil
c9a56048ca Update GoalManager.coffee 2014-03-09 20:35:33 +02:00
Nick Winter
b3964571e1 Fixed bug importing animations into existing ThangTypes that had only containers. 2014-03-08 15:04:11 -08:00
Nick Winter
5bde534757 Fixed parsing for ThangTypes that don't have lib.properties. 2014-03-08 14:53:17 -08:00
Nick Winter
be12d38e34 Taking into account null rects and library width/height subtraction on sprite parsing. 2014-03-08 14:38:35 -08: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