codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-01 03:16:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
5446 commits 27 branches 0 tags 134 MiB
Commit graph

4218 commits

Author SHA1 Message Date
Rafael Jaques
e32787d25c Translation done and spell check 2014-10-18 19:17:07 -03:00
Nick Winter
9c8a0e83af Fixed an indentation typo in pt-BR.coffee. 2014-10-18 14:54:04 -07:00
Nick Winter
56a80e3615 Started getting hero-ladder level type working. 2014-10-18 14:51:49 -07:00
Dmitry
441b1351aa some translates 2014-10-19 00:45:56 +04:00
Nick Winter
08da130598 Merge pull request #1684 from rafajaques/master 
Almost done
 2014-10-18 08:03:14 -07:00
Rafael Jaques
cf64112d95 Almost done! 2014-10-18 11:29:43 -03:00
Michael Schmatz
4aff89d60a Fixed spell palette changes for iPad 2014-10-18 09:46:08 -04:00
Rafael Jaques
d56b2207da Update pt-BR.coffee 2014-10-18 10:39:44 -03:00
Nick Winter
2e539debbb Added signup poke to HeroVictoryModal. 2014-10-17 20:47:32 -07:00
Nick Winter
de7985fc2e More blingstrositization for the HeroVictoryModal. 2014-10-17 20:15:41 -07:00
Nick Winter
a71c591f54 First set of fixes to HeroVictoryModal. 2014-10-17 18:00:13 -07:00
Matt Lott
f75ff8a236 Don't save duplicate user code problems 2014-10-17 15:53:00 -07:00
Nick Winter
a65dabad04 Removed level-specific achievements from achievements list. Fixed bug with return type documentation not showing up. Reduced initial first-level arrow delay. 2014-10-17 15:25:31 -07:00
Nick Winter
cc1d247014 Merge pull request #1682 from rafajaques/master 
pt-BR translations
 2014-10-17 14:26:52 -07:00
Rafael Jaques
7ec54720ca Update pt-BR.coffee 2014-10-17 17:01:51 -03:00
Rafael Jaques
b8d59ed78a Update pt-BR.coffee 2014-10-17 16:59:33 -03:00
Rafael Jaques
a3c8621584 Update pt-BR.coffee 2014-10-17 16:13:20 -03:00
Nick Winter
c4207873d7 Merge pull request #1681 from Imperadeiro98/patch-1 
Update cast_button.jade
 2014-10-17 10:11:40 -07:00
Rafael Jaques
34dd1dadca Update pt-BR.coffee 2014-10-17 13:56:44 -03:00
Scott Erickson
0dc050abca Added i18nCoverage backend support. 2014-10-17 12:12:06 -04:00
Imperadeiro98
3b9feebee8 Update cast_button.jade 
Internationalized "Submit".
 2014-10-17 17:06:25 +01:00
Nick Winter
7f60701daa Merge pull request #1678 from yjw9012/master 
#1668: moved the question above the dropdown
 2014-10-17 08:50:42 -07:00
Nick Winter
005b4991cd Merge pull request #1680 from Imperadeiro98/patch-1 
Update level_loading.jade
 2014-10-17 08:48:47 -07:00
Nick Winter
7bc50ade30 Fixes for spectate layout in new WebGL dual-stage mode. 2014-10-17 08:47:53 -07:00
Imperadeiro98
f496823bb5 Update level_loading.jade 
Removed an unused tip.
 2014-10-17 16:38:21 +01:00
Scott Erickson
36ea415dbf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-17 10:11:33 -04:00
Scott Erickson
092997bffe Added i18n coverage logic to the CocoModel. 2014-10-17 10:11:26 -04:00
yjw9012
30b261e40a Merge remote-tracking branch 'upstream/master' 2014-10-16 23:27:50 -07:00
yjw9012
fe66b6e960 #1668: moved the question above the dropdown 
moved the question ‘which programming do you want to use?’ above the
programming language dropdown.
 2014-10-16 21:39:59 -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
07b988c405 Fixed gear requirements for Closing the Distance. 2014-10-16 12:14:04 -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
Scott Erickson
fbaced90c3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-15 16:43:37 -04:00
Scott Erickson
9455199b39 Limited social media library loading to only those views that need it. 2014-10-15 16:43:26 -04:00
Nick Winter
d3f35f024a Fixed #1665. Fixed #1667. 2014-10-15 10:33:33 -07:00
Nick Winter
92ec44ffce Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-15 10:28:39 -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
Nick Winter
fbdb666e01 Merge pull request #1664 from gabrielcesar/master 
pt-BR.coffee updated.
 2014-10-15 08:39:40 -07:00
Nick Winter
5c40f99d99 Hide guide and select-a-thang message when not needed. Updated commonThisMethods. Restricted script IDs a bit. 2014-10-14 22:38:22 -07:00
Matt Lott
7cbb5ac45d Pass common 'this' methods to Aether 2014-10-14 17:53:17 -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
Nick Winter
ee9e32af51 Hid play/pause button for first few levels. Hid submit button until run once or won for a few more levels. 2014-10-14 11:11:56 -07:00
Nick Winter
b7fe9398d5 Don't preload when player hasn't finished typing this or self. 2014-10-14 10:39:13 -07:00
Nick Winter
d79d40b98c Moved spellbooks to right hand. Put full-body hero feature images in. Saved some height on ChooseHeroView and InventoryView for smaller screens. Hid level play counts unless admin. 2014-10-14 09:54:36 -07:00
Gabriel Cesar
1493110043 pt-BR.coffee updated. 2014-10-14 12:43:44 -03:00
Nick Winter
69a3f78594 Merge pull request #1662 from gabrielcesar/master 
pt-BR.coffee updated.
 2014-10-14 08:30:36 -07:00
Nick Winter
136168f928 Merge pull request #1661 from ikks/patch-1 
Update es-419.coffee
 2014-10-14 08:29:47 -07:00
Nick Winter
80537dfac7 Experimented with triggering full-screen on first level start. 2014-10-13 21:45:14 -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
Scott Erickson
99e5941126 Set up the HeroVictoryModal to block until achievements data has loaded. Enabled the HeroVictoryModal for hero levels. 2014-10-13 17:18:33 -04:00
Scott Erickson
6ff7cd12cc Mostly done with the victory modal. 2014-10-13 11:53:08 -04:00
Imperadeiro98
c3a35d5de7 Update pt-PT.coffee 2014-10-12 18:38:16 +01:00
Gabriel Cesar
d75a0653c3 added some pt-br translations 2014-10-12 02:31:36 -03:00
Igor Támara
5016529f6b Update es-419.coffee 2014-10-11 14:09:18 -05:00
Michael Schmatz
dee5d82d61 Added gutter problem support for iPad 2014-10-11 12:57:45 -04:00
Michael Schmatz
e7269a62dd Added line highlighting event for iPad 2014-10-11 11:34:31 -04:00
Nick Winter
281d0ef96e Fixed zh-HANT.coffee merge conflicts. 2014-10-11 08:24:42 -07:00
Nick Winter
af36b3e4ef Merge pull request #1658 from Imperadeiro98/patch-1 
Update level_loading.jade
 2014-10-11 08:20:43 -07:00
Nick Winter
1203efaad0 Fixing el.coffee merge conflicts. 2014-10-11 08:19:37 -07:00
Imperadeiro98
e574843599 Update pt-PT.coffee 2014-10-11 10:49:22 +01:00
Imperadeiro98
3dc9a5dfdc Update pt-PT.coffee 2014-10-11 10:47:39 +01:00
Imperadeiro98
8130c1b3fa Update pt-PT.coffee 2014-10-11 10:46:31 +01:00
Imperadeiro98
3c5adb7bad Update level_loading.jade 
This tip was removed some time ago from the locale files.
 2014-10-11 10:19:30 +01: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
629827f133 Fixed onAnnotationClick handler message. 2014-10-10 13:36:13 -07:00
Nick Winter
7f9fdc7253 Fixed temporarily locking of items. 2014-10-09 19:59:57 -07:00
Nick Winter
a0ad5efba2 Some improvements for exhortation of tunic donning in The Raised Sword. 2014-10-09 19:54:39 -07:00
Matt Lott
37ac9f1a69 Fix highlight error when opening browser tools 2014-10-09 17:55:38 -07:00
Nick Winter
7487df5af8 Point out (and require) equipping of necessary items for first set of levels. Can now drag items to unequip. 2014-10-09 15:54:18 -07:00
Gkntos
e9f0b9f67a Update es-ES.coffee 
Some changes tu un-transaleted phrases.
:)
 2014-10-09 14:01:01 -05:00
Nick Winter
413e99b6ae Merge pull request #1654 from Imperadeiro98/patch-1 
Update victory.jade
 2014-10-09 10:14:34 -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
Imperadeiro98
cc5a2508d9 Update victory.jade 
Corrected some i18n errors.
 2014-10-09 14:29:48 +01:00
George Litos
f88c889e8f Greek translation update 2014-10-09 12:59:31 +03:00
Matt Lott
b6f37694e1 Autocomplete line endings for javascript 
Fixes #1651
 2014-10-08 14:23:13 -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
Matt Lott
1108159603 Enable updated autocomplete 
Bug fixes for incorrect autocompletes such as “this.this.moveRight()();”
Reducing suggestions to just level snippets to make it more beginner
friendly.
 2014-10-07 15:13:43 -07:00
Nick Winter
ff467d1f31 Don't play a selection sound when adding a Thang. 2014-10-07 12:04:55 -07:00
Nick Winter
5261a7d4d9 Snap to integer meters in the level editor when holding shift. 2014-10-07 10:41:16 -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
ea25224c1e Moved popover navigation fix of #1603 from initialize's link handler to Router's closeCurrentView method. 2014-10-06 18:09:27 -07:00
Nick Winter
c9b01af21c Merge pull request #1603 from ThatOtherPerson/dismiss-popovers 
Fix #1602
 2014-10-06 18:06:32 -07:00
Nick Winter
f9b510aac1 Merge pull request #1645 from kaktycc/patch-2 
Update ru.coffee
 2014-10-06 17:58:37 -07:00
Nick Winter
e6339d68a1 Fixed merge conflicts. 2014-10-06 17:57:47 -07:00
Nick Winter
04939ea690 Merge pull request #1643 from AbnerZheng/patch-2 
Update zh-HANS.coffee
 2014-10-06 17:52:11 -07:00
Nick Winter
dfdcf66f4b A couple tweaks to the ordering of events when starting to play a level. Renaming A Bolt in the Dark to Crossing the Distance. 2014-10-06 17:46:22 -07:00
Scott Erickson
f00fd66bed Fixed displaying raster image thangs in the thang editor. 2014-10-06 16:22:21 -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
Nick Winter
0fefd627fa Fixed COPPA toggle. 2014-10-06 15:04:42 -07:00
Nick Winter
d6b7616f15 Updated keyboard shortcut symbols. 2014-10-06 15:04:42 -07:00
Matt Lott
efa1f7c4a3 Disable Google+ on login modal for IE 
This is causing script errors in IE10.
 2014-10-06 13:38:08 -07:00
Nick Winter
31056933e9 Added volume control to world map. 2014-10-06 10:17:55 -07:00
Nick Winter
63f518e7c6 Fixed LevelHUDView incorrectly showing empty action timeline due to switching from dialogue elements. 2014-10-06 10:17:55 -07:00
Evgenii
77f66d1e1b Update ru.coffee 2014-10-04 14:06:59 +04:00
Matt Lott
530da639d8 Removing css background-position-x usage 
Not supported in Firefox or Opera.
 2014-10-03 16:02:50 -07:00
Matt Lott
33055ca0b5 Fix IE9 world map game control button images 
Fixes #1625
 2014-10-03 15:39:33 -07:00
Matt Lott
49cf206be7 Border-image fallback for world map level buttons 2014-10-03 15:24:43 -07:00
Scott Erickson
b78c91997c Tweaked associating lanks with layers. 2014-10-03 12:06:04 -07:00
Scott Erickson
3da0ea9d72 Fixed labels and marks not properly updating in the level editor. 2014-10-03 12:00:08 -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
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
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
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
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
Imperadeiro98
d23e752755 Update pt-PT.coffee 2014-09-25 12:46:06 +01:00
enricpc
5dab9f8226 Update ca.coffee 2014-09-25 09:59:55 +02:00
Nick Winter
c0c436189f Better preserving supermodel when navigating between new hero levels. Fixed a problem with garbage collection of large CocoModel error callbacks. 2014-09-25 00:02:53 -07:00
Nick Winter
cce36333dd Set letterbox during real-time playback. 2014-09-24 22:59:13 -07:00
Nick Winter
cde2acaea1 Disabled clicking spell palette entries for hero levels. 2014-09-24 22:52:18 -07:00
Nick Winter
58e0ba1c10 Hid flags view during real-time playback for non-flag-using levels. 2014-09-24 22:23:14 -07:00
Nick Winter
5e0b42068a Scrubber auto-pauses when dragging from ended position. 2014-09-24 22:12:00 -07:00
Nick Winter
2aa274cb2d Fixed bugs with Surface fast-forwarding too fast on short levels and rewinding non-instantaneously when rerunning. 2014-09-24 22:07:55 -07:00
Nick Winter
b2592aad8c Fixed more off-by-one errors in playback ratios. Fixed some clickability problems with the scrubber handle. 2014-09-24 21:01:58 -07:00
Nick Winter
b8d59cb179 Fixed a bug with playback never quite getting to the end. 2014-09-24 20:25:30 -07:00
Nick Winter
6441a753d5 Improvements to lock state of items, differentiating between locked and unlocked and equipped vs. available better. 2014-09-24 20:15:17 -07:00
Nick Winter
e48fa5f0b7 Fixed bug with slow-mo heroes in ChooseHeroView. Added lock silhouette portraits. 2014-09-24 19:14:22 -07:00
Scott Erickson
358b36c1bf Set up custom graphics to be copied from old spritesheets when possible as well. 2014-09-24 18:47:10 -07:00
Scott Erickson
fb30f07f2e Re-enabled effect marks. 2014-09-24 18:42:04 -07:00
Scott Erickson
91f33e49dc Re-enabled shadows. 2014-09-24 17:52:44 -07:00
Nick Winter
da83fee58f Unborked victory continue buttons when signup is needed. Fixed an issue with the DocFormatter being unable to display null current values. 2014-09-24 16:58:52 -07:00
Scott Erickson
7f90ed18cc Bunch more work on scaling for everything and hit testing for segmented sprites. Also got health bars working again. 2014-09-24 16:53:38 -07:00