Commit graph

5651 commits

Author SHA1 Message Date
AbnerZheng
74398c43f9 Update zh-HANS.coffee 2014-10-01 11:51:24 +08:00
Nick Winter
6e1d048bfd Can't brunch, even in production, with the new sass-brunch. 2014-09-30 19:57:36 -07:00
Nick Winter
8d37309de1 Several fixes for achievement recalculation. 2014-09-30 19:32:11 -07:00
Nick Winter
5c77e103f3 Fixed issues with achievements awarding awry. Fixed iPad auto-debug toggle. 2014-09-30 16:18:32 -07:00
Nick Winter
2611e441d7 Trying to standardize sass imports in an effort to test #1615, to no avail. 2014-09-30 16:17:54 -07:00
Scott Erickson
1dda6bfcfc Layed the view framework for a new hero victory modal. 2014-09-30 16:14:47 -07:00
Scott Erickson
19e6b9d095 Fixed real-time placement of normal canvas, and brought the stop-real-time-playback-button on top of it. 2014-09-30 14:25:44 -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
b3ae258bed Fixed some issues with the thang editor. 2014-09-30 13:34:44 -07:00
Scott Erickson
8f29d0ee7f Did some tweaking of UserView to handle slugs for ids. 2014-09-30 10:53:01 -07:00
Scott Erickson
adbfa42f25 Merge branch 'master' into feature/webgl 2014-09-30 10:27:26 -07:00
Matt Lott
169e5614d6 Merge pull request #1613 from codecombat/feature/browser-support
Browse support updates
2014-09-30 10:23:28 -07:00
Scott Erickson
6b03de0235 Merge branch 'master' into feature/webgl 2014-09-30 10:21:51 -07:00
Matt Lott
405c21cba4 Clean up sync world running GoalManager creation 2014-09-30 10:15:33 -07:00
enricpc
eebbe8a130 Update ca.coffee 2014-09-30 15:41:44 +02:00
kaktycc
3b4ceeca3d Update ru.coffee 2014-09-30 14:54:17 +04: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
Matt Lott
1e864d49e2 Box2D in own script, rename Vector
Renaming Vector to Box2DVector to avoid naming collisions when
including Box2D on the main thread.  There may be a way to change how
scripts are built and included to avoid this rename, but it wasn’t
obvious.

Box2D declares a Vector in the global namespace, which conflicts with
the CodeCombat Vector.
2014-09-29 12:48:58 -07:00
George Saines
96cd63192c Fixing Tom's avatar 2014-09-29 12:04:43 -07:00
George Saines
eed2cdbe4a Finish up the url cleanup 2014-09-29 12:04:05 -07:00
George Saines
54557d3802 Fixing avatar urls 2014-09-29 11:55:41 -07:00
George Saines
fcd943aa46 adding the teacher's page first draft for HoC 2014-09-29 11:47:40 -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
Randall Mason
45daffc2f3 Rough translations of more phrases to Bulgarian
They should be looked over for grammar and spelling mistakes.
2014-09-29 16:52:45 +03:00
enricpc
26c4271736 Update ca.coffee 2014-09-29 12:34:47 +02: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
64a8322ec0 Fixed some more tests. 2014-09-28 10:47:01 -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
Imperadeiro98
b0ae4f1ddb Update pt-PT.coffee 2014-09-26 20:11:14 +01:00