Nick Winter
05b53fa10e
Merge branch 'iAladdin-master'
2014-11-18 18:16:35 -08:00
Nick Winter
b3119e300d
Resolved merge conflicts.
2014-11-18 18:16:17 -08:00
Nick Winter
666334b28c
Made paths more visible, because I couldn't see them.
2014-11-18 18:13:59 -08:00
iAladdin
4bd578c18e
improved Chinese localization
2014-11-19 09:45:15 +08:00
Scott Erickson
e93de815c2
Some tweaks to the TrailMaster, consolidating some changes and altering the dot style.
2014-11-18 16:18:51 -08:00
Scott Erickson
c40a7c1bb8
TrailMaster plays/pauses animations along with the rest of the Surface.
2014-11-18 16:03:47 -08:00
Scott Erickson
c23fb1d2b5
Removed TODO.
2014-11-18 15:57:06 -08:00
Scott Erickson
8ec016e4b2
Re-enabled RAF_SYNCHED, given the fix for https://github.com/CreateJS/EaselJS/issues/516
2014-11-18 15:56:33 -08:00
Scott Erickson
1444d84aea
Upgraded the CreateJS suite, handling its slight changes.
2014-11-18 15:42:11 -08:00
Scott Erickson
9f79b3ba3e
Removed treema update script. Better to point to a GitHub URL instead.
2014-11-18 15:41:41 -08:00
Matt Lott
957ca50c87
Disable spaces through The Raised Sword
2014-11-18 14:11:28 -08:00
Scott Erickson
5ee1289621
Goal states (for the purpose of triggering achievements) are now only saved as having succeeded when the overall level is succeeded.
2014-11-18 14:05:55 -08:00
Scott Erickson
1889c771f2
Added the close button to the GameMenuModal.
2014-11-18 13:57:44 -08:00
Scott Erickson
3008abed19
Made the Equip button in the inventory modal green.
2014-11-18 13:52:39 -08:00
Scott Erickson
6440ce528b
Fixed the CSS of the item details view in the scrunched item store.
2014-11-18 13:48:59 -08:00
Scott Erickson
acd94c4247
Fixed the nanoscroller in the item details view to be off the sheet and always visible.
2014-11-18 13:44:34 -08:00
Scott Erickson
46f9667311
Made the double click hint alert in the inventory modal more visible.
2014-11-18 13:28:04 -08:00
Scott Erickson
a04bc63b87
Equip hint and available header now are visible only when there are items to equip.
2014-11-18 13:20:59 -08:00
George Saines
6310dcbcac
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-18 13:02:36 -08:00
George Saines
c9d7754623
adding a close button to the main menu modal
2014-11-18 13:02:32 -08:00
Scott Erickson
208f05cf67
Added an equip button to every piece of available equipment.
2014-11-18 13:02:06 -08:00
Nick Winter
f5b5ee2206
Fixes for updating paths during world streaming.
2014-11-18 12:40:28 -08:00
Scott Erickson
aab51178e2
Added WebGL paths.
2014-11-18 11:46:47 -08:00
Nick Winter
6ebc9e8c28
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-18 11:31:10 -08:00
Scott Erickson
2e6f08f7d8
Added stripe checkout script.
2014-11-18 11:30:37 -08:00
Nick Winter
f1a4249f18
More reductions in memory usage for iPad.
2014-11-18 11:21:29 -08:00
Matt Lott
b000389b3a
Add problem range highlighting back
...
Now full line still pulses, and specific problem range has a darker red
background.
2014-11-18 10:03:02 -08:00
Matt Lott
7b3b904ad1
Hide problem alert on code reload
2014-11-18 09:36:01 -08:00
Matt Lott
05cc9c2f46
Move sync pvp status UI to control bar
...
Replaces level name UI for hero-ladder levels.
2014-11-18 09:01:07 -08:00
Nick Winter
547ba692e1
Turned off DOM highlight noise after A/B test insignificantly showed it hurting.
2014-11-18 08:05:20 -08:00
Nick Winter
d0233fc999
Fixed bug with primary spell being unreadable and thus no spells showing up in old, multi-spell levels.
2014-11-18 07:43:02 -08:00
Nick Winter
9afc98f447
Merge pull request #1763 from Dloach/patch-2
...
Update zh-HANS.coffee
2014-11-18 07:31:38 -08:00
Dloach
d9b4a63584
Update zh-HANS.coffee
2014-11-18 23:22:55 +08:00
Nick Winter
1a470a5745
Merge pull request #1762 from MountainWang/patch-1
...
Update zh-HANS.coffee
2014-11-18 07:03:12 -08:00
Nick Winter
daa4d63dcf
Merge pull request #1761 from Dloach/patch-1
...
Update zh-HANS.coffee
2014-11-18 07:03:00 -08:00
Nick Winter
6ef9532b1d
Fixed missing colon in bg.coffee.
2014-11-18 06:50:13 -08:00
Nick Winter
96e57a7520
Merge pull request #1759 from igornishka/patch-1
...
A couple of translations added :)
2014-11-18 06:49:26 -08:00
Nick Winter
110e1efd3c
Merge pull request #1760 from ehnydeel/master
...
Add some more german translations
2014-11-18 06:49:01 -08:00
MountainWang
3615bc87e9
Update zh-HANS.coffee
2014-11-18 21:32:42 +08:00
iAladdin
d09c8c155b
improved Chinese localization
2014-11-18 18:43:37 +08:00
Dloach
f659240061
Update zh-HANS.coffee
2014-11-18 18:03:03 +08:00
Ehnydeel
fcb5f4246c
Add some more german translations
...
Add some more german translations
2014-11-18 10:50:41 +01:00
Nick Winter
bf71893ddf
Significantly reduced memory usage and simulation time by further limiting the amount of Thangs which even start tracking ThangState in the first place.
2014-11-17 21:30:44 -08:00
Scott Erickson
95dca575d1
Set up stripe on the server and site to allow purchases through the website.
2014-11-17 15:15:08 -08:00
Nick Winter
d3da5e330a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-17 15:09:14 -08:00
Matt Lott
f56d01419f
Update sync pvp teams and real-time playback
...
-Non-creator will switch teams upon joining a sync pvp game, if creator
is on same team
-Team swapping should only affect level session
-Real-time multiplayer submit now reloads PlayLevelView to ease loading
both player’s latest level sessions, and then automatically starts
real-time playback.
2014-11-17 15:07:10 -08:00
igornishka
3abe0db1e5
A couple of translations added :)
2014-11-18 01:00:28 +02:00
Nick Winter
9fabe74da6
Changed the name of incorrectly preloaded old spell palette background texture.
2014-11-17 14:45:09 -08:00
Nick Winter
e50e5d3319
Merge branch 'ehnydeel-patch-1'
2014-11-17 12:43:51 -08:00
Nick Winter
736fbaa474
Merged de-DE.
2014-11-17 12:43:31 -08:00
