Scott Erickson
|
b8051689b3
|
Fixed the goal manager from polluting the goals in the level with the isPositive property.
|
2014-02-13 15:50:53 -08:00 |
|
Michael Schmatz
|
ad0590f9ba
|
Merged in Scott's changes manually
|
2014-02-13 15:14:10 -08:00 |
|
Scott Erickson
|
1d3e013cc6
|
Merge remote-tracking branch 'origin/master'
Conflicts:
app/views/play/ladder_view.coffee
|
2014-02-13 15:11:11 -08:00 |
|
Scott Erickson
|
32337df156
|
Trimmed down the ladder view for now.
|
2014-02-13 15:09:40 -08:00 |
|
Michael Schmatz
|
480de71eb6
|
Leaderboard is starting to work
|
2014-02-13 15:02:49 -08:00 |
|
Michael Schmatz
|
40c26bb395
|
Scoring queues mostly working
|
2014-02-13 12:59:24 -08:00 |
|
Nick Winter
|
aa282c3a35
|
Updates for formatting palette docs.
|
2014-02-13 11:18:20 -08:00 |
|
Scott Erickson
|
ccbb521b59
|
Set up a temporary hack to get
|
2014-02-13 10:42:25 -08:00 |
|
Scott Erickson
|
2b742da9e4
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-02-13 10:38:43 -08:00 |
|
Michael Schmatz
|
14530b779a
|
Refactored scoring submissions, added beginnings of spectator view
|
2014-02-13 10:37:44 -08:00 |
|
Scott Erickson
|
2e280fad6b
|
Set up the multiplayer modal with a submit button for the ladder queue.
|
2014-02-13 10:16:27 -08:00 |
|
Scott Erickson
|
850942b895
|
Fixed the chat layout.
|
2014-02-13 10:10:20 -08:00 |
|
Scott Erickson
|
df2171e921
|
Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
app/views/play/level_view.coffee
|
2014-02-13 10:04:42 -08:00 |
|
Scott Erickson
|
23964abee9
|
Set up the goal manager to only use goals from the level.goals property, rather than from scripts.
|
2014-02-13 09:26:42 -08:00 |
|
Nick Winter
|
9ac0939bb8
|
Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again.
|
2014-02-13 09:26:21 -08:00 |
|
Nick Winter
|
adaedc240c
|
Fixed cast button click bug.
|
2014-02-12 20:45:29 -08:00 |
|
Nick Winter
|
04abe36837
|
Don't need that Docs import.
|
2014-02-12 20:36:17 -08:00 |
|
Nick Winter
|
8a80b9770d
|
More work on docs. Got rid of Docs.coffee.
|
2014-02-12 18:54:45 -08:00 |
|
Nick Winter
|
d2345432ff
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-02-12 16:42:31 -08:00 |
|
Nick Winter
|
dc8c4394e1
|
Spell palette entries now using property docs from components.
|
2014-02-12 16:42:09 -08:00 |
|
Scott Erickson
|
8176e2258f
|
Set up the goal manager to use goals from the new level goals property, rather than from scripts. Backward-compatible for now.
|
2014-02-12 16:20:25 -08:00 |
|
Scott Erickson
|
f3489a6c2f
|
Added a 'stop' button for viewing end animations on thang types.
|
2014-02-12 16:18:25 -08:00 |
|
Michael Schmatz
|
60e0d59a66
|
Manually specified tv4 version to fix npm checksum error
|
2014-02-12 15:55:20 -08:00 |
|
Nick Winter
|
b7be08ac19
|
Fixed one more leak.
|
2014-02-12 13:43:17 -08:00 |
|
Nick Winter
|
cdf268ce4f
|
Merged.
|
2014-02-12 13:10:58 -08:00 |
|
Nick Winter
|
5655084981
|
Fixed a ton more leaks.
|
2014-02-12 12:41:41 -08:00 |
|
Scott Erickson
|
abedd07b04
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-02-12 12:27:12 -08:00 |
|
Scott Erickson
|
2f48925e86
|
Added a list of goals as a property to levels for when they won't be added by scripts. Set up the editor to be able to edit these values.
|
2014-02-12 12:27:02 -08:00 |
|
Michael Schmatz
|
dae788905a
|
Merge pull request #362 from cassiocardoso/patch-1
Finished pt-BR translation.
|
2014-02-12 11:38:14 -08:00 |
|
Michael Schmatz
|
365810d302
|
Merge pull request #355 from LightAndLight/master
Updated scripts/devSetup python scripts to natively support python2.7 or python3
|
2014-02-12 11:21:17 -08:00 |
|
Michael Schmatz
|
762a91e4db
|
Added check if node exists
|
2014-02-12 11:05:19 -08:00 |
|
Cassio Cardoso
|
32db5244b5
|
Finished pt-BR translation.
|
2014-02-12 16:15:21 -02:00 |
|
Scott Erickson
|
59f0d8a93e
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-02-12 09:55:35 -08:00 |
|
Scott Erickson
|
533069dba8
|
Fixed a bug with the goals.
|
2014-02-12 09:55:19 -08:00 |
|
Michael Schmatz
|
ad8a8e00e8
|
Merge pull request #354 from justin-/fix/diplomat-template
Add indentation to fix template engine output
|
2014-02-12 09:09:24 -08:00 |
|
Michael Schmatz
|
a0b02c41fa
|
Merge pull request #351 from liyinkan/master
Update Chinese (simplified)
|
2014-02-12 08:51:08 -08:00 |
|
Michael Schmatz
|
5c7a471667
|
Merge pull request #349 from cassiocardoso/patch-1
Update pt-BR.coffee
|
2014-02-12 08:47:30 -08:00 |
|
Scott Erickson
|
bdbb1710eb
|
More memory fixes.
|
2014-02-11 16:09:44 -08:00 |
|
Michael Schmatz
|
1a2fa68473
|
Merge branch 'feature/task-queue'
Conflicts:
app/views/play/level/tome/spell.coffee
|
2014-02-11 15:58:38 -08:00 |
|
Scott Erickson
|
71b6ebf8eb
|
More memory fixes.
|
2014-02-11 15:47:59 -08:00 |
|
Michael Schmatz
|
76b949ac1e
|
Various changes before merge
|
2014-02-11 15:47:06 -08:00 |
|
Scott Erickson
|
d9f4594c9f
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-02-11 15:39:02 -08:00 |
|
Scott Erickson
|
ac49e5eec1
|
More memory fixes.
|
2014-02-11 15:38:36 -08:00 |
|
Michael Schmatz
|
b29ab56fe2
|
Fixed simulation goals
|
2014-02-11 15:26:57 -08:00 |
|
Nick Winter
|
c29e4d6c9c
|
Stupid casting sound effect.
|
2014-02-11 15:05:54 -08:00 |
|
Scott Erickson
|
2a19da5ba2
|
More memory fixes.
|
2014-02-11 14:58:45 -08:00 |
|
Nick Winter
|
6505064fb6
|
Slightly less aggressively preload workers.
|
2014-02-11 14:38:47 -08:00 |
|
Nick Winter
|
1097d56d50
|
Increased maxTranslation in box2d to fix arrow max speed limit problem.
|
2014-02-11 14:25:35 -08:00 |
|
Scott Erickson
|
b904e1f939
|
More memory fixes.
|
2014-02-11 14:24:06 -08:00 |
|
Scott Erickson
|
1b0c3fb236
|
Upgraded to CoffeeScript 1.7
|
2014-02-11 14:23:36 -08:00 |
|