Commit graph

169 commits

Author SHA1 Message Date
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