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

757 commits

Author SHA1 Message Date
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
Nick Winter
f2bcf019fa Should update code when other player changes it again. 2014-02-08 15:32:14 -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
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
a6bfb6770c Matched gradient background colors in HUD to ThangAvatarView. 2014-01-30 12:03:33 -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
Scott Erickson
c5b9b103c5 Merge branch 'feature/team-colors' 
Conflicts:
	app/lib/world/world.coffee
	app/models/ThangType.coffee
 2014-01-16 10:14:21 -08:00
Nick Winter
af7344175a Merged and tweaked phansch's save indicator from #205. 2014-01-16 10:10:27 -08:00
Nick Winter
6f5b37e86d Possible fix for Grab the Mushroom problems. 2014-01-16 09:20:02 -08:00
Philipp Hansch
3a63428c0c Add jquery fading 
Also using the level:session-will-save callback
 2014-01-16 17:13:14 +01:00
Scott Erickson
47effcd50e Got the rest of team colors set up. 2014-01-15 15:16:31 -08:00
Nick Winter
172d97ed83 Fixed #87 I hope; at least, dramatically reduced memory leakage. 2014-01-15 13:04:48 -08:00
Philipp Hansch
17afb62dc9 Add basic code-saved indicator 
Using the tome:spell-changed callback to determine when to
start showing the code-saved indicator
 2014-01-15 20:58:39 +01:00
Scott Erickson
bf4011044f Initially working on using team colors, but it's not working yet. 2014-01-14 13:16:30 -08:00
Nick Winter
69df0079af Fixed bug returning to normal selection from talking portrait in HUD. 2014-01-09 18:30:18 -08:00
Scott Erickson
2d5ca50e89 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-09 14:04:53 -08:00
Scott Erickson
3c3e38b585 Set up thang avatar views with the new db portraits. 2014-01-09 14:04:46 -08:00
Nick Winter
98245d0fb9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-09 11:28:14 -08:00
Nick Winter
3a954ff91c A bit more CoffeeScript-y. 2014-01-09 11:28:08 -08:00
Scott Erickson
4e34b38c83 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/views/play/level/hud_view.coffee
 2014-01-09 11:05:51 -08:00
Scott Erickson
8077c62ceb Set up talking portraits in the hud. 2014-01-09 11:04:22 -08:00
Nick Winter
e2414f7c5a Hopefully fixed #106 by being super conservative about whether G+, FB, and Twitter can be loaded. 2014-01-09 10:49:34 -08:00
Ronald Cheng
278b4d8754 If you have pressed esc, do not get prompted about it 2014-01-08 23:09:58 -08:00
Ronald Cheng
81eed31714 Create notification that esc can skip dialogs 
If you use the shift-space combination at least 5 times per page load, a message will pop up next to the continue button stating that you can press esc to skip dialog.
 2014-01-08 14:23:36 -08:00
Scott Erickson
250b7322a9 Fixed #56 2014-01-06 21:25:18 -08:00
Nick Winter
1d223f790b Trying to force soft tabs and Unix newlines. 2014-01-04 16:41:25 -08:00
Nick Winter
01cfcbedc7 Updated some $attr, $val, and $prop calls. 2014-01-04 15:49:13 -08:00
Nick Winter
6009df26de Ready for action, sir! 2014-01-03 10:32:13 -08:00