Commit graph

4942 commits

Author SHA1 Message Date
Nick Winter
7300c4b3b8 Finished removing grid from playback options menu. 2014-08-26 14:00:03 -07:00
Nick Winter
35b107cf58 Refactored grid. Fixed #158. 2014-08-26 13:56:57 -07:00
Scott Erickson
2f72aa4f47 Fixed adding new components in the thang components edit view. 2014-08-26 13:48:57 -07:00
Scott Erickson
39d0df5153 Fixed name ordering in the thang components editor. 2014-08-26 13:27:17 -07:00
Scott Erickson
5b5bceda3a Components tab now incorporates components inherited from thang types. 2014-08-26 13:08:56 -07:00
Nick Winter
3e9adf6b1a Fixed issue with IndieSprites no longer coloring properly. 2014-08-26 12:39:30 -07:00
Nick Winter
a5912c8e40 Merge pull request #1490 from Imperadeiro98/master
Update pt-PT.coffee
2014-08-26 11:34:58 -07:00
Nick Winter
741139db59 Apparently GitHub ids are integers, not strings. 2014-08-26 11:34:33 -07:00
Nick Winter
38dcb7fcef Fixed #5. 2014-08-26 11:29:16 -07:00
Imperadeiro98
5dde2572ff Update pt-PT.coffee 2014-08-26 19:15:50 +01:00
Scott Erickson
ef8ca9874a For the markdown editor node, tweaked ace height, and made sure preview div is hidden by default. 2014-08-26 10:28:01 -07:00
Scott Erickson
fb06e58201 Fixed a bug where CocoModel wouldn't unset properties on revert because saveBackup is now debounced and would reintroduce those properties. 2014-08-26 10:14:36 -07:00
Scott Erickson
3b6de071f7 Getting rid of a debug line. 2014-08-26 09:55:59 -07:00
Scott Erickson
f92a665b8b Merge conflicts. 2014-08-26 09:53:04 -07:00
Scott Erickson
6091eaea6f Bunch of fixes to the thang component edit view. 2014-08-26 09:48:33 -07:00
Nick Winter
8327cf7027 Merge branch 'rubenvereecken-github' 2014-08-26 08:37:30 -07:00
Nick Winter
832402af6e Merged/tweaked GitHub login. 2014-08-26 08:37:11 -07:00
Nick Winter
397fc02d6c Realized we still needed nav.editor. Propagated i18n. 2014-08-26 08:20:31 -07:00
Nick Winter
898bb69477 Added missing Countdown Screen file. 2014-08-26 08:18:06 -07:00
Nick Winter
51bc98665a Removed more old editor root page bits. Like #1486 but keeping the editor titles. 2014-08-26 08:16:29 -07:00
Nick Winter
6c8051bd48 Merge pull request #1487 from Imperadeiro98/patch-2
Update pt-PT.coffee
2014-08-26 08:07:33 -07:00
Nick Winter
04ddb1cea3 Merge pull request #1488 from Imperadeiro98/patch-3
Update user_home.jade
2014-08-26 08:02:22 -07:00
Imperadeiro98
32de00a87f Update user_home.jade
Fixed some errors.
2014-08-26 10:33:00 +01:00
Imperadeiro98
203dc19ee2 Update pt-PT.coffee 2014-08-26 10:31:25 +01:00
Imperadeiro98
732a9b3762 Update pt-PT.coffee 2014-08-26 10:24:14 +01:00
Nick Winter
e666ee1dac Added stop playback button and real-time countdown screen. 2014-08-25 22:05:30 -07:00
Scott Erickson
1406a970ea Bunch of fixes to get the level editor working again. 2014-08-25 20:34:46 -07:00
George Saines
ea3ade5bbc Merge branch 'master' of https://github.com/codecombat/codecombat 2014-08-25 20:27:54 -07:00
George Saines
f5790907a1 removing editor page 2014-08-25 20:27:50 -07:00
Nick Winter
6fb0073eae Fixed harmless Wizard startup animation error. 2014-08-25 16:15:34 -07:00
Nick Winter
e48b218533 Projected models can now update their projections and re-fetch. Hero ThangTypes now do this. 2014-08-25 15:39:47 -07:00
Nick Winter
6eab4ff7a6 Code language nodes that want to skip JavaScript now can. 2014-08-25 14:35:51 -07:00
Nick Winter
9df0cfb93f A few changes to flags UX. 2014-08-25 14:02:23 -07:00
Scott Erickson
d392994a83 Merge branch 'master' into feature/defaults 2014-08-25 13:00:33 -07:00
Scott Erickson
1669871acc Fixed a demo. 2014-08-25 11:39:38 -07:00
Nick Winter
e278f3ecb4 Merge branch 'stream' 2014-08-25 09:11:57 -07:00
Nick Winter
ac3f1647e4 Merge pull request #1480 from Imperadeiro98/master
Update pt-PT.coffee
2014-08-25 08:29:50 -07:00
Nick Winter
08f2ee248b No longer constructing SpellViews for non-readable methods. 2014-08-24 22:02:22 -07:00
Nick Winter
718d586f07 A ton of misc bug fixes and performance improvements, getting ready to merge world streaming and flags back in. 2014-08-24 21:39:34 -07:00
Nick Winter
f8ddc17a9f Merge pull request #1482 from ZephyrSails/master
Update zh-HANS.coffee
2014-08-24 20:51:28 -07:00
Nick Winter
1a7e4554f0 Fixed a few minor bugs. 2014-08-24 16:48:59 -07:00
Nick Winter
3125c2b129 Add flag cursor and pending flags. 2014-08-24 16:09:06 -07:00
Nick Winter
f44d802934 Fixed a couple bugs. Flags are now colored. 2014-08-24 12:33:46 -07:00
Scott Erickson
297b3e3e63 Last schema refactoring. 2014-08-24 11:19:44 -07:00
Imperadeiro98
4da9b470ab Update pt-PT.coffee 2014-08-24 09:03:25 +01:00
Nick Winter
be07f9cfb9 Many improvements to real-time streaming and flags. 2014-08-23 22:24:00 -07:00
Nick Winter
2dca4d72fc Rudimentary flag buttons are in. 2014-08-23 19:00:35 -07:00
Nick Winter
f59084e651 Sending flag history to the World for to make flag Thangs during simulation. 2014-08-23 17:26:56 -07:00
Scott Erickson
78a4000e34 Refactoring defaults in schemas. 2014-08-23 16:06:41 -07:00
Scott Erickson
0721b49216 Refactoring defaults. 2014-08-23 15:51:59 -07:00