Michael Schmatz
|
9c58aef32b
|
Merged worker_debug and worker_world
|
2014-05-08 09:47:02 -07:00 |
|
Scott Erickson
|
ed222338e7
|
Fixed #892 by having the components tab reload whenever it's opened.
|
2014-05-07 16:24:13 -07:00 |
|
Michael Schmatz
|
4221fd55cb
|
Fixed #979
|
2014-05-07 13:56:10 -07:00 |
|
Michael Schmatz
|
ae213cc330
|
Fixed #982
|
2014-05-07 13:33:17 -07:00 |
|
Scott Erickson
|
c037ce14f2
|
Fixed #958. LevelLoader wasn't handling cached session objects passed in with the supermodel.
|
2014-05-07 13:28:42 -07:00 |
|
Scott Erickson
|
ff51f18a90
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-07 12:25:14 -07:00 |
|
Scott Erickson
|
e87592059b
|
Fixed saving user properties. Mentioned in #958 (was the source of the conflict error) but I don't think is related.
|
2014-05-07 12:25:05 -07:00 |
|
Michael Schmatz
|
7432112cba
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-07 11:37:04 -07:00 |
|
Michael Schmatz
|
7110f023f2
|
Merge branch 'feature/hover-debugger-performance'
Conflicts:
app/lib/God.coffee
app/views/play/level/tome/spell_debug_view.coffee
|
2014-05-07 11:37:03 -07:00 |
|
Scott Erickson
|
09a47cc5d8
|
Fixed #951. The parser was removing the shadow shape but not the tween of the shadow.
|
2014-05-07 11:11:22 -07:00 |
|
Scott Erickson
|
2bbda206e7
|
Updated createjs.
|
2014-05-07 10:59:12 -07:00 |
|
Michael Schmatz
|
806b159aab
|
Fixed another off-by-one error
|
2014-05-07 10:20:22 -07:00 |
|
Michael Schmatz
|
6fd89f10b9
|
Fixed various debugger UI bugs
|
2014-05-07 10:03:49 -07:00 |
|
Michael Schmatz
|
4ef6548dad
|
Fixed array prototype alteration conflict
|
2014-05-07 09:34:37 -07:00 |
|
Michael Schmatz
|
da575f8945
|
Refactored hover debugger is functional
Still needs optimizations and a few bug fixes, but it’s better than the
existing code existing to Nick
|
2014-05-06 15:07:06 -07:00 |
|
Scott Erickson
|
d62f04cf88
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-06 14:52:28 -07:00 |
|
Scott Erickson
|
56cd19a697
|
Merge branch 'dpen2000-PatchesLayoutInconsistency'
|
2014-05-06 14:52:22 -07:00 |
|
Scott Erickson
|
c345a31d14
|
Merge branch 'PatchesLayoutInconsistency' of https://github.com/dpen2000/codecombat into dpen2000-PatchesLayoutInconsistency
|
2014-05-06 14:50:01 -07:00 |
|
dpen2000
|
4ff1e9a3a3
|
Make components' patches tab and systems' patches tab look consistent
Mix of previous stylings with spacing at top and white background
|
2014-05-06 17:34:13 -04:00 |
|
Nick Winter
|
1f166406ac
|
Some new names.
|
2014-05-06 12:47:38 -07:00 |
|
Michael Schmatz
|
e8d26af985
|
Implemented caching and fixed off by one error
|
2014-05-06 11:36:46 -07:00 |
|
Scott Erickson
|
c58a27fcbf
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-06 11:21:15 -07:00 |
|
Scott Erickson
|
6bf7652080
|
Merge branch 'dpen2000-SetReadOnlyChanges'
|
2014-05-06 11:21:04 -07:00 |
|
Scott Erickson
|
ffdf11133e
|
Merge branch 'SetReadOnlyChanges' of https://github.com/dpen2000/codecombat into dpen2000-SetReadOnlyChanges
|
2014-05-06 11:19:11 -07:00 |
|
Nick Winter
|
ca8d5c1f3b
|
Stop bobbing and more marks when world ended.
|
2014-05-06 11:02:53 -07:00 |
|
Michael Schmatz
|
dddd617a08
|
userCodeMap issues fixed
Now beginning hooking up the UI
|
2014-05-06 10:06:32 -07:00 |
|
Nick Winter
|
2e6bec5454
|
Some fixes for my accidental merge of #970.
|
2014-05-06 09:49:04 -07:00 |
|
Nick Winter
|
1f3cc8a004
|
Merge branch 'master' of git://github.com/domenukk/codecombat
|
2014-05-06 08:00:39 -07:00 |
|
Nick Winter
|
41e190e754
|
Merge branch 'gosnat-patch-5'
|
2014-05-06 07:58:06 -07:00 |
|
Nick Winter
|
09c8a99a9b
|
Merge branch 'patch-5' of git://github.com/gosnat/codecombat into gosnat-patch-5
|
2014-05-06 07:23:51 -07:00 |
|
Nick Winter
|
dfa6a59ee8
|
Merge branch 'gosnat-patch-4'
|
2014-05-06 07:22:10 -07:00 |
|
Nick Winter
|
acccee33a3
|
Cleaner conditional init syntax.
|
2014-05-06 07:22:09 -07:00 |
|
Nick Winter
|
3e7edd8c61
|
Merge branch 'patch-4' of git://github.com/gosnat/codecombat into gosnat-patch-4
|
2014-05-06 07:18:26 -07:00 |
|
Nick Winter
|
9e40dcd2e3
|
Added a couple i18n tags.
|
2014-05-06 06:58:20 -07:00 |
|
Nick Winter
|
73f38f84ac
|
Merge branch 'RoyXue-master'
|
2014-05-06 06:56:17 -07:00 |
|
Nick Winter
|
af5b878166
|
Fixed wizard setting things.
|
2014-05-06 06:56:14 -07:00 |
|
Roy Xue
|
03e5d1ca50
|
Merge pull request #1 from codecombat/master
Update CodeCombat
|
2014-05-06 14:09:42 +08:00 |
|
Dominik Maier
|
6d244e8560
|
+ Merged Simulators
|
2014-05-06 05:07:34 +02:00 |
|
Nick Winter
|
81634190ef
|
Added i18n for translating specific articles now, too.
|
2014-05-05 19:14:38 -07:00 |
|
Dominik Maier
|
ad85bf5b77
|
Merge remote-tracking branch 'upstream/master'
|
2014-05-06 03:12:24 +02:00 |
|
Nick Winter
|
0f5ee67fe1
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-05 17:59:32 -07:00 |
|
Scott Erickson
|
cde50a241f
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-05 17:47:32 -07:00 |
|
Scott Erickson
|
8865a9035f
|
Merge branch 'adi2412-anonNameCollide'
|
2014-05-05 17:47:22 -07:00 |
|
Dominik Maier
|
c9bb488794
|
Created headless-client and an alternative implementation of god
|
2014-05-06 02:37:14 +02:00 |
|
Michael Schmatz
|
1793d9a882
|
Fixed testing logic
|
2014-05-05 17:33:47 -07:00 |
|
Nick Winter
|
0e0ca785d9
|
Moved ready-to-rank logic to LevelSession where it can be shared across victory and multiplayer modals and My Matches tab.
|
2014-05-05 16:59:12 -07:00 |
|
Scott Erickson
|
1869bbe859
|
Merge branch 'tests' of https://github.com/adi2412/codecombat into adi2412-anonNameCollide
|
2014-05-05 16:49:15 -07:00 |
|
Scott Erickson
|
056f081cdb
|
Merge branch 'anonNameCollide' of https://github.com/adi2412/codecombat into adi2412-anonNameCollide
Conflicts:
app/views/modal/signup_modal.coffee
|
2014-05-05 16:48:35 -07:00 |
|
Scott Erickson
|
8d67e28977
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-05 16:35:45 -07:00 |
|
Scott Erickson
|
684e61532a
|
Fixed a bug with the deltas library identifying conflicts between patches.
|
2014-05-05 16:35:26 -07:00 |
|