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
Michael Schmatz
45cd7e31ca
Made simulator level-independent
2014-03-06 18:48:41 -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
2fb1c184f9
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-06 16:22:19 -08:00
Scott Erickson
1b61b928b0
Couple tweaks to the cocosprite for effect marks.
2014-03-06 16:21:06 -08:00
Nick Winter
ea406bd3c7
Fixed some event listeners on destroyed loaders.
2014-03-06 15:52:51 -08:00
Scott Erickson
2ac5a94055
Merge remote-tracking branch 'origin/master'
2014-03-06 15:52:14 -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
Nick Winter
40a32d7b43
Fixed array / string ThangState key serialization conflicts. Fixed #333 .
2014-03-06 14:53:37 -08:00
Nick Winter
a03403de94
Started some more name categories.
2014-03-06 09:35:58 -08:00
Nick Winter
fddd210d34
Fixed Archer M names conflict.
2014-03-06 09:27:06 -08:00
Nick Winter
b5c72e4b4a
Merge pull request #477 from iraladson/patch-1
...
Update names.coffee
2014-03-06 09:25:37 -08:00
Nick Winter
d3dd0eb32d
Fixed i18n tag typo: adventurer_sumamry -> adventurer_summary.
2014-03-06 09:25:16 -08:00
Nick Winter
49dac82897
Merge pull request #484 from akaza-akari/cn-locale
...
Chinese(Simpified) translation for Contribute and About page
2014-03-06 09:18:39 -08:00
Nick Winter
58069fc071
Merge branch 'enh-panning' of git://github.com/akaza-akari/codecombat into akaza-akari-enh-panning
2014-03-06 09:02:41 -08:00
Akaza Akari
ad3019a6cb
Translated more strings
2014-03-06 16:51:21 +08:00
Akaza Akari
929d10588e
Translate passages on Contribute and About page
2014-03-06 16:02:42 +08:00
Akaza Akari
030da44c23
Added volume manipulation, adjusted panning parameters
2014-03-05 20:12:42 -08:00
Scott Erickson
a6c4fe8d02
Merge branch 'master' of https://github.com/rubenvereecken/codecombat into rubenvereecken-master
2014-03-05 20:04:14 -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
aa3167f303
Temporary hack fix while mongodb text search is broken.
2014-03-05 15:06:20 -08:00
Darredevil
398fa3c426
Update ro.coffee
...
so much to translate....
2014-03-06 00:12:58 +02:00
Nick Winter
2d69abf674
Merge pull request #481 from dkundel/master
...
Proposed UX improvement for #6
2014-03-05 13:45:14 -08:00
Dominik Kundel
a033a80722
Merge remote-tracking branch 'upstream/master'
2014-03-05 22:18:53 +01:00
Dominik Kundel
b0d571c7ad
highlight only the executing statement
2014-03-05 22:17:34 +01:00
Scott Erickson
7a2d5b4bff
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-05 12:53:57 -08:00
Scott Erickson
fc42043cb8
Fixed #480
2014-03-05 12:53:48 -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
iraladson
8d046c31b9
Update names.coffee
...
"Added more names for #53
2014-03-05 14:06:29 -06:00
iraladson
7885b21b4b
Update names.coffee
2014-03-05 14:03:57 -06:00
Nick Winter
5ec06159a6
Fixed ChallengePost utm link. Tweaked God worker timeout for more reliable performance logging.
2014-03-05 12:00:29 -08:00
Darredevil
ea98a9917d
Update ro
2014-03-05 20:40:14 +02:00
Scott Erickson
0a8d5b5b97
Merge branch 'master' of https://github.com/Shrihari/codecombat into Shrihari-master
2014-03-05 10:35:06 -08:00
Shrihari
f6324807b3
Moved "Skip (esc)" next to Continue button
2014-03-05 23:36:18 +05:30
Dominik Kundel
d16d024782
further changes in design of highlighting lines in code
2014-03-05 17:06:46 +01:00
Shrihari
0ec431f90a
Moved 'skip tutorial' text to locales.
2014-03-05 13:46:21 +05:30
Dominik Kundel
a0e39480e3
new UI design for executing and executed lines in ACE editor
2014-03-05 02:00:38 +01:00
Scott Erickson
03b60838b6
Merge remote-tracking branch 'origin/master'
2014-03-04 12:21:07 -08:00
Scott Erickson
9726840d8a
Trying to handle a case where a user did not have their user account created.
2014-03-04 12:21:02 -08:00
Scott Erickson
3680d628e7
Fixed showing generic errors.
2014-03-04 12:06:31 -08:00
Darredevil
e02780e441
Update for ro.coffee
...
-first 80 lines done
2014-03-04 21:26:52 +02:00
Nick Winter
1532396ceb
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-04 11:15:35 -08:00
Nick Winter
4556536df4
Hooked up new HUD icons.
2014-03-04 11:15:31 -08:00
Yos Riady
195b1941ea
Added even more names for #53
2014-03-05 02:53:54 +08:00
George Saines
3ea4439fc1
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-04 10:24:23 -08:00
Nick Winter
2f653c966e
Simulator now swaps in empty methods when code doesn't compile.
2014-03-04 08:30:50 -08:00
Ruben Vereecken
d43ff5d217
Added an anonymous check on the Fork button
2014-03-04 11:24:38 +01:00
George Saines
33e2571934
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-03 18:04:01 -08:00
George Saines
113c71e141
adding new hud icons
2014-03-03 18:03:54 -08:00
Scott Erickson
1f091b93b8
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-03 17:15:54 -08:00
Scott Erickson
246bbefc91
Made the file uploading just overwrite files with the same name.
2014-03-03 17:14:13 -08:00
Nick Winter
65d9186ef1
Fixed actions showing up under dialogue bubbles on repeated toggling.
2014-03-03 16:55:36 -08:00
Scott Erickson
1b257252f9
Merge branch 'production'
2014-03-03 16:52:01 -08:00
Nick Winter
7b25eeec47
HUD properties now flow into columns more evenly, have max styling.
2014-03-03 16:45:03 -08:00
Scott Erickson
619b628661
Reworked the victory modal styling a bit.
2014-03-03 16:39:56 -08:00
Nick Winter
873c560a06
Added Alexandru's Bubble Sort Bootcamp Battle to /play.
2014-03-03 16:22:50 -08:00
Nick Winter
c944e78271
Ladder views now show level descvription content if present.
2014-03-03 14:59:39 -08:00
Scott Erickson
e231952fcf
Added the jquery minicolors image.
2014-03-03 14:17:36 -08:00
Ruben Vereecken
b7fbf67e89
Enabled Fork button again. Previous commits solve issue #455
2014-03-03 22:52:37 +01:00
Ruben Vereecken
0aa8e7bb7d
Added owner-based save enabling on Thang Types. NOTE server-sided doesn't work yet
2014-03-03 22:21:56 +01:00
Scott Erickson
d66a9d6be0
Set up a generic choose tab for root views so hash->tab behavior is baked in.
2014-03-03 13:21:05 -08:00
Nick Winter
461d66c795
Typo in my matches team ranking.
2014-03-03 13:02:34 -08:00
Nick Winter
0c4a2a2f2b
Multiplied visible scores by 100 for more awesome.
2014-03-03 12:27:32 -08:00
Ruben Vereecken
05b4f536c1
Fixed a link to point correctly
2014-03-03 21:22:04 +01:00
Nick Winter
0c45b6c0e3
Fixes for ladder refreshing.
2014-03-03 12:21:59 -08:00
Ruben Vereecken
ee920afea9
Disabled buttons for non-owners in Article Editor
2014-03-03 21:13:02 +01:00
Michael Schmatz
a5864c4f0c
Live leaderboard updating
2014-03-03 12:10:27 -08:00
Scott Erickson
1efb96f24a
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/templates/play/ladder/ladder_tab.jade
2014-03-03 12:08:11 -08:00
Scott Erickson
fb75ad36e7
Added team icons to the ladder play view.
2014-03-03 12:04:31 -08:00
Ruben Vereecken
942b69ea9f
Created hasWriteAccess on Cocomodel, used it for level access
2014-03-03 20:41:35 +01:00
Scott Erickson
65d39e658d
Removed the old team view cruft.
2014-03-03 11:15:46 -08:00
Scott Erickson
ff3f3e5a07
Removed a link to the old team view.
2014-03-03 11:11:27 -08:00
Scott Erickson
c5521a1311
Level now uses the universal wizard thang type.
2014-03-03 11:04:03 -08:00
Scott Erickson
0d054bec8e
Refactored the universal wizard loading to happen silently when you import ThangType.
2014-03-03 10:42:11 -08:00
Scott Erickson
feaeb1dc98
Made the wizard icons colored based on user settings.
2014-03-03 10:21:51 -08:00
Scott Erickson
d3b6836a06
Fixed some bugs with the new ladder view when you haven't played before.
2014-03-03 09:20:14 -08:00
Scott Erickson
5bb56ac818
Merge branch 'feature/new-ladder-view'
2014-03-03 09:05:52 -08:00
Scott Erickson
22e80f6d24
Set up a play modal, starting to refactor wizard thang type loading to be shared across the site.
2014-03-03 09:03:44 -08:00
Karthig
b04d63d5bf
- create sass file to center 404 image on page
2014-03-03 11:42:07 -05:00
Karthig
357ef45cb0
- insert random error image into 404 page
2014-03-03 10:58:33 -05:00
Nick Winter
20fb9ba5b4
Merge pull request #461 from rubenvereecken/master
...
Localization centred patches and additions
2014-03-03 07:37:46 -08:00
Nick Winter
980a3b6f21
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-03 07:29:07 -08:00
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
Nick Winter
a665aca039
Merge pull request #443 from M-r-A/master
...
Finalized Russian translations
2014-03-03 07:21:49 -08:00
Nick Winter
c858fb5e24
Merge pull request #440 from FinnDS/patch-1
...
Update names.coffee
2014-03-03 07:20:55 -08:00
Ruben Vereecken
b8b22bb739
Localized 'Create New ..' and 'Search .. Here'
2014-03-03 12:45:04 +01:00
George Saines
94b98a2d46
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-02 18:21:46 -08:00
George Saines
4b6ebd6532
styled the victory modal a bit
2014-03-02 18:21:42 -08:00
Nick Winter
82b250b9a3
protectAPI off again for Brawlwood, too slow for now.
2014-03-02 17:51:57 -08:00
Nick Winter
ca274f9787
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-02 16:06:31 -08:00
Nick Winter
a8ef87c9ea
Fixed a few bugs; re-enabled protectAPI for Brawlwood.
2014-03-02 16:06:22 -08:00
Ruben Vereecken
c2d247e686
Editor tables now load i18n correctly after search.
2014-03-03 00:31:49 +01:00
Ruben Vereecken
c3c699df49
Fixed wrong i18n name 'account_settings.autosave'. Added missing i18n name 'account_settings.email_notifications'
2014-03-02 23:28:16 +01:00
Ruben Vereecken
bea002a8d4
Fixed some wrong translations
2014-03-02 22:59:15 +01:00
Scott Erickson
956e2b3c40
Set up the my matches tab in the new ladder view.
2014-03-02 13:24:41 -08:00
Scott Erickson
d0f416f668
Rearranging the ladder view.
2014-03-02 12:43:21 -08:00
Ruben Vereecken
e4bf752e20
Changed Dutch (NL) ambassador_summary to match the English version
2014-03-02 20:30:18 +01:00
Ruben Vereecken
60f79e261d
Patched up tonnes of minor language mistakes (Dutch-Nederlands)
2014-03-02 20:24:14 +01:00
Ruben Vereecken
fb57e634a5
Patched up some grammar mistakes (Dutch-Nederlands).
2014-03-02 18:44:47 +01: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
YF
2db9fa708b
Update zh-HANS.coffee
2014-03-02 07:27:15 +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
Tay Yang Shun
47b37426d0
Added Level Editor page breadcrumbs.
2014-03-01 14:52:51 +08:00
Tay Yang Shun
f43dd2f3ff
Added breadcrumbs for Editor Search Results, Thang Editor and Article Editor pages.
2014-03-01 14:47:31 +08:00
Nick Winter
7855ca02d8
Hit a really bad victory modal image.
2014-02-28 21:29:14 -08:00
George Saines
58f2aa6123
adding victory and 404 images
2014-02-28 18:58:40 -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
9a9bc20c68
Merge pull request #442 from Rahazan/patch-1
...
Finalized Dutch translations
2014-02-28 16:57:22 -08:00
Alexei Nikitin
d68ff5a899
Fix diplomat.jade building
2014-03-01 04:54:54 +04:00
Alexei Nikitin
789b49e15f
Update diplomat.jade
2014-03-01 03:37:11 +04:00
Alexei Nikitin
9c107f24f8
Finishing ru.coffee
2014-03-01 03:31:36 +04:00
Rahazan
ef6acfe157
Fixed small typos.
2014-02-28 23:33:10 +01:00
Rahazan
22c7f9f690
Fixed line indentation, removed some double entries
2014-02-28 23:09:47 +01:00
Scott Erickson
4de425bd58
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-28 13:59:33 -08:00
Scott Erickson
10795df7d9
Renamed hardcoded project-dotas to brawlwoods.
2014-02-28 13:59:02 -08:00
Nick Winter
b5ff264ad0
Merge pull request #441 from yangshun/level-editor-freeze
...
Redirect to level editor only after modal hidden event is triggered. Fixes #438 and #439 .
2014-02-28 12:48:56 -08:00
Nick Winter
52903cc0de
Using String and Array docs when appropriate now.
2014-02-28 12:43:31 -08:00
Rahazan
d58909a39a
Finalized Dutch translations
2014-02-28 21:22:10 +01:00
Nick Winter
6db8051122
Only show action timeline when 'action' is in the hudProperties.
2014-02-28 11:38:41 -08:00
Scott Erickson
2894d4f39c
Set up session-repeating scripts.
2014-02-28 11:28: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
Tay Yang Shun
8af62d53cd
Redirect to level editor only after modal hidden event is triggered. Fixes #438 .
2014-03-01 01:55:30 +08:00
Finn
5b5af5a55a
Update names.coffee
...
Added the name "Cid" under "Soldier M".
2014-02-28 12:06:26 +01:00
Nick Winter
e20e9d68cf
Construct sprite sheets as ThangTypes load.
2014-02-27 22:15:13 -08:00
Nick Winter
97197bd89d
Got rid of potentially unnecessary (and definitely slow) SpriteSheetBuilder _.cloneDeep. Watch out.
2014-02-27 20:54:29 -08:00
Nick Winter
aef1bc63ba
Smarter infinite loop detection vs. web-worker-is-still-loading detection.
2014-02-27 20:01:27 -08:00
Nick Winter
ad30130814
Merge pull request #437 from M-r-A/master
...
Fix indents
2014-02-27 17:10:48 -08:00
M-r-A
873cd55cf3
Update ambassador.jade
2014-02-27 17:00:04 -08:00
M-r-A
a1bb322e7c
Update archmage.jade
2014-02-27 16:56:02 -08:00
M-r-A
0d7eb52fb8
Update ambassador.jade
2014-02-27 16:55:24 -08:00
M-r-A
095b14e41a
Update adventurer.jade
2014-02-27 16:54:59 -08:00
M-r-A
772c0b1ab7
Update artisan.jade
2014-02-27 16:54:22 -08:00
Nick Winter
e64796bba6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-27 16:53:05 -08:00
Nick Winter
01845a0175
Some translations weren't done yet.
2014-02-27 16:52:58 -08:00
Scott Erickson
04a0337b92
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-27 16:44:54 -08:00
Scott Erickson
df196cc531
Modals now stop the level from starting until they close.
2014-02-27 16:44:11 -08:00
Nick Winter
de4c9cb60d
Merge pull request #436 from M-r-A/master
...
Fix link in legal.jade
2014-02-27 16:40:56 -08:00
M-r-A
d3d5810acc
Fix link in legal.jade
2014-02-27 16:34:58 -08:00
Scott Erickson
7c734d6bc9
Added an async name checker for the wizard settings modal.
2014-02-27 14:42:11 -08:00
Scott Erickson
b31527abef
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-27 14:08:04 -08:00
Scott Erickson
02cb9155c0
Improved a bunch of things with the wizard settings view.
2014-02-27 12:25:59 -08:00
Gokul
63f70f7a39
Made changes in the language, It was earlier showing English(Au) for both Lithuanian and Norwegian Nynorsk. Couldno't change Bahasa Melayu. It keeps showing {English} in the description instead of Bahasa Melayu
...
Changed English(Au) in two wrong places to Luthanian and Norwegian
Changed English(Au) in two wrong places to Luthanian and Norwegian and made corrections in Bahasa
Cleaned up some more lang. descriptions and issue #272 shouldn't happen now i guess
Update not_found.jade
A couple tweaks to gokul1794's commits.
2014-02-27 12:07:57 -08:00
Scott Erickson
f991bc3a58
Removed some vestigial wizard coloring code from the settings account view.
2014-02-27 12:02:08 -08:00
Nick Winter
7453ada074
Uncommented some translations that were added.
2014-02-27 11:57:23 -08:00
Nick Winter
ffbef0de5b
Merge pull request #428 from Darredevil/patch-1
...
Added more names for #53
2014-02-27 11:50:59 -08:00
Nick Winter
33ff7a48aa
Merge pull request #426 from M-r-A/patch-1
...
Update ru.coffee
2014-02-27 11:08:39 -08:00
Nick Winter
190ab6e792
Merge pull request #417 from Vic020/patch-1
...
Update zh-HANS.coffee
2014-02-27 11:08:10 -08:00
Michael Schmatz
5d2c430779
Merge pull request #435 from yangshun/editor-modal-input-focus
...
Auto-focus on the modal's input field for creation of new entities in editor.
2014-02-27 09:21:09 -08:00
Tay Yang Shun
d2a6b3822e
Re-added submit form event
2014-02-28 01:17:19 +08:00
Michael Schmatz
53a317df77
Merge pull request #434 from yangshun/play-button
...
Deferred saving of latest level
2014-02-27 09:07:27 -08:00
Michael Schmatz
9deadad99f
Merge pull request #427 from yangshun/music-button
...
Blur the music button after click so that subsequent space and enter keydown events do not trigger it.
2014-02-27 09:06:18 -08:00
Tay Yang Shun
57f896b950
Added newline to end of file.
2014-02-27 15:38:03 +08:00
Tay Yang Shun
947b8766c2
Auto-focus on the modal's input field for creation of new entities in editor. Fixes issue #379
2014-02-27 15:32:18 +08:00
Tay Yang Shun
04895a9204
Merge branch 'master' into play-button
2014-02-27 14:09:37 +08:00
Tay Yang Shun
514fe358c1
Trigger storage of latest level only after the level is guaranteed to be able to load
2014-02-27 14:08:25 +08:00
Scott Erickson
8d828939b6
Fixed a bug where the jingle wouldn't play during level loading if the audio had been loaded previously.
2014-02-26 20:23:13 -08:00
Scott Erickson
74186b7772
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-26 19:30:49 -08:00
Scott Erickson
ec7028af60
Fixed uploading images for articles.
2014-02-26 19:30:37 -08:00
Nick Winter
c26995a3a9
Home button on ladder level goes to ladder.
2014-02-26 18:58:25 -08:00
Scott Erickson
4e8c0b65e2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-26 18:49:43 -08:00
Scott Erickson
7052b0600b
Made mouse dragging not interrupt selecting units so much.
2014-02-26 18:42:39 -08:00
Nick Winter
48122000ed
Gold shows up as an int in the HUD now.
2014-02-26 18:09:09 -08:00
Nick Winter
5c1c17c8dd
Green Guide button for attention.
2014-02-26 17:52:08 -08:00
Nick Winter
081274579b
Forget old goals.
2014-02-26 17:45:08 -08:00
Nick Winter
0cf20b577d
Added a delay to the property documentation on spell debug hover.
2014-02-26 17:23:59 -08:00
Nick Winter
172242d226
Re-denormalize session if things have changed. Removed some logs.
2014-02-26 17:06:21 -08:00
M-r-A
1c675ea2e2
Update ru.coffee
2014-02-26 16:40:51 -08:00
Scott Erickson
0fd1c03b7f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-26 15:56:25 -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
ea73d91a6b
Made the docs modal larger.
2014-02-26 15:44:46 -08:00
Michael Schmatz
b648098c95
Implemented espionage mode
2014-02-26 14:14:43 -08:00
Darredevil
55ab142d75
Added more names for #53
2014-02-26 23:21:03 +02:00
Michael Schmatz
a052180250
Improved match scheduling
2014-02-26 12:14:02 -08:00
M-r-A
1a7e1f2384
Update ru.coffee
2014-02-26 10:56:40 -08:00
Tay Yang Shun
b48a9fabc6
Blur the music button after click so that subsequent space and enter keydown events do not trigger it. Fixes issue #306 .
2014-02-27 02:42:25 +08:00
Michael Schmatz
bb76fb241c
Fixed simulator
...
The format of something must have suddenly changed?
2014-02-26 09:21:44 -08:00
M-r-A
ab6fc69e6c
Update ru.coffee
2014-02-25 23:49:43 -08:00
Scott Erickson
f89768d76d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-25 17:15:01 -08:00
Scott Erickson
02d1dc2445
Added a screen for when playback ends.
2014-02-25 17:14:39 -08:00
Nick Winter
3c5902a1d2
Trying to get session code merging to work again.
2014-02-25 14:46:48 -08:00
Nick Winter
b86c32c3e2
Merge pull request #422 from yangshun/level-not-found
...
Redirect to play page for non-existent levels. Fixes issue #396
2014-02-25 14:17:44 -08:00
Tay Yang Shun
373a618cff
Moved internationalisation of level load error message into template file
2014-02-26 06:14:29 +08:00
Tay Yang Shun
11c5f7419a
Used internationalised strings for level not found message
2014-02-26 05:54:33 +08:00
Tay Yang Shun
e3a81137e0
Modified locale messages for "level_load_error"
2014-02-26 05:52:49 +08:00
Scott Erickson
a53498224c
Tweaked sprite scripts to use given response buttons even if the script is not skippable.
2014-02-25 13:27:02 -08:00
Tay Yang Shun
8a24407d3e
Redirect to play page for non-existent levels. Fixes issue #396
2014-02-26 04:59:35 +08:00
Scott Erickson
1b4699556a
Fixed a bug where sometimes new worlds would hide the hud speaker unnecessarily.
2014-02-25 12:39:22 -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
45e6fadfe2
Added a property to prevent scripts from running after certain other scripts have run.
2014-02-25 10:50:40 -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
Nick Winter
0380a30522
Fixes for not storing default code in other sessions. sass-brunch 1.8. Removed tutorial link for now. Round wizards.
2014-02-25 10:48:23 -08:00
Vic___
547bda9748
Update zh-HANS.coffee
2014-02-25 22:38:01 +08:00
Scott Erickson
168f268d21
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 19:49:12 -08:00
Scott Erickson
242342315f
Can now drag the mouse to move around the map.
2014-02-24 19:49:05 -08:00
Nick Winter
3472b3da97
Working on different shadow shapes. Fixed bug with palette property ownership.
2014-02-24 17:53:35 -08:00
Nick Winter
4a4a702f1e
Fixed a bug where scrubbing playback wouldn't always update sprite existence properly.
2014-02-24 17:01:36 -08:00
Scott Erickson
01b91eb7e2
Lowered the bob height for the wizard a bit.
2014-02-24 16:59:17 -08:00
Scott Erickson
12b28397e0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 16:54:10 -08:00
Scott Erickson
7f738562e9
Fixed a playback bug where if you clicked the scrubber while playing, it would continue playing instead of pausing properly.
2014-02-24 16:53:55 -08:00
Nick Winter
6e557d354e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 16:42:37 -08:00
Nick Winter
2e2f184485
Not sure why beam behaves differently, but fixed its scaling.
2014-02-24 16:42:34 -08:00
George Saines
d62630d0a7
final tweaks to dialogue text styling
2014-02-24 16:03:56 -08:00
George Saines
8192a6153d
fiddling with text formatting
2014-02-24 15:51:10 -08:00
Nick Winter
ab8d63f545
Improved grouping of palette properties.
2014-02-24 15:48:30 -08:00
Scott Erickson
34205a0789
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 14:58:02 -08:00
Scott Erickson
79ce16dbba
Hiding most of the ladder page if not logged in.
2014-02-24 14:57:51 -08:00
Scott Erickson
052d35afe7
Added a screen darkener for when the spell is casting.
2014-02-24 14:40:28 -08:00
Nick Winter
32c45b80a9
Fixed performance problem with duplicate user code problem annotations.
2014-02-24 14:12:41 -08:00
Scott Erickson
e48bdfa1a7
Added your score to the ladder/team view.
2014-02-24 13:03:04 -08:00
Scott Erickson
43a49b3e6f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 12:52:43 -08:00
Scott Erickson
77f923752f
Fixed #411 .
2014-02-24 12:52:35 -08:00
Nick Winter
21975bedd2
Fixed #408 .
2014-02-24 11:21:51 -08:00
Scott Erickson
953c9064f5
Fixed #407 .
2014-02-24 11:20:35 -08:00
Scott Erickson
8138a5b678
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 11:13:21 -08:00
Scott Erickson
2be752ceed
Refactored user creation to /auth/whoami, and made the app call that first, so only one user is created. Fixed #318 . Think this also fixes #406 .
2014-02-24 11:12:52 -08:00
Nick Winter
97ebe6dec8
Lightened problem info background highlight color for legibility.
2014-02-24 10:36:00 -08:00
Nick Winter
10e10aa961
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 09:58:15 -08:00
Nick Winter
91412ccd69
Playback and level editor shortcut tweaks.
2014-02-24 09:58:12 -08:00
Scott Erickson
d146febb32
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 09:47:20 -08:00
Scott Erickson
3f0f391556
Finished up work on the wizard settings modal.
2014-02-24 09:46:40 -08:00
Scott Erickson
4d9dd9bd36
Fixing the wizard settings modal.
2014-02-24 09:06:50 -08:00
Scott Erickson
2d6dd36a68
Saturation and lightness was flipped on the spritebuilder. Fixed.
2014-02-24 09:06:22 -08:00
Nick Winter
af43f18c23
Fixed selective includeFlow.
2014-02-24 08:59:50 -08:00
Nick Winter
af965ccb93
Fixes for ThangListEntryView popover hover states.
2014-02-23 17:11:27 -08:00
Nick Winter
3a0ed0af9b
Still let people copy out of spell palette entries while suppressing selection color.
2014-02-23 16:49:25 -08:00
Nick Winter
b3eadef818
Merge pull request #404 from tips48/master
...
Change spell palette colors
2014-02-23 16:34:28 -08:00
Nick Winter
933bcf9e6b
Showing property documentation when hovering in code in addition to clicking on palette entries.
2014-02-23 16:34:03 -08:00
Aidan Matzko
8bef99e394
Make spell palette prettier
2014-02-23 18:10:03 -05:00
Nick Winter
68497b2cf3
Added arg names or ... for functions which take arguments in spell palette entries.
2014-02-23 13:27:02 -08:00
Nick Winter
a156edc0a2
Merge pull request #403 from tips48/master
...
Silly error names
2014-02-23 12:32:08 -08:00
Nick Winter
5b88b58a75
Fixed application of a few i18n tags in wizard/picture settings.
2014-02-23 12:31:41 -08:00
Aidan Matzko
b69fe85134
Silly error names
2014-02-23 15:30:33 -05:00
Nick Winter
11f742ff0f
Included Hour of Code explanation in play footer.
2014-02-23 11:48:34 -08:00
Nick Winter
60eb0db1aa
A few fixes for IE, anonymous errors, and cast button overflow.
2014-02-23 11:23:26 -08:00
Nick Winter
5f4d5afe4f
Sped up CoordinateDisplay hover based on Russ's feedback.
2014-02-23 09:55:40 -08:00
Nick Winter
2aa103dd87
Merge pull request #402 from Vic020/master
...
Update zh-HANS.coffee
2014-02-23 09:47:00 -08:00
Nick Winter
d27925d862
Merge pull request #401 from sikandar47/patch-1
...
Update es-ES.coffee
2014-02-23 09:43:52 -08:00
Nick Winter
34b2c6dba8
Merge pull request #394 from OviiiOne/patch-1
...
Update es.coffee
2014-02-23 09:39:04 -08:00
Vic___
fb9a424146
Update zh-HANS.coffee
...
Translated wizard_settings and editor page ,and fix up some Inaccurate words.
2014-02-24 01:11:11 +08:00
sikandar47
b3fe74e2a2
Update es-ES.coffee
2014-02-23 18:08:41 +01:00
Nick Winter
d8d514849f
Merge pull request #400 from M-r-A/patch-1
...
Update ru.coffee
2014-02-23 08:34:55 -08:00
Nick Winter
0a334b310f
Merge pull request #398 from jmr0/master
...
fixing language selection disappearance when showing cached home view
2014-02-23 08:32:27 -08:00
M-r-A
01a1d9e871
Update ru.coffee
2014-02-22 18:50:47 -08:00
jmr0
f00d9b2acc
changing showDiplomatSuggestionModal function name and moving language build call to it from afterRender
2014-02-22 21:06:37 -05:00
Nick Winter
43c1240a03
Fixed cast button moving around due to anticipated errors early.
2014-02-22 18:02:58 -08:00
Nick Winter
c21952646a
Stop cast button progress overlay before cast settings gear.
2014-02-22 17:50:45 -08:00
Nick Winter
0d9213ad44
Faded Contact link until hover.
2014-02-22 17:45:24 -08:00
Nick Winter
f88cbba262
Got rid of some unnecessary scrolling behavior on /play/level due to footer when aspect ratio is cramped.
2014-02-22 17:40:38 -08:00
Nick Winter
8565e3f315
Adding the button, not just the shortcut, for beautification.
2014-02-22 17:18:58 -08:00
Nick Winter
9eb8bb97f5
Trying out a Ctrl+Shift+B code beautifier option.
2014-02-22 16:58:54 -08:00
jmr0
1562b02fd1
still need this for rendering after a language switch
2014-02-22 19:32:43 -05:00
jmr0
34df232d4f
fixing language selection disappearance when showing cached home view
2014-02-22 19:32:43 -05:00
Nick Winter
b3009ae909
Fixed #7 with a nice cast-end sound (just reverse of cast sound).
2014-02-22 15:26:38 -08:00
Nick Winter
702eca5c81
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-22 12:04:10 -08:00
Nick Winter
72cfcf96ed
Added basic opponent wizard. Disabled synchronous multiplayer for ladder levels.
2014-02-22 12:01:05 -08:00
Scott Erickson
90ec07fc75
Fixed the camera to properly follow thangs again. Also tweaked the camera to center around the torso rather than the feet.
2014-02-22 11:31:31 -08:00
Scott Erickson
5c85f227c6
Removed the hover playback control.
2014-02-21 17:11:16 -08:00
Scott Erickson
90ea365dc6
Fixed the background to match the footer so that there's no white at the bottom of the screen when playing full screen.
2014-02-21 17:07:31 -08:00
Nick Winter
a60a3fa796
Fixed a syntax problem with the tr merge.
2014-02-20 17:47:38 -08:00
Gediz
822405f3f5
Just updated Turkish translation
...
I've translated a little part. And planning to translate the rest of document tomorrow. I'm not so sciential about GitHub, do I have to do anything else after I propose it?
2014-02-21 03:37:27 +02:00
Nick Winter
26f11f40a9
Fix for destroying level.
2014-02-20 17:21:15 -08:00
Nick Winter
4e5ecb0c9e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 17:21:03 -08:00
Scott Erickson
bf80b806c6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 17:06:25 -08:00
Scott Erickson
da0238ceba
Switched the level view to grab opponent code from submittedCode instead of code.
2014-02-20 16:53:08 -08:00
Scott Erickson
7261f9960c
Tweaked the name column size in the ladder view.
2014-02-20 16:52:46 -08:00
Nick Winter
06f1e284c9
Added comment highlighting icon.
2014-02-20 16:14:31 -08:00
George Saines
c8669d1f19
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 15:32:51 -08:00
George Saines
c11e1b897f
adding comment text color
2014-02-20 15:32:40 -08:00
Nick Winter
edcb7f45b6
Merge pull request #395 from tips48/master
...
Block Ctrl-S while playing
2014-02-20 15:29:16 -08:00
George Saines
10b14e3d65
adding comment color
2014-02-20 15:28:20 -08:00
Scott Erickson
367b1c2007
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 15:13:44 -08:00
Scott Erickson
d9b86b84dc
Fixed a bug with the coloring of avatars in the hud.
2014-02-20 15:13:15 -08:00
Scott Erickson
eccabd2dc5
Apparently you shouldn't boldify text in ACE.
2014-02-20 15:12:57 -08:00
Aidan Matzko
e3ab7a4d7e
Block Ctrl-S while playing
2014-02-20 18:11:20 -05:00
Oviii_One
fc662f7f98
Update es.coffee
2014-02-20 23:57:19 +01:00
Oviii_One
e9c460c642
Update es.coffee
2014-02-20 23:56:22 +01:00
Nick Winter
91a641d3ab
Updated Diplomat instructions and related locale files.
2014-02-20 14:52:42 -08:00
Scott Erickson
9c30b9f0d0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 14:49:17 -08:00
Scott Erickson
7ea9f8549f
Fixed some scroll bars from appearing when they shouldn't.
2014-02-20 14:45:54 -08:00
Nick Winter
67e1959341
Merge pull request #393 from daegren/master
...
Misaligned social share buttons
2014-02-20 14:42:24 -08:00
Nick Winter
54276c2bca
Merge pull request #389 from liyinkan/master
...
Translate and refine Chinese simplified
2014-02-20 14:39:39 -08:00
Nick Winter
81d3702b49
Merge pull request #388 from jcvno/patch-1
...
Update names.coffee
2014-02-20 14:38:43 -08:00
Nick Winter
02ca5db1d6
Merge pull request #387 from EagleTA/patch-1
...
first step of translation
2014-02-20 14:38:17 -08:00
Scott Erickson
48cf9a1443
Added a link to the tutorial level.
2014-02-20 14:31:33 -08:00
Scott Erickson
0198bd1ec5
Gave the tome popovers a bit of margin on the right so the scroll bars don't hang off the side.
2014-02-20 14:31:04 -08:00
Scott Erickson
8bbce727ee
Made the goals view a little more opaque.
2014-02-20 14:26:04 -08:00
Scott Erickson
5bda4d5e5f
Fixed the camera to not move around when the world is reset and being cast.
2014-02-20 14:25:39 -08:00
Nick Winter
3c651abe20
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 14:05:37 -08:00
Nick Winter
97b6094fe8
Tweaks for ladder views.
2014-02-20 13:58:35 -08:00
Oviii_One
245fa11811
Update es.coffee
...
Chanched a lot of words
2014-02-20 22:26:37 +01:00
Nick Winter
284576521f
Added fullscreen toggle to play with.
2014-02-20 13:19:49 -08:00
George Saines
7d4431d2f2
adding youtube link for instructional vid
2014-02-20 12:41:04 -08:00
Scott Erickson
63ef2860d6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 11:57:48 -08:00
Nick Winter
cc8a8cabd5
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 11:57:15 -08:00
Nick Winter
7266142c02
Upgrading docs return value schema. Added button template for tutorial and screencast on ladder.
2014-02-20 11:57:04 -08:00
Scott Erickson
5cefb8fc30
Merge branch 'production'
2014-02-20 11:47:02 -08:00
Scott Erickson
8184d0b9d3
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 11:43:46 -08:00
Scott Erickson
6b2e0bc364
Changed how the goal manager handles arriving at goals and figuring out the how many requirement.
2014-02-20 11:43:35 -08:00
Scott Erickson
251d483eaa
Tweaked some level view styling.
2014-02-20 11:42:19 -08:00
Michael Schmatz
6d6cac7309
Various interface tweaks
2014-02-20 10:56:32 -08:00
Michael Schmatz
a2b811d52f
Added visual feedback for simulation buttons
2014-02-20 10:40:19 -08:00
Nick Winter
bce184b9da
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 10:39:19 -08:00
Nick Winter
f81e0c85ef
Fixes for popover behavior.
2014-02-20 10:39:16 -08:00
Michael Schmatz
cb0c22f0c9
Replaced rank button with button going to ladder page
2014-02-20 10:14:25 -08:00
Michael Schmatz
7c5192820f
Put more security on the session submissions and improved simulation status rendering
2014-02-20 09:44:44 -08:00
Michael Schmatz
99de854536
Put in link to detail view
2014-02-20 08:39:27 -08:00
Michael Schmatz
e593fd23b4
Improved interface for simulating games
2014-02-20 08:06:14 -08:00
David Mills
79a3bea575
Misaligned social share buttons
2014-02-19 22:04:13 -05:00
Nick Winter
f85a55c8b7
Cast -> Cast Spell
2014-02-19 18:20:21 -08:00
Nick Winter
7c2960f2ce
Improved visibility of cast button progress overlay.
2014-02-19 18:04:37 -08:00
Nick Winter
0469c918db
Make dead dudes look deader. Eagerly destroy ThangListEntryView popovers, Highlander-style. Announce eternal brunch.
2014-02-19 17:02:39 -08:00
Nick Winter
01374d63c4
Better comment formatting. Manual cast by default on Project DotA.
2014-02-19 14:00:54 -08:00
Scott Erickson
26af051cca
Set up indie sprites and their avatars to use the new colorConfig property.
2014-02-19 13:43:44 -08:00
Nick Winter
dcf7a0d1fd
Re-enabled Olark.
2014-02-19 12:43:25 -08:00
Scott Erickson
878d1e4098
Fixed the placement of the music note in the playback view.
2014-02-19 12:27:49 -08:00
Scott Erickson
613e7848dc
Fixed a bug with the setting of opposing team spells, not to modify anything when there are no specified teams.
2014-02-19 11:45:29 -08:00
Scott Erickson
86f94cb5fd
Refactored dynamic sound loading to the level view, since the level loader is no longer in service after finishing loading.
2014-02-19 11:42:33 -08:00
Scott Erickson
e85f5c7e6b
Fixed modals not being able to be opened after restarting the level when no scripts are running.
2014-02-19 11:15:36 -08:00
Scott Erickson
0bf772d745
Changing the files view to replace files when there are name collisions.
2014-02-19 10:55:15 -08:00
Scott Erickson
bdbebe886c
Added a log for figuring out what session is causing NaNs.
2014-02-19 08:19:30 -08:00
Scott Erickson
ece08ba366
Fixed the matches order on the ladder team page.
2014-02-19 08:19:13 -08:00
Yinkan Li
a0acdba619
translate and refine Chinese simplified
...
translate:
employers
refine:
coppa_why
2014-02-19 21:54:47 +08:00
Yinkan Li
786ccf476d
translate and refine Chinese simplified
...
translate:
send_password
create_account_title
refine:
slogan
no_mobile
play
2014-02-19 21:49:08 +08:00
Justin Cano
059c50e47d
Update names.coffee
2014-02-19 03:03:43 -08:00
EagleTA
40ef21571c
first step of translation
...
just trying the environment for translation
2014-02-19 00:22:23 +02:00
Nick Winter
a8794f4e7e
Merged
2014-02-18 12:55:18 -08:00
Nick Winter
1c82fc5bb0
Fix for opponent teams not working.
2014-02-18 12:54:47 -08:00
Michael Schmatz
dc70fec977
Merge pull request #385 from codecombat/redis
...
Merge redis into master
2014-02-18 12:53:57 -08:00
Scott Erickson
27fb2ec37d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-18 12:27:56 -08:00
Scott Erickson
f383e5b9fa
Fixes for the ladder team view.
2014-02-18 12:27:10 -08:00
Nick Winter
f54fcfe6c0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-18 11:49:15 -08:00
Nick Winter
636b1bb30d
Fixed home wizard scale.
2014-02-18 11:48:36 -08:00
Michael Schmatz
d02d09ae36
Simulation fixes
2014-02-18 11:46:14 -08:00
Scott Erickson
5a436ce10b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-18 11:41:29 -08:00
Scott Erickson
d2d2099c4a
Fixing a bug with the tome problem view.
2014-02-18 11:39:11 -08:00
Scott Erickson
cacf6539c1
Working on the ladder and team views.
2014-02-18 11:38:49 -08:00
Nick Winter
9cdc07d07c
Fixed spell palette doc duplication.
2014-02-18 11:23:01 -08:00
George Saines
c8679c37de
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-18 10:28:04 -08:00
George Saines
a44f8756ae
hour of code trivial fix
2014-02-18 10:28:00 -08:00
Nick Winter
d45f67a8c3
Fixed some popover and modal layout and bugs.
2014-02-18 10:03:57 -08:00
Scott Erickson
452a43cae9
Working on the ladder and team views.
2014-02-17 17:42:41 -08:00
Nick Winter
6f0ed9040a
Fixes for dirt path, fast portraits, and slow transpilation. Starting to move Aether stuff into a Tome worker with Catiline.
2014-02-17 17:38:49 -08:00
Martin Delille
d7edf84896
translate wizard settings
2014-02-17 22:34:02 +01:00
Nick Winter
3c08f8a5eb
Added wizard settings i18n tags.
2014-02-17 13:08:37 -08:00
Nick Winter
cc4c0f0e85
Exported a few new en i18n tags to the other languages.
2014-02-17 12:42:04 -08:00
Nick Winter
9558745216
Saving some uncommented i18n tags.
2014-02-17 12:40:40 -08:00
Nick Winter
6d87b422f6
Merge pull request #372 from QelioX/patch-1
...
ru.cofee small changes
2014-02-17 12:26:19 -08:00
Nick Winter
58028259c4
Merge pull request #381 from alireza68/patch-1
...
Update fa.coffee
2014-02-17 12:25:32 -08:00
Nick Winter
a4f4016c73
Updating i18n tags for new contribute summaries.
2014-02-17 12:23:06 -08:00
Nick Winter
dcb6f0d280
Merge branch 'master' of git://github.com/iamawong/codecombat into iamawong-master
2014-02-17 11:56:03 -08:00
Nick Winter
af510c7cc7
60 FPS and support for independent world/surface frame rates.
2014-02-17 11:53:52 -08:00
Andrew Wong
b1aa65833a
Consolidated text on contribute and removed padding to make the
...
page not as spread out.
Text on the contribute page was a redundant copy of each class'
contribution page. The summary text was shortened and some vertical
padding was removed.
2014-02-17 10:24:29 -08:00
alireza68
88b4055af3
Update fa.coffee
...
I'll translate the rest soon
2014-02-17 21:17:56 +03:30
Nick Winter
1b0f15b5f3
More LevelLoader defense.
2014-02-17 08:15:53 -08:00
Nick Winter
c19c8f3912
Fix for LevelLoader, selection udpating, and non-documentation tome popovers.
2014-02-16 18:29:24 -08:00
Nick Winter
2c41d403bc
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-16 15:30:07 -08:00
Nick Winter
e3824d7698
Many improvements to the spell palette.
2014-02-16 15:30:00 -08:00
Scott Erickson
bbe5399a97
Fixed #370
2014-02-16 12:51:20 -08:00
Nick Winter
1f7cea4e54
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-15 17:38:50 -08:00
Nick Winter
f94456295e
God needs no options.
2014-02-15 17:38:45 -08:00
Scott Erickson
5bbe829586
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-15 17:36:40 -08:00
Scott Erickson
be83b5420f
Fixed the goals view, which wasn't being properly shown.
2014-02-15 17:36:27 -08:00
Nick Winter
addf4ca245
Improved Simulator memory and performance.
2014-02-15 17:29:54 -08:00
Nick Winter
f3b58a9416
Merged.
2014-02-15 15:45:53 -08:00
Nick Winter
3c7cac8ba9
Trying to do some memory cleanup.
2014-02-15 15:44:45 -08:00
Scott Erickson
8f938bf6fc
Scrolling with the mouse now zooms based on mouse position.
2014-02-15 13:45:16 -08:00
Esh2349
185963f999
ru.cofee small changes
2014-02-16 00:20:59 +03:00
Scott Erickson
72712a349c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-15 12:07:28 -08:00
Scott Erickson
ac08490e86
Reworked the multiplayer modal a bit.
2014-02-15 12:06:47 -08:00
Scott Erickson
663a09ed4b
Spell list updates based on the existence of thangs now.
2014-02-15 09:22:13 -08:00
Michael Schmatz
c418e282ae
Put in pairwise simulation button
2014-02-14 16:53:37 -08:00
Nick Winter
fdf1e21e72
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-14 16:52:54 -08:00
Nick Winter
50f683534f
Support for seeing this.now() in spell palette.
2014-02-14 16:52:50 -08:00
Scott Erickson
597ace25cc
Fixed the spell list tab entry view popover to not popover when using the dropdown.
2014-02-14 16:08:01 -08:00
Scott Erickson
a25b1be916
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-14 15:57:54 -08:00
Michael Schmatz
63a5769bcf
Fixed various bugs in simulator and put in home view
2014-02-14 15:50:42 -08:00
Scott Erickson
d55e4cd624
Made sure session objects are loaded from the server fresh, no caching.
2014-02-14 15:35:54 -08:00
Michael Schmatz
643cafc89f
Refactored level handler and level session schema
2014-02-14 14:55:30 -08:00
Scott Erickson
13caae2690
Fixed the massive memory leak.
2014-02-14 14:10:55 -08:00
Scott Erickson
a8c483a59f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-14 14:10:35 -08:00
Scott Erickson
55fcad2cc3
Fixed a couple bugs with the wizard.
2014-02-14 14:10:28 -08:00
Scott Erickson
7faa401177
Trying to improve memory by clearing out all properties of destroyed objects.
2014-02-14 13:31:26 -08:00
Scott Erickson
1349a59084
Refactored destroy functions to have super be the last thing.
2014-02-14 10:57:47 -08:00
Michael Schmatz
7cec574e17
Started simulator refactor
2014-02-14 10:49:19 -08:00
Scott Erickson
693fa06afb
Fixed a bug in the competitor code session setting when the player has no code yet.
2014-02-14 10:38:20 -08:00
Michael Schmatz
2b1079912a
Merge pull request #368 from gintau/master
...
Revsing Traditional Chinese translation and adding translation of "about".
2014-02-13 21:06:57 -08:00
Nick Winter
da866a418c
Fixed cast options clicking.
2014-02-13 17:43:42 -08:00
Michael Schmatz
fc76846aa6
Stopped parsing ladder as int
2014-02-13 17:34:31 -08:00
Michael Schmatz
db0695513e
Implemented reverse sorting of backbone collection
2014-02-13 17:30:59 -08:00
Michael Schmatz
6011ac0df4
Changed subscription frequency to prevent multiple score registrations
2014-02-13 17:19:43 -08:00
Michael Schmatz
ca7376b794
Worked around mongoose toObject
...
Also tried elementary memory leak fix
2014-02-13 17:10:01 -08:00
Scott Erickson
4001d1c7fe
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-13 16:42:49 -08:00
Scott Erickson
476cc87628
Set up the ladder to be able to compete against other sessions.
2014-02-13 16:42:35 -08:00
Nick Winter
9a835ffc0a
Re-enabled spell tab entry docs.
2014-02-13 16:09:32 -08:00
Michael Schmatz
d33c39c21e
Added continuous simulation and fix for "no team"
2014-02-13 15:59:40 -08:00
Scott Erickson
9bea226677
Fixed the ladder table.
2014-02-13 15:57:07 -08:00
Scott Erickson
8775e86161
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-13 15:54:01 -08:00
Scott Erickson
97b4e7661d
Level loader now loads session based on the team property in the url.
2014-02-13 15:51:41 -08:00
Scott Erickson
9327d420bc
Fixed a bug.
2014-02-13 15:51:18 -08:00
Scott Erickson
b8051689b3
Fixed the goal manager from polluting the goals in the level with the isPositive property.
2014-02-13 15:50:53 -08:00
Michael Schmatz
d6e99273bc
Quick fix for team not being detected
2014-02-13 15:42:00 -08:00
Michael Schmatz
ad0590f9ba
Merged in Scott's changes manually
2014-02-13 15:14:10 -08:00
Scott Erickson
1d3e013cc6
Merge remote-tracking branch 'origin/master'
...
Conflicts:
app/views/play/ladder_view.coffee
2014-02-13 15:11:11 -08:00
Scott Erickson
32337df156
Trimmed down the ladder view for now.
2014-02-13 15:09:40 -08:00
Michael Schmatz
480de71eb6
Leaderboard is starting to work
2014-02-13 15:02:49 -08:00
Michael Schmatz
40c26bb395
Scoring queues mostly working
2014-02-13 12:59:24 -08:00
Ting-Kuan
803770a080
Revise the phrasing of exisitng translations.
...
Translate "about".
2014-02-13 14:32:08 -05:00
Nick Winter
aa282c3a35
Updates for formatting palette docs.
2014-02-13 11:18:20 -08:00
Scott Erickson
2b742da9e4
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-13 10:38:43 -08:00
Michael Schmatz
14530b779a
Refactored scoring submissions, added beginnings of spectator view
2014-02-13 10:37:44 -08:00
Scott Erickson
2e280fad6b
Set up the multiplayer modal with a submit button for the ladder queue.
2014-02-13 10:16:27 -08:00
Scott Erickson
850942b895
Fixed the chat layout.
2014-02-13 10:10:20 -08:00
Scott Erickson
df2171e921
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/views/play/level_view.coffee
2014-02-13 10:04:42 -08:00
Scott Erickson
23964abee9
Set up the goal manager to only use goals from the level.goals property, rather than from scripts.
2014-02-13 09:26:42 -08:00
Nick Winter
9ac0939bb8
Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again.
2014-02-13 09:26:21 -08:00
Ting-Kuan
559e0b7aa0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-13 09:21:49 -05:00
Ting-Kuan
ba405b8fed
Revise zh-tw translations.
2014-02-13 09:21:40 -05:00
Nick Winter
adaedc240c
Fixed cast button click bug.
2014-02-12 20:45:29 -08:00
Nick Winter
04abe36837
Don't need that Docs import.
2014-02-12 20:36:17 -08:00
Nick Winter
8a80b9770d
More work on docs. Got rid of Docs.coffee.
2014-02-12 18:54:45 -08:00
Nick Winter
d2345432ff
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-12 16:42:31 -08:00
Nick Winter
dc8c4394e1
Spell palette entries now using property docs from components.
2014-02-12 16:42:09 -08:00
Scott Erickson
8176e2258f
Set up the goal manager to use goals from the new level goals property, rather than from scripts. Backward-compatible for now.
2014-02-12 16:20:25 -08:00
Scott Erickson
f3489a6c2f
Added a 'stop' button for viewing end animations on thang types.
2014-02-12 16:18:25 -08:00
Nick Winter
b7be08ac19
Fixed one more leak.
2014-02-12 13:43:17 -08:00
Nick Winter
cdf268ce4f
Merged.
2014-02-12 13:10:58 -08:00
Nick Winter
5655084981
Fixed a ton more leaks.
2014-02-12 12:41:41 -08:00
Scott Erickson
abedd07b04
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-12 12:27:12 -08:00
Scott Erickson
2f48925e86
Added a list of goals as a property to levels for when they won't be added by scripts. Set up the editor to be able to edit these values.
2014-02-12 12:27:02 -08:00
Michael Schmatz
dae788905a
Merge pull request #362 from cassiocardoso/patch-1
...
Finished pt-BR translation.
2014-02-12 11:38:14 -08:00
Cassio Cardoso
32db5244b5
Finished pt-BR translation.
2014-02-12 16:15:21 -02:00
Scott Erickson
59f0d8a93e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-12 09:55:35 -08:00
Scott Erickson
533069dba8
Fixed a bug with the goals.
2014-02-12 09:55:19 -08:00
Michael Schmatz
ad8a8e00e8
Merge pull request #354 from justin-/fix/diplomat-template
...
Add indentation to fix template engine output
2014-02-12 09:09:24 -08:00
Michael Schmatz
a0b02c41fa
Merge pull request #351 from liyinkan/master
...
Update Chinese (simplified)
2014-02-12 08:51:08 -08:00
Michael Schmatz
5c7a471667
Merge pull request #349 from cassiocardoso/patch-1
...
Update pt-BR.coffee
2014-02-12 08:47:30 -08:00
Scott Erickson
bdbb1710eb
More memory fixes.
2014-02-11 16:09:44 -08:00
Michael Schmatz
1a2fa68473
Merge branch 'feature/task-queue'
...
Conflicts:
app/views/play/level/tome/spell.coffee
2014-02-11 15:58:38 -08:00
Scott Erickson
71b6ebf8eb
More memory fixes.
2014-02-11 15:47:59 -08:00
Michael Schmatz
76b949ac1e
Various changes before merge
2014-02-11 15:47:06 -08:00
Scott Erickson
d9f4594c9f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-11 15:39:02 -08:00
Scott Erickson
ac49e5eec1
More memory fixes.
2014-02-11 15:38:36 -08:00
Michael Schmatz
b29ab56fe2
Fixed simulation goals
2014-02-11 15:26:57 -08:00
Nick Winter
c29e4d6c9c
Stupid casting sound effect.
2014-02-11 15:05:54 -08:00
Scott Erickson
2a19da5ba2
More memory fixes.
2014-02-11 14:58:45 -08:00
Nick Winter
6505064fb6
Slightly less aggressively preload workers.
2014-02-11 14:38:47 -08:00
Scott Erickson
b904e1f939
More memory fixes.
2014-02-11 14:24:06 -08:00
Michael Schmatz
a6b15663a4
Merge branch 'master' into feature/task-queue
...
Conflicts:
app/views/play/level/tome/spell.coffee
2014-02-11 13:10:59 -08:00
Michael Schmatz
cef7e89326
Added goal states listener
2014-02-11 13:09:53 -08:00
Michael Schmatz
58bfddeebf
Background simulation is now showing signs of life!
2014-02-11 12:58:23 -08:00
Scott Erickson
47eeda5af4
More memory fixes.
2014-02-11 12:54:08 -08:00
Scott Erickson
7ddb97fa22
More memory fixes.
2014-02-11 12:32:12 -08:00
Scott Erickson
b0a74e5b1a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-11 12:24:25 -08:00
Nick Winter
2d9606a8eb
includeFlow only on the currently selected Thang.
2014-02-11 12:16:53 -08:00
Scott Erickson
166bb6db45
More memory cleanup.
2014-02-11 12:10:21 -08:00
Nick Winter
d22c716dce
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-11 12:02:53 -08:00
Scott Erickson
aa4cc8d9c4
Added a whole bunch of view teardown.
2014-02-11 12:02:49 -08:00
Nick Winter
d2a7bfd11c
Added GoldView.
2014-02-11 12:02:27 -08:00
Scott Erickson
7ad6faa0c0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-11 11:31:13 -08:00
Scott Erickson
8ff38a724d
Fixing some event tearing down.
2014-02-11 11:31:02 -08:00
Scott Erickson
21c93e85ed
Fixed a bug with tearing down angels.
2014-02-11 11:30:47 -08:00
Michael Schmatz
612a374b3f
Progress on simulator
2014-02-11 11:27:39 -08:00
Nick Winter
f9bb6de3ff
Typoooo
2014-02-11 09:33:35 -08:00
Nick Winter
c61e2496d8
Trying a faint gold coin noise when you kill something worth money.
2014-02-11 09:28:26 -08:00
Michael Schmatz
c0d43ea32b
Merge branch 'master' into feature/task-queue
2014-02-10 17:10:26 -08:00
Michael Schmatz
7faabc37e3
Simulation button
2014-02-10 17:09:51 -08:00
Nick Winter
7d5db41f5d
God prepares Workers for Angelic consumption ahead of time.
2014-02-10 17:09:19 -08:00
Michael Schmatz
0cbf669474
Added teamSpells persistence
2014-02-10 16:31:21 -08:00
Michael Schmatz
cc3b93a0f8
Transfer teamSpellMap from tome to levelBus
2014-02-10 16:18:39 -08:00
Nick Winter
f812241bd5
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-10 14:50:35 -08:00
Nick Winter
9507be4c9a
Turned off includeFlow for horrific performance reasons on project-dota for now.
2014-02-10 14:19:54 -08:00
Michael Schmatz
465ea22b1a
More progress with queues and client-side simulation
2014-02-10 13:18:39 -08:00
Scott Erickson
9f5b51da19
Made goals for other teams invisible.
2014-02-10 12:49:38 -08:00
Scott Erickson
d95b66df0a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-10 12:12:49 -08:00
Scott Erickson
97d823cc48
Made the LatestVersionReferenceNode use projection results.
2014-02-10 12:12:22 -08:00
Nick Winter
26016f48e2
Skip protectAPI for now. Defer worker termination until after it reports stats.
2014-02-09 18:44:31 -08:00
justin
719dbea3bf
Add indentation to fix template engine output
2014-02-09 12:31:15 -05:00
Yinkan Li
6ced32a1de
update Chinese (simplified)
...
update ‘…’ to ‘……’
add ‘ ’ before and after for each english in Chinese
add ‘。’ for some value
add translation value for ‘email_notifications_description’
update ‘customize_wizard’
update ‘:’ to ‘:’
update ‘!’ to ‘!’
2014-02-09 16:43:13 +08:00
Cassio Cardoso
8d383bc7ea
Update pt-BR.coffee
...
Work in progress.
2014-02-08 23:25:46 -02:00
Nick Winter
eb3f57ce34
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-08 15:32:23 -08:00
Nick Winter
f2bcf019fa
Should update code when other player changes it again.
2014-02-08 15:32:14 -08:00
Kushal
40eead0341
use https when linking to wikipedia
...
Wikipedia supports (but does not yet require) https. This will change in the future but it will not hurt to switch to https ourselves :)
https://blog.wikimedia.org/2013/08/01/future-https-wikimedia-projects/
2014-02-08 16:31:52 -06:00
Scott Erickson
74ddb1135a
Tweaked collision to make missiles not collide with one another.
2014-02-08 12:27:56 -08:00
Nick Winter
22433b14ae
Tweaked about avatar formatting.
2014-02-08 10:30:28 -08:00
Nick Winter
2e7a1fd0ef
Working on the contribute pages -- #314 .
2014-02-08 10:21:12 -08:00
Nick Winter
2a740f777e
Starting to add contributor avatars.
2014-02-07 18:38:17 -08:00
Nick Winter
b2bf4db222
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-07 16:47:38 -08:00
Scott Erickson
0365998658
Began work on a ladder view.
2014-02-07 15:51:05 -08:00
Michael Schmatz
73b0d98538
Merge branch 'master' into feature/task-queue
...
Conflicts:
server/commons/mapping.coffee
2014-02-07 14:31:34 -08:00
Nick Winter
11c63d262d
Merge pull request #347 from monetita/patch-1
...
Update he.coffee
2014-02-07 13:59:27 -08:00
Scott Erickson
72b1b989d8
Tweaked the world to return points that are not 0,0, as that's what the world reports non-existent thangs at.
2014-02-07 11:49:16 -08:00
Scott Erickson
c3bd9cef80
Merge remote-tracking branch 'origin/master'
2014-02-07 11:05:43 -08:00
Nick Winter
2efb9a0ea1
Simple team switch links in multiplayer menu.
2014-02-07 10:51:21 -08:00
monetita
89f6282d50
Update he.coffee
2014-02-07 19:12:46 +02:00
Nick Winter
86de427204
Messing with team setting.
2014-02-06 17:31:08 -08:00
Scott Erickson
ee24263232
Added handling for thang type goesTo animation properties.
2014-02-06 17:00:02 -08:00
Nick Winter
2a3e47b08f
Using playable team config from Alliance system.
2014-02-06 16:05:41 -08:00
Michael Schmatz
b93b5d3062
Added xavismeh to french translators
2014-02-06 14:42:56 -08:00
Michael Schmatz
7dcc351e75
Merge pull request #346 from xavismeh/i18n-fr
...
Improved FR translation
2014-02-06 14:39:42 -08:00
Nick Winter
642d88fe93
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-06 14:00:31 -08:00
Nick Winter
6af2d34f59
Fixed a ton of memory leaks, but not all of them.
2014-02-06 14:00:27 -08:00
Scott Erickson
1e184c9590
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-06 13:23:04 -08:00
Scott Erickson
6484f787c5
Tweaked layer order updating to fallback to sorting by x if y and z are the same.
2014-02-06 13:22:47 -08:00
Michael Schmatz
721ca5f9ca
Credits for FR translation
...
Merged in xavismeh's translation changes
Dummy credits commit
2014-02-06 20:57:30 +01:00
Michael Schmatz
f2b4ffb123
Merged in xavismeh's translation changes
2014-02-06 11:20:59 -08:00
Nick Winter
b696a3f188
Don't count on Olark being there.
2014-02-06 11:16:57 -08:00
Scott Erickson
332ea0df2c
Fixed the level editor save view knowing if the level has changes to save.
2014-02-06 10:30:49 -08:00
Scott Erickson
f3d1a43bbf
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-06 10:19:01 -08:00
Nick Winter
ea99a7b139
Turned off Olark for now.
2014-02-06 10:17:54 -08:00
Scott Erickson
9fd12b15bf
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-06 09:29:13 -08:00
Nick Winter
847faf4d10
Possibly hooked up scaleFactorX and scaleFactorY.
2014-02-06 08:27:49 -08:00
Nick Winter
2a8d0eb694
Updates for ThangsList refreshing its Thangs.
2014-02-05 20:08:28 -08:00
Nick Winter
cc3465fd6f
Improvement for errors updating action of non-existent Thangs in HUD.
2014-02-05 15:54:34 -08:00
Scott Erickson
6728712064
Fixed the thang components edit view in both locations now.
2014-02-05 15:39:08 -08:00
Scott Erickson
25e2895b64
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-05 15:18:23 -08:00
Nick Winter
cec52d70f3
Improvements to how Tome subviews manage Thang updates.
2014-02-05 15:16:59 -08:00
Scott Erickson
7041a12244
Fixed display of actions using container in the thang editor.
2014-02-05 15:16:07 -08:00
Scott Erickson
f900009770
Actions without a container or animation to show don't show anything.
2014-02-05 14:57:05 -08:00
Scott Erickson
88beb4db5f
Fixed the positioning of the thang components view in the thang editor.
2014-02-05 14:39:56 -08:00
Scott Erickson
323d3570ec
Fix for the dynamic programming level of project dota.
2014-02-05 13:39:41 -08:00
Scott Erickson
966155593c
Various fixes.
2014-02-05 11:03:32 -08:00
Michael Schmatz
5c328d09f5
Added scoring and queue modules
2014-02-05 09:39:14 -08:00
Michael Schmatz
a3b17c7d86
Put in basic client-side routes and created server side scoring routing file
2014-02-04 10:07:14 -08:00
Scott Erickson
6533196bc7
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-03 14:01:30 -08:00
Scott Erickson
81912d25d1
Added a handler for when components or systems go rogue, so they don't take down the level editor quite so hard.
2014-02-03 14:01:20 -08:00
Nick Winter
738b791683
Updated to new Aether range info, fixing error line numbers.
2014-02-03 13:58:25 -08:00
Glen De Cauwsemaecker
e920054695
Resolved category-issues for the da.coffee language file.
2014-02-03 13:04:45 +01:00
Glen De Cauwsemaecker
0ead214584
Merge https://github.com/Einar-Rasmussen/codecombat
2014-02-03 12:59:00 +01:00
Einar Rasmussen
5d0084e95d
Update da.coffee
...
Rådmand -> rådgiver since counselor != chancellor
2014-02-03 11:35:34 +00:00
Scott Erickson
09bb669439
Fixed #300
2014-02-02 16:51:22 -08:00
Einar Rasmussen
666a85e986
Update da.coffee
...
Finished 'classes' + other minor edits.
2014-02-02 20:33:54 +00:00
Nick Winter
a5065d273d
More for #133 .
2014-02-02 10:42:18 -08:00
Nick Winter
068f798d58
Fixed bugs in Tome spell views swapping.
2014-02-02 10:26:42 -08:00
Nick Winter
a28ce55793
Localization quote escape typo.
2014-02-02 10:17:23 -08:00
Einar Rasmussen
415b49b661
Update da.coffee
2014-02-02 12:49:24 +00:00
Daniel
517adc9314
Update es-ES.coffee
...
Hi!
I have translated the remaining lines and I also have modified a few lines that had some minor grammar mistakes. All the text is translated.
Cheers!
2014-02-02 00:31:09 +01:00
Nick Winter
f8f3bdd1e3
Improved error alert space usage.
2014-02-01 13:56:55 -08:00
Einar Rasmussen
b602691748
Merged mine and sorsjens versions.
2014-02-01 22:21:15 +01:00
Nick Winter
546914052d
A few tweaks to wizard floating.
2014-02-01 11:02:20 -08:00
Nick Winter
9a1afd6772
Merge pull request #320 from vanous/cz-translation
...
raw translation to czech finished
2014-02-01 10:57:10 -08:00
vanous
d2fb1cfa11
raw translation to czech finished
...
it will need fine tuning, checking within context and more
2014-02-01 19:38:47 +01:00
Nick Winter
663c48c814
Merge pull request #319 from sorsjen/patch-1
...
Update da.coffee
2014-02-01 08:41:44 -08:00
Nick Winter
33bdce8a63
Merge branch 'locale' of git://github.com/HiroP0/codecombat into HiroP0-locale
2014-02-01 08:35:52 -08:00
Einar Rasmussen
582bb15862
Update da.coffee
...
Line 173-181
2014-02-01 16:25:50 +00:00
Nick Winter
b502c24ece
A few updates to the contributors lists.
2014-02-01 08:22:26 -08:00
sorsjen
a2e64860dd
Update da.coffee
...
Added translated strings
2014-02-01 16:32:55 +01:00
Nick Winter
7ba6e5d0f2
Fixed #316 .
2014-01-31 16:32:46 -08:00
Nick Winter
ee7d8a06fe
A few SpellView / debugger fixes.
2014-01-31 16:16:59 -08:00
Nick Winter
632316314e
Don't include flow for invisible methods, don't include protectAPI for non-writable methods.
2014-01-31 14:51:06 -08:00
Nick Winter
4d891ee7fa
Fixed sprite offset positioning bug.
2014-01-31 13:28:42 -08:00
Michael Glass
1df1a2499d
Extended German translation (about, minor fixes)
2014-01-31 13:16:58 -08:00
Nick Winter
8d81d75d2b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-31 10:50:22 -08:00
Nick Winter
2e9386ab70
Fix for fix for #133 .
2014-01-31 10:50:15 -08:00
Michael Schmatz
ce48411ddb
Added worker_world.coffee
2014-01-31 10:40:01 -08:00
Nick Winter
cba7807053
Possibly handling #133 .
2014-01-31 10:26:24 -08:00
Nick Winter
72a3e82404
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-31 10:21:35 -08:00
Nick Winter
6303d28554
Refactored bobbing.
2014-01-31 10:21:32 -08:00
Nick Winter
d46716eec4
Merge pull request #299 from p-buse/eventcheck-regexp
...
Added Regular Expression Event Checker
2014-01-31 07:58:13 -08:00
vanous
1758246b7b
small changes
2014-01-31 09:02:18 +01:00
vanous
c88ad87332
some typo corrections
2014-01-31 09:01:03 +01:00
Nick Winter
d79d66c175
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-30 16:36:40 -08:00
Nick Winter
6e40fa09a6
Updated some Bootstrap event names.
2014-01-30 16:36:36 -08:00
Scott Erickson
3093b59588
Fixed #296
2014-01-30 16:25:06 -08:00
Scott Erickson
46d1d10abe
Removed an unnecessary fat arrow.
2014-01-30 16:20:58 -08:00
Scott Erickson
c376ba6841
Fixed #303
2014-01-30 16:19:55 -08:00
Scott Erickson
1b75ab15db
Added some error handlers for messed up thang type configs.
2014-01-30 16:17:41 -08:00
Scott Erickson
591a8e9ab5
Made the revert modal reload the page if anything was reverted.
2014-01-30 15:38:49 -08:00
Scott Erickson
6d5e9d13c9
Changed the links for artisan documentation to the new wiki pages.
2014-01-30 15:29:20 -08:00
Scott Erickson
0415e8ea4c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-30 15:27:24 -08:00
Scott Erickson
3ca6a5709b
Fixed a bug where systems tabs would change components tabs.
2014-01-30 15:27:10 -08:00
Scott Erickson
371bd9f41c
Tweaked tab styling on level editor.
2014-01-30 15:22:01 -08:00
Michael Schmatz
fe89c9fbad
Fix for #290
2014-01-30 15:03:55 -08:00
Scott Erickson
5f81eb670b
Some styling fixes, removed commented out stuff.
2014-01-30 14:37:33 -08:00
Nick Winter
bd45930071
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-30 14:22:06 -08:00
Nick Winter
7dcbbb983f
Added missing mixins and indoor wall handling.
2014-01-30 14:21:58 -08:00
Glen De Cauwsemaecker
eea541aa1c
Merge branch 'cz-translation' of https://github.com/vanous/codecombat
2014-01-30 22:22:28 +01:00
Scott Erickson
210235553e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-30 12:19:44 -08:00
Scott Erickson
5429e8ad2a
Cleaning up editors in the systems and components tabs.
2014-01-30 12:19:25 -08:00
Scott Erickson
231e8582fa
Added some basic control tips to the thang components edit view.
2014-01-30 12:07:01 -08:00
Nick Winter
b09d1b1c74
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-30 12:03:35 -08:00
Nick Winter
a6bfb6770c
Matched gradient background colors in HUD to ThangAvatarView.
2014-01-30 12:03:33 -08:00
Scott Erickson
56576dd1a5
Fixed the styling for editing components in the level editor.
2014-01-30 12:01:43 -08:00
Scott Erickson
827b5a3756
Fixed the world select modal.
2014-01-30 11:55:46 -08:00
vanous
0d453f2860
translated about and classes to cz
2014-01-30 20:52:24 +01:00
Scott Erickson
ed1b5c6560
Fixed slowness to editing settings for large levels.
2014-01-30 11:40:24 -08:00
Scott Erickson
65f74e9587
Improved the navbars in the level editor.
2014-01-30 11:37:40 -08:00
Paul Buser
8881a880ea
Merge branch 'master' of https://github.com/codecombat/codecombat into eventcheck-regexp
2014-01-29 23:57:47 -05:00
Nick Winter
067d3abd75
Improved handling of spawning Programmables in Tome after the fact.
2014-01-29 16:26:08 -08:00
Glen De Cauwsemaecker
67e575065b
quick-fix for the de.coffee locale file
2014-01-29 22:54:23 +01:00
Glen De Cauwsemaecker
94328f202e
Merge branch 'locale' of https://github.com/HiroP0/codecombat
2014-01-29 22:52:33 +01:00
Glen De Cauwsemaecker
ca1bb6a1ec
Merge branch 'cz-translation' of https://github.com/vanous/codecombat
2014-01-29 22:36:55 +01:00
vanous
35397a356c
fixing typo, caused by web editor
2014-01-29 22:28:04 +01:00
vanous
ea458a0edc
fixing typo, caused by web editor
2014-01-29 22:27:22 +01:00
vanous
bfcf5b7e39
Halfway through czech translation
2014-01-29 22:25:33 +01:00
Nick Winter
e0108a3166
A few fixes for the Bootstrap 3 migration. Fixed #280 .
2014-01-29 12:18:37 -08:00
Scott Erickson
f065406cf5
Merge branch 'feature/bootstrap3'
2014-01-29 10:40:34 -08:00
Scott Erickson
bac4fbcd7d
Fixed naming.
...
Improved tome updating of programmable spell thangs.
2014-01-29 10:14:12 -08:00
Nick Winter
01efb2f92b
Improvements to SpellDebugView hover.
2014-01-29 08:38:37 -08:00
Michael Glass
04f0aa9473
Fixed some German langues issues. Translated good deal of legals page.
2014-01-28 21:20:25 -08:00
Nick Winter
c3f5c1c334
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-28 15:24:12 -08:00
Nick Winter
fb7739727c
Updates for Aether's protectAPI stuff.
2014-01-28 15:24:08 -08:00
vanous
58569cdd2c
Misunderstood the first translation line. Fixed.
2014-01-28 22:53:55 +01:00
vanous
c8260e97ae
Correcting typo
...
Correcting typo causing The Travis CI build could not complete due to an error
2014-01-28 22:48:12 +01:00
vanous
470b06d888
Initial work at czech translation
2014-01-28 22:25:58 +01:00
Scott Erickson
065a1c4c27
New editor layout.
2014-01-28 13:16:50 -08:00
Scott Erickson
407d2c7768
Merge branch 'master' into feature/bootstrap3
...
Conflicts:
app/styles/editor/level/edit.sass
Also experimenting with a new layout for the level editor.
2014-01-28 12:46:33 -08:00
Scott Erickson
6e9f93d299
Merge branch 'master' into feature/bootstrap3
...
Conflicts:
app/styles/editor/level/edit.sass
Also experimenting with a new layout for the level editor.
2014-01-28 12:46:17 -08:00
Scott Erickson
55ea4d86e4
Made the level editor layout more stretchy.
2014-01-28 12:27:11 -08:00
Scott Erickson
00872f80f9
Fixed the bug where opening a modal or switching a tab while having a thang to add selected would create a thang.
2014-01-28 11:54:16 -08:00
Scott Erickson
e2db421d1c
Fixed cloning.
2014-01-28 09:22:23 -08:00
Scott Erickson
9336a637ce
Merge branch 'master' into feature/bootstrap3
2014-01-27 21:25:26 -08:00
Scott Erickson
a82a6a4188
Systems part of #266 .
2014-01-27 21:25:01 -08:00
Scott Erickson
ca026610b1
Component part of #266 .
2014-01-27 21:06:27 -08:00
Scott Erickson
0b7224e2f4
Tweaked the home page button. #279
2014-01-27 19:11:39 -08:00
Scott Erickson
b4cd7bdec4
Fixed #281
2014-01-27 19:03:22 -08:00
Scott Erickson
43193aab4a
Removed a buggy transition.
2014-01-27 18:58:27 -08:00
Scott Erickson
fa8928c187
Fixed the wizard sprite on the home page again.
2014-01-27 18:55:25 -08:00
Scott Erickson
a239ba3465
Removed some more .controls from forms.
2014-01-27 18:50:03 -08:00
Scott Erickson
13af9febbf
More fixes for #283
2014-01-27 18:44:05 -08:00
Scott Erickson
096d318e96
Fixed #283
2014-01-27 18:05:39 -08:00
Scott Erickson
d6e21192f5
Fixed #278
2014-01-27 16:59:34 -08:00
Scott Erickson
9c7ac3dfdc
Fixed the top nav height.
2014-01-27 16:20:13 -08:00
Scott Erickson
22e6942165
Fixed account settings page.
2014-01-27 16:07:17 -08:00
Scott Erickson
056b81115d
Fixed profile page.
2014-01-27 11:45:24 -08:00
Scott Erickson
26d6c2dc5b
Fixed the new model modal in search.
2014-01-27 11:30:22 -08:00
Scott Erickson
b48fb6823e
Fixed the progress bar for loading pages.
2014-01-27 11:12:58 -08:00
Scott Erickson
88c8c3896b
Merge branch 'master' into feature/bootstrap3
2014-01-27 11:03:04 -08:00
Scott Erickson
fa3ab69dab
Level preview now loads from backups so that brunch reloads don't cause the preview to break.
2014-01-27 11:00:36 -08:00
Scott Erickson
36a46a07f2
Updated the names file.
2014-01-27 10:50:58 -08:00
Scott Erickson
9206dda3ba
Systems now autosave too in the level editor.
2014-01-27 10:39:16 -08:00
Scott Erickson
8768d710ba
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-27 10:06:45 -08:00
Scott Erickson
f1518a28e2
Fixed the camera when locked to never go to a new target.
2014-01-27 10:06:34 -08:00
Michael Schmatz
bf6e91883e
Fixed es-ES.coffee compilation errror
2014-01-27 09:00:03 -08:00
Michael Schmatz
668ba81e78
Merge pull request #285 from DanielRodriguezRivero/patch-2
...
Update es-ES.coffee
2014-01-27 08:59:28 -08:00
Michael Schmatz
298057ae58
Merge pull request #288 from atlantisguru/patch-1
...
Updated hu.coffee
2014-01-27 08:30:22 -08:00
Scott Erickson
692b24dde0
#267
2014-01-26 15:59:33 -08:00
Scott Erickson
26e9dc3b09
Fixed system order in the level view.
2014-01-26 15:37:32 -08:00
Scott Erickson
9da955d1a2
Set up a backup system for the editor using localStorage.
2014-01-26 14:46:25 -08:00
Scott Erickson
ae2bb625c8
Refactored storage module.
2014-01-26 14:44:08 -08:00
Nick Winter
47c78d1758
Revamped SpellToolbarView.
2014-01-25 15:11:29 -08:00
Bubori Attila
e8c42b8d2b
Updated hu.coffe
...
Editor section translated to hungarian.
2014-01-25 23:27:44 +01:00
Nick Winter
d262dfaca7
A few visual tweaks to the spell view flow.
2014-01-24 17:48:11 -08:00
Nick Winter
45329df4cd
Temp fix for debugger bug on a relevant session.
2014-01-24 13:46:51 -08:00
Nick Winter
6fa38bd889
Several improvements to hover debugging.
2014-01-24 13:03:04 -08:00
Nick Winter
9b9df12ea0
Huge Aether performance fix; spells now scroll while debugging.
2014-01-24 08:01:00 -08:00
DanielRodriguezRivero
2acd67f658
Update es-ES.coffee
2014-01-24 13:15:17 +01:00
Scott Erickson
0727e11669
Merge branch 'bootstrapMigration' of https://github.com/TomSteinbrecher/codecombat into feature/bootstrap3
...
Conflicts:
app/templates/play/level/playback.jade
2014-01-23 20:15:36 -08:00
Scott Erickson
9740fe0700
Reworked how sprites flip when rotated.
2014-01-23 20:08:35 -08:00
Paul Buser
e958c1293d
Fixing my actual regexp checker
2014-01-23 21:57:12 -05:00
Paul Buser
30d8eb8256
Merge remote-tracking branch 'upstream/master' into eventcheck-regexp
2014-01-23 21:56:23 -05:00
Tom Steinbrecher
cd33376dea
Upgrade from Bootstrap 2 to Bootstrap 3
2014-01-23 21:49:29 -05:00
Scott Erickson
70d301d1b6
How did this bug not break everything always?
2014-01-23 18:14:25 -08:00
Scott Erickson
0a34bfc7a8
Fixed a couple things with the component versions view.
2014-01-22 18:54:20 -08:00
Scott Erickson
dcaa24ffa9
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-22 17:38:31 -08:00
Scott Erickson
4ff2abc4b0
Refactored a collection into its own file.
2014-01-22 17:38:22 -08:00
Nick Winter
af6abda7cd
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-22 10:56:54 -08:00
Nick Winter
3b7a908dcd
Handled a couple errors.
2014-01-22 10:56:49 -08:00
Paul Buser
2b7d18bbfa
Merge remote-tracking branch 'upstream/master' into eventcheck-regexp
2014-01-21 21:32:17 -05:00
Scott Erickson
00a7de12c9
Fixed a selection bug.
2014-01-21 10:54:59 -08:00
Scott Erickson
01a43bb3d7
Added filters to the extant thangs column.
2014-01-21 10:42:09 -08:00
GlenDC
c771936f45
Merge branch 'master' of https://github.com/ReiDuKuduro/codecombat
2014-01-21 18:07:02 +01:00
GlenDC
b2ddde96cd
Merge https://github.com/codecombat/codecombat
2014-01-21 18:05:14 +01:00
Nick Winter
24c4051442
Merge branch 'feature/time-travel-debugger'
2014-01-21 09:04:09 -08:00
Nick Winter
6ea4f645f8
Added spell toolbar view. Made many time-travel debugger improvements.
2014-01-21 09:03:04 -08:00
GlenDC
c12e232ec1
Merge https://github.com/codecombat/codecombat
2014-01-21 18:01:58 +01:00
André Filipe
da94673fa5
Added some translations
2014-01-21 12:02:54 +00:00
Scott Erickson
956243818a
Fixed updating the sprite sheets in the thang type editor.
2014-01-20 23:45:27 -08:00
Scott Erickson
cf0e1d305b
Tweaked updateZoom.
2014-01-20 23:23:49 -08:00
Scott Erickson
68567c1366
Fixed level editor preview.
2014-01-20 23:14:34 -08:00
Scott Erickson
e61d31f48c
Level editor displays thangs in a more orderly fashion.
2014-01-20 23:02:23 -08:00
Scott Erickson
4b1b72627c
Reenabled projecting on the search views.
2014-01-20 22:38:36 -08:00
Scott Erickson
cc8bd156ec
Put back the portraits in the thang type search view.
2014-01-20 22:38:14 -08:00
Scott Erickson
2cf19a4781
Renamed canvases to spritesheets in the edit thang view.
2014-01-20 22:37:47 -08:00
Scott Erickson
514adb2159
Improved the speed of placing down thangs in levels with lots of extant thangs.
2014-01-20 21:19:54 -08:00
Scott Erickson
222fa6100b
Set up the level editor to lazily load thang types.
2014-01-20 17:20:04 -08:00
Scott Erickson
5a78d92173
New graph structure for viewing path finding data.
2014-01-20 16:50:53 -08:00
Scott Erickson
c780863545
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-20 15:27:18 -08:00
Scott Erickson
7c8c2e9381
Fixed distanceSquaredToPoint
2014-01-20 15:27:03 -08:00
GlenDC
262a523458
Merge branch 'FixThangScroll' of https://github.com/phansch/codecombat
2014-01-20 23:50:19 +01:00
GlenDC
b045426740
Fixed some alignment issues caused by the update on the it.coffee file.
2014-01-20 23:48:08 +01:00
GlenDC
fad096047a
Merge https://github.com/codecombat/codecombat
2014-01-20 23:35:54 +01:00
Scott Erickson
f0fbfa6cbc
Added a system for viewing pathfinding.
2014-01-20 12:57:45 -08:00
Scott Erickson
7f4f268ff8
Improved the refresh rate for the color tab, and made it work with containers.
2014-01-20 12:57:29 -08:00
Scott Erickson
3dfe99045b
Fixed a small bug with building sprite sheets.
2014-01-20 12:55:44 -08:00
Michael Schmatz
480b55ded9
Fixed errors in locale file
...
Please compile before you commit.
2014-01-20 07:42:32 -08:00
flauta
9f23d3c989
Update it.coffee
2014-01-20 16:10:49 +01:00
Philipp Hansch
2c6c60307b
Disable body scrolling in Thang List
...
This overwrites the native scrolling behavior for the
thangs-list div by manually setting the value of
@scrollTop
2014-01-20 12:15:20 +01:00
GlenDC
34846849aa
Applied locale changes to es, fa, hu
2014-01-19 23:30:22 +01:00
GlenDC
8073bb77f8
Applied locale changes to it, ms-BA, nb, no, pl, pt-BR, pt-PT
2014-01-19 23:19:09 +01:00
GlenDC
306e26d7a2
Applied locale changes to es-419, es-ES, ja, pt, ru, sk, sr, sv, th, tr, vi, zh-HANS, zh-HANT, zh
2014-01-19 23:00:21 +01:00
GlenDC
7d6548ec6c
Applied locale changes to the fr.coffee file (French Language)
2014-01-19 22:03:58 +01:00
GlenDC
23ccaad916
Applied locale update to el, en-AU, en-GB, fi, he, hi, id, ko, lt, nn, ro, sl, ur
2014-01-19 21:32:31 +01:00
GlenDC
7665b043d8
Merge branch 'patch-1' of https://github.com/ferpeter/codecombat
2014-01-19 20:58:03 +01:00
GlenDC
9f98fdd98d
Hotfix for cs.coffee, and did part of el.coffee
2014-01-19 20:57:53 +01:00
GlenDC
831ab1cb7a
Applied big i18n tag update to ar, bg, cs, da, de, en, nl.
2014-01-19 20:49:37 +01:00
ferpeter
4ff1044169
Update hu.coffee
2014-01-19 18:56:01 +01:00
GlenDC
4186333cce
Merge branch 'translation_fr2' of https://github.com/MartinDelille/codecombat
2014-01-19 18:44:25 +01:00
GlenDC
9313e5cc70
Found more tags. ar, bg and nl should have now the correct versions with the (re)moved i18n tags.
2014-01-19 18:43:55 +01:00
MartinDelille
594cbee1c8
french grammar and orthograph fix.
2014-01-19 18:25:50 +01:00
MartinDelille
5caa6870cc
fix i18n tag in editor and setting template
2014-01-19 18:20:41 +01:00
Nick Winter
f87c3a37e8
More progress on debugger.
2014-01-19 09:14:42 -08:00
GlenDC
95c81e4672
Found more duplicate i18n tags and applied it both to the ar.coffee and nl.coffee file
2014-01-19 17:19:19 +01:00
GlenDC
6c46dc3fda
Tracked down common used i18n tags and applied it already on the nl.coffee file
2014-01-19 17:00:41 +01:00
Nick Winter
0a8d64046a
Starting work on time-travel debugging interface.
2014-01-19 07:08:28 -08:00
GlenDC
882302d66e
Resolved issue #149
2014-01-19 15:59:33 +01:00
GlenDC
07c80f6354
Added missing i18n tags for issue #198 (now resolved) in all locale files.
2014-01-19 15:10:14 +01:00
GlenDC
464208443b
Translated some more words in Dutch and also translated the newly added/shuffled words.
2014-01-19 14:59:59 +01:00
GlenDC
05d43fb63f
Added/shuffled (missing) words in locale files.
2014-01-19 14:36:49 +01:00
GlenDC
abbd576b4d
Added the else statement. This can be used to make pull request #253 more advanced.
2014-01-19 14:08:32 +01:00
GlenDC
1f486c3cb6
Merge branch 'feature/play-button' of https://github.com/dristic/codecombat into test
2014-01-19 14:04:26 +01:00
GlenDC
364179e140
Merge https://github.com/codecombat/codecombat
2014-01-19 14:02:38 +01:00
GlenDC
9a16f450a4
Added some missing words to the translation lists. Important for pull request #248
2014-01-19 14:02:01 +01:00
GlenDC
e082b0bd87
Merge branch 'master' of https://github.com/faabsen/codecombat
2014-01-19 13:51:28 +01:00
Fab
59b41fc042
Update de.coffee - Space fix
2014-01-19 13:07:36 +01:00
dristic
7f39693d70
Save latest level played to local storage. Change play link when latest level is available on home page.
2014-01-18 23:15:59 -08:00
Michael Schmatz
3ecaee5bce
Fixed russian translations
2014-01-18 22:46:57 -08:00
GlenDC
ad7ae2236f
Merge branch 'patch-2' of https://github.com/ser-storchak/codecombat
2014-01-19 04:03:36 +01:00
GlenDC
ab4e7204ad
Merge branch 'master' of https://github.com/rezahb/codecombat
2014-01-19 03:59:01 +01:00
Rehb
65c734be76
Update fa.coffee
2014-01-19 01:49:15 +03:30
Fab
ea4cc848f2
German translation
...
Partly translate some parts of the game
2014-01-18 22:47:17 +01:00
ser-storchak
c9ea0540ef
Update ru.coffee
2014-01-18 12:08:35 -08:00
Nick Winter
b06426c85b
Merge pull request #245 from MartinDelille/translation2
...
Adding more translation fixes
2014-01-18 11:45:44 -08:00
guricchi
f0f871d8a5
Updated sr.coffee
2014-01-18 11:27:31 -08:00
Martin Delille
54234f0c9e
better description for nick
2014-01-18 19:31:27 +01:00
Martin Delille
0efd7f4066
dix conjugaison
2014-01-18 19:30:54 +01:00
Martin Delille
90edce1db4
fix accent
2014-01-18 19:30:41 +01:00
Nick Winter
ea44047c04
Merge pull request #225 from ser-storchak/patch-2
...
Update ru.coffee
2014-01-18 10:14:08 -08:00
Nick Winter
15717847cd
Merge pull request #243 from MartinDelille/mdTranslation
...
fix french translation
2014-01-18 10:13:38 -08:00
Nick Winter
b9ff09b709
Merged meself up some hu and tr.
2014-01-18 10:09:59 -08:00
Martin Delille
8a9859c3f5
more translation
2014-01-18 18:45:29 +01:00
Nick Winter
99a43b97e8
Merge pull request #242 from flauta/patch-1
...
Update it.coffee
2014-01-18 09:39:01 -08:00
Nick Winter
19267505e1
Merge pull request #240 from guricchi/patch-13
...
Updated el.coffee
2014-01-18 09:38:17 -08:00
Nick Winter
11c80f36f4
Merge pull request #239 from guricchi/patch-12
...
Updated da.coffee
2014-01-18 09:38:05 -08:00
Nick Winter
cd605b857b
Merge pull request #238 from guricchi/patch-11
...
Updated hu.coffee
2014-01-18 09:37:41 -08:00
Nick Winter
f30340cfda
Merge pull request #237 from guricchi/patch-10
...
updated pl.coffee
2014-01-18 09:37:11 -08:00
Nick Winter
1fca0322f3
Merge pull request #236 from cobaimelan/master
...
new translate
2014-01-18 09:36:54 -08:00
Nick Winter
b23609a97b
Merge pull request #235 from guricchi/patch-9
...
Updated tr.coffee
2014-01-18 09:36:25 -08:00
Martin Delille
f267971207
fix french translation
2014-01-18 18:35:53 +01:00
Nick Winter
c83708526a
Merge pull request #233 from guricchi/patch-7
...
Updated zh-HANT.coffee
2014-01-18 09:35:27 -08:00
Nick Winter
6b6c51ce06
Merge pull request #232 from guricchi/patch-6
...
Updated zh-HANS.coffee
2014-01-18 09:35:08 -08:00
Nick Winter
4654bd5a27
Merge pull request #231 from guricchi/patch-5
...
Updated ja.coffee
2014-01-18 09:34:17 -08:00
flauta
63f712aa8c
Update it.coffee
2014-01-18 10:48:26 +01:00
csuvsaregal
c89a88848b
Update hu.coffee
...
I've made some corrections. Later I'll do some new translations.
csuvasregal - Sárosi Gergely
2014-01-18 01:07:19 +01:00
guricchi
c6629e4e48
Updated el.coffee
2014-01-17 12:32:22 -08:00
guricchi
b71c5cd1ef
Updated da.coffee
2014-01-17 12:09:23 -08:00
guricchi
7d8d6ed24f
Updated hu.coffee
2014-01-17 11:55:14 -08:00
guricchi
c97d67515b
updated pl.coffee
2014-01-17 11:45:40 -08:00
cobaimelan
93fc7be44d
new translate
2014-01-17 21:42:51 +02:00
guricchi
9bf08b9d20
Updated tr.coffee
2014-01-17 11:08:35 -08:00
guricchi
1c018b0cac
Updated zh-HANT.coffee
2014-01-17 11:01:17 -08:00
guricchi
70a3503097
Updated zh-HANS.coffee
2014-01-17 10:51:18 -08:00
Scott Erickson
8b0a0c4e51
Added unsubscribe view.
2014-01-17 10:47:42 -08:00
guricchi
4cbfd846f4
Updated ja.coffee
2014-01-17 10:37:04 -08:00
Michael Schmatz
91c1b62375
Merge pull request #229 from guricchi/patch-3
...
Updated es-ES.coffee
2014-01-17 10:28:12 -08:00
Michael Schmatz
db96bbaf9a
Merge pull request #228 from guricchi/patch-2
...
Updated es-419.coffee
2014-01-17 10:27:57 -08:00
guricchi
3e040d9d30
Updated es-ES.coffee
2014-01-17 10:21:33 -08:00
guricchi
d4fec100de
Updated es-419.coffee
2014-01-17 10:17:23 -08:00
guricchi
f898c8d57c
Updated pt-PT.coffee
2014-01-17 10:07:38 -08:00
Scott Erickson
6e47a6b8fd
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-17 09:53:40 -08:00
Scott Erickson
3caf16ae0c
Set up sendwithus.
...
Created a 'notification' email subscription.
2014-01-17 09:53:17 -08:00
Volkan Gezer
f072030198
Updated Turkish translation
...
Updated Turkish translation
2014-01-17 17:23:27 +01:00
ser-storchak
bace74d6ad
Update ru.coffee
2014-01-17 00:45:17 -08:00
Nick Winter
053927eaec
Fixed home page wizard scale.
2014-01-16 16:27:34 -08:00
Nick Winter
5267febd8f
Couple fixes for small errors when running with no Programmables.
2014-01-16 14:29:57 -08:00
Michael Schmatz
389fa9a30b
Merge pull request #220 from Elfisen/patch-2
...
spelling and grammar mistakes - fr.coffee
2014-01-16 14:26:10 -08:00
GlenDC
553ad833ed
Merge https://github.com/codecombat/codecombat
2014-01-16 22:27:09 +01:00
GlenDC
5cc24ea1b2
Logs now a warning in the console to give user the feedback that there are no programmable thangs which makws the level unplayable.
2014-01-16 22:26:34 +01:00
GlenDC
b557c43f60
Hotfix for previous commit, forgot to uncommit some stuff
2014-01-16 22:22:42 +01:00
GlenDC
926b31f62f
Resolved issue #160
2014-01-16 22:18:38 +01:00
Allisson
580a439fab
spelling and grammar mistakes - fr.coffee
...
Just a correction of what really hurt the eye
2014-01-16 21:15:39 +01:00
Nick Winter
1fb68ae717
Fixed bug with team assignments and spell permissions.
2014-01-16 11:37:04 -08:00
Michael Schmatz
d0f1510623
Merge branch 'pr/197'
...
Conflicts:
app/locale/fr.coffee
2014-01-16 10:46:56 -08:00
Michael Schmatz
6e43daa98a
Revert "Merge branch 'pr/190'"
...
This reverts commit 457accf729
, reversing
changes made to 9df9f75f64
.
2014-01-16 10:40:05 -08:00
Michael Schmatz
457accf729
Merge branch 'pr/190'
...
Conflicts:
app/locale/fr.coffee
2014-01-16 10:33:00 -08:00
Michael Schmatz
9df9f75f64
Merge branch 'pr/200'
...
Conflicts:
app/locale/fr.coffee
2014-01-16 10:24:55 -08:00
Scott Erickson
c5b9b103c5
Merge branch 'feature/team-colors'
...
Conflicts:
app/lib/world/world.coffee
app/models/ThangType.coffee
2014-01-16 10:14:21 -08:00
Nick Winter
af7344175a
Merged and tweaked phansch's save indicator from #205 .
2014-01-16 10:10:27 -08:00
Scott Erickson
ba01101ae0
Cleanup from the system tracked properties refactoring.
2014-01-16 10:04:52 -08:00
Nick Winter
6f5b37e86d
Possible fix for Grab the Mushroom problems.
2014-01-16 09:20:02 -08:00
Philipp Hansch
3a63428c0c
Add jquery fading
...
Also using the level:session-will-save callback
2014-01-16 17:13:14 +01:00
Philipp Hansch
ff5807adb8
New i18n tag
2014-01-16 13:37:52 +01:00
Nick Winter
84e268a88c
Removed some logs.
2014-01-15 19:03:10 -08:00
Scott Erickson
f230e8983c
Fixed the level preview view.
2014-01-15 18:37:47 -08:00
Michael Schmatz
6bc3924af0
Merge pull request #208 from kengos/update_ja_coffee
...
Update ja.coffee
2014-01-15 15:58:53 -08:00
Michael Schmatz
74d5b1a845
Merge pull request #199 from GlenDC/master
...
Issue #30 is resolved + Added Dutch Translations + Hotfixes
2014-01-15 15:54:04 -08:00
GlenDC
a7368fb51e
Converted line endings to unix endings for 3 files
2014-01-16 00:35:17 +01:00
Scott Erickson
47effcd50e
Got the rest of team colors set up.
2014-01-15 15:16:31 -08:00
GlenDC
556149f756
Resolved issue #162
2014-01-16 00:08:35 +01:00
Nick Winter
172d97ed83
Fixed #87 I hope; at least, dramatically reduced memory leakage.
2014-01-15 13:04:48 -08:00
Michael Schmatz
236c323b43
Merge pull request #194 from brunoporto/patch-1
...
Update pt-BR.coffee
2014-01-15 12:53:15 -08:00
Michael Schmatz
f9970f0ddb
Merge pull request #203 from jaybi/patch-1
...
Update fr.coffee
2014-01-15 12:03:22 -08:00
Michael Schmatz
6d20d34048
Merge pull request #204 from rezahb/patch-3
...
Update fa.coffee
2014-01-15 12:00:50 -08:00
Michael Schmatz
0e40c8b20a
Removed comma from diplomats template
2014-01-15 11:59:34 -08:00
Michael Schmatz
5c3ce7459c
Merge pull request #192 from rezahb/patch-2
...
Update diplomat.jade
2014-01-15 11:59:00 -08:00
Philipp Hansch
17afb62dc9
Add basic code-saved indicator
...
Using the tome:spell-changed callback to determine when to
start showing the code-saved indicator
2014-01-15 20:58:39 +01:00
kengos
8e6271854d
Update ja.coffee
2014-01-16 00:06:38 +09:00
Rehb
ac86e08902
Update fa.coffee
2014-01-15 18:19:43 +03:30
GlenDC
6e5cf30c29
Hotfix for 2 url i18n tags. The Category wasn't prefixed.
2014-01-15 14:49:17 +01:00
GlenDC
8acc4d7071
Translated 1/3 of the Contribute web page as well. + Added a missing tag to the nl.coffee document.
2014-01-15 14:45:18 +01:00
GlenDC
72cb62f607
Translated the Legal page completly in Dutch. (nl.coffee)
2014-01-15 13:48:24 +01:00
jaybi
99f8343df4
Update fr.coffee
...
edited by jaybi
2014-01-15 12:32:09 +01:00
GlenDC
8f5e80d101
Translated most of the Dutch version. (It's my native language)
2014-01-15 03:39:20 +01:00
GlenDC
eba0665616
Hotfix for issue #30
2014-01-15 03:38:33 +01:00
Thomas Triboult
e713fe828f
Translation of new elements
2014-01-15 02:36:39 +01:00
GlenDC
c14c55e382
Applied fix for issue #198 on vi.coffee + added a couple of translations done by An as a test (succesful)
2014-01-15 02:17:04 +01:00
GlenDC
d5907059ed
Resolved issue #30
2014-01-15 01:58:37 +01:00
GlenDC
92416dc4f2
Created view versions for components, systems and thangs ( fix #30 )
2014-01-15 01:33:24 +01:00
Alliss
4ce5a95e22
Update fr.coffee
...
Here's a little contribution, everything I changed I'm 100% sure of. Hope it'll help !
2014-01-15 01:32:16 +01:00
GlenDC
4633ced78d
Created superclass & common templates for article & level (fix for #30 )
2014-01-15 01:12:21 +01:00
Nick Winter
7f1f0fadff
Fixed System deserialization.
2014-01-14 14:03:55 -08:00
brunoporto
fda49c888f
Update pt-BR.coffee
2014-01-14 19:59:15 -02:00
Nick Winter
156c6734ac
Merge pull request #189 from rezahb/master
...
Update fa.coffee
2014-01-14 13:49:44 -08:00
Rehb
17803d018c
Update fa.coffee
...
Delet #
2014-01-15 01:11:54 +03:30
Rehb
8e4c246e5e
Update diplomat.jade
...
Add name 91-Persian
2014-01-15 01:05:10 +03:30
Scott Erickson
bf4011044f
Initially working on using team colors, but it's not working yet.
2014-01-14 13:16:30 -08:00
Rehb
a63f8afff0
Update fa.coffee
2014-01-15 00:40:59 +03:30
Rehb
e13a68df66
Update fa.coffee
2014-01-15 00:39:58 +03:30
Rehb
415bd36f73
Update fa.coffee
2014-01-15 00:37:55 +03:30
Elio
237b97ac5a
Update fr.coffee
2014-01-14 22:05:15 +01:00
Scott Erickson
f4a2209d6f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-14 12:53:18 -08:00
Scott Erickson
83e7a98869
Fixed the versions pages.
2014-01-14 12:53:06 -08:00
Rehb
182548402e
Update fa.coffee
2014-01-15 00:15:39 +03:30
Nick Winter
704f9af864
Updated language progress; added Slovene placeholder.
2014-01-14 12:18:05 -08:00
Nick Winter
a291dd9364
Added new i18n tags to all locales.
2014-01-14 10:30:18 -08:00
Nick Winter
60850d5c48
Updated some tags. Added a script to copy tags from en.coffee.
2014-01-14 10:29:23 -08:00
Nick Winter
6a40e27bdd
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-14 09:15:32 -08:00
armaldio
a0f5eece96
Update fr.coffee
...
just stay few english words that I can't translate
2014-01-14 12:37:40 +01:00
Nick Winter
4a702176a6
Updated i18n, added /employers.
2014-01-13 22:29:58 -08:00
Scott Erickson
37f1ccdb51
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-13 20:32:41 -08:00
Scott Erickson
810eabef46
Tweaked some copy in prep for the new translations to be sent out.
2014-01-13 20:32:21 -08:00
Nick Winter
1041ce4b17
Added GitHub stars button.
2014-01-13 18:19:28 -08:00
Nick Winter
5405423510
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-13 17:17:48 -08:00
Nick Winter
40bd91f415
Working on adding i18n tags from #23 .
2014-01-13 17:17:41 -08:00
Scott Erickson
0fda326858
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-13 16:59:13 -08:00
Scott Erickson
05f4840369
Added tracking properties to systems.
2014-01-13 16:58:56 -08:00
Michael Schmatz
eb04575294
Merge pull request #157 from shiyingzheng/master
...
Randomized Thang Names #128
2014-01-13 16:50:55 -08:00
Paul Buser
f6ada477ef
Merge remote-tracking branch 'upstream/master' into eventcheck-regexp
2014-01-13 16:59:36 -05:00
Nick Winter
69a6070e02
Merge branch 'master' of git://github.com/p-buse/codecombat into p-buse-master
2014-01-13 13:18:52 -08:00
Philipp Hansch
ee06d40974
Update de.coffee
...
Updated missing translations with the translations from the
Google Doc.
Ref #123
2014-01-13 14:54:55 +01:00
Paul Buser
bfe2ab0f1e
Add regexp event checking
2014-01-12 21:26:07 -05:00
Paul Buser
485bc4d6cf
Remove common scripts from user-created levels
2014-01-12 21:15:31 -05:00
Paul Buser
8838903d58
Remove common scripts from user-created level packaging
2014-01-12 21:13:03 -05:00
Michael Schmatz
60abd9f794
Merge pull request #168 from schmatz/master
...
Fixed some client-side tests
2014-01-12 14:04:57 -08:00
Michael Schmatz
718e7ebd22
Fixed failing createPath test
...
There was a misnamed variable, incorrect expect, and outdated calling
style
2014-01-12 12:44:22 -08:00
Scott Erickson
dbbfbcf861
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-12 12:27:26 -08:00
Scott Erickson
de258fdf20
Set up wizard sprites to use the color config.
2014-01-12 12:27:10 -08:00
Nick Winter
d6f2f41cf8
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-12 12:24:24 -08:00
Nick Winter
acc6c2e4e6
Fixed a couple typos.
2014-01-12 12:24:02 -08:00
Scott Erickson
c4028a8036
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-12 12:06:48 -08:00
Nick Winter
1572228aa5
Merge branch 'master' of git://github.com/GlenDC/codecombat into GlenDC-master
2014-01-12 12:01:56 -08:00
Nick Winter
8ab997680e
Turned off A/B test for Break the Prison.
2014-01-12 12:00:38 -08:00
Scott Erickson
6d60221668
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-12 11:58:24 -08:00
Scott Erickson
be80858648
Added wizard color setting.
2014-01-12 11:54:50 -08:00
Nick Winter
fbd7d4a0c5
Fixed up some syntax errors in #147 .
2014-01-12 11:40:38 -08:00
Nick Winter
34ee6778b9
Merge pull request #147 from mlewisno/master
...
Added a file and translations for Bahasa Malaysia
2014-01-12 11:37:25 -08:00
Mischa Lewis-Norelle
958c3e5bae
Made it clear that this is the Bahasa region of the Malay macro language
2014-01-12 14:20:29 -05:00
Mischa Lewis-Norelle
1d7a01fd5c
Fixed the language issues
...
Still not sure about the language code, as there are several Malay
languages, but since this is the only one we have right now, I suppose
it’ll do. Google has it as .my, but BCP 47 says that is Burmese. I’ll
look into this more later on.
2014-01-12 14:09:56 -05:00
SHIYING
b6c499db72
Better randomized orders. Better styled code.
2014-01-12 12:59:51 -05:00
GlenDC
1032fdb1d3
Enchangement for issue #23 . Removed classes related ids from account_settings to classes category
2014-01-12 11:20:07 +01:00
SHIYING
524b2318f8
Better comment for randArray
2014-01-11 16:15:46 -05:00
SHIYING
08a1668bcc
Bug fixed where ordering of thang names becomes undefined sometimes
2014-01-11 16:09:25 -05:00
SHIYING
ae67a9dc23
Added comments and made code more readable
2014-01-11 15:43:34 -05:00
SHIYING
00cdb1e5ad
Randomized naming for Thangs
2014-01-11 15:41:13 -05:00
GlenDC
683b72f67a
First big fix for issue #23 . The issue is as good as fixed besides some details I think.
2014-01-11 17:25:04 +01:00
Adam23
0fc8643133
update zh-HANT.coffee + zh-HANS.coffee
...
fix something
2014-01-11 21:45:08 +08:00
Adam23
016dc1a3f6
Chinese (Traditional)
...
zh-HANT.coffee + zh-HANS.coffee
2014-01-11 21:17:47 +08:00
Nick Winter
00f4699ce5
Further fixes for save modals.
2014-01-10 17:32:29 -08:00
Scott Erickson
52eae882e8
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-10 17:14:31 -08:00
Scott Erickson
ecd9ed8fef
Fixed the save version modal.
2014-01-10 17:11:13 -08:00
Nick Winter
033e3a6c0b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-10 17:04:21 -08:00
Nick Winter
2383d5dd3a
An improvement for containingString in #133 .
2014-01-10 17:04:12 -08:00
Scott Erickson
1f9c531938
Got rid of a bunch of logs.
2014-01-10 16:57:38 -08:00
Scott Erickson
95900f230f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-10 16:48:45 -08:00
Scott Erickson
1a3c6498e8
Built the thang editor colors tab.
2014-01-10 16:48:28 -08:00
Nick Winter
a6f1ce53ba
Merged #152 , and slightly improved update interval handling.
2014-01-10 16:36:36 -08:00
dristic
21915f358c
Add clear timers to not have timer running in the background on home page.
2014-01-10 16:18:39 -08:00
GlenDC
100a296951
Fixed Issue #26
2014-01-10 22:31:26 +01:00
Nick Winter
2b6a7cf753
Merge pull request #145 from fess89/master
...
Update uk.coffee
2014-01-10 09:42:16 -08:00
mlewisno
c6e81f909c
Added a file and translations for Bahasa Malaysia
2014-01-10 10:09:45 -05:00
mlewisno
9318675447
Merge remote-tracking branch 'upstream/master'
...
Updated my local copy to match the public copy
2014-01-10 10:08:02 -05:00
Oleksii Chyrkov
8902ba91e2
Update uk.coffee
...
Copied Ukrainian strings from Google doc to uk.coffee.
2014-01-10 14:55:56 +02:00
Adam23
29a302aaa9
update zh-HANS.coffee
...
make the string blank, and comment out the line
2014-01-10 14:54:22 +08:00
Adam23
cf6b6c11ce
update zh-HANS.coffee
...
two places
2014-01-10 14:19:25 +08:00
Adam23
e01db58608
updating zh-HANS.coffee
...
I have finished the first draft.
2014-01-10 13:43:59 +08:00
Nick Winter
69df0079af
Fixed bug returning to normal selection from talking portrait in HUD.
2014-01-09 18:30:18 -08:00
Nick Winter
25d2f95db9
Not using subreddit any more.
2014-01-09 18:29:57 -08:00
Nick Winter
027cddd151
Increased matching bracket highlighting visibility.
2014-01-09 18:02:16 -08:00
Nick Winter
05d7562c78
Copied Norwegian also Norwegian (Bokmal).
2014-01-09 17:43:13 -08:00
Nick Winter
7cbd1605e4
Merge pull request #139 from rhc2104/dutch
...
Add Dutch translations
2014-01-09 17:28:13 -08:00
Nick Winter
4502492d8a
Merge pull request #138 from rhc2104/italian
...
Add support for Italian
2014-01-09 17:27:47 -08:00
Ronald Cheng
014fd0d608
Add Dutch translations
2014-01-09 17:15:44 -08:00
Ronald Cheng
309e2c7467
Add support for Italian
2014-01-09 16:50:59 -08:00
Ronald Cheng
36c8e96450
Add Swedish translations, plus a couple of Polish translations
2014-01-09 16:08:57 -08:00
Oleksii Chyrkov
8931a01ae3
Update ru.coffee
...
Added a missing quote at the last line.
2014-01-10 00:47:14 +02:00
Nick Winter
0c6b1257ff
Fixed a couple syntax issues in Russian locale..
2014-01-09 14:46:00 -08:00
Nick Winter
7cda5dcbc5
Merge pull request #130 from fess89/master
...
Update ru.coffee
2014-01-09 14:43:22 -08:00
Oleksii Chyrkov
96b995ed60
Update ru.coffee
...
Updated ru.coffee with the actual Russian translation of all the strings.
2014-01-10 00:24:35 +02:00
Michael Schmatz
faac70bee9
Merge pull request #125 from p-buse/master
...
Fix "Contact" link in footer not properly changing cursor to pointer
2014-01-09 14:18:15 -08:00
Scott Erickson
2d5ca50e89
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-09 14:04:53 -08:00
Scott Erickson
3c3e38b585
Set up thang avatar views with the new db portraits.
2014-01-09 14:04:46 -08:00
mlewisno
414bb4d07a
Added a file for Bahasa Malaysia, will update soon
2014-01-09 16:30:03 -05:00
Dman19993
6f094f0f38
Update names.coffee
2014-01-09 14:47:24 -06:00
Paul Buser
7af5804e29
Fix "Contact" link in footer not properly changing cursor to pointer
2014-01-09 15:31:56 -05:00
Tavio
850313ca70
Update names.coffee
2014-01-09 18:00:39 -02:00
Nick Winter
98245d0fb9
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-09 11:28:14 -08:00
Nick Winter
3a954ff91c
A bit more CoffeeScript-y.
2014-01-09 11:28:08 -08:00
Scott Erickson
4e34b38c83
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/views/play/level/hud_view.coffee
2014-01-09 11:05:51 -08:00
Scott Erickson
8077c62ceb
Set up talking portraits in the hud.
2014-01-09 11:04:22 -08:00
Nick Winter
e2414f7c5a
Hopefully fixed #106 by being super conservative about whether G+, FB, and Twitter can be loaded.
2014-01-09 10:49:34 -08:00
Bård Eik-Hvidsten
1d525bad37
Update no.coffee
...
Translated the text into Norwegian (Bokmål)
2014-01-09 19:35:11 +01:00
Ronald Cheng
278b4d8754
If you have pressed esc, do not get prompted about it
2014-01-08 23:09:58 -08:00
Scott Erickson
391207d00f
Fixes for unit portraits.
2014-01-08 22:30:00 -08:00
Nick Winter
03a5614a18
Fixed #96 .
2014-01-08 19:18:23 -08:00
Scott Erickson
50beeb93bc
Merge branch 'production'
2014-01-08 14:59:49 -08:00
Scott Erickson
4b8c8f22c1
Fixed logging out to update the header properly.
2014-01-08 14:57:59 -08:00
Scott Erickson
aab11ea5f7
Fixed logging in with facebook and google plus to not overwrite existing user settings.
2014-01-08 14:57:42 -08:00
Nick Winter
2fdb8c2dc2
Merge pull request #116 from rhc2104/press-esc
...
Create notification that esc can skip dialogs
2014-01-08 14:35:58 -08:00
Ronald Cheng
81eed31714
Create notification that esc can skip dialogs
...
If you use the shift-space combination at least 5 times per page load, a message will pop up next to the continue button stating that you can press esc to skip dialog.
2014-01-08 14:23:36 -08:00
Ronald Cheng
a717ee80fb
Add more peasant names, and soldiers cannot be both Will and William
2014-01-08 11:34:52 -08:00
Michael Schmatz
ee3841b32c
Merge pull request #110 from rhc2104/google-plus
...
Make G+ button same size as other buttons
2014-01-08 05:56:31 -08:00
Michael Schmatz
119812e126
Merge pull request #109 from rhc2104/404
...
Center text in 404 page
2014-01-08 05:13:06 -08:00
Ronald Cheng
3658d5ca3a
Make G+ button same size as other buttons
...
The default G+ button size is slightly larger than the Facebook and Twitter buttons. Use the "medium" size to make the size even.
2014-01-08 02:15:52 -08:00
Ronald Cheng
a61756a816
Center text in 404 page
2014-01-08 01:28:38 -08:00
engstrom
21536794be
added peasant names
2014-01-07 20:59:43 -07:00
Tavio
07df7be1f4
Update names.coffee
...
A few more names.
2014-01-08 00:26:16 -02:00
Tavio
32eaf4a891
Update names.coffee
2014-01-07 23:02:55 -02:00
armaldio
9f4188da09
Update fr.coffee
...
Hi, I'm French and I like CodeCombat.
I enjoy translate things from English to French.
If you agree, I can translate many of levels dialogues :D
2014-01-07 23:56:41 +01:00
Gabriel Cebrian
74bcc4ec1b
Increase element padding to avoid cutting words off
2014-01-07 14:05:39 -05:00
Gabriel Cebrian
ad12680ce9
Make language options menu right aligned instead of left aligned
...
Remove horizontal scrollbar that is shown when vertical scrollbar is shown
Changed top property to improve look
2014-01-07 13:27:46 -05:00
Nick Winter
70cd16cee4
Fixing bug with application require for now. Shoutout for Firebase.
2014-01-06 23:45:33 -08:00
Scott Erickson
250b7322a9
Fixed #56
2014-01-06 21:25:18 -08:00
Scott Erickson
a988c91a63
Fixed blog links.
2014-01-06 20:17:27 -08:00
Scott Erickson
f0147e8f7c
More tweaks to the thang editor.
2014-01-06 19:33:36 -08:00
Scott Erickson
7d638b596f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-06 19:10:57 -08:00
Scott Erickson
ddbf45b50c
Made the thang editor a little more organized.
2014-01-06 19:09:43 -08:00
Nick Winter
845601ed96
No need for wallNameFor any more.
2014-01-06 19:07:13 -08:00
Scott Erickson
59ec63c041
Fixed #60 .
2014-01-06 18:12:57 -08:00
Scott Erickson
aeaeb84fe5
Fixed general articles showing up in the guides.
2014-01-06 18:03:17 -08:00
Scott Erickson
5a4de61999
Bug fix.
2014-01-06 17:56:34 -08:00
Scott Erickson
975a7453bd
Refactored initial User creation.
2014-01-06 17:45:35 -08:00
Scott Erickson
a9c70f9a7d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-06 17:15:24 -08:00
Scott Erickson
94cb6ea4e1
Fixed up the search optimization and installed thang portraits into the level editor.
2014-01-06 17:11:57 -08:00
Nick Winter
1297126abd
Added back lang val instead of attr setting.
2014-01-06 16:58:50 -08:00
Scott Erickson
fe984d7c73
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-06 15:36:50 -08:00
Scott Erickson
27e7b6c240
Tweaks for thang portraits.
2014-01-06 15:36:35 -08:00
Nick Winter
8b4ec9b263
Merged and cleaned up #79 .
2014-01-06 15:18:40 -08:00
Nick Winter
f53f20a6ad
Fixed #86 .
2014-01-06 14:53:21 -08:00
Tom Steinbrecher
60c4b360d5
Added ContribueClassView, which all contribute pages are now based off of.
...
Moved nav in to contribute_nav.jad, allowing for easier addition of nav to contribute pages.
Fixed other small bugs.
2014-01-06 17:30:35 -05:00
Nick Winter
fa687c4c30
Increase infinite loop timeout wait slightly to bandage #81 .
2014-01-06 12:47:50 -08:00
Scott Erickson
f656a4f4cf
Set up portrait uploading for thangs.
2014-01-06 12:37:35 -08:00
George Saines
7758ecc91b
Added additional names for units.
2014-01-06 11:06:03 -08:00
George Saines
387eab5592
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-06 11:02:03 -08:00
George Saines
123affeec6
Fixing a typo in the CLA
2014-01-06 11:02:00 -08:00
Nick Winter
316b382d81
Fix for announcement duplicates.
2014-01-06 10:33:52 -08:00
Tom Steinbrecher
75894d1160
Issues 13 and 14. Contributor pages, and fixed the scrolling bug better than before
2014-01-06 00:56:32 -05:00
Tom Steinbrecher
34dd42a7ca
Refactored contribute pages, each class has it's own page. Better fix to issue 13 and solution to 14
2014-01-06 00:41:31 -05:00
Scott Erickson
d1c33430d8
Tweaked the Archmage contribute copy.
2014-01-05 17:01:23 -08:00
Nick Winter
3a448d589a
Merge pull request #77 from chloester/master
...
Fixed #13
2014-01-05 15:59:30 -08:00
Chloe Fan
5a9b55342e
Aligning intro to rest of the page
2014-01-05 15:55:36 -08:00
Chloe Fan
b7ecab102e
Issue 13. Pushed header and image down to compensate for fixed top bar
2014-01-05 15:51:46 -08:00
Nick Winter
1185731fd0
Fixed two bugs with the CLA.
2014-01-05 15:07:30 -08:00
Nick Winter
f1186f6092
Contributor emails now indicate saved.
2014-01-05 14:45:55 -08:00
Nick Winter
ec20cac6f7
Allowed access to character class emails by prompting for signup on check.
2014-01-05 14:20:48 -08:00
Nick Winter
fa1d24ba8f
Updated README.
2014-01-05 12:32:44 -08:00
Nick Winter
164dd49933
Fixed a GitHub link.
2014-01-04 22:20:17 -08:00
Tom Steinbrecher
d50c362286
Refactored ticker, fixed from all instances were using same ticker.
2014-01-05 01:05:03 -05:00
Tom Steinbrecher
b5bb1b13a1
Completed issue 48: Adds bobbing to thangs with 'bobs' property.
...
Thangs with 'bobs' must also set 'bobSpeed' and 'bobHeight'
2014-01-04 22:51:53 -05:00
Nick Winter
1d223f790b
Trying to force soft tabs and Unix newlines.
2014-01-04 16:41:25 -08:00
Nick Winter
01cfcbedc7
Updated some $attr, $val, and $prop calls.
2014-01-04 15:49:13 -08:00
Scott Erickson
0499cddbe6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-04 08:56:29 -08:00
Scott Erickson
c4bfcd5c2d
Refactored portraits to be built in sprite sheets separately.
2014-01-04 08:55:12 -08:00
Mischa Lewis-Norelle
c35cd3437f
Added a bunch of names
...
Added a bunch of names, will come up with more tomorrow and add them in
the evening.
2014-01-03 23:28:09 -06:00
Scott Erickson
56fa98e76b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-03 14:31:27 -08:00
Scott Erickson
594b54a40e
Can now set admin permissions on the dev environment.
2014-01-03 14:28:00 -08:00
Nick Winter
ffebe45267
Updated uglify-brunch options to not break on for(;;).
2014-01-03 13:49:36 -08:00
Nick Winter
6009df26de
Ready for action, sir!
2014-01-03 10:32:13 -08:00