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

1599 commits

Author SHA1 Message Date
Damien
65f148974c Add to french diplomats list 2014-03-17 23:39:36 +01:00
Damien
71d248afef Add some french translations 2014-03-17 23:38:41 +01:00
Nick Winter
a58faa1acd Merged. 2014-03-17 14:07:37 -07:00
Nick Winter
2dd762a0d7 Merge pull request #600 from M-r-A/patch-2 
Update ru.coffee
 2014-03-17 14:01:48 -07:00
Nick Winter
2098bef39e Fixed quoting problem. 2014-03-17 13:58:40 -07:00
Nick Winter
21ca74d76f Merge branch 'patch-koreanlocale' of git://github.com/walkingtospace/codecombat into walkingtospace-patch-koreanlocale 2014-03-17 13:58:11 -07:00
Mikhail Koltsov
97f9e548e2 added perspectivizion for arrows (issue #46) 2014-03-18 00:40:37 +04:00
Björn Kimminich
4ea7d0e9b2 Update de.coffee 2014-03-17 21:36:53 +01:00
Björn Kimminich
b0a361abb2 Update de.coffee 2014-03-17 20:32:57 +01:00
Alexei Nikitin
4860e2e7a1 Update ru.coffee 2014-03-17 12:00:28 -07:00
fist0512
9d75fa5588 Added korean locale and modified unnatural translation 2014-03-18 03:49:15 +09:00
armaldio
2eb84252f3 Update fr.coffee 2014-03-17 19:47:44 +01:00
Nick Winter
bf323d59f2 Merge pull request #594 from ahmed80dz/patch-1 
Update ar.coffee
 2014-03-17 11:09:17 -07:00
Cassio Cardoso
970d5e46a2 Update pt-BR.coffee 
Add multiplayer translation
 2014-03-17 14:47:22 -03:00
ounis ahmed
aab91057f2 Update ar.coffee 2014-03-17 10:12:24 -07:00
BonnieBBS
9a9480ea83 Update zh-HANS.coffee 
Some words about "Ambassador" have been translated. :D
 2014-03-18 00:18:09 +08:00
Nick Winter
5fef126672 Merge pull request #592 from ImmortalJoker/patch-2 
Update ru.coffee
 2014-03-17 08:51:18 -07:00
Nick Winter
794b1472f6 Merge pull request #587 from cassiocardoso/patch-1 
Update diplomat.jade
 2014-03-17 08:50:45 -07:00
Nick Winter
df2c1b443e Merge pull request #589 from yangxuan8282/patch-2 
Update diplomat.jade
 2014-03-17 08:49:30 -07:00
Nick Winter
98025f1ae2 Merge pull request #588 from yangxuan8282/patch-1 
Update zh-HANS.coffee
 2014-03-17 08:49:21 -07:00
Nick Winter
763f08a05e Merge pull request #590 from ImmortalJoker/patch-1 
Update uk.coffee
 2014-03-17 08:49:09 -07:00
Krasnov Ehor
c9d916fb7a Update ru.coffee 2014-03-17 17:49:07 +02:00
Krasnov Ehor
172ad1d17a Update uk.coffee 2014-03-17 17:40:51 +02:00
BonnieBBS
abf90cf8f5 Update zh.coffee 
Translated some of the words. :D
 2014-03-17 23:38:13 +08:00
yangxuan8282
4b2bcc283f Update diplomat.jade 
just make some change on Ch-HANS translate,and have pull request,so may I add myself to contributors?
 2014-03-17 23:32:20 +08:00
yangxuan8282
43ecfec28f Update zh-HANS.coffee 
a little change,make grammar more idiomatic
 2014-03-17 23:27:38 +08:00
Cassio Cardoso
2917255193 Update diplomat.jade 
Add my username in brazilian portuguese diplomats list.
 2014-03-17 11:51:55 -03:00
Scott Erickson
87b225b061 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-17 07:34:02 -07:00
Scott Erickson
564d267463 Removed a TODO. 2014-03-17 07:33:53 -07:00
Aditya Raisinghani
b5bef94eb3 Fixed issue with video on multiplayer page modal 2014-03-17 19:52:03 +05:30
Randi Katrine Hillerøe
5cecbeea40 Update diplomat.jade 
Added my name to the contributors list.
 2014-03-17 13:59:48 +01:00
Randi Katrine Hillerøe
a936964434 Update da.coffee 
Added a few of the missing translations.
 2014-03-17 13:55:58 +01:00
Nick Winter
6c2a78c060 Show videos in HD if possible. Use ready state on level loader. 2014-03-17 05:52:19 -07:00
Nick Winter
3d56cc4393 Merge pull request #584 from batista/patch-1 
Update pt-PT.coffee for multiplayer
 2014-03-17 05:26:57 -07:00
Sérgio Batista
641fa482d8 Update pt-PT.coffee for multiplayer 2014-03-17 13:13:45 +01:00
bbeasmile
03f309a441 Update hu.coffee 2014-03-17 13:01:17 +01:00
Nick Winter
36a90de7f9 Last bits of #546. 2014-03-17 04:44:00 -07:00
Nick Winter
1397b63e50 Merged. 2014-03-17 04:37:54 -07:00
pouyio
f5e3e717f1 Update diplomat.jade 
added a spanish translator
 2014-03-17 12:33:35 +01:00
Nick Winter
fe56e82348 Merge pull request #581 from pouyio/patch-1 
Update es.coffee
 2014-03-17 04:31:24 -07:00
Nick Winter
833c310a91 Merge pull request #579 from ItsLastDay/popover 
Fix for issue #496
 2014-03-17 04:30:57 -07:00
pouyio
9092a7961d Update es.coffee 2014-03-17 12:30:34 +01:00
Maximilian Bachhuber
5903dc1ae2 Update de.coffee 2014-03-17 12:27:46 +01:00
Nick Winter
287bf0398e Embedded new video in multiplayer launch modal. 2014-03-17 03:18:13 -07:00
Mikhail Koltsov
df3739517d fixed issue #496 2014-03-17 12:28:49 +04:00
Scott Erickson
db4ae0cd2d Made some tips show up more rarely. 2014-03-17 00:12:11 -07:00
Scott Erickson
7555dce172 Tweaked the loading page progress bar. 2014-03-17 00:05:45 -07:00
Scott Erickson
729a016b1f More tweaks to the video. 2014-03-16 22:57:16 -07:00
Scott Erickson
1fa18fe2e0 Added a border to the home view video. 2014-03-16 22:46:57 -07:00
Nick Winter
65c53a9e43 Check anonymous for clicking link. 2014-03-16 22:17:56 -07:00
Scott Erickson
5ddd2b9109 Added a few more tips. 2014-03-16 22:11:21 -07:00
Scott Erickson
8eed311aea Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 22:01:41 -07:00
Scott Erickson
dc4252a94d Moved the tips into the level loader screen and gave them i18n. 2014-03-16 22:01:21 -07:00
Nick Winter
566c9e6c9d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:48:37 -07:00
Nick Winter
b51f51f636 Fix for no Camera for creating Marks in the Thang Editor. 2014-03-16 21:48:28 -07:00
Scott Erickson
5a8d1b0a2b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:43:21 -07:00
Scott Erickson
de34896a9a Playback is now disabled during casting. Also cleaned out some remaining hover logic. 2014-03-16 21:43:14 -07:00
Nick Winter
af57e88a1a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:33:50 -07:00
Nick Winter
f02f4e77d0 Improved next game routing and speed. Hid that catastrophically dangerous reset all games button. 2014-03-16 21:33:46 -07:00
Scott Erickson
661c60ec50 Merge branch 'adi2412-simulator-teardown' 2014-03-16 21:14:56 -07:00
Scott Erickson
e88c79681d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:04:44 -07:00
Scott Erickson
c663bd74cf Tweaks to the scrubber. Sliding it around no longer changes its play state; it only pauses playback if you click. 2014-03-16 21:04:36 -07:00
Nick Winter
3dd47ec98e Propagated new multiplayer_launch i18n. 2014-03-16 20:56:48 -07:00
Nick Winter
fc93ede891 Merged some merging in the locales. 2014-03-16 20:54:34 -07:00
Nick Winter
cfab3061f5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 20:52:29 -07:00
Nick Winter
680c12707a Merge pull request #567 from 2xG/patch-1 
Update es-419.coffee
 2014-03-16 20:51:58 -07:00
Nick Winter
f3a76da47c Added i18n for multiplayer launch modal. 2014-03-16 20:50:49 -07:00
Nick Winter
ffb9ec2908 Merged. 2014-03-16 20:36:18 -07:00
Scott Erickson
17af4cec0c Slight tweak. 2014-03-16 20:36:02 -07:00
Scott Erickson
dc32add6cb Merge branch 'simulator-teardown' of https://github.com/adi2412/codecombat into adi2412-simulator-teardown 2014-03-16 20:34:03 -07:00
Nick Winter
9a64fb5dac Work on /multiplayer modal. 2014-03-16 20:32:24 -07:00
Scott Erickson
296a7584a6 Ladder page now shows the ladder for anonymous users, and prods them to sign up if they click a link or button that would have them play. 2014-03-16 20:28:02 -07:00
Scott Erickson
a3df986567 Added a tween for size changes. 2014-03-16 19:27:48 -07:00
honam bang
41d26f5709 Refactoring ModalView Templates 2014-03-17 11:00:25 +09:00
Scott Erickson
957fdd22e6 Tweaked the rank button to be much larger in the my matches tab. 2014-03-16 18:48:56 -07:00
Scott Erickson
5cb42fa92c Tweaked the video on the home page. 2014-03-16 18:10:39 -07:00
Scott Erickson
150077ab22 Removed the new button from the home view. 2014-03-16 17:48:16 -07:00
Darredevil
123de3a997 Update ro.coffee 2014-03-17 02:44:29 +02:00
Scott Erickson
e430a6c2de Added multiplayer launch view. 2014-03-16 17:33:57 -07:00
Scott Erickson
3fa0124d7e Removed wizard loading code from home view, for now anyway. 2014-03-16 17:21:17 -07:00
Scott Erickson
dd8ea18186 Merge remote-tracking branch 'origin/master' 2014-03-16 17:13:18 -07:00
Scott Erickson
f23e3285cd Fixed a bug. 2014-03-16 17:12:55 -07:00
Nick Winter
b550708113 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 17:07:24 -07:00
Nick Winter
6db33fd967 Brawlwood protectAPI on! 2014-03-16 17:07:10 -07:00
Scott Erickson
209a1a3563 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 17:00:12 -07:00
Scott Erickson
eee8fbba2c New level page with new artwork. 2014-03-16 16:59:48 -07:00
Nick Winter
1f1802dc38 A couple tweaks for #577. 2014-03-16 16:04:17 -07:00
Nick Winter
753952e519 Merge pull request #577 from IngridMorstrad/templates 
Templates
 2014-03-16 16:00:24 -07:00
IngridMorstrad
dadf0dab86 refactored docs and reload 2014-03-17 02:57:15 +05:30
Nick Winter
aa4f1baf73 Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions. 2014-03-16 13:23:01 -07:00
IngridMorstrad
57f24932fb Removed redundant code for close button 2014-03-17 01:10:55 +05:30
IngridMorstrad
52115876bb Refactored docs.jade to use the base template 2014-03-17 01:03:27 +05:30
honam bang
29a88ee128 Merge remote-tracking branch 'codecombat/master' 2014-03-17 02:20:44 +09:00
Nick Winter
125ffa9f43 Merged 2014-03-16 10:06:47 -07:00
honam bang
3940ba23b8 Merge branch 'master' of https://github.com/walkingtospace/codecombat 2014-03-17 01:47:16 +09:00
honam bang
34be8917cb Fixes #546 2014-03-17 01:41:19 +09:00
Nick Winter
28b049d8a4 Adjusted some i19n commenting. 2014-03-16 09:10:17 -07:00
Nick Winter
f266db7aaa Merge pull request #573 from AlessioPaternoster/master 
#01 Updated Italian Local
 2014-03-16 09:08:40 -07:00
IngridMorstrad
8d9a8aaf73 Change victory.jade to use the base template 2014-03-16 21:16:00 +05:30
honam bang
b42bf45ddb Added korean locale 2014-03-16 23:40:10 +09:00
Alessio Paternoster
dd2a55928e Updated Italian Local 2014-03-16 13:53:57 +01:00
Aditya Raisinghani
226ae29caf Added CocoClass as superclass to Simulator and updated destroy method. 2014-03-16 13:37:17 +05:30
2xG
6efe87982c Update es-419.coffee 
small fix2
 2014-03-16 01:10:29 -05:00
2xG
9107937f75 Update es-419.coffee 
small fix
 2014-03-16 01:09:31 -05:00
2xG
3765ffa87d Update es-419.coffee 
Few translated strings
 2014-03-15 22:10:11 -05:00
Nick Winter
2e2c9459d8 Even better-looking loading background. 2014-03-15 16:06:35 -07:00
Nick Winter
4e14ff3b11 Merge pull request #565 from jayant1992/master 
Bugfix for play, usability improvement for editor.
 2014-03-15 15:32:17 -07:00
Nick Winter
38bfe222a0 Merge pull request #564 from Shrihari/range-radii 
Added radii marks for voiceRange, visualRange and attackRange
 2014-03-15 15:31:12 -07:00
George Saines
417ff1e48d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-15 15:12:09 -07:00
Jayant Jain
93bb2d0893 Restricts wizard to level bounds when moving around 2014-03-16 03:11:55 +05:30
Jayant Jain
91515b1cea Clicking a thang in the left list automatically pans to the sprite on the editor map 2014-03-16 03:11:40 +05:30
Shrihari
005a91cec2 Moved createMarks() to setupSprite() to optimize loading 2014-03-16 02:48:19 +05:30
Shrihari
d186ae0a15 Added radii marks for voiceRange, visualRange and attackRange 2014-03-16 02:02:17 +05:30
TigroTigro
19d3f4af76 Update pl.coffee 
Translated one tag which I earlier missed, edited the more_about_X tags to make them shorter and solve the unneeded line splitting which occured where they were displayed.
 2014-03-15 21:29:44 +01:00
TigroTigro
30fb039675 Update pl.coffee 
Translated new tags
 2014-03-15 20:35:18 +01:00
Nick Winter
b210423419 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-15 12:31:43 -07:00
Nick Winter
ca75cc4a1a Fixed #405 with a sledgehammer--just loading all Components before loading level editor. 2014-03-15 12:31:39 -07:00
Michael Schmatz
efba8a0654 Fixed control bar leaderboard button for #429 2014-03-15 11:34:59 -07:00
Nick Winter
e97bff6a3c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-15 11:34:53 -07:00
Nick Winter
4b9c7a3784 Fixed bug with sprites being offset incorrectly when starting with an action not in their ThangType. 2014-03-15 11:31:12 -07:00
Michael Schmatz
6dcbaddbbd Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/views/play/spectate_view.coffee
 2014-03-15 09:20:44 -07:00
Michael Schmatz
2c6e667bb7 Added API for queue messages count 2014-03-15 09:20:13 -07:00
honam bang
e63e787a30 Removed spaces for coding convention 2014-03-15 08:30:47 -07:00
bang honam
70f3ca8f8e Added a line for coding convention 2014-03-15 08:30:37 -07:00
Nick Winter
7b1f8d1114 Merge pull request #547 from jayant1992/master 
Improved panning and zooming for editor
 2014-03-15 08:05:02 -07:00
Nick Winter
95cd3782a1 Oops, don't keep sending ladder updates just to me. 2014-03-15 07:45:44 -07:00
Nick Winter
8276dbf2d1 Merge branch 'loading-view' 2014-03-14 19:44:33 -07:00
Nick Winter
b2efb1bba5 More work on the loading view. 2014-03-14 19:44:19 -07:00
Nick Winter
fc7d403785 Fixed two bugs with destroying sprites. 2014-03-14 17:15:07 -07:00
Nick Winter
efd0d82dea Working on new loading view design. 2014-03-14 17:06:08 -07:00
Michael Schmatz
357b73be93 Fixed bug in next game button, fixed wizard positions 2014-03-14 16:14:35 -07:00
George Saines
c00c7ed56b adding the new website background images 2014-03-14 15:24:36 -07:00
Michael Schmatz
075ea23be9 Fixed random sessions fetching 2014-03-14 12:54:54 -07:00
Scott Erickson
39ed6c3a43 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-14 11:58:42 -07:00
Scott Erickson
af8008596a Made editing thangs in the level editor not so slow by avoiding calling level.serialize. 2014-03-14 11:58:29 -07:00
Michael Schmatz
71aa6cc2c6 Added random session pair choosing 
Due to a bug I cannot test this immediately
 2014-03-14 11:30:06 -07:00
Jayant Jain
ece932595c Enables drag-panning for editor and region chooser 2014-03-14 23:57:00 +05:30
Jayant Jain
d8418f7bb2 Fixes issue where panning occurs upon mouse scroll at max/min zoom 2014-03-14 23:57:00 +05:30
Nick Winter
c0e966a08c Propagated new editor i18n tags. 2014-03-14 10:24:07 -07:00
Nick Winter
5c76ca71e3 Added configuring of behaviors to the editor config. 2014-03-14 10:14:48 -07:00
Nick Winter
3c0b496033 Fix for if aceConfig doesn't exist yet. 2014-03-14 07:46:36 -07:00
Nick Winter
c28d2bb576 Merge pull request #545 from dkundel/master 
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
 2014-03-14 07:35:11 -07:00
Dominik Kundel
190469d794 removed unnecessary comment 2014-03-14 03:28:20 +01:00
Dominik Kundel
0392f630cc including i18n support for new editor config and minor styling changes 2014-03-14 03:26:53 +01:00
Nick Winter
6e9945040f Truncated long score graphs; made my-matches score graphs independent of time; showed crude score y-axis for now. 2014-03-13 19:20:22 -07:00
Dominik Kundel
7e955c72b8 apply config to editor 2014-03-14 02:49:58 +01:00
Nick Winter
795bd8f63b Moved Glen from Archmages to About. 2014-03-13 18:27:08 -07:00
Dominik Kundel
8a5aeb6227 save editor config to database 2014-03-14 02:09:11 +01: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
Darredevil
88659aa191 Update ro.coffee 
Check line 234
Also need alternative for the word "ladder" in this context, there is translation that makes sense(will try to see how other games translate it and come back)
 2014-03-14 03:00:32 +02:00
Nick Winter
8b572f0647 Using isThang instead of instanceof Thang. 2014-03-13 17:59:17 -07:00
Dominik Kundel
6f2a04c5c0 added new editor config modal 2014-03-14 00:54:06 +01:00
Dominik Kundel
f618338d32 added button to access new modal for editor config 2014-03-14 00:53:29 +01:00
Dominik Kundel
4cbdc3cb4b highlight lines after insertion 2014-03-14 00:52:18 +01:00
Nick Winter
8ccd12866e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-13 15:46:53 -07:00
Scott Erickson
8431fd1e57 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-13 15:45:41 -07:00
Scott Erickson
abd50b9495 Fixed the new build queue system for levels where there are multiple builders for a single thang type. 2014-03-13 15:45:24 -07:00
Nick Winter
8554de7c4b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-13 15:35:31 -07:00
Nick Winter
e2d2e96cf5 Fixed several bugs with Thang selection and the SpellView and HUD. 2014-03-13 15:35:28 -07:00
Michael Schmatz
3262ad81f2 Merge branch 'master' of github.com:codecombat/codecombat 
Conflicts:
	app/views/play/spectate_view.coffee
 2014-03-13 15:24:04 -07:00
Michael Schmatz
7aa506e58c Various changes to spectate view 2014-03-13 15:22:35 -07:00
Scott Erickson
b2e9768127 Set up a build queue for async sprite sheet building, which lessens blocking the main thread. 2014-03-13 13:25:03 -07:00
Scott Erickson
c238b49f52 Fixed initial wizard position. 2014-03-13 11:07:08 -07:00
Nick Winter
485b179f5d Added Opponent i18n placeholder to other locales, and restored some new placeholders to pl.coffee. 2014-03-13 10:33:20 -07:00
Nick Winter
2b41efe466 Resolved some merge conflicts. 2014-03-13 10:32:18 -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
TigroTigro
206af3184d Update diplomat.jade 2014-03-13 18:01:52 +01:00
Björn Kimminich
055241c994 Update de.coffee 2014-03-13 17:57:27 +01:00
TigroTigro
94e7e6185b Update pl.coffee 2014-03-13 17:04:22 +01:00
TigroTigro
13fce18d5f Update pl.coffee 2014-03-13 17:03:07 +01: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
0be08574fc Merge pull request #536 from bkimminich/master 
Added/fixed some German translations
 2014-03-13 07:05:17 -07:00
Nick Winter
3e50e0c58c Merge pull request #535 from M-r-A/patch-1 
Update i18n
 2014-03-13 07:04:45 -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
Björn Kimminich
87ddd10dd4 Update diplomat.jade 2014-03-13 14:19:59 +01:00
Björn Kimminich
e87031afa0 Update de.coffee 2014-03-13 14:18:57 +01:00
Jayant Jain
17debf49e6 Implements smoother panning around the map for keyboard controls 2014-03-13 18:32:23 +05:30
Alexei Nikitin
e7c85d76b9 Update ru.coffee 2014-03-13 03:24:33 -07:00
Alexei Nikitin
3b04cd1e19 Update en.coffee 2014-03-13 03:24:26 -07:00
Alexei Nikitin
f844a4f630 Update ru.coffee 2014-03-13 03:07:55 -07:00
Shrihari
fb7f64ddb0 Grid toggle consistent with the button and the shortcut 2014-03-13 15:21:00 +05:30
Shrihari
d230c267a3 Fixed a locale issue which was making brunch fail 2014-03-13 15:00:00 +05:30
Jayant Jain
3c1ebc25ca Sass changes for footer and search in editor 2014-03-13 13:30:30 +05:30
Jayant Jain
c24469e86b Minor UI updates to level editor's thang tab 2014-03-13 12:19:51 +05:30
Nick Winter
8be2f8c455 Used i18n script to add new i18n tags to other languages. 2014-03-12 21:21:23 -07:00
Nick Winter
19a30bb1c7 Saved some commented-out translations. 2014-03-12 21:16:16 -07:00
Nick Winter
28d56f526e Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces. 2014-03-12 20:59:19 -07:00
Dominik Kundel
5c97fea363 fixed issue of multiple insertions due to multiple event handlers 2014-03-13 03:38:34 +01:00
Dominik Kundel
c01d29907d try to achieve higher contrast between background and 'executing' line 2014-03-13 03:08:28 +01:00
Dominik Kundel
60214abb41 Change cursor if moving on map with pressed 'shift' 2014-03-13 02:50:09 +01:00
Michael Schmatz
6eda2d24a5 Commented out line 133 2014-03-12 17:52:05 -07: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
Nick Winter
7e16821743 Updates for /play levels list. 2014-03-12 16:41:09 -07:00
TigroTigro
d0c5beafd0 Update pl.coffee 2014-03-13 00:24:11 +01:00
Nick Winter
1250207113 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-12 16:03:39 -07:00
Nick Winter
ac8f12ef20 I don't think we need this template any more. 2014-03-12 16:03:32 -07:00
Nick Winter
d2fd36c15f Merge pull request #531 from Darredevil/patch-1 
Update ro.coffee
 2014-03-12 16:02:18 -07:00
Nick Winter
ddea7d1531 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-12 15:44:33 -07:00
Scott Erickson
660e9ceca5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-12 15:12:22 -07:00
Darredevil
4e4474c819 Update ro.coffee 
miniupdate , testing if github works
 2014-03-13 00:00:23 +02: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
19184a88b0 Fixed showing the guide at the beginning of the level.... more. 2014-03-12 13:49:28 -07:00
Ruben Vereecken
6d3525afe6 Finished NL translations for ladder 2014-03-12 21:47:10 +01:00
Ruben Vereecken
b845961218 Clean up 2014-03-12 21:25:14 +01:00
Ruben Vereecken
f4637251be Added i18n to play modal 2014-03-12 21:23:25 +01:00
Ruben Vereecken
ca271fedd6 Added i18n to my matches tab 2014-03-12 21:13:01 +01:00
Ruben Vereecken
9f5c0f03be Added i18n to ladder_tab 2014-03-12 20:51:38 +01:00
Ruben Vereecken
c2e81db200 Added i18n to ladder.jade 2014-03-12 20:46:25 +01:00
Nick Winter
1ca9b2d3e5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-12 12:45:46 -07:00
Scott Erickson
ed60f5932f Fixed showing the guide at the beginning of the level. 2014-03-12 12:44:06 -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
TigroTigro
19f458b193 Update pl.coffee 2014-03-12 20:38:12 +01:00
Ruben Vereecken
76110423c0 Created i18n utility function 2014-03-12 20:30:43 +01:00
Nick Winter
77c9217357 Better handling of refreshing ladder and matches views depending on idle state. 2014-03-12 11:39:09 -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
49ab47e3fe Allowing shift+space to insert spaces as well as end scripts. Not ideal yet, 'cause we can't selectively not insert the space when canceling a script. 2014-03-12 10:01:31 -07:00
Nick Winter
f83fe6ce14 Fixed bugs with sprite rotation updating. 2014-03-12 09:31:45 -07:00
Nick Winter
d9b8375744 Merge pull request #513 from rubenvereecken/treema_fix 
Treema fix
 2014-03-12 09:21:52 -07:00
Ruben Vereecken
bd129f5824 No dropdown for sound in readOnly Treemas. 2014-03-12 17:19:47 +01: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
Nick Winter
da762fbc4f Merge branch 'rubenvereecken-versions_modal' 2014-03-12 08:30:02 -07:00
Nick Winter
0125c46dc2 Resolved merge conflict. 2014-03-12 08:29:42 -07:00
Ruben Vereecken
27fd580324 Got rid of CRLF line endings 2014-03-12 16:03:36 +01:00
Ruben Vereecken
4b72ee1d04 Clean up 2014-03-12 15:43:49 +01:00
Ruben Vereecken
8acf35b290 Added i18n for components 2014-03-12 15:42:57 +01:00
Ruben Vereecken
ddae5d0763 Added Version History to Level Components 2014-03-12 15:32:55 +01:00
Michael Schmatz
a6fb2a3994 Various changes to spectate view 2014-03-12 07:32:30 -07:00
Ruben Vereecken
2a86daaa2a Added Version History to Thang Types 2014-03-12 15:22:15 +01:00
TigroTigro
a8eff71438 Update pl.coffee 2014-03-12 14:01:35 +01:00
TigroTigro
85b1b81149 Update pl.coffee 2014-03-12 13:47:58 +01:00
TigroTigro
b1ab6225ee Update pl.coffee 2014-03-12 13:16:09 +01:00
Prabh Simran Singh Baweja
5e964cd6cf Update play_view.coffee 
New Level Added : Sword Loop
 2014-03-12 15:58:33 +05:30
Dominik Kundel
dd87215012 Avoid overwriting gutter symbols of error, warning, info 2014-03-12 11:26:56 +01:00
Scott Erickson
9cb80783ff Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-11 22:01:47 -07:00
Scott Erickson
8ddbb49845 Trying out promises to simplify view loading. 2014-03-11 22:01:38 -07:00
Nick Winter
b560827e32 Working on cleaning up some server errors. 2014-03-11 19:17:58 -07:00
Nick Winter
2b487eeed8 Using /db/thang.type instead of /db/thang_type in URLs, for consistency. 2014-03-11 18:30:25 -07:00
Nick Winter
4f9db0a7f7 Merged in all names. 2014-03-11 18:11:48 -07:00
Nick Winter
ce895ffd75 Merge pull request #524 from Darredevil/master 
Added GetALLToLocations and KeepALLFromLocations
 2014-03-11 18:09:50 -07:00
Nick Winter
40ea643f67 Merge pull request #523 from dkundel/master 
Avoid flickering of editor when executing the script.
 2014-03-11 18:07:17 -07:00
Nick Winter
8d718a4b16 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-11 18:06:52 -07:00
Nick Winter
8c57b31c54 Fixed a couple bugs with the matches tab. 2014-03-11 18:06:48 -07:00
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
Tigrowski
a5edfbcaa7 Update pl.coffee 2014-03-10 21:57:16 +01:00
Tigrowski
50469a8ae4 Update pl.coffee 2014-03-10 21:40:53 +01: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