Commit graph

1223 commits

Author SHA1 Message Date
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
Nick Winter
f44d802934 Fixed a couple bugs. Flags are now colored. 2014-08-24 12:33:46 -07:00
Nick Winter
be07f9cfb9 Many improvements to real-time streaming and flags. 2014-08-23 22:24:00 -07:00
Nick Winter
2dca4d72fc Rudimentary flag buttons are in. 2014-08-23 19:00:35 -07:00
Nick Winter
f59084e651 Sending flag history to the World for to make flag Thangs during simulation. 2014-08-23 17:26:56 -07:00
Scott Erickson
0721b49216 Refactoring defaults. 2014-08-23 15:51:59 -07:00
Nick Winter
2e23247521 Fixed #811, a bug where you could pause the world if you clicked on a letterboxed playback scrubber. 2014-08-23 14:55:58 -07:00
Nick Winter
8777a87774 Made a real-time playback button. 2014-08-23 14:31:38 -07:00
Nick Winter
c79541f669 Full-screen playback during real-time mode. 2014-08-23 13:54:52 -07:00
Nick Winter
9c0869e566 Press Ctrl+Shift+Enter to cast in real-time, and click on the ground to use your wizard as a flag. OMG, it not only works, but it is really fun! 2014-08-22 21:35:08 -07:00
Nick Winter
ee41796b73 Fixed some wonkiness with the playback scrubbing while streaming worlds. 2014-08-22 15:32:23 -07:00
Nick Winter
92f0a68dd1 World streaming is getting there! 2014-08-22 14:59:32 -07:00
Nick Winter
9b31e28536 More improvements to world streaming. 2014-08-21 21:23:45 -07:00
Nick Winter
d55afa77b7 Began streaming a mighty stream. 2014-08-21 16:27:52 -07:00
Nick Winter
28176c7f72 Misc workarounds. 2014-08-20 13:26:48 -07:00
Nick Winter
91db8397a0 Fixed problem with loading levels with no Programmable Thanags, and fixed infinite loops while simulating single games when swapping out Simulators. 2014-08-19 08:09:15 -07:00
Nick Winter
2c6fc67db2 Some simulation and ladder fixes. Preparing Criss-Cross tournament. 2014-08-18 21:49:58 -07:00
Darredevil
1f51eabe48 Added new 'Minimax Tic-Tac-Toe' level 2014-08-18 18:39:16 +03:00
Nick Winter
32c74db282 Merge pull request #1442 from dkundel/master
Fixing most of the issues described in #18
2014-08-15 09:02:15 -07:00
Dominik Kundel
68828b67bb removed console.log 2014-08-15 02:04:46 +02:00
Dominik Kundel
755a86e3d3 moving some styling 2014-08-15 01:56:01 +02:00
Nick Winter
69c22db434 Moved Hero Placeholder replacement logic to Level's denormalizeThang. 2014-08-14 16:35:03 -07:00
Matt Lott
9b79e2ca27 Instrument user code problems 2014-08-14 13:32:00 -07:00
Dominik Kundel
702656ad02 Merge remote-tracking branch 'upstream/master' 2014-08-14 22:30:19 +02:00
Dominik Kundel
b1252a4426 moving the popover for palette entries into the body to fix layering with popover of autocomplete 2014-08-14 22:29:57 +02:00
Darredevil
1b1174d460 Added 'Classic Algorithms' level section 2014-08-12 23:23:43 +03:00
Nick Winter
291b44f0a6 Fix typo introduced in last commit. Like a boss. 2014-08-12 12:56:55 -07:00
Nick Winter
2ab83328f3 Added item editor level preview window. 2014-08-12 12:50:41 -07:00
Nick Winter
023fd40767 Renamed inventory to collectedThangIDs for Collects. #59 2014-08-11 12:52:40 -07:00
Dominik Kundel
d2c63f4b98 fixed undo manager to not remove all code 2014-08-11 21:34:02 +02:00
Dominik Kundel
14f96a7eac Merge remote-tracking branch 'upstream/master' 2014-08-11 15:30:05 +02:00
Nick Winter
d1e26b40c2 I retook the Nick name. 2014-08-10 17:47:18 -07:00
Nick Winter
0074a04cfe Moved Restart into Game Menu. 2014-08-10 17:41:18 -07:00
Nick Winter
45c762fddc Moved multiplayer from modal into Game Menu. Deleted MultiplayerLaunchModal. Updated some i18n. 2014-08-10 17:26:30 -07:00
Nick Winter
dc59aff9d0 Starting skeleton for GameMenuModal and its subviews. 2014-08-08 11:36:41 -07:00
Darredevil
bea6e12a3a Minor name fix 2014-08-08 03:26:13 +03:00
Darredevil
3dfe7987ea Added new level 'QuickSort the Spiral' 2014-08-08 02:04:02 +03:00
Dominik Kundel
84c0fbd01f use shortName as fallback for some entries if no snippet 2014-08-05 11:19:15 +02:00
Nick Winter
3bbdee583d Better problem alert layout for alerts that include hints. 2014-08-04 20:16:12 -07:00
Nick Winter
a0b75ddb8e Put Sky Span up for testing. 2014-08-04 19:46:00 -07:00
Dominik Kundel
f09b3c4792 Merge remote-tracking branch 'upstream/master' 2014-08-04 23:03:28 +02:00
Dominik Kundel
50517431db added support for inserting snippets by shift+click 2014-08-04 23:02:54 +02:00
Dominik Kundel
86eea93e2f merged changes 2014-08-04 22:37:15 +02:00
Ruben Vereecken
39c01c0bcb Finished refactoring of LevelGuideModal (renamed from docs_modal) 2014-07-29 19:50:50 +02:00
Michael Schmatz
7910c5d9cc Implement #1370 2014-07-23 15:10:51 -07:00
Michael Schmatz
c4e3044a81 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-23 14:44:17 -07:00
Michael Schmatz
07cc01332d Merge branch 'pr/1383'
Conflicts:
	app/views/play/level/tome/SpellListTabEntryView.coffee
2014-07-23 14:44:15 -07:00
Nick Winter
26ac94367e Fixed #1372. Minor fixes. 2014-07-23 08:59:42 -07:00
Scott Erickson
beef508e76 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-23 07:09:12 -07:00
Scott Erickson
65375aa5fc Renamed problem and spell to their new, capitalized names. 2014-07-23 07:09:05 -07:00
Scott Erickson
1c3404d03e Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell. 2014-07-23 07:02:45 -07:00
Dominik Kundel
4f6ca5335f fixed spell palette sliding behind HUD 2014-07-23 15:50:47 +02:00
Dominik Kundel
be50927fb6 disabled editor works again 2014-07-23 14:38:12 +02:00
Dominik Kundel
5db634d6a8 fullscreen on keyboard shortcut 2014-07-22 21:47:36 +02:00
Nick Winter
a7905db316 Inferring and documenting cooldown, action/spell name, damage, range, radius, and duration when possible. 2014-07-20 15:51:48 -07:00
Nick Winter
1537754a16 A few bugfixes, plus gigantic child window convenience for me editing levels. 2014-07-19 20:26:13 -07:00
Scott Erickson
97964f7853 More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView. 2014-07-18 17:06:20 -07:00
Scott Erickson
59b723b890 Refactoring View to ModalView. 2014-07-17 17:22:26 -07:00
Scott Erickson
e18b4de583 Refactoring View to CocoView. 2014-07-17 17:20:11 -07:00
Scott Erickson
0e042ee61c Refactoring View to RootView. Refactoring some RootViews to be routed manually. 2014-07-17 17:16:32 -07:00
Nick Winter
6b028513fd Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup. 2014-07-17 15:50:29 -07:00
Nick Winter
42af807e5c Merged in geometry work from #51. 2014-07-16 16:01:37 -07:00
Nick Winter
6e9091fdf0 More fixes to documentation popovers. 2014-07-15 19:25:53 -07:00
Nick Winter
906ab3ac2b Stopped language-excluded docs from showing up undocumented in the 'this' area of the spell palette. 2014-07-15 18:54:55 -07:00
Nick Winter
da73975f20 Fixed #1095. 2014-07-15 09:47:13 -07:00
Nick Winter
3318d4a171 Fixed #1010. 2014-07-15 09:35:14 -07:00
Nick Winter
d7586025d9 Improved behavior of lint/runtime/transpilation problem error alert showing when not in JS mode. 2014-07-14 11:05:59 -07:00
Nick Winter
1a016394fe Starting to show opponent code languages. 2014-07-13 20:19:51 -07:00
Michael Schmatz
2a5a366c12 Made language selection in opponent modal 2014-07-13 17:22:06 -07:00
Nick Winter
6dc2a48b75 Tracking time spent reading initial guides. 2014-07-13 16:07:15 -07:00
Nick Winter
c62f5f3fa0 Skipping docs for language-inappropriate entries in spell palette. 2014-07-11 18:42:55 -07:00
Nick Winter
17ba4bc8a7 Starting to limit some property documentation to specific code languages. Fixed Criss-Cross squares on frame 0. Removed comment box highlighting from the gutter. 2014-07-11 18:07:00 -07:00
Michael Schmatz
fede037e89 Fixed time NaN 2014-07-11 13:55:31 -07:00
Nick Winter
9ee373428f Fixed some schema issues related to snippets and code languages. 2014-07-10 08:31:40 -07:00
Nick Winter
0ed8d2b371 Merged in the full-screen editor, and fixed a spell palette multi-language bug while at it. 2014-07-09 13:41:42 -07:00
Nick Winter
c19a31a58c Fixed some wizard positioning issues in multiplayer. 2014-07-08 18:51:10 -07:00
Scott Erickson
1263d4724a Fixed the title in the gold view to handle when goldEarned isn't available. 2014-07-07 16:56:47 -07:00
Scott Erickson
908772d8fe Fixed an instance where a level loading callback was erroring if called before the surface was built. 2014-07-07 16:44:18 -07:00
Scott Erickson
61e6c8dfc3 Fixed the gold view not showing numbers until the first change. 2014-07-07 16:05:23 -07:00
Scott Erickson
85a6b648a5 Merged conflicts. 2014-07-04 17:54:24 -07:00
Scott Erickson
1ce55e356c Making the ladder tab reload when social network friends load. See #1196. 2014-07-04 17:32:16 -07:00
Tery Lim
9090ce7714 Merge master into branch 2014-07-04 22:37:16 +08:00
Dominik Kundel
004a14ae3c fixed autocomplete issue related to switching the programming language 2014-07-02 20:52:16 +02:00
Tery Lim
618ade4946 Clean up mixed quotes 2014-07-01 12:23:22 +08:00
Nick Winter
802d43651e Exposing Vector z property. Getting ready to use new builtin property documentation. 2014-06-27 00:36:18 -07:00
Nick Winter
d360ecac94 Merged in the language-war branch. 2014-06-25 23:00:03 -07:00
Nick Winter
aee95ac5c0 Improved per-language spell palette and tab documentation. 2014-06-25 22:56:39 -07:00
Nick Winter
8c6ee66684 Better handling of alternate spell palette documentation syntax for other code languages. 2014-06-25 20:19:11 -07:00
Nick Winter
04976a7b14 Working on the Tome displaying the proper syntax for the selected programming language. Fixed #1225. 2014-06-24 21:08:01 -07:00
Nick Winter
dd9b8a0018 Migrating from tileGroupNumber to tileGroupLetter. 2014-06-24 16:32:44 -07:00
Nick Winter
580d002a98 Messing with marks. 2014-06-24 15:45:33 -07:00
Scott Erickson
0363166736 Some tweaks to the guide for the benefit of the criss-cross docs, and hopefully others as well. 2014-06-24 13:23:31 -04:00
Nick Winter
6a31e0bcd3 Fixed bug showing spell palette for languages missing any code snippets. 2014-06-24 10:17:38 -07:00
Nick Winter
815ef88e78 Fixed bugs with camera bobbing with bobbing units and gold views showing up when empty. 2014-06-23 10:36:42 -07:00
Nick Winter
1f29a923cf Fixed playing multiplayer levels without an opponent, against the AI. 2014-06-21 12:24:14 -07:00
Nick Winter
a8f4baebbc Restricted some more analytics. 2014-06-21 09:47:48 -07:00
Nick Winter
dde71485bf A bit of cleanup. 2014-06-20 20:52:50 -07:00
Nick Winter
60ca6e46d3 Ooops, that's a function. 2014-06-20 18:45:57 -07:00
Nick Winter
c9dcc290cb Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes. 2014-06-20 17:19:18 -07:00
Nick Winter
bb8b9b2e93 bid -> makeBid. 2014-06-19 17:27:41 -07:00
Nick Winter
7b59c42f5d Added stupid method argument compilation info for bid(blockNumber) to various Aether compilation steps. 2014-06-19 15:41:35 -07:00
Nick Winter
cf57411b5c Added another logging message for more easily seeing when transpiled code might be misfiring. 2014-06-19 13:42:38 -07:00
Scott Erickson
20589db6be Fixed a bug with logging missing documentation. 2014-06-19 16:15:38 -04:00
Michael Schmatz
51923459e0 Changed autocomplete to on by default 2014-06-19 10:44:44 -07:00
Michael Schmatz
2559a73244 Merge pull request #1186 from dkundel/master
Initial Autocomplete Version
2014-06-19 10:10:26 -07:00
Nick Winter
2e850dba78 Working on home language selection. 2014-06-19 08:06:34 -07:00
Michael Schmatz
548eaefae1 Add debug variable inspection progress bar 2014-06-18 13:43:04 -07:00
Dominik Kundel
d3e0299465 merge conflict solved 2014-06-18 17:59:26 +02:00
Dominik Kundel
f6355b034b integrated autocomplete 2014-06-18 17:57:42 +02:00
Nick Winter
59654da24b Starting more work on integrating additional languages. Improved Component code editing performance with a trusty debounce. 2014-06-17 22:17:44 -07:00
Nick Winter
9a64ca5973 A few misc fixes. 2014-06-16 10:49:20 -07:00
Dominik Kundel
25a0447d77 autocomplete 2014-06-16 14:29:01 +01:00
Dominik Kundel
e756c83d9e preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES 2014-06-13 16:14:31 +01:00
Dominik Kundel
603766b8c5 preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES 2014-06-13 16:12:55 +01:00
Nick Winter
28264d5ace Added tournament results and a way to email them out. 2014-06-12 17:52:08 -07:00
Nick Winter
77920b5416 Improvements to profile views. Added links to players' code. 2014-06-11 19:38:47 -07:00
Scott Erickson
8a728cbb64 More switching of user objects from save to patch. 2014-06-11 14:17:31 -07:00
Scott Erickson
f0cdf6b2e2 Fixed #1111. 2014-06-06 16:47:48 -07:00
Nick Winter
400fddc294 Jade, you're supposed to be so minimalist. But today... Today, I did this. I am sorry. 2014-05-31 22:09:41 -07:00
Nick Winter
f3adc216ed Protecting our replacement of Math.random via Aether. 2014-05-29 12:26:08 -07:00
Nick Winter
c01bd69625 Better recoverability for non-UserCodeProblem errors during world generation. 2014-05-26 18:45:00 -07:00
Nick Winter
ec0027043b Added experimental Io language from Aether. 2014-05-26 08:59:48 -07:00
Nick Winter
3dd362c01e Added support for blaming infinite loops. 2014-05-25 12:15:32 -07:00
Nick Winter
6b554e03ef Merge pull request #1084 from domenukk/feature/step-single-frame
Added shortcut for frame single-stepping
2014-05-25 09:37:13 -07:00
Nick Winter
33408020f1 Merge pull request #1054 from dpen2000/patch-2
Update simulate_tab.coffee
2014-05-25 08:27:54 -07:00
Dominik Maier
f62cd7f38b + added shortcut for frame single-stepping
+ fixed single stepping for frames
2014-05-24 17:31:59 +02:00
Nick Winter
690fbc6919 Fixed a bug with Tome trying to retranspile transpiled code on clone spells when remagicking. 2014-05-23 12:04:42 -07:00
Scott Erickson
bfa90f671d Fixes #940, merging the signup and login modal into a single modal. Created a couple A/B tests for amount of text in the signup modal. 2014-05-22 11:26:08 -07:00
Nick Winter
48f5347075 Fixed gigantor server scoring bug. Cleaned up a bit of logging and error handling. Finished not resetting scores on resubmitting. 2014-05-21 21:56:11 -07:00
Nick Winter
4fc1341a64 Added a way to remove SuperModel resources to fix ladder tab refreshing. 2014-05-21 15:33:28 -07:00
Scott Erickson
037dbe97c6 Some remaining work to get the delayed show guide script set up. 2014-05-21 14:50:27 -07:00
dpen2000
ce661a5493 Update simulate_tab.coffee
Add back in current user to nearby simulators
2014-05-21 15:06:52 +01:00
Nick Winter
88ef5ffe93 Prevent default ACE go-to-line alert when pressing Ctrl/Cmd+L. 2014-05-20 15:24:57 -07:00
Scott Erickson
93c6f72f07 Asynchronously building things again. 2014-05-20 10:49:19 -07:00
Nick Winter
a04130f26a Fixed a bug with ladder tab not reloading. 2014-05-20 10:40:15 -07:00
Nick Winter
248cec1e6e Transpile code properly. 2014-05-20 08:23:25 -07:00
Nick Winter
d058b16283 Fixed some memory leaks. 2014-05-20 08:00:49 -07:00
Scott Erickson
04da5b4714 Fixed thang avatar view thang loading some more. 2014-05-19 23:02:02 -07:00
Scott Erickson
042fd7ac0d Made the guide, when it shows up the first time, only show the first doc. 2014-05-19 22:25:40 -07:00
Nick Winter
b6406b9b0e Put some tournament details in there. Muted some extra casting sounds during level load. 2014-05-19 21:56:20 -07:00
Scott Erickson
b816055f9e Fixed goal states to handle teams. 2014-05-19 21:55:30 -07:00
Nick Winter
39178daff6 Trying to show loading ready and initialize the Surface earlier. 2014-05-19 20:49:17 -07:00
Nick Winter
341097c5ca A couple improvements for the LadderSubmissionView. 2014-05-19 19:51:24 -07:00
Nick Winter
116965fcdc Rules wording tweaks; highlighting new matches and end of ranking with sounds. 2014-05-19 19:13:36 -07:00
Nick Winter
af31bcf008 Fleshed out tournament prizes tab. 2014-05-19 17:40:06 -07:00
Scott Erickson
b410d91203 Cleaned up the LevelView, organizing it so that initialization code roughly runs in order, and set it up so that the ScriptManager is created earlier. 2014-05-19 17:10:41 -07:00
Scott Erickson
62ad8dd26a Added a status message to the goals view. 2014-05-19 16:36:45 -07:00
Nick Winter
8a5a45950f Simulator now pleads for you to help simulate when your match is being ranked. 2014-05-19 14:59:47 -07:00
Nick Winter
68a4483e91 Moved views/play/ladder_view to views/play/ladder/ladder_view and made a new views/play/ladder_home_view. 2014-05-19 11:58:53 -07:00
Scott Erickson
179702b0eb Set up the goals view to be more hidden by default, and shows up on mouse hover. 2014-05-19 11:31:18 -07:00
Nick Winter
b89615cea4 Added helpful keyboard shortcuts modal. 2014-05-19 10:08:34 -07:00
Michael Schmatz
38d732d8bc Disable hover debugger when spell changed 2014-05-18 11:51:31 -07:00
Michael Schmatz
5c72ccdce1 Add support for Aether globals in hover debugger 2014-05-18 11:41:42 -07:00
Nick Winter
3c9428ffd3 Refactored game ranking buttons into a LadderSubmissionView. 2014-05-17 11:55:51 -07:00
Nick Winter
736fc8c12f Remove overeager transpile problem showing for JS again. 2014-05-17 09:58:35 -07:00
Nick Winter
418c2f1a2c Preserve original scripts; don't overwrite with nothing if new world finishes before script initialization. 2014-05-16 17:38:33 -07:00
Nick Winter
f64e50f85b Recording flow only for frame of interest. 2014-05-16 16:52:55 -07:00
Michael Schmatz
891471b80a Add time to hover debugger 2014-05-16 16:04:10 -07:00
Michael Schmatz
21ccaa2d8a Adjust histogram height downwards
Make room for ranking text
2014-05-16 13:33:41 -07:00
Michael Schmatz
ab1b0cac42 Added "Rank your session" message 2014-05-16 13:30:55 -07:00
Michael Schmatz
bd1261802d Fix rank for unranked sessions on ladder histogram 2014-05-16 13:27:42 -07:00
Michael Schmatz
934c853789 Live simulation count and fixed double simulator leaderboard session 2014-05-16 13:16:35 -07:00
Michael Schmatz
60342cc40e Hover debugger optimization for "this" 2014-05-16 10:19:36 -07:00
Michael Schmatz
206d63231e Fixed teamSpells instantiation 2014-05-16 09:47:15 -07:00
Nick Winter
7811bda6c3 Use ace/mdoe/python for Python instead of ace/mode/lua. 2014-05-16 08:55:59 -07:00
Nick Winter
cff00f90b5 Stopped bug with useTranspiledCode; it will need more work later to get right. 2014-05-15 21:53:23 -07:00
Nick Winter
c7ca081df9 Merged ProblemAlertView fixes. 2014-05-15 15:36:06 -07:00
Nick Winter
c2a7530b62 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-15 15:35:08 -07:00
Michael Schmatz
0bb1422d6c Switch spectate and level view to use transpiled code 2014-05-15 15:18:17 -07:00
Nick Winter
763e0500b2 Tracking simulator clicks. 2014-05-15 15:10:50 -07:00
Nick Winter
b973b749c0 Merged. 2014-05-15 14:57:24 -07:00
Nick Winter
8909d218bc Moved random seed initialization to Existence System, where it can be configured. 2014-05-15 14:54:31 -07:00
Vicky Chijwani
0a14681e7b Correctly parse multi-line error messages in the editor. 2014-05-16 01:41:26 +05:30
Nick Winter
c1f9d51b37 Added times to runtime errors. Don't load ThangTypes for Thangs that don't exist on the first frame of the world. 2014-05-15 11:27:51 -07:00
Michael Schmatz
338b613074 Added transpiledCode to victory modal 2014-05-15 09:30:59 -07:00
Nick Winter
dbcafbb29b Working on level-specific coding languages, with non-writable code in JavaScript. 2014-05-14 21:54:36 -07:00
Nick Winter
dd1acb94ed Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-14 16:06:09 -07:00
Nick Winter
c420209a6b Improved GoldView tooltip. 2014-05-14 16:06:00 -07:00
Michael Schmatz
f32a0ca963 Added transpile to in-game rank button 2014-05-14 15:45:38 -07:00
Nick Winter
d61922ae42 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-14 15:31:19 -07:00
Nick Winter
cc7808251f Zoom/scroll, ModelModal, and coordinate grabber fixes. 2014-05-14 15:29:55 -07:00
Scott Erickson
7a381df348 Merge branch 'feature/thangload' 2014-05-14 11:48:19 -07:00
Michael Schmatz
a1360d6cb8 Include transpiled code in submission process 2014-05-14 11:42:15 -07:00
Scott Erickson
0be813e424 Figured out how to get the world to properly get shown if the world is created before the level loader is completely finished. 2014-05-14 10:35:16 -07:00
Scott Erickson
cab1adf8fc Merge branch 'master' into feature/thangload 2014-05-14 09:31:59 -07:00
Scott Erickson
4b404ae124 Finished tuning the supermodel loading and progress. 2014-05-13 14:39:45 -07:00
Nick Winter
53870a89a5 Python allowed, and better support for transpile errors. 2014-05-13 11:04:04 -07:00
Scott Erickson
66af855497 Merge branch 'master' into feature/thangload 2014-05-13 10:27:10 -07:00
Scott Erickson
1d88b6eefe Most of the way there getting it to work with loading thang types dynamically throughout the play view. 2014-05-13 10:26:33 -07:00
Nick Winter
69dc96c7c8 Fixed Rank My Game on my matches. 2014-05-12 19:56:12 -07:00
Nick Winter
802889d115 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-12 13:28:51 -07:00
Nick Winter
1a5e30d5b5 Dynamic Canvas sizing. 2014-05-12 13:28:46 -07:00
Michael Schmatz
687872a97b Moved debug cache onto main thread
UI responsiveness greatly improved
2014-05-12 11:16:02 -07:00
Nick Winter
1aa72541ff Merged master into feature/thangload. 2014-05-12 09:57:31 -07:00
Nick Winter
0b5854765a Adding Clojure and Lua as choosable languages. 2014-05-11 22:51:44 -07:00
Nick Winter
74ef9bc987 Experimental support for preloading worlds when we would have autocast if manual cast is on. 2014-05-11 17:42:32 -07:00
Nick Winter
1e18f0b42f Merged God and Buddha, split out Angels, did a huge refactoring, fixed many bugs, and laid groundwork for preloading Worlds. 2014-05-10 18:24:50 -07:00
Nick Winter
df88be1ab1 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-09 15:07:55 -07:00
Nick Winter
6040d3b225 Shouldn't use much CPU when totally paused on Surface. 2014-05-09 15:07:30 -07:00
Michael Schmatz
1bbd4e6c68 Fixed frame-related bug 2014-05-09 15:05:50 -07:00
Nick Winter
589410ed8e Merged master into feature/thangload. 2014-05-09 12:56:58 -07:00
Nick Winter
c4819c647c Removed includeeFlow, since we're going to do it lazily with the debug worker. 2014-05-09 09:29:50 -07:00
Nick Winter
3819778bee Updating everything to Aether 0.2.0. 2014-05-08 11:43:00 -07:00
Michael Schmatz
7110f023f2 Merge branch 'feature/hover-debugger-performance'
Conflicts:
	app/lib/God.coffee
	app/views/play/level/tome/spell_debug_view.coffee
2014-05-07 11:37:03 -07:00
Michael Schmatz
806b159aab Fixed another off-by-one error 2014-05-07 10:20:22 -07:00
Michael Schmatz
6fd89f10b9 Fixed various debugger UI bugs 2014-05-07 10:03:49 -07:00
Michael Schmatz
da575f8945 Refactored hover debugger is functional
Still needs optimizations and a few bug fixes, but it’s better than the
existing code existing to Nick
2014-05-06 15:07:06 -07:00
Nick Winter
ca8d5c1f3b Stop bobbing and more marks when world ended. 2014-05-06 11:02:53 -07:00
Michael Schmatz
dddd617a08 userCodeMap issues fixed
Now beginning hooking up the UI
2014-05-06 10:06:32 -07:00
Nick Winter
2e6bec5454 Some fixes for my accidental merge of #970. 2014-05-06 09:49:04 -07:00
Nick Winter
1f3cc8a004 Merge branch 'master' of git://github.com/domenukk/codecombat 2014-05-06 08:00:39 -07:00
Dominik Maier
6d244e8560 + Merged Simulators 2014-05-06 05:07:34 +02:00
Dominik Maier
c9bb488794 Created headless-client and an alternative implementation of god 2014-05-06 02:37:14 +02:00
Nick Winter
0e0ca785d9 Moved ready-to-rank logic to LevelSession where it can be shared across victory and multiplayer modals and My Matches tab. 2014-05-05 16:59:12 -07:00
Nick Winter
82529c781b Fixed some ladder home links. 2014-05-05 15:33:08 -07:00
Nick Winter
b6a53a83e7 Fixed issue with play button not turning into rewind. 2014-05-03 13:26:37 -07:00
Nick Winter
73222a1a98 Don't start drawing Surface until needed. 2014-05-03 09:13:26 -07:00
Scott Erickson
db9a82d58a Merge branch 'feature/thangload' of https://github.com/codecombat/codecombat into feature/thangload 2014-05-02 17:03:53 -07:00
Scott Erickson
aee90c72bb Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel. 2014-05-02 17:03:30 -07:00
Nick Winter
afbe5b063b Fix HTML icon syntax in the Markdown. 2014-05-02 15:51:07 -07:00
Nick Winter
a04f74de8b Implemented George's gold design. 2014-05-02 15:12:30 -07:00
Nick Winter
d54149d0f3 Reworked LevelView loading priorities to try to get world simulating earlier. 2014-05-02 12:32:41 -07:00
Scott Erickson
2952d7702c Merge branch 'master' into feature/thangload
Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee
2014-05-02 08:20:03 -07:00
Scott Erickson
92687b17de Merge branch 'master' into feature/thangload
Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee
2014-05-02 08:19:47 -07:00
Nick Winter
9f18811701 Fixed logic for displaying runtime errors from last run based on code being the same as last cast. 2014-05-01 17:41:06 -07:00
Scott Erickson
26cafd2f19 Fixed #941. Actually it was no longer crashing probably because of the fix for #934, but there were still other bugs. Fixed it, and other bugs like it, particularly in the spectate view. Cleaned up a bit, too. 2014-05-01 16:38:27 -07:00
Nick Winter
5376a42f94 Fixed serialization of tracked property arrays. 2014-05-01 13:23:14 -07:00
Nick Winter
bebe5a0620 Improved hover debugger tokenization specificity to not extend past end of line. 2014-05-01 11:18:20 -07:00
Nick Winter
eca35ce371 Several minor bugfixes, and enabled API protection on all levels by default. 2014-04-29 15:25:59 -07:00
Nick Winter
40fbf336c2 Using new level loading sound. 2014-04-28 17:59:02 -07:00
Nick Winter
bd3c059c2a Several performance improvements based on profiling. 2014-04-28 16:31:51 -07:00
Scott Erickson
b9f4093b08 Set up the LevelLoader to load names instead of whole ThangTypes. 2014-04-28 14:58:58 -07:00
Nick Winter
7e16fa5bd6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-28 14:01:43 -07:00
Nick Winter
6d75b5593a Fixed bug with pointer animation. 2014-04-28 14:01:33 -07:00
Scott Erickson
3a28f190a1 Merge branch 'master' into feature/loading-views 2014-04-28 11:55:17 -07:00
Scott Erickson
02a74ae40c Migrated and fixed the rest of the views using the new loading system. 2014-04-28 11:52:04 -07:00
Nick Winter
4a2f2700bc Don't show tutorial level link if tutorial level doesn't exist for a ladder level. 2014-04-28 10:54:03 -07:00
Scott Erickson
17a0bf54c6 Merge branch 'master' into feature/loading-views 2014-04-28 10:10:57 -07:00
Nick Winter
a7179ae3b2 Fixed some more gold view stuff. 2014-04-27 15:33:16 -07:00
Nick Winter
2ec225b0d0 Enabled API protection for Find the Spy. 2014-04-27 14:30:32 -07:00
Nick Winter
dac4f05fd9 Improved legibility of gold font. Moved Done button to not conflict with gold display. 2014-04-27 14:19:39 -07:00
Nick Winter
fa0e7f04f7 Fixed a thing. 2014-04-26 14:21:26 -07:00
Scott Erickson
fed5d681f2 Merge branch 'master' into feature/loading-views 2014-04-26 12:54:37 -07:00
Nick Winter
834c27bbd7 Show spell palette for Thangs with apiProperties that aren't programmable. 2014-04-25 16:57:42 -07:00
Scott Erickson
6cd7c723d8 Fixed up showing errors, made sure they work with the play view. 2014-04-25 15:31:38 -07:00
Nick Winter
d8d2a57c38 Listed a few new levels. 2014-04-25 15:00:46 -07:00
Scott Erickson
3dc3f62473 Merge branch 'master' into feature/loading-views
Conflicts:
	app/views/editor/components/main.coffee
2014-04-25 14:31:58 -07:00
Scott Erickson
278d6752c3 Refactored SuperModel, CocoModel and LevelLoader.
Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader.
Simplified SuperModel.
2014-04-25 14:30:06 -07:00
Nick Winter
8a42521cd0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 14:31:54 -07:00
Nick Winter
2a2ddd068e Separate isSelectable from inThangList. Mouse wheel all the way in/out. bountyGold shows up as gold. Moved say Labels to mouth offset from aboveHead offset and obey sprite rotation. Don't link projects to example.com. 2014-04-24 14:23:15 -07:00
Scott Erickson
b7cb4696f0 Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection 2014-04-24 13:31:29 -07:00
Nick Winter
b9173a5ea5 Fixed #913, I think. (This was just built into marked.) 2014-04-24 12:24:22 -07:00
Michael Schmatz
c408196814 Fix for runtime errors 2014-04-23 16:44:31 -07:00
Nick Winter
86aa4cd0fe Updated janky include_flow skip levels. 2014-04-23 16:11:47 -07:00
edtrist
3962d37681 #889 - moved CocoCollection.coffee to app/collections and updated references 2014-04-22 20:42:26 +01:00
Michael Schmatz
7419b269f1 Merge pull request #894 from codecombat/feature/worker-lint
Background linting/transpilation/hasChangedSignificantly
2014-04-22 12:05:03 -07:00
Michael Schmatz
6122d31e28 Removed web worker logging listener 2014-04-22 12:03:33 -07:00
Michael Schmatz
3110e6e56a Renamed test_worker to aether_worker 2014-04-22 11:58:27 -07:00
Michael Schmatz
392dbb9f8d Removed superfluous comment 2014-04-22 11:51:51 -07:00