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

267 commits

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