Commit graph

5208 commits

Author SHA1 Message Date
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
Nick Winter
bdb3fd4b92 Merge pull request #1607 from enricpc/patch-1
Update ca.coffee
2014-09-26 08:50:51 -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
Nick Winter
8698e8a6dd Fixed jsondiffpatch bower version at 0.1.8, since somewhere around 0.1.10 through 0.1.17 moved the main bower script and it doesn't seem to work. 2014-09-26 03:06:14 -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
George Litos
d83e06ee46 updated greek translation 2014-09-26 01:05:28 +03: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
George Saines
8183d671b8 simplifying the homepage 2014-09-25 14:38:02 -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
George Saines
fb30fdec8b manually resolving merge conflict 2014-09-25 12:35:19 -07:00
George Saines
729baabf43 making the spikes appear above the walls 2014-09-25 12:34:14 -07:00
Scott Erickson
d4b1849eaf Fixed one other little thing. 2014-09-25 12:22:33 -07:00
Nick Winter
2ed6b737c2 Added WorldMapView ambient sounds. 2014-09-25 11:37:29 -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
Nick Winter
9ea24f4c74 Added a workaround for Surface resize failure on realtime playback end that Maksym had seen. 2014-09-25 09:48:14 -07:00
David Beckley
7596b887fd Fix #1602 2014-09-25 09:10:32 -07:00
Nick Winter
867279b6b8 Merge pull request #1600 from Imperadeiro98/master
Update pt-PT.coffee
2014-09-25 08:47:44 -07:00
Nick Winter
8bf619359c Uncommented some section headers from #1598. 2014-09-25 08:43:23 -07:00
Nick Winter
6e938becec Merge pull request #1598 from enricpc/patch-1
Update ca.coffee
2014-09-25 08:41:18 -07:00
enricpc
38b84af208 Update ca.coffee 2014-09-25 16:16:32 +02:00
enricpc
56aecbab88 Update ca.coffee 2014-09-25 16:15:28 +02:00