Scott Erickson
1c49e475b9
Merge remote-tracking branch 'origin/master'
2014-02-17 12:00:39 -08:00
Nick Winter
dcb6f0d280
Merge branch 'master' of git://github.com/iamawong/codecombat into iamawong-master
2014-02-17 11:56:03 -08:00
Nick Winter
1f7ba083d8
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-17 11:54:30 -08:00
Nick Winter
af510c7cc7
60 FPS and support for independent world/surface frame rates.
2014-02-17 11:53:52 -08:00
Andrew Wong
b1aa65833a
Consolidated text on contribute and removed padding to make the
...
page not as spread out.
Text on the contribute page was a redundant copy of each class'
contribution page. The summary text was shortened and some vertical
padding was removed.
2014-02-17 10:24:29 -08:00
alireza68
88b4055af3
Update fa.coffee
...
I'll translate the rest soon
2014-02-17 21:17:56 +03:30
Michael Schmatz
3b5d881c46
Changed schema date to proper format
2014-02-17 09:24:46 -08:00
Michael Schmatz
302a13b6e7
Added submitDate to session schema
2014-02-17 09:23:49 -08:00
Scott Erickson
72b6bcb7ed
Temp fix for the number of thang types exploding recently.
2014-02-17 09:22:12 -08:00
Michael Schmatz
9b53873414
Updated session schema for session aggregation
2014-02-17 08:51:12 -08:00
Nick Winter
877094a90b
Merge branch 'master' into production
2014-02-17 08:18:54 -08:00
Nick Winter
1b0f15b5f3
More LevelLoader defense.
2014-02-17 08:15:53 -08:00
Andrew Wong
3bf05ad5c4
Merge remote-tracking branch 'cocomaster/master'
2014-02-16 22:30:22 -08:00
Nick Winter
c19c8f3912
Fix for LevelLoader, selection udpating, and non-documentation tome popovers.
2014-02-16 18:29:24 -08:00
Nick Winter
2c41d403bc
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-16 15:30:07 -08:00
Nick Winter
e3824d7698
Many improvements to the spell palette.
2014-02-16 15:30:00 -08:00
Scott Erickson
bbe5399a97
Fixed #370
2014-02-16 12:51:20 -08:00
Nick Winter
e193b68aea
Merge branch 'master' into production
2014-02-15 18:36:04 -08:00
Nick Winter
1f7cea4e54
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-15 17:38:50 -08:00
Nick Winter
f94456295e
God needs no options.
2014-02-15 17:38:45 -08:00
Scott Erickson
5bbe829586
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-15 17:36:40 -08:00
Scott Erickson
be83b5420f
Fixed the goals view, which wasn't being properly shown.
2014-02-15 17:36:27 -08:00
Nick Winter
addf4ca245
Improved Simulator memory and performance.
2014-02-15 17:29:54 -08:00
Nick Winter
f3b58a9416
Merged.
2014-02-15 15:45:53 -08:00
Nick Winter
3c7cac8ba9
Trying to do some memory cleanup.
2014-02-15 15:44:45 -08:00
Scott Erickson
0fb2018f2a
Added project query param to getLatestVersion.
2014-02-15 14:09:30 -08:00
Scott Erickson
8f938bf6fc
Scrolling with the mouse now zooms based on mouse position.
2014-02-15 13:45:16 -08:00
Esh2349
185963f999
ru.cofee small changes
2014-02-16 00:20:59 +03:00
Scott Erickson
72712a349c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-15 12:07:28 -08:00
Scott Erickson
ac08490e86
Reworked the multiplayer modal a bit.
2014-02-15 12:06:47 -08:00
Scott Erickson
7eee28422a
Fixed the submitting of scores to only allow logged in users to get on the leaderboard.
2014-02-15 10:31:24 -08:00
Scott Erickson
663a09ed4b
Spell list updates based on the existence of thangs now.
2014-02-15 09:22:13 -08:00
Michael Schmatz
c418e282ae
Put in pairwise simulation button
2014-02-14 16:53:37 -08:00
Nick Winter
fdf1e21e72
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-14 16:52:54 -08:00
Nick Winter
50f683534f
Support for seeing this.now() in spell palette.
2014-02-14 16:52:50 -08:00
Scott Erickson
597ace25cc
Fixed the spell list tab entry view popover to not popover when using the dropdown.
2014-02-14 16:08:01 -08:00
Scott Erickson
a25b1be916
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-14 15:57:54 -08:00
Michael Schmatz
63a5769bcf
Fixed various bugs in simulator and put in home view
2014-02-14 15:50:42 -08:00
Scott Erickson
d55e4cd624
Made sure session objects are loaded from the server fresh, no caching.
2014-02-14 15:35:54 -08:00
Michael Schmatz
643cafc89f
Refactored level handler and level session schema
2014-02-14 14:55:30 -08:00
Scott Erickson
13caae2690
Fixed the massive memory leak.
2014-02-14 14:10:55 -08:00
Scott Erickson
a8c483a59f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-14 14:10:35 -08:00
Scott Erickson
55fcad2cc3
Fixed a couple bugs with the wizard.
2014-02-14 14:10:28 -08:00
Scott Erickson
7faa401177
Trying to improve memory by clearing out all properties of destroyed objects.
2014-02-14 13:31:26 -08:00
Scott Erickson
1349a59084
Refactored destroy functions to have super be the last thing.
2014-02-14 10:57:47 -08:00
Michael Schmatz
7cec574e17
Started simulator refactor
2014-02-14 10:49:19 -08:00
Scott Erickson
693fa06afb
Fixed a bug in the competitor code session setting when the player has no code yet.
2014-02-14 10:38:20 -08:00
Michael Schmatz
2b1079912a
Merge pull request #368 from gintau/master
...
Revsing Traditional Chinese translation and adding translation of "about".
2014-02-13 21:06:57 -08:00
Nick Winter
da866a418c
Fixed cast options clicking.
2014-02-13 17:43:42 -08:00
Nick Winter
bf030418dc
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-13 17:35:01 -08:00