codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 18:15:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
1905 commits 27 branches 0 tags 134 MiB
Commit graph

562 commits

Author SHA1 Message Date
Scott Erickson
d12b923eaf Made a casting progress bar on the canvas to test vs having it shown in the cast button. 2014-02-28 11:05:41 -08:00
Tay Yang Shun
8af62d53cd Redirect to level editor only after modal hidden event is triggered. Fixes #438. 2014-03-01 01:55:30 +08:00
Nick Winter
aef1bc63ba Smarter infinite loop detection vs. web-worker-is-still-loading detection. 2014-02-27 20:01:27 -08:00
Scott Erickson
df196cc531 Modals now stop the level from starting until they close. 2014-02-27 16:44:11 -08:00
Scott Erickson
7c734d6bc9 Added an async name checker for the wizard settings modal. 2014-02-27 14:42:11 -08:00
Scott Erickson
b31527abef Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-27 14:08:04 -08:00
Scott Erickson
02cb9155c0 Improved a bunch of things with the wizard settings view. 2014-02-27 12:25:59 -08:00
Scott Erickson
f991bc3a58 Removed some vestigial wizard coloring code from the settings account view. 2014-02-27 12:02:08 -08:00
Michael Schmatz
5d2c430779 Merge pull request #435 from yangshun/editor-modal-input-focus 
Auto-focus on the modal's input field for creation of new entities in editor.
 2014-02-27 09:21:09 -08:00
Tay Yang Shun
d2a6b3822e Re-added submit form event 2014-02-28 01:17:19 +08:00
Michael Schmatz
53a317df77 Merge pull request #434 from yangshun/play-button 
Deferred saving of latest level
 2014-02-27 09:07:27 -08:00
Michael Schmatz
9deadad99f Merge pull request #427 from yangshun/music-button 
Blur the music button after click so that subsequent space and enter keydown events do not trigger it.
 2014-02-27 09:06:18 -08:00
Tay Yang Shun
57f896b950 Added newline to end of file. 2014-02-27 15:38:03 +08:00
Tay Yang Shun
947b8766c2 Auto-focus on the modal's input field for creation of new entities in editor. Fixes issue #379 2014-02-27 15:32:18 +08:00
Tay Yang Shun
04895a9204 Merge branch 'master' into play-button 2014-02-27 14:09:37 +08:00
Tay Yang Shun
514fe358c1 Trigger storage of latest level only after the level is guaranteed to be able to load 2014-02-27 14:08:25 +08:00
Scott Erickson
74186b7772 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-26 19:30:49 -08:00
Scott Erickson
ec7028af60 Fixed uploading images for articles. 2014-02-26 19:30:37 -08:00
Nick Winter
c26995a3a9 Home button on ladder level goes to ladder. 2014-02-26 18:58:25 -08:00
Nick Winter
48122000ed Gold shows up as an int in the HUD now. 2014-02-26 18:09:09 -08:00
Nick Winter
0cf20b577d Added a delay to the property documentation on spell debug hover. 2014-02-26 17:23:59 -08:00
Nick Winter
172242d226 Re-denormalize session if things have changed. Removed some logs. 2014-02-26 17:06:21 -08:00
Scott Erickson
0fd1c03b7f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-26 15:56:25 -08:00
Scott Erickson
ea73d91a6b Made the docs modal larger. 2014-02-26 15:44:46 -08:00
Michael Schmatz
b648098c95 Implemented espionage mode 2014-02-26 14:14:43 -08:00
Tay Yang Shun
b48a9fabc6 Blur the music button after click so that subsequent space and enter keydown events do not trigger it. Fixes issue #306. 2014-02-27 02:42:25 +08:00
Scott Erickson
f89768d76d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-25 17:15:01 -08:00
Scott Erickson
02d1dc2445 Added a screen for when playback ends. 2014-02-25 17:14:39 -08:00
Nick Winter
3c5902a1d2 Trying to get session code merging to work again. 2014-02-25 14:46:48 -08:00
Nick Winter
b86c32c3e2 Merge pull request #422 from yangshun/level-not-found 
Redirect to play page for non-existent levels. Fixes issue #396
 2014-02-25 14:17:44 -08:00
Tay Yang Shun
373a618cff Moved internationalisation of level load error message into template file 2014-02-26 06:14:29 +08:00
Tay Yang Shun
11c5f7419a Used internationalised strings for level not found message 2014-02-26 05:54:33 +08:00
Tay Yang Shun
8a24407d3e Redirect to play page for non-existent levels. Fixes issue #396 2014-02-26 04:59:35 +08:00
Scott Erickson
1b4699556a Fixed a bug where sometimes new worlds would hide the hud speaker unnecessarily. 2014-02-25 12:39:22 -08:00
Nick Winter
a440c4dff0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-25 10:48:33 -08:00
Nick Winter
0380a30522 Fixes for not storing default code in other sessions. sass-brunch 1.8. Removed tutorial link for now. Round wizards. 2014-02-25 10:48:23 -08:00
Scott Erickson
168f268d21 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 19:49:12 -08:00
Scott Erickson
242342315f Can now drag the mouse to move around the map. 2014-02-24 19:49:05 -08:00
Nick Winter
3472b3da97 Working on different shadow shapes. Fixed bug with palette property ownership. 2014-02-24 17:53:35 -08:00
Scott Erickson
7f738562e9 Fixed a playback bug where if you clicked the scrubber while playing, it would continue playing instead of pausing properly. 2014-02-24 16:53:55 -08:00
Nick Winter
ab8d63f545 Improved grouping of palette properties. 2014-02-24 15:48:30 -08:00
Scott Erickson
34205a0789 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 14:58:02 -08:00
Nick Winter
32c45b80a9 Fixed performance problem with duplicate user code problem annotations. 2014-02-24 14:12:41 -08:00
Scott Erickson
e48bdfa1a7 Added your score to the ladder/team view. 2014-02-24 13:03:04 -08:00
Scott Erickson
43a49b3e6f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 12:52:43 -08:00
Scott Erickson
77f923752f Fixed #411. 2014-02-24 12:52:35 -08:00
Nick Winter
21975bedd2 Fixed #408. 2014-02-24 11:21:51 -08:00
Nick Winter
10e10aa961 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 09:58:15 -08:00
Nick Winter
91412ccd69 Playback and level editor shortcut tweaks. 2014-02-24 09:58:12 -08:00
Scott Erickson
d146febb32 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 09:47:20 -08:00
Scott Erickson
3f0f391556 Finished up work on the wizard settings modal. 2014-02-24 09:46:40 -08:00
Scott Erickson
2d6dd36a68 Saturation and lightness was flipped on the spritebuilder. Fixed. 2014-02-24 09:06:22 -08:00
Nick Winter
af43f18c23 Fixed selective includeFlow. 2014-02-24 08:59:50 -08:00
Nick Winter
af965ccb93 Fixes for ThangListEntryView popover hover states. 2014-02-23 17:11:27 -08:00
Nick Winter
933bcf9e6b Showing property documentation when hovering in code in addition to clicking on palette entries. 2014-02-23 16:34:03 -08:00
Nick Winter
68497b2cf3 Added arg names or ... for functions which take arguments in spell palette entries. 2014-02-23 13:27:02 -08:00
Nick Winter
5b88b58a75 Fixed application of a few i18n tags in wizard/picture settings. 2014-02-23 12:31:41 -08:00
Nick Winter
11f742ff0f Included Hour of Code explanation in play footer. 2014-02-23 11:48:34 -08:00
Nick Winter
60eb0db1aa A few fixes for IE, anonymous errors, and cast button overflow. 2014-02-23 11:23:26 -08:00
Nick Winter
0a334b310f Merge pull request #398 from jmr0/master 
fixing language selection disappearance when showing cached home view
 2014-02-23 08:32:27 -08:00
jmr0
f00d9b2acc changing showDiplomatSuggestionModal function name and moving language build call to it from afterRender 2014-02-22 21:06:37 -05:00
Nick Winter
43c1240a03 Fixed cast button moving around due to anticipated errors early. 2014-02-22 18:02:58 -08:00
Nick Winter
c21952646a Stop cast button progress overlay before cast settings gear. 2014-02-22 17:50:45 -08:00
Nick Winter
8565e3f315 Adding the button, not just the shortcut, for beautification. 2014-02-22 17:18:58 -08:00
Nick Winter
9eb8bb97f5 Trying out a Ctrl+Shift+B code beautifier option. 2014-02-22 16:58:54 -08:00
jmr0
1562b02fd1 still need this for rendering after a language switch 2014-02-22 19:32:43 -05:00
jmr0
34df232d4f fixing language selection disappearance when showing cached home view 2014-02-22 19:32:43 -05:00
Nick Winter
b3009ae909 Fixed #7 with a nice cast-end sound (just reverse of cast sound). 2014-02-22 15:26:38 -08:00
Nick Winter
702eca5c81 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-22 12:04:10 -08:00
Nick Winter
72cfcf96ed Added basic opponent wizard. Disabled synchronous multiplayer for ladder levels. 2014-02-22 12:01:05 -08:00
Scott Erickson
5c85f227c6 Removed the hover playback control. 2014-02-21 17:11:16 -08:00
Nick Winter
26f11f40a9 Fix for destroying level. 2014-02-20 17:21:15 -08:00
Nick Winter
4e5ecb0c9e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 17:21:03 -08:00
Scott Erickson
bf80b806c6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 17:06:25 -08:00
Scott Erickson
da0238ceba Switched the level view to grab opponent code from submittedCode instead of code. 2014-02-20 16:53:08 -08:00
Nick Winter
06f1e284c9 Added comment highlighting icon. 2014-02-20 16:14:31 -08:00
Nick Winter
edcb7f45b6 Merge pull request #395 from tips48/master 
Block Ctrl-S while playing
 2014-02-20 15:29:16 -08:00
Scott Erickson
d9b86b84dc Fixed a bug with the coloring of avatars in the hud. 2014-02-20 15:13:15 -08:00
Aidan Matzko
e3ab7a4d7e Block Ctrl-S while playing 2014-02-20 18:11:20 -05:00
Nick Winter
3c651abe20 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 14:05:37 -08:00
Nick Winter
97b6094fe8 Tweaks for ladder views. 2014-02-20 13:58:35 -08:00
Nick Winter
284576521f Added fullscreen toggle to play with. 2014-02-20 13:19:49 -08:00
Scott Erickson
5cefb8fc30 Merge branch 'production' 2014-02-20 11:47:02 -08:00
Michael Schmatz
a2b811d52f Added visual feedback for simulation buttons 2014-02-20 10:40:19 -08:00
Nick Winter
bce184b9da Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 10:39:19 -08:00
Nick Winter
f81e0c85ef Fixes for popover behavior. 2014-02-20 10:39:16 -08:00
Michael Schmatz
cb0c22f0c9 Replaced rank button with button going to ladder page 2014-02-20 10:14:25 -08:00
Michael Schmatz
7c5192820f Put more security on the session submissions and improved simulation status rendering 2014-02-20 09:44:44 -08:00
Michael Schmatz
e593fd23b4 Improved interface for simulating games 2014-02-20 08:06:14 -08:00
Nick Winter
f85a55c8b7 Cast -> Cast Spell 2014-02-19 18:20:21 -08:00
Nick Winter
7c2960f2ce Improved visibility of cast button progress overlay. 2014-02-19 18:04:37 -08:00
Nick Winter
0469c918db Make dead dudes look deader. Eagerly destroy ThangListEntryView popovers, Highlander-style. Announce eternal brunch. 2014-02-19 17:02:39 -08:00
Nick Winter
01374d63c4 Better comment formatting. Manual cast by default on Project DotA. 2014-02-19 14:00:54 -08:00
Scott Erickson
26af051cca Set up indie sprites and their avatars to use the new colorConfig property. 2014-02-19 13:43:44 -08:00
Scott Erickson
613e7848dc Fixed a bug with the setting of opposing team spells, not to modify anything when there are no specified teams. 2014-02-19 11:45:29 -08:00
Scott Erickson
86f94cb5fd Refactored dynamic sound loading to the level view, since the level loader is no longer in service after finishing loading. 2014-02-19 11:42:33 -08:00
Scott Erickson
e85f5c7e6b Fixed modals not being able to be opened after restarting the level when no scripts are running. 2014-02-19 11:15:36 -08:00
Scott Erickson
0bf772d745 Changing the files view to replace files when there are name collisions. 2014-02-19 10:55:15 -08:00
Scott Erickson
ece08ba366 Fixed the matches order on the ladder team page. 2014-02-19 08:19:13 -08:00
Nick Winter
a8794f4e7e Merged 2014-02-18 12:55:18 -08:00
Nick Winter
1c82fc5bb0 Fix for opponent teams not working. 2014-02-18 12:54:47 -08:00
Scott Erickson
27fb2ec37d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-18 12:27:56 -08:00
Scott Erickson
f383e5b9fa Fixes for the ladder team view. 2014-02-18 12:27:10 -08:00
Nick Winter
f54fcfe6c0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-18 11:49:15 -08:00
Nick Winter
636b1bb30d Fixed home wizard scale. 2014-02-18 11:48:36 -08:00
Scott Erickson
5a436ce10b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-18 11:41:29 -08:00
Scott Erickson
d2d2099c4a Fixing a bug with the tome problem view. 2014-02-18 11:39:11 -08:00
Scott Erickson
cacf6539c1 Working on the ladder and team views. 2014-02-18 11:38:49 -08:00
Nick Winter
9cdc07d07c Fixed spell palette doc duplication. 2014-02-18 11:23:01 -08:00
Nick Winter
d45f67a8c3 Fixed some popover and modal layout and bugs. 2014-02-18 10:03:57 -08:00
Scott Erickson
452a43cae9 Working on the ladder and team views. 2014-02-17 17:42:41 -08:00
Nick Winter
6f0ed9040a Fixes for dirt path, fast portraits, and slow transpilation. Starting to move Aether stuff into a Tome worker with Catiline. 2014-02-17 17:38:49 -08:00
Nick Winter
2c41d403bc Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-16 15:30:07 -08:00
Nick Winter
e3824d7698 Many improvements to the spell palette. 2014-02-16 15:30:00 -08:00
Scott Erickson
bbe5399a97 Fixed #370 2014-02-16 12:51:20 -08:00
Scott Erickson
5bbe829586 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-15 17:36:40 -08:00
Scott Erickson
be83b5420f Fixed the goals view, which wasn't being properly shown. 2014-02-15 17:36:27 -08:00
Nick Winter
f3b58a9416 Merged. 2014-02-15 15:45:53 -08:00
Nick Winter
3c7cac8ba9 Trying to do some memory cleanup. 2014-02-15 15:44:45 -08:00
Scott Erickson
72712a349c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-15 12:07:28 -08:00
Scott Erickson
663a09ed4b Spell list updates based on the existence of thangs now. 2014-02-15 09:22:13 -08:00
Michael Schmatz
c418e282ae Put in pairwise simulation button 2014-02-14 16:53:37 -08:00
Nick Winter
fdf1e21e72 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-14 16:52:54 -08:00
Nick Winter
50f683534f Support for seeing this.now() in spell palette. 2014-02-14 16:52:50 -08:00
Scott Erickson
597ace25cc Fixed the spell list tab entry view popover to not popover when using the dropdown. 2014-02-14 16:08:01 -08:00
Scott Erickson
a25b1be916 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-14 15:57:54 -08:00
Michael Schmatz
63a5769bcf Fixed various bugs in simulator and put in home view 2014-02-14 15:50:42 -08:00
Scott Erickson
7faa401177 Trying to improve memory by clearing out all properties of destroyed objects. 2014-02-14 13:31:26 -08:00
Scott Erickson
1349a59084 Refactored destroy functions to have super be the last thing. 2014-02-14 10:57:47 -08:00
Scott Erickson
693fa06afb Fixed a bug in the competitor code session setting when the player has no code yet. 2014-02-14 10:38:20 -08:00
Nick Winter
da866a418c Fixed cast options clicking. 2014-02-13 17:43:42 -08:00
Michael Schmatz
db0695513e Implemented reverse sorting of backbone collection 2014-02-13 17:30:59 -08:00
Michael Schmatz
6011ac0df4 Changed subscription frequency to prevent multiple score registrations 2014-02-13 17:19:43 -08:00
Michael Schmatz
ca7376b794 Worked around mongoose toObject 
Also tried elementary memory leak fix
 2014-02-13 17:10:01 -08:00
Scott Erickson
4001d1c7fe Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-13 16:42:49 -08:00
Scott Erickson
476cc87628 Set up the ladder to be able to compete against other sessions. 2014-02-13 16:42:35 -08:00
Nick Winter
9a835ffc0a Re-enabled spell tab entry docs. 2014-02-13 16:09:32 -08:00
Michael Schmatz
d33c39c21e Added continuous simulation and fix for "no team" 2014-02-13 15:59:40 -08:00
Scott Erickson
8775e86161 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-13 15:54:01 -08:00
Scott Erickson
97b4e7661d Level loader now loads session based on the team property in the url. 2014-02-13 15:51:41 -08:00
Scott Erickson
9327d420bc Fixed a bug. 2014-02-13 15:51:18 -08:00
Michael Schmatz
d6e99273bc Quick fix for team not being detected 2014-02-13 15:42:00 -08:00
Michael Schmatz
ad0590f9ba Merged in Scott's changes manually 2014-02-13 15:14:10 -08:00
Scott Erickson
1d3e013cc6 Merge remote-tracking branch 'origin/master' 
Conflicts:
	app/views/play/ladder_view.coffee
 2014-02-13 15:11:11 -08:00
Scott Erickson
32337df156 Trimmed down the ladder view for now. 2014-02-13 15:09:40 -08:00
Michael Schmatz
480de71eb6 Leaderboard is starting to work 2014-02-13 15:02:49 -08:00
Michael Schmatz
40c26bb395 Scoring queues mostly working 2014-02-13 12:59:24 -08:00
Nick Winter
aa282c3a35 Updates for formatting palette docs. 2014-02-13 11:18:20 -08:00
Scott Erickson
2b742da9e4 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-13 10:38:43 -08:00
Michael Schmatz
14530b779a Refactored scoring submissions, added beginnings of spectator view 2014-02-13 10:37:44 -08:00
Scott Erickson
2e280fad6b Set up the multiplayer modal with a submit button for the ladder queue. 2014-02-13 10:16:27 -08:00
Nick Winter
9ac0939bb8 Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again. 2014-02-13 09:26:21 -08:00
Nick Winter
adaedc240c Fixed cast button click bug. 2014-02-12 20:45:29 -08:00
Nick Winter
04abe36837 Don't need that Docs import. 2014-02-12 20:36:17 -08:00
Nick Winter
8a80b9770d More work on docs. Got rid of Docs.coffee. 2014-02-12 18:54:45 -08:00
Nick Winter
d2345432ff Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-12 16:42:31 -08:00
Nick Winter
dc8c4394e1 Spell palette entries now using property docs from components. 2014-02-12 16:42:09 -08:00
Scott Erickson
8176e2258f Set up the goal manager to use goals from the new level goals property, rather than from scripts. Backward-compatible for now. 2014-02-12 16:20:25 -08:00
Scott Erickson
f3489a6c2f Added a 'stop' button for viewing end animations on thang types. 2014-02-12 16:18:25 -08:00
Nick Winter
b7be08ac19 Fixed one more leak. 2014-02-12 13:43:17 -08:00
Nick Winter
cdf268ce4f Merged. 2014-02-12 13:10:58 -08:00
Nick Winter
5655084981 Fixed a ton more leaks. 2014-02-12 12:41:41 -08:00
Scott Erickson
2f48925e86 Added a list of goals as a property to levels for when they won't be added by scripts. Set up the editor to be able to edit these values. 2014-02-12 12:27:02 -08:00
Scott Erickson
59f0d8a93e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-12 09:55:35 -08:00
Michael Schmatz
1a2fa68473 Merge branch 'feature/task-queue' 
Conflicts:
	app/views/play/level/tome/spell.coffee
 2014-02-11 15:58:38 -08:00
Scott Erickson
71b6ebf8eb More memory fixes. 2014-02-11 15:47:59 -08:00
Michael Schmatz
76b949ac1e Various changes before merge 2014-02-11 15:47:06 -08:00
Scott Erickson
d9f4594c9f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 15:39:02 -08:00
Scott Erickson
ac49e5eec1 More memory fixes. 2014-02-11 15:38:36 -08:00
Michael Schmatz
b29ab56fe2 Fixed simulation goals 2014-02-11 15:26:57 -08:00
Nick Winter
c29e4d6c9c Stupid casting sound effect. 2014-02-11 15:05:54 -08:00
Scott Erickson
2a19da5ba2 More memory fixes. 2014-02-11 14:58:45 -08:00
Scott Erickson
b904e1f939 More memory fixes. 2014-02-11 14:24:06 -08:00
Michael Schmatz
a6b15663a4 Merge branch 'master' into feature/task-queue 
Conflicts:
	app/views/play/level/tome/spell.coffee
 2014-02-11 13:10:59 -08:00
Michael Schmatz
cef7e89326 Added goal states listener 2014-02-11 13:09:53 -08:00
Michael Schmatz
58bfddeebf Background simulation is now showing signs of life! 2014-02-11 12:58:23 -08:00
Scott Erickson
b0a74e5b1a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 12:24:25 -08:00
Nick Winter
2d9606a8eb includeFlow only on the currently selected Thang. 2014-02-11 12:16:53 -08:00
Scott Erickson
166bb6db45 More memory cleanup. 2014-02-11 12:10:21 -08:00
Nick Winter
d22c716dce Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 12:02:53 -08:00
Scott Erickson
aa4cc8d9c4 Added a whole bunch of view teardown. 2014-02-11 12:02:49 -08:00
Nick Winter
d2a7bfd11c Added GoldView. 2014-02-11 12:02:27 -08:00
Scott Erickson
8ff38a724d Fixing some event tearing down. 2014-02-11 11:31:02 -08:00
Michael Schmatz
612a374b3f Progress on simulator 2014-02-11 11:27:39 -08:00
Michael Schmatz
c0d43ea32b Merge branch 'master' into feature/task-queue 2014-02-10 17:10:26 -08:00
Michael Schmatz
7faabc37e3 Simulation button 2014-02-10 17:09:51 -08:00
Nick Winter
7d5db41f5d God prepares Workers for Angelic consumption ahead of time. 2014-02-10 17:09:19 -08:00
Michael Schmatz
cc3b93a0f8 Transfer teamSpellMap from tome to levelBus 2014-02-10 16:18:39 -08:00
Nick Winter
f812241bd5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-10 14:50:35 -08:00
Nick Winter
9507be4c9a Turned off includeFlow for horrific performance reasons on project-dota for now. 2014-02-10 14:19:54 -08:00
Michael Schmatz
465ea22b1a More progress with queues and client-side simulation 2014-02-10 13:18:39 -08:00
Scott Erickson
9f5b51da19 Made goals for other teams invisible. 2014-02-10 12:49:38 -08:00
Nick Winter
26016f48e2 Skip protectAPI for now. Defer worker termination until after it reports stats. 2014-02-09 18:44:31 -08:00
Nick Winter
f2bcf019fa Should update code when other player changes it again. 2014-02-08 15:32:14 -08:00
Nick Winter
2e7a1fd0ef Working on the contribute pages -- #314. 2014-02-08 10:21:12 -08:00
Nick Winter
2a740f777e Starting to add contributor avatars. 2014-02-07 18:38:17 -08:00
Nick Winter
b2bf4db222 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-07 16:47:38 -08:00
Scott Erickson
0365998658 Began work on a ladder view. 2014-02-07 15:51:05 -08:00
Nick Winter
2efb9a0ea1 Simple team switch links in multiplayer menu. 2014-02-07 10:51:21 -08:00
Nick Winter
86de427204 Messing with team setting. 2014-02-06 17:31:08 -08:00
Nick Winter
2a3e47b08f Using playable team config from Alliance system. 2014-02-06 16:05:41 -08:00
Nick Winter
6af2d34f59 Fixed a ton of memory leaks, but not all of them. 2014-02-06 14:00:27 -08:00
Scott Erickson
332ea0df2c Fixed the level editor save view knowing if the level has changes to save. 2014-02-06 10:30:49 -08:00
Nick Winter
2a8d0eb694 Updates for ThangsList refreshing its Thangs. 2014-02-05 20:08:28 -08:00
Nick Winter
cc3465fd6f Improvement for errors updating action of non-existent Thangs in HUD. 2014-02-05 15:54:34 -08:00
Nick Winter
cec52d70f3 Improvements to how Tome subviews manage Thang updates. 2014-02-05 15:16:59 -08:00
Scott Erickson
6533196bc7 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-03 14:01:30 -08:00
Scott Erickson
81912d25d1 Added a handler for when components or systems go rogue, so they don't take down the level editor quite so hard. 2014-02-03 14:01:20 -08:00
Nick Winter
738b791683 Updated to new Aether range info, fixing error line numbers. 2014-02-03 13:58:25 -08:00
Scott Erickson
09bb669439 Fixed #300 2014-02-02 16:51:22 -08:00
Nick Winter
068f798d58 Fixed bugs in Tome spell views swapping. 2014-02-02 10:26:42 -08:00
Nick Winter
7ba6e5d0f2 Fixed #316. 2014-01-31 16:32:46 -08:00
Nick Winter
ee7d8a06fe A few SpellView / debugger fixes. 2014-01-31 16:16:59 -08:00
Nick Winter
632316314e Don't include flow for invisible methods, don't include protectAPI for non-writable methods. 2014-01-31 14:51:06 -08:00
Nick Winter
6303d28554 Refactored bobbing. 2014-01-31 10:21:32 -08:00
Nick Winter
d79d66c175 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 16:36:40 -08:00
Nick Winter
6e40fa09a6 Updated some Bootstrap event names. 2014-01-30 16:36:36 -08:00
Scott Erickson
3093b59588 Fixed #296 2014-01-30 16:25:06 -08:00
Scott Erickson
46d1d10abe Removed an unnecessary fat arrow. 2014-01-30 16:20:58 -08:00
Scott Erickson
c376ba6841 Fixed #303 2014-01-30 16:19:55 -08:00
Scott Erickson
1b75ab15db Added some error handlers for messed up thang type configs. 2014-01-30 16:17:41 -08:00
Scott Erickson
591a8e9ab5 Made the revert modal reload the page if anything was reverted. 2014-01-30 15:38:49 -08:00
Michael Schmatz
fe89c9fbad Fix for #290 2014-01-30 15:03:55 -08:00
Scott Erickson
210235553e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 12:19:44 -08:00
Scott Erickson
5429e8ad2a Cleaning up editors in the systems and components tabs. 2014-01-30 12:19:25 -08:00
Nick Winter
b09d1b1c74 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 12:03:35 -08:00
Nick Winter
a6bfb6770c Matched gradient background colors in HUD to ThangAvatarView. 2014-01-30 12:03:33 -08:00
Scott Erickson
827b5a3756 Fixed the world select modal. 2014-01-30 11:55:46 -08:00
Scott Erickson
ed1b5c6560 Fixed slowness to editing settings for large levels. 2014-01-30 11:40:24 -08:00
Scott Erickson
65f74e9587 Improved the navbars in the level editor. 2014-01-30 11:37:40 -08:00
Nick Winter
067d3abd75 Improved handling of spawning Programmables in Tome after the fact. 2014-01-29 16:26:08 -08:00
Nick Winter
e0108a3166 A few fixes for the Bootstrap 3 migration. Fixed #280. 2014-01-29 12:18:37 -08:00
Scott Erickson
f065406cf5 Merge branch 'feature/bootstrap3' 2014-01-29 10:40:34 -08:00
Scott Erickson
bac4fbcd7d Fixed naming. 
Improved tome updating of programmable spell thangs.
 2014-01-29 10:14:12 -08:00
Nick Winter
01efb2f92b Improvements to SpellDebugView hover. 2014-01-29 08:38:37 -08:00
Nick Winter
c3f5c1c334 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-28 15:24:12 -08:00
Nick Winter
fb7739727c Updates for Aether's protectAPI stuff. 2014-01-28 15:24:08 -08:00
Scott Erickson
6e9f93d299 Merge branch 'master' into feature/bootstrap3 
Conflicts:
	app/styles/editor/level/edit.sass

Also experimenting with a new layout for the level editor.
 2014-01-28 12:46:17 -08:00
Scott Erickson
00872f80f9 Fixed the bug where opening a modal or switching a tab while having a thang to add selected would create a thang. 2014-01-28 11:54:16 -08:00
Scott Erickson
e2db421d1c Fixed cloning. 2014-01-28 09:22:23 -08:00
Scott Erickson
9336a637ce Merge branch 'master' into feature/bootstrap3 2014-01-27 21:25:26 -08:00
Scott Erickson
a82a6a4188 Systems part of #266. 2014-01-27 21:25:01 -08:00
Scott Erickson
ca026610b1 Component part of #266. 2014-01-27 21:06:27 -08:00
Scott Erickson
b4cd7bdec4 Fixed #281 2014-01-27 19:03:22 -08:00
Scott Erickson
fa8928c187 Fixed the wizard sprite on the home page again. 2014-01-27 18:55:25 -08:00
Scott Erickson
13af9febbf More fixes for #283 2014-01-27 18:44:05 -08:00
Scott Erickson
26d6c2dc5b Fixed the new model modal in search. 2014-01-27 11:30:22 -08:00
Scott Erickson
b48fb6823e Fixed the progress bar for loading pages. 2014-01-27 11:12:58 -08:00
Scott Erickson
88c8c3896b Merge branch 'master' into feature/bootstrap3 2014-01-27 11:03:04 -08:00
Scott Erickson
fa3ab69dab Level preview now loads from backups so that brunch reloads don't cause the preview to break. 2014-01-27 11:00:36 -08:00