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
d5fce3ee99
Added a handler for fetching a user id given a name.
2014-02-27 14:07:11 -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
6c2d4fac7d
Noticed a tab and converted to spaces.
2014-02-27 11:58:45 -08:00
Nick Winter
6075f4cbe7
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-27 11:58:22 -08:00
Nick Winter
794cdf78b0
Merge pull request #432 from Akhil-T/master
...
Fix for "Type str doesn't support the buffer API"
2014-02-27 11:57:35 -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
Akhil Thampy
673b5ff04e
Fix for "Type str doesn't support the buffer API"
...
subprocess.check_output("mongod --version",shell=True) returns a byte
string so to convert it to a regular string we should do this :
mongo_version_string = subprocess.check_output("mongod
--version",shell=True)
mongo_version_string = mongo_version_string.decode(encoding='UTF-8')
2014-02-26 23:15:04 -06:00
Akhil-T
312d880508
Merge pull request #1 from codecombat/master
...
Fixes error "Type str doesn't support the buffer API"
2014-02-26 23:01:07 -06: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
