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

809 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
61e6c8dfc3 Fixed the gold view not showing numbers until the first change. 2014-07-07 16:05:23 -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
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
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
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
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
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
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
037dbe97c6 Some remaining work to get the delayed show guide script set up. 2014-05-21 14:50:27 -07: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
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
62ad8dd26a Added a status message to the goals view. 2014-05-19 16:36:45 -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
60342cc40e Hover debugger optimization for "this" 2014-05-16 10:19:36 -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
Michael Schmatz
0bb1422d6c Switch spectate and level view to use transpiled code 2014-05-15 15:18:17 -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
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
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
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
Michael Schmatz
dddd617a08 userCodeMap issues fixed 
Now beginning hooking up the UI
 2014-05-06 10:06:32 -07: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
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
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
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
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
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
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
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
Michael Schmatz
3bbedbc100 Added background transpile 2014-04-22 11:46:17 -07:00
Nick Winter
675db1b76f Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents. 2014-04-22 11:11:08 -07:00
Michael Schmatz
e0f8d1343e Fixed race condition 2014-04-22 11:04:56 -07:00
Michael Schmatz
81809956b8 hasChangedSignificantly async refactor 
Still checking for bugs
 2014-04-22 08:54:35 -07:00
Ting-Kuan
692693c181 Merge branch 'master' into feature/loading-views 
Conflicts:
	app/locale/en.coffee
	app/views/editor/level/edit.coffee
	app/views/kinds/CocoView.coffee
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
	app/views/play/level/level_loading_view.coffee
 2014-04-19 01:15:04 -04:00
Michael Schmatz
a7867e5e2d Added background linting 
Background hasChangedSignificantly is soon!
 2014-04-18 14:59:08 -07:00
Ting-Kuan
1c1cf2f189 Fix loading of Level. 2014-04-17 19:23:35 -04:00
Nick Winter
46487f55a4 Fixed up some styles for job profile page, and prevented long links from destroying things with poor wrapping. 2014-04-17 11:34:55 -07:00
Ting-Kuan
2e50d7b15d Merge branch 'feature/Change-view-to-fit-new-supermodel' into feature/loading-views 
Conflicts:
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
 2014-04-16 11:38:05 -04:00
Nick Winter
f762d95ab8 ModelModal and simple leaderboard pagination. 2014-04-15 15:01:54 -07:00
Ting-Kuan
af399f4415 Merge branch 'master' into feature/loading-views 2014-04-15 13:34:20 -04:00
Nick Winter
e908ae2fb4 Fixed #772. 2014-04-14 14:49:38 -07:00
Nick Winter
1794e5e040 Fixed #813 (sort of). 2014-04-14 11:18:02 -07:00
Nick Winter
8aa36178af Fixed #769. Added some analytics timing tracking. Added replacement for $.browser. 2014-04-13 20:31:23 -07:00
Nick Winter
a9725f2dc6 A bit of error handling. 2014-04-13 14:48:36 -07:00
Ting-Kuan
77c4c586dd Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815 
Conflicts:
	app/locale/en.coffee
 2014-04-12 17:13:06 -04:00
Ting-Kuan
508b570fea Merge branch 'master' into feature/loading-views 
Conflicts:
	.gitignore
	app/locale/en.coffee
	app/models/SuperModel.coffee
	app/views/editor/thang/edit.coffee
	app/views/kinds/CocoView.coffee
 2014-04-12 17:07:30 -04:00
Ting-Kuan
7ae3bd5a60 Fix style and supermodel based on #815. 
Fix ladder_view and ladder_tab.
Change error handling functions in CocoView.
 2014-04-12 16:29:49 -04:00
Nick Winter
f0aa5e1d5e Fixed #681 by removing full-screen button in Safari. 2014-04-11 18:19:52 -07:00
Nick Winter
10bb17c38a Added getThangByID method to Thang. Handled a few error corner cases with the time popup. 2014-04-11 14:03:13 -07:00
Scott Erickson
e3a1f170cf Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader 
Conflicts:
	app/views/kinds/CocoView.coffee
	app/views/play/level/level_loading_view.coffee
 2014-04-11 11:19:16 -07:00
Ting-Kuan
a5e6496a7c Make resources as static class to avoid loading multiple times. 
Clean debug message.
 2014-04-10 16:59:08 -04:00
Michael Schmatz
42bf2996af Made Aether ignore variable hoisting 
See #813
 2014-04-10 10:36:32 -07:00
Nick Winter
76054345d7 Fixed #805. 2014-04-09 09:04:59 -07:00
Nick Winter
13f34341b2 Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat 2014-04-06 14:55:14 -07:00
Scott Erickson
978c84bc89 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-03 18:43:36 -07:00
Scott Erickson
3b3b825be0 Set up a new loading/progress system for views. 2014-04-03 18:43:29 -07:00
Nick Winter
9a70abb104 Don't need to explicitly skip Mobile Artillery's next level now. 2014-04-03 16:37:24 -07:00
Nick Winter
670f94cc22 Fixed #418, no more print/save dialogues evaaarr. 2014-04-02 14:42:34 -07:00
Aditya Raisinghani
44979c074d Integrated nanoscroller. 2014-04-03 03:10:06 +05:30
Dominik Kundel
1c6aea9c1c Merge remote-tracking branch 'upstream/master' 2014-03-31 20:35:32 +02:00
Nick Winter
a79fe37ca1 Merged; made a couple tweaks. 2014-03-29 17:30:12 -07:00
Dominik Maier
fb607d06fa Implemented popover for playback scrubber that will show the time the mouse is hovering over, the current time as well as the total ime of the level. Fixing #670 2014-03-30 00:38:45 +01:00
Nick Winter
c58a1682f4 Fixed #519 for real, I think. 2014-03-29 14:09:45 -07:00
Nick Winter
5bcaf2c746 Fixed #64 (I hope; let's UX test.) 2014-03-28 17:06:21 -07:00
Nick Winter
cf81d51a89 Fixed #46. 2014-03-28 15:23:12 -07:00
Nick Winter
c4a56dc9a5 Added a thing which highlights the guide every 5 minutes until clicked. Fixed #11. 2014-03-28 12:22:53 -07:00
Nick Winter
62867534a7 Fixed #727. 2014-03-28 09:52:07 -07:00
Dominik Kundel
267d033997 initial coffeescript support. No proper highlighting of executing parts and errors are not displayed inline 2014-03-28 14:42:08 +01:00
Dominik Kundel
35a16b47ff Merge remote-tracking branch 'upstream/master' 2014-03-28 14:37:14 +01:00
Nick Winter
b0b37aa9d8 Made play/pause and scrubber look even more disabled when disabled. 2014-03-27 15:07:37 -07:00
Nick Winter
2677751dc5 Merge branch 'lbox-prog' of git://github.com/Shrihari/codecombat into Shrihari-lbox-prog 2014-03-27 14:58:06 -07:00
Nick Winter
127c4a4e0f Refactored defaults for Aether's fancy options, and overriding them with query parameters. Reduced non-dev-mode script debug logging. 2014-03-27 13:36:33 -07:00
Scott Erickson
fae9034dfc Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master 
Conflicts:
	app/models/SuperModel.coffee
 2014-03-26 14:29:16 -07:00
swapnesh
1118324b41 Migrate from .on, .once to .listenTo, .listenToOnce 2014-03-26 03:25:11 +05:30
Dominik Kundel
fe8a4901de Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/locale/de.coffee
	bower.json
 2014-03-25 17:07:36 +01:00
Shrihari
aee18523b0 Fix for #506 2014-03-25 13:28:22 +05:30
Scott Erickson
2c329a256f Removed all the setting properties to null in destroy methods that don't need them since destroy nullifies all properties. 2014-03-24 14:42:56 -07:00
Scott Erickson
f55cef5ced Merge branch 'migrateBBevents' of https://github.com/Shrihari/codecombat into Shrihari-migrateBBevents 2014-03-24 10:38:57 -07:00
Shrihari
f085b0d319 Refactored cast-button events 2014-03-24 22:41:27 +05:30
Shrihari
0160538b44 More migrations 2014-03-24 22:28:34 +05:30
Shrihari
69ee16f77f Fixed wrong migrations 2014-03-24 21:37:09 +05:30
Nick Winter
92c87dc4ad Merge branch 'fix/scroll-spell-debug-view' of git://github.com/gintau/codecombat into gintau-fix/scroll-spell-debug-view 2014-03-24 08:28:48 -07:00
Ting-Kuan
e9118142db Fix issue #662 2014-03-24 10:54:59 -04:00
Shrihari
67f5270bfc Migrate .on, .once - Batch 1 2014-03-24 12:23:41 +05:30
Nick Winter
dbeb3d445b Give focus back to spell view on palette click. 2014-03-23 16:48:30 -07:00
Nick Winter
656b34fc34 Fixed comment gutter icons jumping all over the place. 2014-03-23 16:00:23 -07:00
Nick Winter
96fe1e42f0 Merge pull request #657 from adi2412/reloadCode 
Made changes to reloadAllCode to reload only the team's code.
 2014-03-22 10:36:17 -07:00
Aditya Raisinghani
bee5d528ec Made changes to reloadAllCode to reload only the team's code. 2014-03-22 22:56:41 +05:30
dpen2000
b1b0579cb3 Save autocastDelay as a setting on User re #627 2014-03-21 22:46:14 +00:00
Scott Erickson
b6c9b6276c Tweaked logging of sprite building. 2014-03-19 17:11:45 -07:00
Scott Erickson
74e068af0b Fixed some bugs from the migration from _.cloneDeep to $.extend 2014-03-18 13:47:51 -07:00
Scott Erickson
37a9b7f319 Switching from the slow _.cloneDeep to the fast $.extend 2014-03-18 13:08:26 -07:00
Dominik Kundel
c55b608886 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/templates/play/level/modal/editor_config.jade
 2014-03-17 19:39:38 +01:00
Nick Winter
6c2a78c060 Show videos in HD if possible. Use ready state on level loader. 2014-03-17 05:52:19 -07:00
Nick Winter
833c310a91 Merge pull request #579 from ItsLastDay/popover 
Fix for issue #496
 2014-03-17 04:30:57 -07:00
Mikhail Koltsov
df3739517d fixed issue #496 2014-03-17 12:28:49 +04:00
Scott Erickson
db4ae0cd2d Made some tips show up more rarely. 2014-03-17 00:12:11 -07:00
Scott Erickson
7555dce172 Tweaked the loading page progress bar. 2014-03-17 00:05:45 -07:00
Scott Erickson
dc4252a94d Moved the tips into the level loader screen and gave them i18n. 2014-03-16 22:01:21 -07:00
Scott Erickson
de34896a9a Playback is now disabled during casting. Also cleaned out some remaining hover logic. 2014-03-16 21:43:14 -07:00
Scott Erickson
e88c79681d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:04:44 -07:00
Scott Erickson
c663bd74cf Tweaks to the scrubber. Sliding it around no longer changes its play state; it only pauses playback if you click. 2014-03-16 21:04:36 -07:00
Nick Winter
9a64fb5dac Work on /multiplayer modal. 2014-03-16 20:32:24 -07:00
Dominik Kundel
6a983dcb8c changed name of event triggered when config is changed and introduced new event when language is changed 2014-03-17 02:14:04 +01:00
Nick Winter
6db33fd967 Brawlwood protectAPI on! 2014-03-16 17:07:10 -07:00
Dominik Kundel
ce6533de59 changing ace edit mode based on setting 2014-03-15 23:14:57 +01:00
Dominik Kundel
46133ab85d added select statement for programming language 2014-03-15 22:00:29 +01:00
Nick Winter
b2efb1bba5 More work on the loading view. 2014-03-14 19:44:19 -07:00
Nick Winter
efd0d82dea Working on new loading view design. 2014-03-14 17:06:08 -07:00
Nick Winter
5c76ca71e3 Added configuring of behaviors to the editor config. 2014-03-14 10:14:48 -07:00
Nick Winter
3c0b496033 Fix for if aceConfig doesn't exist yet. 2014-03-14 07:46:36 -07:00
Nick Winter
c28d2bb576 Merge pull request #545 from dkundel/master 
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
 2014-03-14 07:35:11 -07:00
Dominik Kundel
7e955c72b8 apply config to editor 2014-03-14 02:49:58 +01:00
Dominik Kundel
8a5aeb6227 save editor config to database 2014-03-14 02:09:11 +01:00
Nick Winter
42a8862fa9 Merge pull request #541 from dkundel/master 
Easy use of coordinates as discussed in #10 and minor fixes
 2014-03-13 18:05:04 -07:00
Dominik Kundel
6f2a04c5c0 added new editor config modal 2014-03-14 00:54:06 +01:00
Dominik Kundel
f618338d32 added button to access new modal for editor config 2014-03-14 00:53:29 +01:00
Dominik Kundel
4cbdc3cb4b highlight lines after insertion 2014-03-14 00:52:18 +01:00
Nick Winter
e2d2e96cf5 Fixed several bugs with Thang selection and the SpellView and HUD. 2014-03-13 15:35:28 -07:00
Nick Winter
c8103154a9 Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n. 2014-03-13 09:02:19 -07:00
Nick Winter
28d56f526e Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces. 2014-03-12 20:59:19 -07:00
Michael Schmatz
6eda2d24a5 Commented out line 133 2014-03-12 17:52:05 -07:00
Michael Schmatz
aea9e9d1a6 Spectate view is nearing completion 2014-03-12 17:51:13 -07:00
Dominik Kundel
8990b9d194 paste coordiante if click + shift 2014-03-13 01:50:59 +01:00
Nick Winter
ac8f12ef20 I don't think we need this template any more. 2014-03-12 16:03:32 -07:00
Nick Winter
49ab47e3fe Allowing shift+space to insert spaces as well as end scripts. Not ideal yet, 'cause we can't selectively not insert the space when canceling a script. 2014-03-12 10:01:31 -07:00
Nick Winter
2e354a7f11 Fixed #519, pressing esc while loading level, and CocoSprites updating actions and other things unnecessarily while paused. Watch for bugs with that last one. 2014-03-12 09:10:36 -07:00
Nick Winter
b560827e32 Working on cleaning up some server errors. 2014-03-11 19:17:58 -07:00
Dominik Kundel
c7ca878c69 added class property that got missing 2014-03-12 01:26:11 +01:00
Dominik Kundel
714c6ddf9b Merge remote-tracking branch 'upstream/master' 2014-03-11 23:50:51 +01:00
Dominik Kundel
4c7da1ea69 update Gutter only if changed 2014-03-11 23:47:27 +01:00
Nick Winter
234b3f105d Reworked ladder game victory modal main call to action to actually submit game for ranking. 2014-03-10 10:36:28 -07:00
Nick Winter
6a71e97204 Improvements to HUD actions. 2014-03-10 09:37:05 -07:00
Nick Winter
39c4657204 Fixed HUD showing actions backwardly. Added rank numbering to leaderboard. 2014-03-08 15:43:56 -08:00
Nick Winter
68099bbd7c Victory modal for ladder games takes you back to the ladder matches. 2014-03-07 21:20:09 -08:00
Alexei Nikitin
98b36d299c Update article model 2014-03-08 05:05:35 +04:00
Nick Winter
b6ae73ef29 Merge pull request #492 from Shrihari/issue464 
Fixed Spell Debug View width bug
 2014-03-07 16:14:57 -08:00
Scott Erickson
13b9a9cb58 Added dungeon arena tutorial to a few hardcoded places. 2014-03-07 15:16:13 -08:00
Shrihari
5274f22467 Fixed Spell Debug View width bug 2014-03-08 01:10:12 +05:30
Nick Winter
6e47416d24 Fixed some level IDs. 2014-03-06 19:09:15 -08:00
Nick Winter
2d69abf674 Merge pull request #481 from dkundel/master 
Proposed UX improvement for #6
 2014-03-05 13:45:14 -08:00
Dominik Kundel
a033a80722 Merge remote-tracking branch 'upstream/master' 2014-03-05 22:18:53 +01:00
Dominik Kundel
b0d571c7ad highlight only the executing statement 2014-03-05 22:17:34 +01:00
Scott Erickson
0a8d5b5b97 Merge branch 'master' of https://github.com/Shrihari/codecombat into Shrihari-master 2014-03-05 10:35:06 -08:00
Shrihari
f6324807b3 Moved "Skip (esc)" next to Continue button 2014-03-05 23:36:18 +05:30
Dominik Kundel
d16d024782 further changes in design of highlighting lines in code 2014-03-05 17:06:46 +01:00
Shrihari
0ec431f90a Moved 'skip tutorial' text to locales. 2014-03-05 13:46:21 +05:30
Dominik Kundel
a0e39480e3 new UI design for executing and executed lines in ACE editor 2014-03-05 02:00:38 +01:00
Nick Winter
4556536df4 Hooked up new HUD icons. 2014-03-04 11:15:31 -08:00
Nick Winter
65d9186ef1 Fixed actions showing up under dialogue bubbles on repeated toggling. 2014-03-03 16:55:36 -08:00
Nick Winter
7b25eeec47 HUD properties now flow into columns more evenly, have max styling. 2014-03-03 16:45:03 -08:00
Nick Winter
86fd098159 Localized WizardSprite movement hey handling to WizardSprite file. 2014-03-03 07:28:40 -08:00
Nick Winter
f2f0a993af Merge branch 'thanish-move-wizard' of git://github.com/mnmtanish/codecombat 2014-03-03 07:22:44 -08:00
Nick Winter
82b250b9a3 protectAPI off again for Brawlwood, too slow for now. 2014-03-02 17:51:57 -08:00
Nick Winter
a8ef87c9ea Fixed a few bugs; re-enabled protectAPI for Brawlwood. 2014-03-02 16:06:22 -08:00
Muhammed Thanish
da2ebf857a Increase delay 2014-03-02 14:02:30 +05:30
Muhammed Thanish
d7e031fd00 Use key.isPressed() to get movement direction 2014-03-02 03:27:06 +05:30
Muhammed Thanish
7ea9260322 Use WizardSprite 2014-03-02 01:45:49 +05:30
Nick Winter
2f130da090 HUD supports more hudProperties. Palette looks at programmableObjectProperties. Fixed bug with level editor frames advancing. 2014-03-01 11:06:44 -08:00
Muhammed Thanish
8cc8103288 Add keyboard shortcuts to move the wizard 2014-03-01 19:58:15 +05:30
Scott Erickson
4de425bd58 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-28 13:59:33 -08:00
Scott Erickson
10795df7d9 Renamed hardcoded project-dotas to brawlwoods. 2014-02-28 13:59:02 -08:00
Nick Winter
52903cc0de Using String and Array docs when appropriate now. 2014-02-28 12:43:31 -08:00
Nick Winter
6db8051122 Only show action timeline when 'action' is in the hudProperties. 2014-02-28 11:38:41 -08:00
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
Nick Winter
aef1bc63ba Smarter infinite loop detection vs. web-worker-is-still-loading detection. 2014-02-27 20:01: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
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
Scott Erickson
ea73d91a6b Made the docs modal larger. 2014-02-26 15:44:46 -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
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
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
Nick Winter
32c45b80a9 Fixed performance problem with duplicate user code problem annotations. 2014-02-24 14:12:41 -08:00
Nick Winter
21975bedd2 Fixed #408. 2014-02-24 11:21:51 -08:00
Nick Winter
91412ccd69 Playback and level editor shortcut tweaks. 2014-02-24 09:58:12 -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
60eb0db1aa A few fixes for IE, anonymous errors, and cast button overflow. 2014-02-23 11:23:26 -08: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
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
06f1e284c9 Added comment highlighting icon. 2014-02-20 16:14:31 -08:00
Scott Erickson
d9b86b84dc Fixed a bug with the coloring of avatars in the hud. 2014-02-20 15:13:15 -08:00
Scott Erickson
5cefb8fc30 Merge branch 'production' 2014-02-20 11:47:02 -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
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
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
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
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
e3824d7698 Many improvements to the spell palette. 2014-02-16 15:30:00 -08:00
Scott Erickson
be83b5420f Fixed the goals view, which wasn't being properly shown. 2014-02-15 17:36:27 -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
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
1349a59084 Refactored destroy functions to have super be the last thing. 2014-02-14 10:57:47 -08:00
Nick Winter
da866a418c Fixed cast options clicking. 2014-02-13 17:43:42 -08:00
Nick Winter
9a835ffc0a Re-enabled spell tab entry docs. 2014-02-13 16:09:32 -08:00
Michael Schmatz
d6e99273bc Quick fix for team not being detected 2014-02-13 15:42:00 -08:00
Nick Winter
aa282c3a35 Updates for formatting palette docs. 2014-02-13 11:18:20 -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
8a80b9770d More work on docs. Got rid of Docs.coffee. 2014-02-12 18:54:45 -08:00
Nick Winter
dc8c4394e1 Spell palette entries now using property docs from components. 2014-02-12 16:42:09 -08:00
Nick Winter
b7be08ac19 Fixed one more leak. 2014-02-12 13:43:17 -08:00
Nick Winter
5655084981 Fixed a ton more leaks. 2014-02-12 12:41:41 -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
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
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
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
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