Commit graph

981 commits

Author SHA1 Message Date
Nick Winter
d3f35f024a Fixed #1665. Fixed #1667. 2014-10-15 10:33:33 -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
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
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
Nick Winter
80537dfac7 Experimented with triggering full-screen on first level start. 2014-10-13 21:45:14 -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
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
629827f133 Fixed onAnnotationClick handler message. 2014-10-10 13:36:13 -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
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
Matt Lott
b6f37694e1 Autocomplete line endings for javascript
Fixes #1651
2014-10-08 14:23:13 -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
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
Nick Winter
d6b7616f15 Updated keyboard shortcut symbols. 2014-10-06 15:04:42 -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
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
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
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
285264ceb4 Skip past hero selection if hero has already been selected. 2014-10-02 11:18:43 -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
Nick Winter
5c77e103f3 Fixed issues with achievements awarding awry. Fixed iPad auto-debug toggle. 2014-09-30 16:18:32 -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
adbfa42f25 Merge branch 'master' into feature/webgl 2014-09-30 10:27:26 -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
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
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
98fed4a277 Extended Achievements to support earning heroes, items, levels, and gems. Fixed a few Achievement bugs. 2014-09-26 02:29:04 -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
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
Nick Winter
2ed6b737c2 Added WorldMapView ambient sounds. 2014-09-25 11:37:29 -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
9ea24f4c74 Added a workaround for Surface resize failure on realtime playback end that Maksym had seen. 2014-09-25 09:48:14 -07: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
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
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
Nick Winter
73d6261b5d Hide run shortcut (shift+enter) for first few levels so as not to distract. Don't show beautification button in Python mode. Don't show maximize editor button in hero levels. Don't show method selector if there's only one method. Renamed some spells to methods. Added a bit of i18n. 2014-09-24 16:29:28 -07:00
Nick Winter
6b6d1d3e74 Changed 'Available Spells' to 'Your Skills' in hero levels. 2014-09-24 15:48:18 -07:00
Nick Winter
a786b1e096 Changed world map to click on iPad, hover otherwise. 2014-09-24 15:21:39 -07:00
Nick Winter
ada65cc290 Lowered master volume temporarily until per-sound instance volumes are fixed. 2014-09-24 15:06:22 -07:00
Nick Winter
8d6b23274b Zoom in on hero during real-time playback. 2014-09-23 22:10:18 -07:00
Nick Winter
225fd0ca18 Moved world map level info to click from hover. 2014-09-23 19:12:05 -07:00
Nick Winter
e493855578 Hiding spell tab hover docs for plan(). 2014-09-23 18:32:07 -07:00
Nick Winter
c1023b137f Better pointing out of submit button when victory is ready. 2014-09-23 18:21:27 -07:00
Nick Winter
e109cbbbdc Hid world map level icons for now. Hid play counts when fewer than 20 players. Disabled Zatanna for now until it can stop doing this.this.moveRight()(). Disabled hover debugger for new hero levels for now. Fixed bug with victory modal not allowing replay of completed non-hero levels. 2014-09-23 11:39:56 -07:00
Nick Winter
33080e5a65 Fixed #1586. 2014-09-23 10:56:52 -07:00
Nick Winter
00e2fc99a2 Fixed some issues with the sample code. 2014-09-23 08:58:23 -07:00
Nick Winter
6a8d3082f3 Propagated i18n. Added a fallback for cast button for now until the new run button can be translated. 2014-09-23 08:08:29 -07:00
Nick Winter
f3511a5dde Fixed another bug with loading heroes between levels. 2014-09-22 23:01:19 -07:00
Nick Winter
b0ee2224ae Start hero levels playing from the beginning on unveil. Fixed some of the bugs with heroes not equipping. 2014-09-22 22:26:09 -07:00
Nick Winter
8640369b26 Improved solidity of victory modal. Fixed error with empty sound groups in Thang editor. 2014-09-22 21:50:48 -07:00
Nick Winter
1b4e75e7e8 Fix for earned achievement default null worths. Misc other fixes. 2014-09-22 20:15:51 -07:00
Nick Winter
a79976e6a2 Bigass 'Stop' button in lower right during real-time playback. 2014-09-22 15:34:25 -07:00
Nick Winter
de85d8c170 Split cast button into Run and Submit. Slighted adjusted victory modal for new hero levels. Real-time playbck is now required to beat hero levels. Worked around an error in the delta expansion. 2014-09-22 14:05:13 -07:00
Nick Winter
42b52f5593 No more ThangListView for hero levels. Fixed pluralization of level loading goals when there's only one goal. Fixed default playback state to paused. Started playing ambient dungeon/grass sounds. Fixed bug with goals not showing up at first. Refactored how goals, gold, and flags hide themselves initially. Ignored InventoryView ThangTypes when sorting Components during level serialization. 2014-09-21 22:10:52 -07:00
Nick Winter
6cb8a2a019 Hero always centered in camera in new hero levels when playing and not panning to drag. 2014-09-21 20:49:45 -07:00
Nick Winter
600e985259 Removed Wizards from hero levels. Fixed issues with GameMenuModal width and swapping of hero config. No need to click start with ?dev=true. Hero is always selected in hero levels. GameMenuModal shows up while loading if no heroConfig is detected. 2014-09-21 20:19:27 -07:00
Nick Winter
949f4594af Showing goals on level loading view. 2014-09-21 15:52:49 -07:00
Nick Winter
0d495ba36e Press Start to begin playing levels. Fixed #1574. 2014-09-21 14:35:59 -07:00
Nick Winter
4cdff02a32 Implemented most of new inventory view. 2014-09-20 23:11:51 -07:00
Nick Winter
9f6e1e081c Using language choice from ChooseHeroView. 2014-09-20 16:04:13 -07:00
Nick Winter
ae14bd1ced Hooked up hero choice from ChooseHeroView and PlayLevelModal. Tried to fix some oddities with achievements. Fixed #1564. 2014-09-20 15:18:21 -07:00
Nick Winter
e3b75a69ea Working on PlayLevelModal and ChooseHeroView. 2014-09-19 22:16:05 -07:00
Nick Winter
ec21637adf Showing the new hero levels instead of the old campaign levels on the /play-hero map. 2014-09-19 11:03:38 -07:00
Nick Winter
121ff0a4af Fixed a couple issues with DOM highlight pointer; removed the noise for now. Minor tweaks to the world map view; hiding the items for non-admins for now. 2014-09-18 18:25:33 -07:00
Nick Winter
5ddbbe7707 Fixed a bug with spectate not loading opponent code language. Improved Criss-Cross winners formatting. 2014-09-18 08:12:46 -07:00
Nick Winter
689a4241d4 Final Criss-Cross tournament results. 2014-09-17 22:37:34 -07:00
Nick Winter
95e37fa3b2 Starting new front view (at /front for now) and play view (at /play-hero for now). 2014-09-17 18:56:08 -07:00
Nick Winter
a700b7844f Added a bit of error handling for weird equipment error we were seeing. 2014-09-16 11:13:03 -07:00
Nick Winter
d2491dba4f Disabled autocast even more. 2014-09-15 11:56:29 -07:00
George Saines
040b901e41 removed merge junk 2014-09-11 11:08:25 -07:00
George Saines
b81288cf52 changing volume for some SFX 2014-09-11 10:16:56 -07:00
George Saines
f5a4442e8a trying to change SFX volume 2014-09-11 09:59:50 -07:00
Nick Winter
68808d0e07 Some fixes for how audio is triggered. 2014-09-11 08:38:30 -07:00
Nick Winter
f53f6bf0a3 Misc changes, wishing I could get sounds to work at lower volumes. 2014-09-10 19:55:00 -07:00
Nick Winter
2396f9c26d Updates to go along with latest iPad app spell palette loading. 2014-09-08 21:40:52 -07:00
Nick Winter
8dad2bf12d Fixed some typo. 2014-09-08 14:26:17 -07:00
Nick Winter
6ed89a2d79 Temporarily worked around issue with doubled sprite dragging logic in ThangsTabView. 2014-09-08 12:29:49 -07:00
Nick Winter
ffdf48dadb Fixed typo in spell palette event. 2014-09-08 09:01:34 -07:00
Nick Winter
1bd1ca0ced Fixed #1530. Propagated i18n. Starting to add some more events for the iOS app. 2014-09-07 20:54:25 -07:00
Nick Winter
2f07c3e8d3 Adding communication with iPad app. 2014-09-06 19:50:31 -07:00
Nick Winter
8de75024fc Implemented placeholders for a bunch of sound triggers. 2014-09-05 13:04:05 -07:00
Nick Winter
d3eb7a7438 Fixed a few issues with real-time multiplayer flags. 2014-09-04 20:10:04 -07:00
Nick Winter
b698200cf0 A few minor fixes. 2014-09-04 15:14:27 -07:00
Nick Winter
8c45e22741 Protection and logging for #1463. Fixed an issue with spectate camera script bounds. 2014-09-04 11:04:23 -07:00
Nick Winter
35f22e0f8c Fixed a few tome / canvas resizing bugs. 2014-09-03 18:35:14 -07:00
Nick Winter
6b6c8dd683 Merged master into feature/realtime-multiplayer; looks good. 2014-09-03 16:14:33 -07:00
Nick Winter
24a2373d54 Fixed editor config change event schema. 2014-09-03 13:08:09 -07:00
Nick Winter
3e0518cd70 Fixed a few bugs and added a bunch of defensive handling for permissions not existing without new defaults. Fixed longstanding mistake with signup ignoring email newsletter setting. 2014-09-01 09:11:10 -07:00
Nick Winter
1329d31a63 Hot-swapping inventory works now. 2014-08-31 16:05:20 -07:00
Nick Winter
a8644d030e Fixed #1355. 2014-08-30 14:30:53 -07:00
Nick Winter
85a9a558ef Fixed #1329. 2014-08-30 13:43:56 -07:00
Nick Winter
051f1a77ae Fixed #1152. 2014-08-30 09:19:41 -07:00
Matt Lott
437ab0feb2 PVP waiting screen in real-time view 2014-08-29 21:46:26 -07:00
Scott Erickson
7a9c53e424 All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though. 2014-08-29 18:04:50 -07:00
Scott Erickson
21e0889a86 All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though. 2014-08-29 18:02:29 -07:00
Nick Winter
cb14149816 Fixed #1286. Sort of. 2014-08-29 17:52:47 -07:00
Nick Winter
5503b3a2bc Fixed #1147. 2014-08-29 17:03:02 -07:00
Matt Lott
8143d9c5ba Real-time multiplayers to 'coding' after playback 2014-08-29 15:26:39 -07:00
Matt Lott
92cad5f46f Real-time multiplayer subscription schemas 2014-08-29 15:10:04 -07:00
Matt Lott
68cca74b43 Real-time multiplayer initial commit
Simple matchmaking, synchronous multiplayer PVP, flags!

Rough matchmaking is under the game menu multiplayer tab, for ladder
games only.  After creating a 2-person game there, you can exit that
modal and real-time cast to play against each other.

If you’re the first person to cast, you’ll sit at the real-time level
playback view waiting until the other player casts.  When they do, you
both should start the real-time playback (and start placing flags like
crazy people).

If in a multiplayer session, the real-time simulation runs the players’
code against each other.  Your multiplayer opponent’s name should be up
near the level name.

Multiplayer sessions are stored completely in Firebase for now, and
removed if both players leave the game.  There’s plenty of bugs,
synchronization issues, and minimal polish to add before we push it to
master.
2014-08-28 23:34:07 -07:00
Scott Erickson
9406a8c920 Merge branch 'master' into feature/defaults 2014-08-28 17:58:58 -07:00
Nick Winter
e67b4ae064 Fixed #1090. 2014-08-28 17:08:05 -07:00
Scott Erickson
2dde77f8b0 Merge branch 'master' into feature/defaults 2014-08-28 15:26:04 -07:00
Nick Winter
f79a2848fd Fixed #1038. Focus should now remain on code editor when after clicking on Surface. 2014-08-28 14:00:54 -07:00
Scott Erickson
8b943d1c2c Merged conflicts. 2014-08-28 09:59:03 -07:00
Nick Winter
a0e1806239 Fixed a bug with old, un-migrated level-set-playing events in button handlers. 2014-08-28 09:52:51 -07:00
Nick Winter
a50f6b9224 Fixed a bug with reloading non-writable code. 2014-08-28 09:41:47 -07:00
Nick Winter
ec6b3d7e5f Fixed #1481. More Mediator schema fixes. 2014-08-28 09:27:42 -07:00
Nick Winter
28431703f5 Fixed #953. 2014-08-27 22:23:24 -07:00
Nick Winter
02255044e3 Fixed #847. Fixed some subscription schemas. 2014-08-27 18:43:17 -07:00
Nick Winter
92b29915e2 Finished fixing #841. 2014-08-27 17:26:56 -07:00
Nick Winter
ee9e453896 Fixed #828. Added many other minor refactorings. 2014-08-27 12:24:11 -07:00
Nick Winter
871cd4b3c9 Fixed #784. 2014-08-26 17:34:00 -07:00
Nick Winter
1864cb09bc Fixed #712. Fixed a bug with listing files/musics in admin files view due to removed trailing slashes. 2014-08-26 15:42:33 -07:00
Scott Erickson
5d804c6d9a Fixed merge conflict. 2014-08-26 15:41:59 -07:00
Nick Winter
35b107cf58 Refactored grid. Fixed #158. 2014-08-26 13:56:57 -07:00
Nick Winter
3e9adf6b1a Fixed issue with IndieSprites no longer coloring properly. 2014-08-26 12:39:30 -07:00
Nick Winter
38dcb7fcef Fixed #5. 2014-08-26 11:29:16 -07:00
Scott Erickson
f92a665b8b Merge conflicts. 2014-08-26 09:53:04 -07:00
Nick Winter
e666ee1dac Added stop playback button and real-time countdown screen. 2014-08-25 22:05:30 -07:00
Nick Winter
9df0cfb93f A few changes to flags UX. 2014-08-25 14:02:23 -07:00
Scott Erickson
d392994a83 Merge branch 'master' into feature/defaults 2014-08-25 13:00:33 -07:00
Nick Winter
08f2ee248b No longer constructing SpellViews for non-readable methods. 2014-08-24 22:02:22 -07:00
Nick Winter
718d586f07 A ton of misc bug fixes and performance improvements, getting ready to merge world streaming and flags back in. 2014-08-24 21:39:34 -07:00
Nick Winter
1a7e4554f0 Fixed a few minor bugs. 2014-08-24 16:48:59 -07:00
Nick Winter
3125c2b129 Add flag cursor and pending flags. 2014-08-24 16:09:06 -07:00