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 |
|
Scott Erickson
|
66af855497
|
Merge branch 'master' into feature/thangload
|
2014-05-13 10:27:10 -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
|
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 |
|
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
|
bd3c059c2a
|
Several performance improvements based on profiling.
|
2014-04-28 16:31:51 -07:00 |
|
Nick Winter
|
2ec225b0d0
|
Enabled API protection for Find the Spy.
|
2014-04-27 14:30:32 -07:00 |
|
Nick Winter
|
fa0e7f04f7
|
Fixed a thing.
|
2014-04-26 14:21:26 -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 |
|
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 |
|
Michael Schmatz
|
a7867e5e2d
|
Added background linting
Background hasChangedSignificantly is soon!
|
2014-04-18 14:59:08 -07: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 |
|
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
|
a9725f2dc6
|
A bit of error handling.
|
2014-04-13 14:48:36 -07:00 |
|
Michael Schmatz
|
42bf2996af
|
Made Aether ignore variable hoisting
See #813
|
2014-04-10 10:36:32 -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
|
1c6aea9c1c
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-31 20:35:32 +02: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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
Dominik Kundel
|
b0d571c7ad
|
highlight only the executing statement
|
2014-03-05 22:17:34 +01:00 |
|
Dominik Kundel
|
d16d024782
|
further changes in design of highlighting lines in code
|
2014-03-05 17:06:46 +01:00 |
|
Dominik Kundel
|
a0e39480e3
|
new UI design for executing and executed lines in ACE editor
|
2014-03-05 02:00:38 +01: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 |
|
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 |
|
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 |
|
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 |
|
Nick Winter
|
0cf20b577d
|
Added a delay to the property documentation on spell debug hover.
|
2014-02-26 17:23:59 -08:00 |
|
Nick Winter
|
3472b3da97
|
Working on different shadow shapes. Fixed bug with palette property ownership.
|
2014-02-24 17:53:35 -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
|
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
|
72cfcf96ed
|
Added basic opponent wizard. Disabled synchronous multiplayer for ladder levels.
|
2014-02-22 12:01:05 -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 |
|
Nick Winter
|
f81e0c85ef
|
Fixes for popover behavior.
|
2014-02-20 10:39:16 -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
|
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
|
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 |
|
Nick Winter
|
aa282c3a35
|
Updates for formatting palette docs.
|
2014-02-13 11:18:20 -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 |
|
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 |
|
Scott Erickson
|
aa4cc8d9c4
|
Added a whole bunch of view teardown.
|
2014-02-11 12:02:49 -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
|
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 |
|
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
|
6af2d34f59
|
Fixed a ton of memory leaks, but not all of them.
|
2014-02-06 14:00:27 -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 |
|
Nick Winter
|
738b791683
|
Updated to new Aether range info, fixing error line numbers.
|
2014-02-03 13:58:25 -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
|
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 |
|
Michael Schmatz
|
fe89c9fbad
|
Fix for #290
|
2014-01-30 15:03:55 -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
|
fb7739727c
|
Updates for Aether's protectAPI stuff.
|
2014-01-28 15:24:08 -08:00 |
|
Nick Winter
|
47c78d1758
|
Revamped SpellToolbarView.
|
2014-01-25 15:11:29 -08:00 |
|
Nick Winter
|
d262dfaca7
|
A few visual tweaks to the spell view flow.
|
2014-01-24 17:48:11 -08:00 |
|
Nick Winter
|
45329df4cd
|
Temp fix for debugger bug on a relevant session.
|
2014-01-24 13:46:51 -08:00 |
|
Nick Winter
|
6fa38bd889
|
Several improvements to hover debugging.
|
2014-01-24 13:03:04 -08:00 |
|
Nick Winter
|
9b9df12ea0
|
Huge Aether performance fix; spells now scroll while debugging.
|
2014-01-24 08:01:00 -08:00 |
|
Nick Winter
|
3b7a908dcd
|
Handled a couple errors.
|
2014-01-22 10:56:49 -08:00 |
|
Nick Winter
|
6ea4f645f8
|
Added spell toolbar view. Made many time-travel debugger improvements.
|
2014-01-21 09:03:04 -08:00 |
|
Nick Winter
|
f87c3a37e8
|
More progress on debugger.
|
2014-01-19 09:14:42 -08:00 |
|
Nick Winter
|
0a8d64046a
|
Starting work on time-travel debugging interface.
|
2014-01-19 07:08:28 -08:00 |
|
Nick Winter
|
5267febd8f
|
Couple fixes for small errors when running with no Programmables.
|
2014-01-16 14:29:57 -08:00 |
|
GlenDC
|
553ad833ed
|
Merge https://github.com/codecombat/codecombat
|
2014-01-16 22:27:09 +01:00 |
|
GlenDC
|
5cc24ea1b2
|
Logs now a warning in the console to give user the feedback that there are no programmable thangs which makws the level unplayable.
|
2014-01-16 22:26:34 +01:00 |
|
GlenDC
|
b557c43f60
|
Hotfix for previous commit, forgot to uncommit some stuff
|
2014-01-16 22:22:42 +01:00 |
|
GlenDC
|
926b31f62f
|
Resolved issue #160
|
2014-01-16 22:18:38 +01:00 |
|