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 |
|
Nick Winter
|
bebe5a0620
|
Improved hover debugger tokenization specificity to not extend past end of line.
|
2014-05-01 11:18:20 -07:00 |
|
Michael Schmatz
|
c9ea301b29
|
Fixed various bugs with debug worker
|
2014-05-01 11:12:44 -07:00 |
|
Nick Winter
|
f7bdb7e840
|
Upgrades for teleportation imnterpolation performance, ACE search box styling.
|
2014-05-01 10:44:17 -07:00 |
|
Nick Winter
|
c2df4d43c9
|
Merge branch 'master' into production
|
2014-04-29 16:55:39 -07:00 |
|
Nick Winter
|
541a2756fd
|
Simulate properly even if Simulator Supermodel starts fully loaded.
|
2014-04-29 16:54:57 -07:00 |
|
Nick Winter
|
2f174691c5
|
Fixed #939.
|
2014-04-29 16:44:38 -07:00 |
|
Nick Winter
|
04d74fb76f
|
Fixed bug with scale not updating properly when paused.
|
2014-04-29 16:04:30 -07:00 |
|
Nick Winter
|
4ad7ebc95d
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-29 15:31:23 -07:00 |
|
Michael Schmatz
|
c0e2d3da8f
|
Merge pull request #937 from codecombat/master
Master into production
|
2014-04-29 15:31:18 -07:00 |
|
Nick Winter
|
bea0589fad
|
Fixed #935.
|
2014-04-29 15:31:18 -07:00 |
|
Michael Schmatz
|
294570cb1b
|
Made it so that modal doesn't show if you've signed the contract
|
2014-04-29 15:30:28 -07:00 |
|
Nick Winter
|
eca35ce371
|
Several minor bugfixes, and enabled API protection on all levels by default.
|
2014-04-29 15:25:59 -07:00 |
|
Nick Winter
|
8a6bec9d40
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-29 15:25:39 -07:00 |
|
Michael Schmatz
|
6bd1dd000e
|
Merge pull request #936 from codecombat/master
Master into production
|
2014-04-29 15:14:10 -07:00 |
|
Michael Schmatz
|
546bd26328
|
Fixed login flow and user profile issue
|
2014-04-29 15:12:50 -07:00 |
|
Nick Winter
|
d3a21f4959
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-29 09:43:08 -07:00 |
|
Nick Winter
|
cc8d1d4a07
|
Merge pull request #933 from gosnat/patch-2
Update play_view.coffee
|
2014-04-29 09:25:53 -07:00 |
|