Scott Erickson
cc04626a5a
Fixed walls not updating when you edit them in the ThangsTabView.
2014-10-03 11:21:05 -07:00
Scott Erickson
3305a3d7db
Added a way to set titles for RootViews. In development, titles show what RootView class you're looking at.
2014-10-03 10:45:01 -07:00
Scott Erickson
d65ade7a97
Couple teardown fixes.
2014-10-03 10:44:02 -07:00
Scott Erickson
df1c72d132
Fixed normalCanvas styling in the level editor.
2014-10-03 09:59:54 -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
AbnerZheng
6f0d3fa6e3
Update zh-HANS.coffee
...
method是不是要统一成法术？ 暂时翻译成了方法，如有出入，请告知。
2014-10-04 00:03:57 +08:00
Nick Winter
0c09a468c7
Fixed skipping through real-time playback to fire when the final goals are actually ready.
2014-10-02 17:49:14 -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
ca84721921
Added a play button to the thang type edit view, made the canvas taller, and now have selected nodes show bounds for the display object being displayed.
2014-10-02 16:54:58 -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
987061cec6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-10-02 14:43:08 -07:00
George Saines
90be8a4ad3
moving the level dots to fit the dungeon world map
2014-10-02 14:36:26 -07:00
Nick Winter
3636f3d259
Messing with the scaling on the dungeon map.
2014-10-02 14:05:18 -07:00
Nick Winter
5c2b03d245
Propagated i18n.
2014-10-02 12:12:51 -07:00
Nick Winter
16ff8c6601
Reordered i18n in rough order of section importance. Deprecated employer/candidate pages for now and turned off candidate emails.
2014-10-02 12:10:24 -07:00
Imperadeiro98
9c97abe6d0
Update pt-PT.coffee
2014-10-02 19:39:23 +01:00
Nick Winter
62fa133075
Merge pull request #1612 from kaktycc/patch-1
...
Update ru.coffee
2014-10-02 11:25:50 -07:00
Nick Winter
47c4ab700a
Propagated i18n.
2014-10-02 11:24:16 -07:00
Nick Winter
285264ceb4
Skip past hero selection if hero has already been selected.
2014-10-02 11:18:43 -07:00
Scott Erickson
e1e8945f9e
Made sure all dots are invisible by default.
2014-10-02 10:50:05 -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
40b61c32f2
Linked iPad preview video from teacher's page.
2014-10-02 01:20:45 -07:00
Nick Winter
2491861d76
A few tweaks for the iPad app.
2014-10-01 22:02:52 -07:00
Nick Winter
d50a90171a
Added new slot icons and dungeon map.
2014-10-01 18:17:21 -07:00
Nick Winter
36615ae39f
Unlocked all levels again until we can figure out the achievement timing problems.
2014-10-01 17:02:04 -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
Nick Winter
5dd7c3ffa1
Adding some iPad event publishing optimizations. Fixed #1623 .
2014-10-01 10:58:19 -07:00
Nick Winter
dce47f6570
Merge pull request #1611 from ClashTheBunny/patch-1
...
Rough translations of more phrases to Bulgarian
2014-10-01 09:11:59 -07:00
Nick Winter
4c1448e818
Merge pull request #1610 from enricpc/patch-2
...
Update ca.coffee
2014-09-30 22:10:07 -07:00
Nick Winter
cbad8d30da
Merge pull request #1608 from Imperadeiro98/patch-1
...
Update pt-PT.coffee
2014-09-30 22:09:35 -07:00
AbnerZheng
74398c43f9
Update zh-HANS.coffee
2014-10-01 11:51:24 +08: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
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
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
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
enricpc
e3e84bef73
Update ca.coffee
2014-09-26 15:53:51 +02:00
Nick Winter
cf9cf6f98b
Stopped locking levels for now, since the achievements aren't quite unlocking them correctly.
2014-09-26 03:52:57 -07:00
Nick Winter
f0408a85d3
Recommented a couple ca.coffee section headers that aren't started yet.
2014-09-26 03:43:35 -07:00
Nick Winter
dc18438356
Merge pull request #1605 from enricpc/patch-1
...
Update ca.coffee
2014-09-26 03:42:22 -07:00
George Litos
a1cf7823de
Merge remote-tracking branch 'upstream/master'
2014-09-26 12:31:23 +03:00
George Litos
4fbacda295
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
app/locale/el.coffee
2014-09-26 12:30:55 +03:00
Nick Winter
98fed4a277
Extended Achievements to support earning heroes, items, levels, and gems. Fixed a few Achievement bugs.
2014-09-26 02:29:04 -07:00
enricpc
37b04c10cb
Update ca.coffee
2014-09-26 09:44:10 +02:00
Matt Lott
c50b443eca
IE9 compat: css fixes
...
Linking to bless-brunch git for fixes that blocked bless from splitting
app.css into multiple files to address IE9 limits.
sass-brunch version update fixes problems during the css file-splitting
that were messing up nested @media queries.
2014-09-25 16:17:35 -07:00
Nick Winter
9656fd4f49
Propagated i18n.
2014-09-25 15:58:49 -07:00
Nick Winter
4ca7df0b32
A few fixes to WorldMapView to handle authentication and hiding the parts that aren't done yet.
2014-09-25 15:58:25 -07:00
Nick Winter
0928bb7a81
Completed transition to new hero levels.
2014-09-25 15:32:33 -07:00
George Litos
384bd4291e
Merge remote-tracking branch 'upstream/master'
2014-09-26 01:05:42 +03:00
