Nick Winter
|
400fddc294
|
Jade, you're supposed to be so minimalist. But today... Today, I did this. I am sorry.
|
2014-05-31 22:09:41 -07:00 |
|
Nick Winter
|
826d5f1ffa
|
Merge pull request #1118 from kinez/patch-7
Update hu.coffee
|
2014-05-31 07:23:09 -07:00 |
|
Inez KEMENES
|
a97d243100
|
Update hu.coffee
|
2014-05-31 16:16:28 +02:00 |
|
Nick Winter
|
852053022a
|
Started the horrifying migration to an inline jobs profile editor.
|
2014-05-30 22:12:44 -07:00 |
|
Scott Erickson
|
29011fab2a
|
Reworked validation error handling a little, putting better debugging logs in and making level save modal show when there are some.
|
2014-05-30 17:26:49 -07:00 |
|
Scott Erickson
|
22c4ddc064
|
Fixed the settings view putting undefineds in the level documents and causing validation errors.
|
2014-05-30 17:24:13 -07:00 |
|
Scott Erickson
|
f82ca5c1b6
|
Fixed #1099
|
2014-05-30 16:43:55 -07:00 |
|
Scott Erickson
|
47f28d26d1
|
Fixed up my refactoring of markToRevert so now _revertAttributes is only populated the first time set is called.
|
2014-05-30 16:20:20 -07:00 |
|
Scott Erickson
|
bba0e4939d
|
Fixed #1039
|
2014-05-30 15:06:33 -07:00 |
|
Scott Erickson
|
3602f67c24
|
Tweaked how editPath is passed to the server so it doesn't foul up validation.
|
2014-05-30 14:41:41 -07:00 |
|
Scott Erickson
|
7a9928b0c5
|
Fixed #1102
|
2014-05-30 13:57:21 -07:00 |
|
Scott Erickson
|
254c6ff7ba
|
Fixed #1106 a bunch. Patches show up correctly, don't include skipped paths when patching, and skipped paths are now used in the patch modal too.
|
2014-05-30 13:40:38 -07:00 |
|
Scott Erickson
|
135c541d98
|
Merge branch 'rubenvereecken-issue1061'
|
2014-05-30 11:28:33 -07:00 |
|
Ruben Vereecken
|
84e6b8cd6d
|
Script event triggers are now fetched from the mediator, resolving issue #1061
|
2014-05-30 12:38:43 +02:00 |
|
Nick Winter
|
1f32c1c8a1
|
Merge pull request #1113 from rubenvereecken/issue1110
One line fix for issue #1110. Thang search bar works again.
|
2014-05-29 15:31:28 -07:00 |
|
Ruben Vereecken
|
ba57899f9f
|
One line fix for issue #1110. Thang search bar works again.
|
2014-05-30 00:16:11 +02:00 |
|
Nick Winter
|
0793066e43
|
Merge branch 'master' into production
|
2014-05-29 12:34:52 -07:00 |
|
Nick Winter
|
df13bbfaa6
|
Made right-click duplicate Thang menu actually clone modified Thang.
|
2014-05-29 12:33:21 -07:00 |
|
Nick Winter
|
f3adc216ed
|
Protecting our replacement of Math.random via Aether.
|
2014-05-29 12:26:08 -07:00 |
|
Scott Erickson
|
afc14e593d
|
Fixed models thinking they've got changes when they don't.
|
2014-05-29 10:48:48 -07:00 |
|
Nick Winter
|
90c97008ae
|
Merge pull request #1098 from rubenvereecken/view-refactoring
Refactored getRenderData from SearchView to children
|
2014-05-28 18:59:02 -07:00 |
|
Nick Winter
|
8fea99cbc1
|
Merge pull request #1101 from dpen2000/FixPatchesList
Fixes #1096
|
2014-05-28 18:57:46 -07:00 |
|
dpen2000
|
bd444fa547
|
Fixes #1096 by ensuring progress is reset back to zero so render gets called correctly after ajax call to load patches completes
|
2014-05-29 02:16:07 +01:00 |
|
Darredevil
|
50c0599ff2
|
Merge branch 'master' of https://github.com/Darredevil/codecombat
|
2014-05-29 00:06:28 +03:00 |
|
Darredevil
|
13273426fb
|
Merge pull request #5 from codecombat/master
update
|
2014-05-28 23:30:23 +03:00 |
|
Darredevil
|
45a2fe5883
|
Merge remote-tracking branch 'upstream/master'
|
2014-05-28 20:35:05 +03:00 |
|
Ruben Vereecken
|
5909f15678
|
Refactored getRenderData from SearchView to children
|
2014-05-28 17:32:18 +02:00 |
|
Scott Erickson
|
93f7d8c0a4
|
Made sure sprites are idle and properly positioned when they load.
|
2014-05-27 16:41:56 -07:00 |
|
Scott Erickson
|
3b87c9c360
|
Fixed some remaining jqxhr objects hanging around.
|
2014-05-27 16:33:57 -07:00 |
|
Nick Winter
|
a481af08d3
|
Fixed a couple typos with failed resource loading handling.
|
2014-05-26 20:51:05 -07:00 |
|
Nick Winter
|
b21f14f0b5
|
Merge branch 'master' into production
|
2014-05-26 19:13:16 -07:00 |
|
Nick Winter
|
c01bd69625
|
Better recoverability for non-UserCodeProblem errors during world generation.
|
2014-05-26 18:45:00 -07:00 |
|
Nick Winter
|
e75e1d168e
|
Merge branch 'master' into production
|
2014-05-26 10:32:12 -07:00 |
|
Nick Winter
|
ec0027043b
|
Added experimental Io language from Aether.
|
2014-05-26 08:59:48 -07:00 |
|
Nick Winter
|
f794eca4a2
|
Merge branch 'master' into production
|
2014-05-25 12:20:11 -07:00 |
|
Nick Winter
|
ed36dba3f5
|
Merge pull request #1041 from Shpionus/patch-1
Update ru.coffee
|
2014-05-25 12:17:12 -07:00 |
|
Nick Winter
|
3dd362c01e
|
Added support for blaming infinite loops.
|
2014-05-25 12:15:32 -07:00 |
|
Nick Winter
|
a8cffacaf3
|
Merge branch 'domenukk-master'
|
2014-05-25 09:44:46 -07:00 |
|
Nick Winter
|
b20dac3bec
|
Mergizord.
|
2014-05-25 09:44:37 -07:00 |
|
Nick Winter
|
6b554e03ef
|
Merge pull request #1084 from domenukk/feature/step-single-frame
Added shortcut for frame single-stepping
|
2014-05-25 09:37:13 -07:00 |
|
Nick Winter
|
16e1ef760a
|
Merge branch 'master' of git://github.com/jayant1992/codecombat
|
2014-05-25 08:51:13 -07:00 |
|
Nick Winter
|
1a6fd75103
|
Trying to fix some Simulator loading errors.
|
2014-05-25 08:29:33 -07:00 |
|
Nick Winter
|
33408020f1
|
Merge pull request #1054 from dpen2000/patch-2
Update simulate_tab.coffee
|
2014-05-25 08:27:54 -07:00 |
|
Nick Winter
|
1ef842dc9c
|
Merge pull request #1091 from z3t1/patch-1
Update zh.coffee
|
2014-05-25 08:26:43 -07:00 |
|
z3t1
|
d8b448ab60
|
Update zh.coffee
Update some phrases.
|
2014-05-25 16:05:35 +08:00 |
|
Darredevil
|
dcc7072a7f
|
Merge remote-tracking branch 'upstream/master'
|
2014-05-25 02:22:52 +03:00 |
|
Darredevil
|
6a9e1edc3d
|
Merge pull request #4 from codecombat/master
Update
|
2014-05-25 02:21:58 +03:00 |
|
Dominik Maier
|
f62cd7f38b
|
+ added shortcut for frame single-stepping
+ fixed single stepping for frames
|
2014-05-24 17:31:59 +02:00 |
|
Nick Winter
|
5681c590c5
|
Merge pull request #1083 from dpen2000/CameraSpecFixes
Camera spec fixes
|
2014-05-24 08:20:27 -07:00 |
|
dpen2000
|
64f91861ef
|
Refactor: Remove unused parameters in camera.spec and extend previous fix to ignored tests
|
2014-05-24 16:05:19 +01:00 |
|