codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 16:17:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
5574 commits 27 branches 0 tags 134 MiB
Commit graph

1128 commits

Author SHA1 Message Date
Scott Erickson
ba79d59190 Fixed a couple errors in the tests. 2014-10-21 11:54:03 -07:00
Scott Erickson
091910f2ad Fixed debug, and some other mark issues when sprite sheets update, most likely. 2014-10-21 11:36:38 -07:00
Scott Erickson
7f4ac3e5d6 Fixed point and region choosers in the level editor. 2014-10-21 10:59:05 -07:00
Nick Winter
a33bb215d4 Fixed checking compile-time problems for clean code goals. 2014-10-20 17:49:52 -07:00
Nick Winter
d0b878db37 Implemented lines-of-code goal type. 2014-10-20 14:43:18 -07:00
Nick Winter
ec3e1d0bce Added optional goals. Working on lines-of-code goal. Fixed bugs with HeroVictoryModal not firing. 2014-10-20 13:57:32 -07:00
Nick Winter
67166f1496 Removed a log. 2014-10-20 09:41:58 -07:00
Nick Winter
1219710cbb Starting to work on codeProblems goal type. Rearranged script import for publishing notes earlier. Fallback for Math.log10. 2014-10-20 09:41:28 -07:00
Nick Winter
08d9e39764 LevelLoader and Simulator fixes for simulating hero-ladder matches. Commented out some logging that hasn't been very useful. Fixed some tests. 2014-10-19 21:56:26 -07:00
Nick Winter
1fb48f2b85 Fixed a few bugs. Removed Olark; disabled LinkedIn. Added ladder submission to HeroVictoryModal. 2014-10-19 17:38:10 -07:00
Nick Winter
9f216e3361 Preserving opponent flags. 2014-10-18 18:57:33 -07:00
Nick Winter
66c728210b Fixing flag coloring in new WebGL rendering. 2014-10-18 18:18:12 -07:00
Nick Winter
24da2aa80a Preserving flag history and submission count so that things are more stable in between real-time submissions. 2014-10-18 17:32:01 -07:00
Nick Winter
56a80e3615 Started getting hero-ladder level type working. 2014-10-18 14:51:49 -07:00
Nick Winter
7bc50ade30 Fixes for spectate layout in new WebGL dual-stage mode. 2014-10-17 08:47:53 -07:00
Nick Winter
a922c9c6ef First draft of new hero spell palette that groups abilities by item. 2014-10-16 21:38:11 -07:00
Nick Winter
54de8482f1 Spell palette now hugs the spell editor, which itself shrinks as needed. 2014-10-16 12:08:21 -07:00
Nick Winter
9826311656 Started playing menu music on WorldMapView. Only go full-screen on squat windows where we really need it (see #1669). 2014-10-15 10:28:29 -07:00
Matt Lott
ce14f92979 Pass problem context to Aether 
So Aether can craft better error messages.
Bumping Aether to v0.2.39
 2014-10-14 14:02:34 -07:00
Nick Winter
04ec8c5222 Sped up maze levels. Fixed an unhinged world deserialization listener. 2014-10-14 11:53:32 -07:00
George Saines
ee88c0870e pushing my fix 2014-10-13 16:24:54 -07:00
George Saines
6350debf26 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-13 15:51:48 -07:00
Nick Winter
f80380784a Levels save right away on victory. 2014-10-10 19:20:00 -07:00
Nick Winter
2db637866c Fix for non-Boolean includeFlow. 2014-10-10 18:23:51 -07:00
George Saines
3927371427 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-10 16:55:12 -07:00
George Saines
95afb6c4d3 playing with FPS 2014-10-10 16:55:09 -07:00
Nick Winter
a0ad5efba2 Some improvements for exhortation of tunic donning in The Raised Sword. 2014-10-09 19:54:39 -07:00
Nick Winter
45471b8030 Fix for streaming new serialized Aethers into worlds where their Thangs hadn't existed before. 2014-10-09 09:53:57 -07:00
Nick Winter
f9409488ff Fixed a bug with jerky camera udpates due to dropped frames and camera updating before positions update. Fleshed out default level scripts. Tweaked style on Dropper code. 2014-10-08 12:38:23 -07:00
Nick Winter
589c3b090c Moved DOM highlight arrows from PlayLevelView to CocoView so that everywhere can use them. Added highlight for next level on world map. 2014-10-08 10:46:10 -07:00
Nick Winter
c6b398aae2 Increased prominence of GoalsView when at level playback end. Increased legibility of Surface text when PlaybackOverScreen is in effect, and changed colors of PlaybackOverScreen to be less intense and to indicate goal failure / non-failure. 2014-10-08 09:46:56 -07:00
Nick Winter
fcd174ed22 Re-enabled line-by-line highlighting through brute force for hero levels. 2014-10-07 22:28:53 -07:00
Nick Winter
ef3edfcc08 Optimization for not rebuilding LevelSession defaults once a second to set playtime. 2014-10-07 10:06:41 -07:00
Nick Winter
67ed73a01f Probably don't need this; it doesn't appear to be storing the NaNs. 2014-10-06 22:29:54 -07:00
Nick Winter
e04a0f33a1 Fixed bug recording level playtime. 2014-10-06 18:55:10 -07:00
Nick Winter
8fdd2c0688 Redid my bobbing fix b286b24 in a way that doesn't break the LankBoss position test. 2014-10-06 18:18:39 -07:00
Nick Winter
b286b24f27 Fixed bobbing. Increased LayerAdapter cleanup vengeancy. Allow dragging without snapping when playback is at the end. 2014-10-06 15:04:42 -07:00
Scott Erickson
b78c91997c Tweaked associating lanks with layers. 2014-10-03 12:06:04 -07:00
Scott Erickson
e504932e5e Added yet another fine tuning of camera movement in the level editor. 2014-10-03 11:54:06 -07:00
Scott Erickson
cc04626a5a Fixed walls not updating when you edit them in the ThangsTabView. 2014-10-03 11:21:05 -07:00
Scott Erickson
d65ade7a97 Couple teardown fixes. 2014-10-03 10:44:02 -07:00
Scott Erickson
ca9c387964 Fixed singular sprite animations frame ordering. 2014-10-03 09:51:07 -07:00
Scott Erickson
67bd01b397 Fixed a bug where SegmentedSprite would sometimes error out (particularly the door on death). 2014-10-03 09:36:47 -07:00
Scott Erickson
64acbe4580 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-03 09:11:12 -07:00
Scott Erickson
d02d58ed4e Improved the LayerAdapter to more accurately adjust its size downward if it renders a spritesheet, handle when a single thang is too large, and cancels in-progress async builds if a new one starts. 2014-10-02 17:38:50 -07:00
Nick Winter
3cdb8ff416 Fixed music defaulting to off while appearing on. Reordered The Second Kithmaze and New Sight on the dungeon map. 2014-10-02 17:21:06 -07:00
Scott Erickson
5bb1275cea Tweaked how movie clips are animated and copied from, sidestepping how adding children from movie clips removes them from the movie clips, and making inheritence fully recursive. 2014-10-02 16:55:03 -07:00
Scott Erickson
6bd6b2eea2 Tweaked when and how we shift the bounds of imported sprites. For things like Anya, especially Anya's attack, it wasn't working correctly. 2014-10-02 16:54:58 -07:00
Nick Winter
abf28c2c19 Fixed bug with world deserialization missing state batches. 2014-10-02 15:33:23 -07:00
Scott Erickson
b1f4dc996d Fixed a handful of bugs with the thang editor and sprite animation. 2014-10-02 10:42:21 -07:00
Scott Erickson
e044a660eb Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-02 09:28:31 -07:00
Nick Winter
2491861d76 A few tweaks for the iPad app. 2014-10-01 22:02:52 -07:00
Scott Erickson
1b1bc4e95a Fixed adding thangs in the level editor, and moving them around. 2014-10-01 15:02:14 -07:00
Scott Erickson
e9222f34bd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-01 13:26:45 -07:00
Scott Erickson
3205821ee9 Got the level editor mostly working again. 2014-10-01 13:26:38 -07:00
Nick Winter
0290db9cd4 Starting to try to get iPad to work during real-time playback. 2014-10-01 12:08:14 -07:00
Scott Erickson
bab7598ce0 Fixed an error wizard sprites were having. 2014-09-30 14:01:29 -07:00
Scott Erickson
ffdb2ef6b4 Fixed position updating for indie sprites. 2014-09-30 14:01:20 -07:00
Scott Erickson
c05cc1c0ad Fixed text box pointers being cut off from caching. 2014-09-30 14:00:47 -07:00
Scott Erickson
528383c0dc Undid the attempted optimization of having the normal stage update half as often. 2014-09-30 13:45:15 -07:00
Scott Erickson
90e21c6085 Did some more missed refactorings from sprite -> lank. 2014-09-30 13:44:03 -07:00
Scott Erickson
34cf6240c1 Refactored heroSprite -> heroLank, replaced a call to LankBoss.spriteFor with LankBoss.lankFor. 2014-09-30 13:41:42 -07:00
Scott Erickson
4a6e8018e4 Fixed choosing the first frame for segmented sprites. 2014-09-30 13:34:55 -07:00
Scott Erickson
adbfa42f25 Merge branch 'master' into feature/webgl 2014-09-30 10:27:26 -07:00
Matt Lott
405c21cba4 Clean up sync world running GoalManager creation 2014-09-30 10:15:33 -07:00
Matt Lott
8f85e37713 Fix for main thread GoalManager creation 
Using @shared.goalManager.constructor was yielding an incomplete
GoalManager in IE9.

Also fixing up console.debug in CocoModel for IE10 and earlier.
 2014-09-29 17:31:58 -07:00
Scott Erickson
b06cd12c5c Some more optimizations, this time in LankBoss update operations. 2014-09-29 11:47:12 -07:00
Scott Erickson
ce9a7e2ed4 Improved performance of the non-webgl stage. 2014-09-29 10:18:27 -07:00
Matt Lott
136af8a0b4 Fixes for world simulation without Web Workers 
Primarily for IE9, which is still blocked by box2d issues with these
changes.

Forcing vendor.js instead of vendor_with_box2d.js in main.html allows
you to load a level in IE9, but without Collision-based movement.

Work in progress.
 2014-09-28 23:24:18 -07:00
Scott Erickson
326057a816 Fixed another bug from the refactoring. 2014-09-28 14:16:56 -07:00
Scott Erickson
b65b553f2d Fixed some tests broken from the refactoring. 2014-09-28 14:04:01 -07:00
Scott Erickson
f081d9ed4b Refactored CocoSprite -> Lank, lank.imageObject -> lank.sprite, SpriteBoss -> LankBoss, spriteLayers -> layerAdapters, sprite -> lank in general. Also got the ThangTypeEditView working again. 2014-09-28 14:00:48 -07:00
Scott Erickson
8adbd87401 Merge branch 'master' into feature/webgl 2014-09-28 10:38:19 -07:00
Scott Erickson
024cd9c955 Fixed a bunch of tests, and a child animations bug from the MovieClip pooling optimization. 2014-09-28 10:33:24 -07:00
Scott Erickson
6d595705f2 Made the placeholder color and shape different for each layer. 2014-09-26 16:15:44 -07:00
Scott Erickson
8234db333e Reenabled text events. 2014-09-26 15:57:24 -07:00
Scott Erickson
b89a6c41a7 Fixed the surface to not restore state until it's done dropping frames. 2014-09-26 15:23:27 -07:00
Scott Erickson
332f4700f6 Fixed the mark toggle equivalency check. This bug was causing the target mark to be turned on repeatedly. 2014-09-26 15:22:46 -07:00
Scott Erickson
f0e879295c Set back up debug marks. 2014-09-26 14:09:44 -07:00
Scott Erickson
f21083acf5 Set back up highlight mark. 2014-09-26 13:58:35 -07:00
Scott Erickson
2505f50eec Set back up selection and target marks. 2014-09-26 13:45:11 -07:00
Scott Erickson
5b9c7dc8a7 Removed layer's cache function (wasn't used before webgl factoring anyway?). Removed TRANSFORM_CHILD layer transform setting. 2014-09-26 13:02:01 -07:00
Scott Erickson
37e9d7bb2d Enabled the Surface's normalStage and all its layers. 2014-09-26 12:45:27 -07:00
Scott Erickson
c1e7423a64 Fixed sprite coloring and the thangtype-not-yet-loaded placeholder. 2014-09-26 12:17:46 -07:00
Scott Erickson
6f45eee81d Fixed registration points for scaled raster image thang types. 2014-09-26 11:33:07 -07:00
Scott Erickson
be805ff3c1 Update scale and rotation after playing a new action, since with segmented sprites that often means a new image object. 2014-09-26 11:25:36 -07:00
Scott Erickson
627c56dbb5 Fixed mouse scrolling. Fixed SpriteStage scaling (scale the layers instead). Added spriteType to the ThangType schema. 2014-09-26 11:07:01 -07:00
Nick Winter
b7d2bcd222 Decreased severity of camera jerkiness during real-time playback. 2014-09-25 15:01:06 -07:00
Scott Erickson
8aeb6555ec Added MovieClip pooling, improving WebGL performance. 2014-09-25 14:48:17 -07:00
Scott Erickson
14f3fb6486 Fixed one last instance of cocoSprite using its resolutionFactor value. 2014-09-25 14:03:44 -07:00
Nick Winter
61aa2d8b6f Changed default language from JavaScript to Python. Fixed a few InventoryView tests. Adjusted maze real-time playback speed factor code. 2014-09-25 13:29:20 -07:00
Scott Erickson
4b87607599 Fixed animations where the frame stays the same for periods of time. 2014-09-25 13:26:05 -07:00
Scott Erickson
d77b87ed22 Fixed raster thang types, and level destruction. 2014-09-25 13:12:47 -07:00
Scott Erickson
10314b8bfa Fixed sprites often disappearing when idle. 2014-09-25 12:43:51 -07:00
Scott Erickson
d4b1849eaf Fixed one other little thing. 2014-09-25 12:22:33 -07:00
Nick Winter
68bb1dc135 Sped up "real-time" playback for the maze levels. 2014-09-25 11:17:04 -07:00
Scott Erickson
8fe2ed4438 Resolved conflicts. 2014-09-25 10:52:36 -07:00
Scott Erickson
06b106f42b Merged from master. 2014-09-25 10:52:27 -07:00
Scott Erickson
c7e7066aef Migrating surface to webgl. It sorta works! 2014-09-25 10:47:53 -07:00
Nick Winter
9fc7fca528 Hooked up real-time playback music. 2014-09-25 10:30:43 -07:00