Commit graph

3266 commits

Author SHA1 Message Date
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
35fc5a5197 Fixed infinite loop detection, I hope. 2014-05-23 21:24:50 -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
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
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
8fabbadff3 Fix random game results not being sent back 2014-05-22 09:02:57 -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
482965fe0f No reset of scores when session resubmit 2014-05-21 16:58:51 -07:00
Michael Schmatz
d59c163493 Fix selection 2014-05-21 16:51:10 -07:00
Michael Schmatz
7bc4a0451c Weighted random selection of games 2014-05-21 15:34:19 -07:00
Nick Winter
4fc1341a64 Added a way to remove SuperModel resources to fix ladder tab refreshing. 2014-05-21 15:33:28 -07:00
Scott Erickson
037dbe97c6 Some remaining work to get the delayed show guide script set up. 2014-05-21 14:50:27 -07:00
Scott Erickson
4929f81fcc Fixed the level editor preview window not loading on repeated opens. 2014-05-21 14:28:52 -07:00
Scott Erickson
18f694b010 Fixed up the level loader to include session objects as world necessities. 2014-05-21 12:53:28 -07:00
Scott Erickson
c43081636f Fixed the facebook event schema. 2014-05-21 12:35:37 -07:00
Nick Winter
06866e48de Merge pull request #1059 from rafagomes/patch-1
Updated some words and phrases
2014-05-21 11:27:54 -07:00
Nick Winter
3c9321afab Merge pull request #1060 from domenukk/fixxss
+ more than one </script> tag in username no longer breaks the page, part 2
2014-05-21 11:18:06 -07:00
Dominik Maier
b95a475969 + more than one </script> tag in username no longer breaks the page.
(aka. Javascript never ceases to surprise me)
2014-05-21 20:12:46 +02:00
Rafael Gomes
09db5cb9ee Updated some words and phrases
Just a few words and phares until have more experience in the project.
2014-05-21 14:38:08 -03:00
Nick Winter
511dcef313 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-21 10:30:03 -07:00
Michael Schmatz
585b907f4e More temp fixes for 422s 2014-05-21 10:29:16 -07:00
Nick Winter
8fb1237810 Added noty error messages when unable to save CocoModels. 2014-05-21 10:27:47 -07:00
Jayant Jain
8f1f378bcb Fixes issue with thang being added twice upon click 2014-05-21 10:27:47 -07:00
Jayant Jain
c05780de4c Resolves #170, thang can be directly placed by dragging onto the map 2014-05-21 10:27:46 -07:00
Michael Schmatz
02f8458dfe Temp fix for occasional 422 2014-05-21 10:16:01 -07:00
Scott Erickson
a8b54f3cdc Made backbone mediator validate only on development. 2014-05-20 15:58:57 -07:00
Michael Schmatz
47c41e0a6e Added error handling for findNearestBetterSessionID 2014-05-20 15:55:25 -07:00
Scott Erickson
a7f24ab04f Some work on subscription definitions for the validated Backbone Mediator. Added 'script-manager:tick' channel. 2014-05-20 15:36:15 -07:00
Michael Schmatz
a6352c214a Add temp error handling for updateSessions 2014-05-20 15:35:44 -07:00
Nick Winter
88ef5ffe93 Prevent default ACE go-to-line alert when pressing Ctrl/Cmd+L. 2014-05-20 15:24:57 -07:00
Michael Schmatz
de93dfd357 Stopgap measure for incorrectly formatted session results 2014-05-20 15:12:25 -07:00
Nick Winter
c712494d17 Merge branch 'gutierri-master' 2014-05-20 15:10:07 -07:00
Nick Winter
de9f1fab0d Merged. 2014-05-20 15:09:48 -07:00