Nick Winter
|
df88be1ab1
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-09 15:07:55 -07:00 |
|
Nick Winter
|
6040d3b225
|
Shouldn't use much CPU when totally paused on Surface.
|
2014-05-09 15:07:30 -07:00 |
|
Michael Schmatz
|
1bbd4e6c68
|
Fixed frame-related bug
|
2014-05-09 15:05:50 -07:00 |
|
Michael Schmatz
|
f05af0fbe7
|
Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
app/assets/javascripts/workers/worker_world.js
|
2014-05-09 14:50:08 -07:00 |
|
Michael Schmatz
|
66cc427417
|
Forward simulation optimization
|
2014-05-09 14:48:43 -07:00 |
|
Nick Winter
|
a74d015d18
|
Fixed a couple minor bugs.
|
2014-05-09 14:30:33 -07:00 |
|
Nick Winter
|
589410ed8e
|
Merged master into feature/thangload.
|
2014-05-09 12:56:58 -07:00 |
|
Michael Schmatz
|
6d8d119c94
|
Revert "Updated createjs."
This reverts commit 2bbda206e7 .
This breaks loading sometimes.
|
2014-05-09 09:37:05 -07:00 |
|
Nick Winter
|
c4819c647c
|
Removed includeeFlow, since we're going to do it lazily with the debug worker.
|
2014-05-09 09:29:50 -07:00 |
|
Scott Erickson
|
bb7a28e3ad
|
Added a folder for putting utility mongodb scripts.
|
2014-05-08 18:30:37 -07:00 |
|
Scott Erickson
|
9ae8847be0
|
Wrote a script for populating watchers.
|
2014-05-08 15:56:18 -07:00 |
|
Scott Erickson
|
0292be054e
|
I think this fixes #976. I believe the client was attempting to save components and systems it didn't have write access to, and that was gumming up the works. Not 100% sure though; reopen if it rears its ugly head once more.
|
2014-05-08 14:56:02 -07:00 |
|
Scott Erickson
|
3d51969757
|
Fixed the patch view loading.
|
2014-05-08 14:54:47 -07:00 |
|
Scott Erickson
|
9c3cefa457
|
Removed a couple logs I forgot about.
|
2014-05-08 14:28:18 -07:00 |
|
Scott Erickson
|
f1927dcf35
|
Added a regressive test for e87592059b
|
2014-05-08 13:56:54 -07:00 |
|
Scott Erickson
|
8072629534
|
Merged the bug fix which I did too.
|
2014-05-08 13:43:15 -07:00 |
|
Scott Erickson
|
57f11ff3ea
|
Fixed some bugs with the components tab.
|
2014-05-08 13:40:42 -07:00 |
|
Michael Schmatz
|
cb5ae5f2f6
|
Fix #983
We need a generic scrolling solution
|
2014-05-08 11:58:45 -07:00 |
|
Nick Winter
|
3819778bee
|
Updating everything to Aether 0.2.0.
|
2014-05-08 11:43:00 -07:00 |
|
Nick Winter
|
775a2a87e2
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-08 11:36:26 -07:00 |
|
Michael Schmatz
|
f0a873cf02
|
Fix #985
I can’t wait until Chrome has majority market share
|
2014-05-08 11:17:27 -07:00 |
|
Scott Erickson
|
1e938910ed
|
Couple bug fixes.
|
2014-05-08 11:10:22 -07:00 |
|
Scott Erickson
|
9a5c4b6ced
|
Merge remote-tracking branch 'origin/master'
|
2014-05-08 10:54:43 -07:00 |
|
Scott Erickson
|
e9fc3df7c1
|
Set up the versions modal to display changes between versions when you select two of them.
|
2014-05-08 10:54:39 -07:00 |
|
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 |
|
Nick Winter
|
f3c6745b29
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-07 15:37:49 -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 |
|
Nick Winter
|
0c30ec0c12
|
Some weird bugs I noticed with {me}.
|
2014-05-06 16:58:08 -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 |
|