codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-30 10:56:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
3332 commits 27 branches 0 tags 134 MiB
Commit graph

3332 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
f794eca4a2 Merge branch 'master' into production 2014-05-25 12:20:11 -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
Scott Erickson
681adc1dcd Got rid of a log. 2014-05-22 13:37:08 -07:00
Nick Winter
4c7d7fce03 Fixed some memory leaks. 2014-05-22 12:05:36 -07:00
Scott Erickson
4b88296265 Set up the supermodel to clear out jqxhrs once they're done, since they take a lot of memory. 2014-05-22 11:47:38 -07:00
Michael Schmatz
c8d09e1a15 Merge pull request #1071 from codecombat/master 
Master into production
 2014-05-22 11:34:01 -07:00
Scott Erickson
bfa90f671d Fixes #940, merging the signup and login modal into a single modal. Created a couple A/B tests for amount of text in the signup modal. 2014-05-22 11:26:08 -07:00
Scott Erickson
d613c230ef Fixed some text in the victory modal that wasn't showing up because of indentation. 2014-05-22 11:26:08 -07:00
Scott Erickson
104deb2ab8 Disabled CocoModel noty errors for form submissions that handle these errors. 2014-05-22 11:26:08 -07:00
Michael Schmatz
8604a0ed3c Update rules about location restrictions 
Just to clarify, people from regions that we can't send prizes to can play, just not receive prizes.
 2014-05-22 10:34:46 -07:00
George Saines
a2fbe5865a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-22 09:55:34 -07:00
George Saines
4ffbdf004c modifying oreilly logo size 2014-05-22 09:55:30 -07:00
Michael Schmatz
7026d2036f Merge pull request #1067 from codecombat/master 
Fix random game results not being sent back
 2014-05-22 09:03:46 -07:00
Michael Schmatz
8fabbadff3 Fix random game results not being sent back 2014-05-22 09:02:57 -07:00
Nick Winter
61fc5f5ff1 Merge branch 'master' into production 2014-05-21 21:56:32 -07:00
Nick Winter
48f5347075 Fixed gigantor server scoring bug. Cleaned up a bit of logging and error handling. Finished not resetting scores on resubmitting. 2014-05-21 21:56:11 -07:00
Michael Schmatz
87909c34b8 Merge pull request #1065 from codecombat/master 
No reset of scores when session resubmit
 2014-05-21 16:59:11 -07:00
Michael Schmatz
482965fe0f No reset of scores when session resubmit 2014-05-21 16:58:51 -07:00