Commit graph

3366 commits

Author SHA1 Message Date
Vicky Chijwani
0a14681e7b Correctly parse multi-line error messages in the editor. 2014-05-16 01:41:26 +05:30
Scott Erickson
3a1afbb7ca Turned shadow caching back on. Makes a bigger diff for maps like Greed on Firefox where they're all over the place. 2014-05-15 13:06:42 -07:00
Scott Erickson
c03004166c Set up the save version modal/patch modal to submit on submit form (like pressing enter in an input). 2014-05-15 12:37:39 -07:00
Michael Schmatz
54172ee775 Merge pull request #1009 from codecombat/master
Master into production
2014-05-15 11:52:34 -07:00
Nick Winter
c1f9d51b37 Added times to runtime errors. Don't load ThangTypes for Thangs that don't exist on the first frame of the world. 2014-05-15 11:27:51 -07:00
Scott Erickson
f653aa3375 Fixed #1008 2014-05-15 10:51:38 -07:00
Michael Schmatz
02f3bd2fb5 Merge pull request #1007 from codecombat/master
Master into production
2014-05-15 09:40:57 -07:00
Michael Schmatz
338b613074 Added transpiledCode to victory modal 2014-05-15 09:30:59 -07:00
Nick Winter
dbcafbb29b Working on level-specific coding languages, with non-writable code in JavaScript. 2014-05-14 21:54:36 -07:00
Nick Winter
40b867f1a9 Merge branch 'master' into production 2014-05-14 20:47:07 -07:00
Scott Erickson
2a17ec5cb9 Refactored out displayObject from CocoSprites. 2014-05-14 17:05:13 -07:00
Michael Schmatz
4e268d8dc6 Add codeLanguage to level session 2014-05-14 16:41:02 -07:00
Nick Winter
dd1acb94ed Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-14 16:06:09 -07:00
Nick Winter
c420209a6b Improved GoldView tooltip. 2014-05-14 16:06:00 -07:00
Michael Schmatz
1e0f220352 Send out transpiled code with simulator task 2014-05-14 16:01:08 -07:00
Michael Schmatz
ae69487c64 Merge pull request #1004 from codecombat/master
Master into production
2014-05-14 15:48:00 -07:00
Michael Schmatz
f32a0ca963 Added transpile to in-game rank button 2014-05-14 15:45:38 -07:00
Nick Winter
d61922ae42 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-14 15:31:19 -07:00
Nick Winter
cc7808251f Zoom/scroll, ModelModal, and coordinate grabber fixes. 2014-05-14 15:29:55 -07:00
George Saines
75ab5d6435 making our recruitment % consistent 2014-05-14 14:55:04 -07:00
Scott Erickson
a1474652f6 Merge branch 'feature/thangload' 2014-05-14 14:21:40 -07:00
Scott Erickson
00fdaa1d0f Fixed raster image sprites to update their scales when they load, and to properly place themselves if matching world dimensions. 2014-05-14 12:28:47 -07:00
Nick Winter
698207f533 Merge pull request #996 from gosnat/patch-8
Update world.coffee
2014-05-14 11:55:01 -07:00
Nick Winter
7f3e769cbd Merge pull request #997 from gosnat/patch-6
Update GoalManager.coffee
2014-05-14 11:54:50 -07:00
Nick Winter
57f3846abb Merge pull request #998 from gosnat/patch-7
Update thang.coffee
2014-05-14 11:54:46 -07:00
Scott Erickson
7a381df348 Merge branch 'feature/thangload' 2014-05-14 11:48:19 -07:00
Michael Schmatz
e59ba63584 Merge pull request #1002 from codecombat/master
Master into production
2014-05-14 11:46:06 -07:00
Michael Schmatz
b11112c0aa Merge pull request #1001 from codecombat/transpiledCode
Include transpiled code in submission process
2014-05-14 11:43:53 -07:00
Michael Schmatz
a1360d6cb8 Include transpiled code in submission process 2014-05-14 11:42:15 -07:00
Scott Erickson
09fbfdb360 Fixed a bug with the simulator due to the changes made to the supermodel. 2014-05-14 11:13:36 -07:00
Michael Schmatz
19a637aaa4 Open candidates in new tab 2014-05-14 10:37:16 -07:00
Scott Erickson
0be813e424 Figured out how to get the world to properly get shown if the world is created before the level loader is completely finished. 2014-05-14 10:35:16 -07:00
Michael Schmatz
9f9d651b3b Updates to transpile script and updated aetherOptions 2014-05-14 10:14:18 -07:00
Scott Erickson
cab1adf8fc Merge branch 'master' into feature/thangload 2014-05-14 09:31:59 -07:00
Scott Erickson
54af58baee SuperModel no longer emits progress going backward ever, and added a way to prevent it from getting to high in the middle of a chain of loading. 2014-05-14 09:24:52 -07:00
Scott Erickson
4b404ae124 Finished tuning the supermodel loading and progress. 2014-05-13 14:39:45 -07:00
Nick Winter
ab37646cb6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-13 11:04:20 -07:00
Nick Winter
53870a89a5 Python allowed, and better support for transpile errors. 2014-05-13 11:04:04 -07:00
Michael Schmatz
eee05a2442 Merge pull request #999 from codecombat/master
Updated level session schema and transpile script
2014-05-13 10:52:54 -07:00
Scott Erickson
b4ad34eb8f LevelLoader only builds and loads thang types in the world on the first frame, letting everything else happen lazily. 2014-05-13 10:51:55 -07:00
Michael Schmatz
961fea7d5c Update level session schema 2014-05-13 10:49:02 -07:00
gosnat
12f351197d Update world.coffee
add getGoalState
2014-05-13 12:43:39 -05:00
gosnat
72b2c84705 Update thang.coffee
add getGoalState
2014-05-13 12:42:48 -05:00
gosnat
25287e0298 Update GoalManager.coffee
add getGoalState
2014-05-13 12:41:39 -05:00
Michael Schmatz
92ffc1d5a2 Progress on transpile script 2014-05-13 10:27:45 -07:00
Scott Erickson
66af855497 Merge branch 'master' into feature/thangload 2014-05-13 10:27:10 -07:00
Scott Erickson
1d88b6eefe Most of the way there getting it to work with loading thang types dynamically throughout the play view. 2014-05-13 10:26:33 -07:00
Nick Winter
02a3c0e037 Merge branch 'master' into production 2014-05-12 19:56:48 -07:00
Nick Winter
69dc96c7c8 Fixed Rank My Game on my matches. 2014-05-12 19:56:12 -07:00
Dominik Maier
bb562aba32 + Overly lengtly comment changed. 2014-05-13 04:40:15 +02:00