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 |
|
Nick Winter
|
2e23247521
|
Fixed #811, a bug where you could pause the world if you clicked on a letterboxed playback scrubber.
|
2014-08-23 14:55:58 -07:00 |
|
Nick Winter
|
8777a87774
|
Made a real-time playback button.
|
2014-08-23 14:31:38 -07:00 |
|
Nick Winter
|
c79541f669
|
Full-screen playback during real-time mode.
|
2014-08-23 13:54:52 -07:00 |
|
Nick Winter
|
f2adb7ec7f
|
Skipping serialization/deserialization of needless Programmable clones.
|
2014-08-23 11:16:02 -07:00 |
|
Scott Erickson
|
4520c0f2b6
|
Merge branch 'master' into feature/defaults
|
2014-08-23 11:08:54 -07:00 |
|
Scott Erickson
|
7d797b9cd9
|
Removed duplicate goal schemas from the deprecated script goal properties.
|
2014-08-23 11:08:27 -07:00 |
|
Scott Erickson
|
1c5db3f2b7
|
First round of getting the site to use the new defaults system, in particular the job profile view.
|
2014-08-23 11:07:52 -07:00 |
|
Nick Winter
|
0431f70954
|
Improved Surface playback fast-forwarding.
|
2014-08-23 09:52:05 -07:00 |
|
Nick Winter
|
92b70ae833
|
Propagated i18n. Fixed #1478.
|
2014-08-23 08:45:14 -07:00 |
|
Nick Winter
|
f86ec5d4c9
|
Merge branch 'mugenryuk-patch-1'
|
2014-08-23 08:32:30 -07:00 |
|
Nick Winter
|
4e87dc5e46
|
Uncommented es units header.
|
2014-08-23 08:32:22 -07:00 |
|
Nick Winter
|
c1aa147f41
|
Merge branch 'patch-1' of git://github.com/mugenryuk/codecombat into mugenryuk-patch-1
|
2014-08-23 08:31:55 -07:00 |
|
Nick Winter
|
c3ed4c6618
|
Merge branch 'Fedorsturov-patch-1'
|
2014-08-23 08:31:25 -07:00 |
|