Roy Xue
fd3c008ca7
Update zh-HANS.coffee
2014-05-04 11:03:43 +08:00
gosnat
39b21da035
Update GoalManager.coffee
...
I'd like to temporarily turn on console logging (lines 240 and 245) to take a peek at why numNeeded doesn't seem to be correct if howMany isn't defined.
2014-05-03 21:36:24 -05:00
dpen2000
5d4f5cd97d
Change dev server to watch app/schemas
...
The previous app.js watch wasn't working and we probably only need to see changes in schemas because server code depend on these
2014-05-03 18:39:14 -04:00
Nick Winter
b6a53a83e7
Fixed issue with play button not turning into rewind.
2014-05-03 13:26:37 -07:00
Nick Winter
73222a1a98
Don't start drawing Surface until needed.
2014-05-03 09:13:26 -07:00
Nick Winter
fbf5f52228
Merge pull request #955 from benojan/patch-3
...
Update zh-WUU-HANT.coffee
2014-05-03 07:22:57 -07:00
Nick Winter
7535f5b49d
Merge branch 'benojan-patch-4'
2014-05-03 07:21:23 -07:00
Nick Winter
8fbe2dedfc
Propagated Wu name update.
2014-05-03 07:21:18 -07:00
Marc Portier
5212eca404
fixing typox - thx to @JasperDhaene
2014-05-03 16:04:08 +02:00
Marc Portier
f7b746c3ea
making case consistent - thx to @JasperDhaene
2014-05-03 16:01:17 +02:00
Marc Portier
add2944a28
ogre ==> ork and a serious spelling error
2014-05-03 15:59:16 +02:00
Benojan
8a11990e89
Update locale.coffee
...
巫师吴语->吴语
巫師吳語->吳語
2014-05-03 17:55:36 +08:00
Benojan
50d4078ade
Update zh-WUU-HANT.coffee
...
translate others that was not translated.
2014-05-03 17:14:11 +08:00
Marc Portier
d348c6f333
translate space
2014-05-03 11:06:39 +02:00
Marc Portier
e1482280c3
first translation contribution
2014-05-03 08:23:36 +02:00
Nick Winter
90bbe0bf55
Moved modals down a bit; watch out, not sure why they were !important before.
2014-05-02 19:28:08 -07:00
Nick Winter
77adebe181
Fixed #893 .
2014-05-02 18:53:18 -07:00
Scott Erickson
db9a82d58a
Merge branch 'feature/thangload' of https://github.com/codecombat/codecombat into feature/thangload
2014-05-02 17:03:53 -07:00
Scott Erickson
aee90c72bb
Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel.
2014-05-02 17:03:30 -07:00
Nick Winter
afbe5b063b
Fix HTML icon syntax in the Markdown.
2014-05-02 15:51:07 -07:00
Nick Winter
a04f74de8b
Implemented George's gold design.
2014-05-02 15:12:30 -07:00
Nick Winter
d54149d0f3
Reworked LevelView loading priorities to try to get world simulating earlier.
2014-05-02 12:32:41 -07:00
Nick Winter
e610ecb476
Propagated new i18n tags.
2014-05-02 11:02:48 -07:00
Nick Winter
9d45b22057
Added some i18n tags.
2014-05-02 11:00:30 -07:00
Scott Erickson
eacbf571c6
Merge branch 'master' into feature/thangload
2014-05-02 10:32:05 -07:00
Scott Erickson
06bc96d7d0
Set up the level loader to get thangtype names first, then load the thang types themselves so the world can be generated in parallel with thang type loading and rendering.
2014-05-02 10:31:20 -07:00
Nick Winter
ef036b409b
Merge pull request #930 from M-r-A/patch-1
...
Update ru.coffee
2014-05-02 09:58:55 -07:00
Nick Winter
3ac052a4a6
Merge branch 'benojan-patch-2'
2014-05-02 09:49:35 -07:00
Nick Winter
082a9d141a
Keeping Wu English stub.
2014-05-02 09:49:02 -07:00
Nick Winter
302cb78095
Added zh-WUU-HANS stubs.
2014-05-02 09:48:40 -07:00
Nick Winter
f92fd122c6
Integrating Wu as zh-WUU-HANS and zh-WUU-HANT; hacking on a fork of i18next to do so.
2014-05-02 09:46:00 -07:00
Scott Erickson
2952d7702c
Merge branch 'master' into feature/thangload
...
Conflicts:
app/lib/LevelLoader.coffee
app/views/play/level_view.coffee
2014-05-02 08:20:03 -07:00
Scott Erickson
92687b17de
Merge branch 'master' into feature/thangload
...
Conflicts:
app/lib/LevelLoader.coffee
app/views/play/level_view.coffee
2014-05-02 08:19:47 -07:00
Nick Winter
178e40b679
Merge pull request #946 from benojan/patch-1
...
Update zh.coffee
2014-05-02 08:10:17 -07:00
Benojan
28a56c1c83
Create new language--the wuu-chinese
...
Just for Wuu Chinese, including Shanghainese and such language in Zhejiang Province, China.
2014-05-02 19:19:21 +08:00
Benojan
770345f84d
Update zh.coffee
2014-05-02 16:09:13 +08:00
Nick Winter
5f43fdc698
Merge branch 'master' into production
2014-05-01 20:41:04 -07:00
Nick Winter
ae31f90a25
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-01 17:41:10 -07:00
Nick Winter
9f18811701
Fixed logic for displaying runtime errors from last run based on code being the same as last cast.
2014-05-01 17:41:06 -07:00
Michael Schmatz
b2ee18d055
Merge pull request #945 from codecombat/master
...
Implemented save notes button
2014-05-01 17:37:23 -07:00
Michael Schmatz
347292c985
Implemented save notes button
2014-05-01 17:36:49 -07:00
Michael Schmatz
7d15e3cd12
Merge pull request #944 from codecombat/master
...
Scroll to candidate position while going back
2014-05-01 17:20:40 -07:00
Michael Schmatz
9fb5826593
Scroll to candidate position while going back
2014-05-01 16:56:41 -07:00
Michael Schmatz
b7ddbe74a9
Merge pull request #943 from codecombat/master
...
Master into production
2014-05-01 16:46:31 -07:00
Scott Erickson
26cafd2f19
Fixed #941 . Actually it was no longer crashing probably because of the fix for #934 , but there were still other bugs. Fixed it, and other bugs like it, particularly in the spectate view. Cleaned up a bit, too.
2014-05-01 16:38:27 -07:00
Michael Schmatz
717651d6ff
Progress on thang property serialization
...
There is a bug where thang properties aren’t updated when simulating
forward
2014-05-01 16:08:46 -07:00
Scott Erickson
3bc0c1710e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-01 15:45:00 -07:00
Scott Erickson
31c5890288
Fixed #934
2014-05-01 15:44:50 -07:00
Nick Winter
0f33bae1f1
Hid level done button better. Avoiding building wizard sprite when not needed.
2014-05-01 14:36:26 -07:00
Nick Winter
5376a42f94
Fixed serialization of tracked property arrays.
2014-05-01 13:23:14 -07:00
