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
1542 commits 27 branches 0 tags 134 MiB
Commit graph

1144 commits

Author SHA1 Message Date
Dominik Kundel
c7ca878c69 added class property that got missing 2014-03-12 01:26:11 +01:00
Michael Schmatz
8eb5f1b830 Merge pull request #517 from Darredevil/patch-10 
Update ro.coffee
 2014-03-11 17:26:05 -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
Nick Winter
392534878a Keeping old matches, up to 200, and showing them as stale. Added LevelSession.isRanking for better display of when you're still in the initial ranking phase. 2014-03-11 16:31:39 -07:00
Alexandru
4552455284 Merge branch 'master' of https://github.com/Darredevil/codecombat 2014-03-12 01:23:55 +02:00
Scott Erickson
eeff462051 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-11 16:23:20 -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
Dominik Kundel
714c6ddf9b Merge remote-tracking branch 'upstream/master' 2014-03-11 23:50:51 +01:00
Dominik Kundel
4c7da1ea69 update Gutter only if changed 2014-03-11 23:47:27 +01:00
Nick Winter
852b1c97ac Added idle.js so we can stop refreshing the page forever on ladder views when they're not looking. 2014-03-11 13:59:12 -07:00
Nick Winter
bba3c78107 Ties are not victories in the emails. 2014-03-11 13:20:52 -07:00
Michael Schmatz
4062bba245 Created initial spectate level view 2014-03-11 13:12:45 -07:00
Ruben Vereecken
8709cdc472 Finished Article History 2014-03-11 19:33:27 +01:00
Nick Winter
d012e0d7a9 Merge pull request #508 from Rahazan/patch-2 
Update Dutch Translations
 2014-03-11 09:46:18 -07:00
Sam Epps
11ca60765d Added some additional names to names.coffee 2014-03-11 17:16:09 +01:00
Nick Winter
eac219a2be Inserted score history graph into ladder update emails. 2014-03-10 22:03:33 -07:00
Nick Winter
32baf2ae79 Improved my-matches rank history and name fetching, ladder update emails, ladder update unsubscribes. 2014-03-10 21:30:46 -07:00
Nick Winter
c393ecd51a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-10 20:22:31 -07:00
Nick Winter
6ce65488aa Added simple rank history graph. Improving ladder update mail. 2014-03-10 20:22:25 -07:00
Darredevil
97633dec26 Update ro.coffee 
Getting there...
Please suggest alternatives for lines 297 and 331
 2014-03-11 04:24:11 +02:00
Michael Schmatz
93d0e293cd Merge pull request #509 from Darredevil/patch-7 
Update ro.coffee
 2014-03-10 16:17:39 -07:00
Darredevil
6b48577e56 Update ro.coffee 2014-03-11 01:03:20 +02:00
Ruben Vereecken
af73e5a594 Added a versions modal for every type 2014-03-10 23:29:34 +01:00
Ruben Vereecken
8e989ec08f Got the level history view set up as before, but better 2014-03-10 23:17:19 +01:00
Nick Winter
c4a3b71786 Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal 2014-03-10 13:57:51 -07:00
Nick Winter
6055512ac7 Working on ladder updates. 2014-03-10 13:20:00 -07:00
Ruben Vereecken
68b10d9023 History now shows a loading bar upon opening 2014-03-10 20:06:36 +01:00
Nick Winter
77f7276759 Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal 2014-03-10 11:29:47 -07:00
Ruben Vereecken
29901787f7 Added i18n for Version History 2014-03-10 19:11:37 +01:00
Ruben Vereecken
06ae06fa34 Used mix-ins to combine Modal and VersionView 2014-03-10 19:08:53 +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
6a71e97204 Improvements to HUD actions. 2014-03-10 09:37:05 -07:00
Nick Winter
c6b1d9089c Fixed sounds spamming on last frame. 2014-03-10 08:45:36 -07:00
Ruben Vereecken
f6ece2d63e Created a modal version of Version History 2014-03-10 12:16:08 +01:00
Darredevil
5e634f9915 Update ro.coffee 
Almost done.
The legal stuff is the most boring thing i ever had to translate...
 2014-03-10 04:10:29 +02:00
Nick Winter
3d71fcbc70 Wins, losses, and realizing that I'm not doing server code right. 2014-03-09 18:46:11 -07:00
Rahazan
66b7ba40e8 Added missing Dutch diplomats 2014-03-09 23:54:06 +01:00
Rahazan
2daa70bef4 Changed manual 
Manual is ambiguous, is it manual as in "manual instead of automatic" or manual as in a handbook/guide. I thought it was the latter, so I changed it here.
 2014-03-09 23:45:04 +01:00
Rahazan
e55a43b396 Fixed some formatting of sentences 2014-03-09 23:37:25 +01:00
Nick Winter
2d32bc1ac4 Reduced unnecessary name fetching. 2014-03-09 13:22:22 -07:00
Nick Winter
3e82e0b599 Disallow submission of non-denormalized sessions to ladders. 2014-03-09 12:53:11 -07:00
Nick Winter
34983059aa Fixed bug with trying to show challenger modals with no hash to indicate we should. 2014-03-09 11:52:05 -07:00
Nick Winter
03abbc44cb Better error messages for missing Component dependencies. 2014-03-09 11:46:53 -07:00
Darredevil
c9a56048ca Update GoalManager.coffee 2014-03-09 20:35:33 +02:00
Nick Winter
9e56540cee Uncommented out some headers in uk.coffee localization. 2014-03-09 11:03:21 -07:00
Nick Winter
802454bbb9 Merge pull request #504 from gorodsb/patch-1 
Update uk.coffee
 2014-03-09 08:55:11 -07:00
gorodsb
6be9ff2bb7 Update uk.coffee 2014-03-09 17:54:08 +02:00
Nick Winter
59314bcb3c Merge pull request #500 from M-r-A/i18n 
Update i18n
 2014-03-09 08:19:02 -07:00
gorodsb
adc8c8eddf Update uk.coffee 2014-03-09 16:47:48 +02:00
Darredevil
ed93b2bbe5 More than half done 2014-03-09 05:53:22 +02:00
Alexei Nikitin
59318678ba Update ru 2014-03-09 05:06:53 +04:00
Alexei Nikitin
bcaa801f88 Sync en i18n 2014-03-09 05:04:11 +04:00
Alexei Nikitin
81084a24c6 Add admin i18n 2014-03-09 04:36:48 +04:00
Alexei Nikitin
f6d6805534 Add password i18n 2014-03-09 04:31:15 +04:00
Alexei Nikitin
bfebd0b47a Add revert i18n 2014-03-09 04:13:30 +04:00
Nick Winter
39c4657204 Fixed HUD showing actions backwardly. Added rank numbering to leaderboard. 2014-03-08 15:43:56 -08: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
Scott Erickson
57f1588dea Fixed another bug related to the race condition fix. 2014-03-08 14:34:25 -08:00
Scott Erickson
afbe2200a6 Fixed a bug with the new race condition fix. Moving the schemas to the application would be good. 2014-03-08 13:52:34 -08:00
Scott Erickson
ad6317434d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-08 13:07:12 -08:00
Scott Erickson
2861f62248 Simple fix for a race condition where the user schema might load after /auth/whoami, overwriting /auth/whoami's cookie. 2014-03-08 13:06:04 -08:00
Nick Winter
b0238d74a4 Let's just show 200 leaderboard entries for now until we have paging. 2014-03-08 11:50:10 -08:00
Nick Winter
c3c5782fd9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-08 11:37:37 -08:00
Nick Winter
1c44e3df1e Fixed bug with linking to #my-matches tab. 2014-03-08 11:37:33 -08:00
Nick Winter
cd79403736 Merge pull request #494 from M-r-A/patch-3 
Fix l18n tags
 2014-03-08 11:27:00 -08:00
Nick Winter
027643fd2a Merge pull request #493 from M-r-A/patch-2 
Update ru.coffee
 2014-03-08 11:26:18 -08:00
Yinkan Li
bfad68b03b refine skip_tutorial 
refine skip_tutorial
using Chinese （）
 2014-03-09 00:01:13 +08:00
Yinkan Li
452857e66c update Chinese Simplified 
update
legal
concat
 2014-03-08 23:56:05 +08:00
Yinkan Li
bcd8c837b4 Update ： employers for Chinese simplified 
Update ： employers for Chinese simplified
 2014-03-08 23:53:47 +08:00
Nick Winter
68099bbd7c Victory modal for ladder games takes you back to the ladder matches. 2014-03-07 21:20:09 -08:00
Nick Winter
085fb82cc9 Fixed a multiplayer link and debug mark alpha. 2014-03-07 21:02:10 -08:00
Michael Schmatz
2f378106ca Added checking level ladder status before submitting 2014-03-07 18:16:50 -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
Alexei Nikitin
98b36d299c Update article model 2014-03-08 05:05:35 +04:00
Nick Winter
b6ae73ef29 Merge pull request #492 from Shrihari/issue464 
Fixed Spell Debug View width bug
 2014-03-07 16:14:57 -08:00
Nick Winter
ec86a07906 Changed Camera min/max zoom. 2014-03-07 15:20:54 -08:00
Scott Erickson
8fa9c9c410 Set up the level play view to show the guide on startup based on the showGuide property. 2014-03-07 15:18:56 -08:00
Scott Erickson
13b9a9cb58 Added dungeon arena tutorial to a few hardcoded places. 2014-03-07 15:16:13 -08:00
Scott Erickson
17231bce06 Added showsGuide and type properties to level. 2014-03-07 13:13:58 -08:00
Scott Erickson
be03485538 Set up the ladder play modal to be more forthright getting new players to play the tutorial. 2014-03-07 12:58:17 -08:00
Alexei Nikitin
683c578dcb Fix lolwtf deleting 2014-03-07 12:36:17 -08:00
Alexei Nikitin
a3afa802d9 Update ru.coffee 2014-03-07 12:33:18 -08:00
Alexei Nikitin
16f2379af9 Update ru.coffee 2014-03-07 12:27:12 -08:00
Alexei Nikitin
535881b637 Update ambassador.jade 2014-03-07 12:20:17 -08:00
Alexei Nikitin
b002ae376b Update counselor.jade 2014-03-07 12:19:14 -08:00
Alexei Nikitin
317ae5cc32 Update scribe.jade 2014-03-07 12:17:32 -08:00
Scott Erickson
d8d917ecf9 Set up better teardown for the ladder view. 2014-03-07 12:15:16 -08:00
Alexei Nikitin
517ef8611b Update ru.coffee 2014-03-07 12:13:15 -08:00
Alexei Nikitin
4e24e2a244 Update ru.coffee 2014-03-07 12:10:25 -08:00
Scott Erickson
cf2a0a999e Set up the ladder play modal to point to the tutorial level dynamically. 2014-03-07 11:57:31 -08:00
Scott Erickson
610fc0694b Turning off view caching by default now. Should help lower the memory footprint. 2014-03-07 11:57:15 -08:00
Shrihari
5274f22467 Fixed Spell Debug View width bug 2014-03-08 01:10:12 +05:30
Scott Erickson
d14f862359 Ladder view can now be linked to to play against a specific team. 2014-03-07 11:23:06 -08:00
Scott Erickson
12f1042530 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-06 19:17:21 -08:00
Nick Winter
6e47416d24 Fixed some level IDs. 2014-03-06 19:09:15 -08:00
Scott Erickson
8012addaa1 Merge remote-tracking branch 'origin/master' 2014-03-06 19:01:30 -08:00