Nick Winter
7f3e769cbd
Merge pull request #997 from gosnat/patch-6
...
Update GoalManager.coffee
2014-05-14 11:54:50 -07:00
Nick Winter
57f3846abb
Merge pull request #998 from gosnat/patch-7
...
Update thang.coffee
2014-05-14 11:54:46 -07:00
Scott Erickson
7a381df348
Merge branch 'feature/thangload'
2014-05-14 11:48:19 -07:00
Scott Erickson
09fbfdb360
Fixed a bug with the simulator due to the changes made to the supermodel.
2014-05-14 11:13:36 -07:00
Scott Erickson
0be813e424
Figured out how to get the world to properly get shown if the world is created before the level loader is completely finished.
2014-05-14 10:35:16 -07:00
Michael Schmatz
9f9d651b3b
Updates to transpile script and updated aetherOptions
2014-05-14 10:14:18 -07:00
Scott Erickson
54af58baee
SuperModel no longer emits progress going backward ever, and added a way to prevent it from getting to high in the middle of a chain of loading.
2014-05-14 09:24:52 -07:00
Scott Erickson
4b404ae124
Finished tuning the supermodel loading and progress.
2014-05-13 14:39:45 -07:00
Scott Erickson
b4ad34eb8f
LevelLoader only builds and loads thang types in the world on the first frame, letting everything else happen lazily.
2014-05-13 10:51:55 -07:00
gosnat
12f351197d
Update world.coffee
...
add getGoalState
2014-05-13 12:43:39 -05:00
gosnat
72b2c84705
Update thang.coffee
...
add getGoalState
2014-05-13 12:42:48 -05:00
gosnat
25287e0298
Update GoalManager.coffee
...
add getGoalState
2014-05-13 12:41:39 -05:00
Scott Erickson
66af855497
Merge branch 'master' into feature/thangload
2014-05-13 10:27:10 -07:00
Scott Erickson
1d88b6eefe
Most of the way there getting it to work with loading thang types dynamically throughout the play view.
2014-05-13 10:26:33 -07:00
Dominik Maier
bb562aba32
+ Overly lengtly comment changed.
2014-05-13 04:40:15 +02:00
Nick Winter
09bdc9bad9
Fixed initial team setting.
2014-05-12 19:39:16 -07:00
Dominik Maier
521bc31fa5
+ Created function for generating a reproducable seed out of user code - as using JSON.stringify is not garanteed to be the same on every browser for objects.
2014-05-13 04:32:29 +02:00
Dominik Maier
efa39ffcd9
+ Created function for generating a reproducable seed out of user code but it fails inside the web-worker
2014-05-13 04:18:56 +02:00
Dominik Maier
2807e83672
+ "Real" predictable random. Seed depends on usercode map.
2014-05-13 03:34:11 +02:00
Nick Winter
2eefdef191
Working on matching Surface paused state to the pause screen.
2014-05-12 15:54:07 -07:00
Nick Winter
78a0efac78
Fixed long words in Labels and empty GoldView.
2014-05-12 15:03:53 -07:00
Nick Winter
802889d115
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-12 13:28:51 -07:00
Nick Winter
1a5e30d5b5
Dynamic Canvas sizing.
2014-05-12 13:28:46 -07:00
Michael Schmatz
687872a97b
Moved debug cache onto main thread
...
UI responsiveness greatly improved
2014-05-12 11:16:02 -07:00
Nick Winter
1aa72541ff
Merged master into feature/thangload.
2014-05-12 09:57:31 -07:00
Nick Winter
e1b35251a3
Fixed bug with playback ending early.
2014-05-12 08:35:46 -07:00
Nick Winter
74ef9bc987
Experimental support for preloading worlds when we would have autocast if manual cast is on.
2014-05-11 17:42:32 -07:00
Nick Winter
8df3b01f9e
Merged world/lodash/aether breakup for world workers.
2014-05-10 18:52:55 -07:00
Nick Winter
1e18f0b42f
Merged God and Buddha, split out Angels, did a huge refactoring, fixed many bugs, and laid groundwork for preloading Worlds.
2014-05-10 18:24:50 -07:00
Scott Erickson
f1de2ca8d9
Brought the canvas size down again because it halves the FPS in Firefox at least.
2014-05-09 16:35:10 -07:00
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
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
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
9c58aef32b
Merged worker_debug and worker_world
2014-05-08 09:47:02 -07:00
Nick Winter
f3c6745b29
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-07 15:37:49 -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
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
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
Nick Winter
1f166406ac
Some new names.
2014-05-06 12:47:38 -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
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
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
Dominik Maier
6d244e8560
+ Merged Simulators
2014-05-06 05:07:34 +02:00
Dominik Maier
ad85bf5b77
Merge remote-tracking branch 'upstream/master'
2014-05-06 03:12:24 +02:00
Dominik Maier
c9bb488794
Created headless-client and an alternative implementation of god
2014-05-06 02:37:14 +02: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
684e61532a
Fixed a bug with the deltas library identifying conflicts between patches.
2014-05-05 16:35:26 -07:00
Michael Schmatz
97f3694dbf
Basic backend functionality is there
2014-05-05 13:26:37 -07:00
gosnat
939509849c
Update GoalManager.coffee
...
Justification:
For a negative goal like saveThangs, let's say you have 5 thangs on the save list. As things stand, if you don't have a HowMany defined, then the number of needed deaths to fail is
numNeeded = _.size(stateThangs) - Math.min((goal.howMany ? 1), _.size stateThangs) + 1
numNeeded = 5 - Math.min(1, 5) + 1
numNeeded = 5
So you would only fail the goal if all 5 thangs you were supposed to save died. This is contrary to the comment right above this line:
# saveThangs: by default we would want to save all the Thangs, which means that we would want none of them to be "done"
Therefore, I think it should be Math.max rather than Math.min.
numNeeded = _.size(stateThangs) - Math.max((goal.howMany ? 1), _.size stateThangs) + 1
numNeeded = 5 - Math.max(1, 5) + 1
numNeeded = 1
So any of the Thangs on the save list dying is enough to fail the goal.
As a double check, what if the level designer designated a HowMany of 5?
numNeeded = _.size(stateThangs) - Math.max((goal.howMany ? 1), _.size stateThangs) + 1
numNeeded = 5 - Math.max(5, 5) + 1
numNeeded = 1
So this is consistent.
2014-05-05 14:08:41 -05:00
gosnat
93d117100a
Update GoalManager.coffee
...
For compound goals like GetAllToLocation, you should continue adding to the existing list of thang states.
2014-05-05 13:22:57 -05:00
gosnat
39b21da035
Update GoalManager.coffee
...
I'd like to temporarily turn on console logging (lines 240 and 245) to take a peek at why numNeeded doesn't seem to be correct if howMany isn't defined.
2014-05-03 21:36:24 -05:00
Scott Erickson
db9a82d58a
Merge branch 'feature/thangload' of https://github.com/codecombat/codecombat into feature/thangload
2014-05-02 17:03:53 -07:00
Scott Erickson
aee90c72bb
Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel.
2014-05-02 17:03:30 -07:00
Nick Winter
d54149d0f3
Reworked LevelView loading priorities to try to get world simulating earlier.
2014-05-02 12:32:41 -07:00
Scott Erickson
06bc96d7d0
Set up the level loader to get thangtype names first, then load the thang types themselves so the world can be generated in parallel with thang type loading and rendering.
2014-05-02 10:31:20 -07:00
Scott Erickson
2952d7702c
Merge branch 'master' into feature/thangload
...
Conflicts:
app/lib/LevelLoader.coffee
app/views/play/level_view.coffee
2014-05-02 08:20:03 -07:00
Scott Erickson
92687b17de
Merge branch 'master' into feature/thangload
...
Conflicts:
app/lib/LevelLoader.coffee
app/views/play/level_view.coffee
2014-05-02 08:19:47 -07:00
Scott Erickson
26cafd2f19
Fixed #941 . Actually it was no longer crashing probably because of the fix for #934 , but there were still other bugs. Fixed it, and other bugs like it, particularly in the spectate view. Cleaned up a bit, too.
2014-05-01 16:38:27 -07:00
Michael Schmatz
717651d6ff
Progress on thang property serialization
...
There is a bug where thang properties aren’t updated when simulating
forward
2014-05-01 16:08:46 -07:00
Scott Erickson
3bc0c1710e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-01 15:45:00 -07:00
Scott Erickson
31c5890288
Fixed #934
2014-05-01 15:44:50 -07:00
Nick Winter
0f33bae1f1
Hid level done button better. Avoiding building wizard sprite when not needed.
2014-05-01 14:36:26 -07:00
Nick Winter
5376a42f94
Fixed serialization of tracked property arrays.
2014-05-01 13:23:14 -07:00
Michael Schmatz
c9ea301b29
Fixed various bugs with debug worker
2014-05-01 11:12:44 -07:00
Nick Winter
f7bdb7e840
Upgrades for teleportation imnterpolation performance, ACE search box styling.
2014-05-01 10:44:17 -07:00
Nick Winter
541a2756fd
Simulate properly even if Simulator Supermodel starts fully loaded.
2014-04-29 16:54:57 -07:00
Nick Winter
2f174691c5
Fixed #939 .
2014-04-29 16:44:38 -07:00
Nick Winter
04d74fb76f
Fixed bug with scale not updating properly when paused.
2014-04-29 16:04:30 -07:00
Nick Winter
bea0589fad
Fixed #935 .
2014-04-29 15:31:18 -07:00
Nick Winter
369ea8a00f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-28 19:09:04 -07:00
Nick Winter
aea49cc27f
Fixed bobbing.
2014-04-28 18:36:46 -07:00
Scott Erickson
bcad939eae
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-28 18:31:04 -07:00
Scott Erickson
57beb94b5c
Fixed a bug with the levelloader loading articles.
2014-04-28 18:30:47 -07:00
Nick Winter
b954e70d85
Let's try 30 FPS. Fixed Surface destruction bug.
2014-04-28 17:06:43 -07:00
Nick Winter
0b947dbeee
Let's try 30 FPS for a while now.
2014-04-28 16:41:18 -07:00
Nick Winter
bd3c059c2a
Several performance improvements based on profiling.
2014-04-28 16:31:51 -07:00
Michael Schmatz
544cc62cdb
First steps towards hover debugger improvements
2014-04-28 15:05:54 -07:00
Scott Erickson
b9f4093b08
Set up the LevelLoader to load names instead of whole ThangTypes.
2014-04-28 14:58:58 -07:00
Scott Erickson
01f2a556f9
Set up the patches view with the new loading system, fixing a few things in the meanwhile.
2014-04-28 11:09:21 -07:00
Scott Erickson
17a0bf54c6
Merge branch 'master' into feature/loading-views
2014-04-28 10:10:57 -07:00
Nick Winter
fc6ad1dd01
Properly tracking first-frame team gold. Slightly more visible team gold on hover.
2014-04-27 20:11:11 -07:00
Nick Winter
a7179ae3b2
Fixed some more gold view stuff.
2014-04-27 15:33:16 -07:00
Nick Winter
fa0e7f04f7
Fixed a thing.
2014-04-26 14:21:26 -07:00
Scott Erickson
fed5d681f2
Merge branch 'master' into feature/loading-views
2014-04-26 12:54:37 -07:00
Scott Erickson
d5bcec5ad0
Fixed the level editor with the new loading system.
2014-04-25 19:11:32 -07:00
Nick Winter
834c27bbd7
Show spell palette for Thangs with apiProperties that aren't programmable.
2014-04-25 16:57:42 -07:00