Commit graph

99 commits

Author SHA1 Message Date
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
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
d360ecac94 Merged in the language-war branch. 2014-06-25 23:00:03 -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
6a31e0bcd3 Fixed bug showing spell palette for languages missing any code snippets. 2014-06-24 10:17: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
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
Dominik Kundel
25a0447d77 autocomplete 2014-06-16 14:29:01 +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
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
88ef5ffe93 Prevent default ACE go-to-line alert when pressing Ctrl/Cmd+L. 2014-05-20 15:24:57 -07:00
Nick Winter
736fc8c12f Remove overeager transpile problem showing for JS again. 2014-05-17 09:58:35 -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
dbcafbb29b Working on level-specific coding languages, with non-writable code in JavaScript. 2014-05-14 21:54:36 -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
Nick Winter
53870a89a5 Python allowed, and better support for transpile errors. 2014-05-13 11:04:04 -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
589410ed8e Merged master into feature/thangload. 2014-05-09 12:56:58 -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
dddd617a08 userCodeMap issues fixed
Now beginning hooking up the UI
2014-05-06 10:06:32 -07:00
Nick Winter
82529c781b Fixed some ladder home links. 2014-05-05 15:33:08 -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
Michael Schmatz
c408196814 Fix for runtime errors 2014-04-23 16:44:31 -07:00
Michael Schmatz
3bbedbc100 Added background transpile 2014-04-22 11:46:17 -07:00
Michael Schmatz
81809956b8 hasChangedSignificantly async refactor
Still checking for bugs
2014-04-22 08:54:35 -07:00
Michael Schmatz
a7867e5e2d Added background linting
Background hasChangedSignificantly is soon!
2014-04-18 14:59:08 -07:00
Nick Winter
1794e5e040 Fixed #813 (sort of). 2014-04-14 11:18:02 -07:00
Nick Winter
13f34341b2 Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat 2014-04-06 14:55:14 -07:00
Scott Erickson
3b3b825be0 Set up a new loading/progress system for views. 2014-04-03 18:43:29 -07:00
Aditya Raisinghani
44979c074d Integrated nanoscroller. 2014-04-03 03:10:06 +05:30
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
fe8a4901de Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/locale/de.coffee
	bower.json
2014-03-25 17:07:36 +01:00
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
Shrihari
0160538b44 More migrations 2014-03-24 22:28:34 +05:30
Nick Winter
656b34fc34 Fixed comment gutter icons jumping all over the place. 2014-03-23 16:00:23 -07:00