codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-02 03:47:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
3601 commits 27 branches 0 tags 134 MiB
Commit graph

3601 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
dpen2000
b09bd8c5ce Fix camera.spec.coffee tests after constructor change in ae64032739 and ignore one test still failing 2014-05-24 16:05:18 +01:00
Jayant Jain
55569ccf2f Resolves an issue with nanoscroller and initially hidden content 2014-05-24 12:02:26 +05:30
Jayant Jain
241adafad8 Adds nanoscroll for other tabs in editor 2014-05-24 12:02:26 +05:30
Jayant Jain
f17c5cfb51 Adds nanoscroll to thang tab in level editor 2014-05-24 12:02:26 +05:30
Jayant Jain
a84049cf16 Fixes issues with dragging thangs onto the map 2014-05-24 12:02:26 +05:30
Jayant Jain
cbe5f3a011 Fixes issue with esc key not deselecting the current thang 2014-05-24 12:02:26 +05:30
Jayant Jain
94f70ca9f4 Fixes #1079 2014-05-24 12:02:26 +05:30
Nick Winter
ff6cbe1974 Merge branch 'master' into production 2014-05-23 21:25:57 -07:00
Nick Winter
35fc5a5197 Fixed infinite loop detection, I hope. 2014-05-23 21:24:50 -07:00
Nick Winter
c2a2826baf Merge branch 'master' into production 2014-05-23 12:07:10 -07:00
Nick Winter
690fbc6919 Fixed a bug with Tome trying to retranspile transpiled code on clone spells when remagicking. 2014-05-23 12:04:42 -07:00
Nick Winter
ff171588d9 Trying out text shadow coloring based on team for text event labels. 2014-05-23 09:56:39 -07:00
Nick Winter
087d9e0901 Merge branch 'kinez-patch-5' 2014-05-23 09:27:10 -07:00
Nick Winter
bda8f10508 Fixed a couple typos in the hu merge. 2014-05-23 09:27:02 -07:00
Nick Winter
6b51d3de35 Merge branch 'patch-5' of git://github.com/kinez/codecombat into kinez-patch-5 2014-05-23 09:26:05 -07:00
Nick Winter
104a405453 Trying some error handling for a missing TaskLog error I saw. 2014-05-23 09:24:57 -07:00
Inez KEMENES
1d595e9a0d Update hu.coffee 
The line no. 123 disappeared. I may have accidentally deleted it while working on 122. Sorry. Please correct.
 2014-05-23 16:21:46 +02:00
Nick Winter
5092de16a9 Merge branch 'master' into production 2014-05-22 19:06:04 -07:00
Nick Winter
26d2816071 Fixed some more memory leaks. 2014-05-22 19:05:11 -07:00
Scott Erickson
bd575ad667 Fixed the placement of wall sprites in the level editor to wait until the sprite sheet is finished being built. 2014-05-22 14:16:39 -07:00
Scott Erickson
5a407492db Got rid of a bunch of magic numbers in mark scaling. Now assumed all target marks have a width of 10m by default. 2014-05-22 13:48:48 -07:00