codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 18:45:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
1921 commits 27 branches 0 tags 134 MiB
Commit graph

394 commits

Author SHA1 Message Date
Scott Erickson
2fb1c184f9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-06 16:22:19 -08:00
Scott Erickson
1b61b928b0 Couple tweaks to the cocosprite for effect marks. 2014-03-06 16:21:06 -08:00
Nick Winter
ea406bd3c7 Fixed some event listeners on destroyed loaders. 2014-03-06 15:52:51 -08:00
Scott Erickson
2ac5a94055 Merge remote-tracking branch 'origin/master' 2014-03-06 15:52:14 -08:00
Scott Erickson
041f4512e8 Set up marks to all load dynamically, and set up effect marks, which appear above a thang's head and rotate between them if there are multiple. 2014-03-06 15:52:09 -08:00
Nick Winter
40a32d7b43 Fixed array / string ThangState key serialization conflicts. Fixed #333. 2014-03-06 14:53:37 -08:00
Nick Winter
a03403de94 Started some more name categories. 2014-03-06 09:35:58 -08:00
Nick Winter
fddd210d34 Fixed Archer M names conflict. 2014-03-06 09:27:06 -08:00
Nick Winter
b5c72e4b4a Merge pull request #477 from iraladson/patch-1 
Update names.coffee
 2014-03-06 09:25:37 -08:00
Akaza Akari
030da44c23 Added volume manipulation, adjusted panning parameters 2014-03-05 20:12:42 -08:00
Akaza Akari
51d7bd656d Made updatePosition use getWorldPosition 2014-03-05 19:54:58 -08:00
Akaza Akari
99f43028a0 Add thang sound panning for #454 2014-03-05 19:39:14 -08:00
Scott Erickson
7a2d5b4bff Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-05 12:53:57 -08:00
Scott Erickson
af265ebee8 Tweaked an error message to be more generally useful. 2014-03-05 12:53:11 -08:00
Jayant Jain
db0fc82eb0 Minor bugfix for freezing editor due to out of bounds frame index 2014-03-06 01:54:09 +05:30
iraladson
8d046c31b9 Update names.coffee 
"Added more names for #53
 2014-03-05 14:06:29 -06:00
iraladson
7885b21b4b Update names.coffee 2014-03-05 14:03:57 -06:00
Nick Winter
5ec06159a6 Fixed ChallengePost utm link. Tweaked God worker timeout for more reliable performance logging. 2014-03-05 12:00:29 -08:00
Scott Erickson
03b60838b6 Merge remote-tracking branch 'origin/master' 2014-03-04 12:21:07 -08:00
Scott Erickson
9726840d8a Trying to handle a case where a user did not have their user account created. 2014-03-04 12:21:02 -08:00
Scott Erickson
3680d628e7 Fixed showing generic errors. 2014-03-04 12:06:31 -08:00
Yos Riady
195b1941ea Added even more names for #53 2014-03-05 02:53:54 +08:00
Nick Winter
2f653c966e Simulator now swaps in empty methods when code doesn't compile. 2014-03-04 08:30:50 -08:00
Scott Erickson
65d39e658d Removed the old team view cruft. 2014-03-03 11:15:46 -08:00
Nick Winter
980a3b6f21 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 07:29:07 -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
c858fb5e24 Merge pull request #440 from FinnDS/patch-1 
Update names.coffee
 2014-03-03 07:20:55 -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
Nick Winter
6c48660922 No save button when there's nothing to save. Messing with AudioPlayer playSound API a bit. 2014-03-01 16:57:29 -08:00
Muhammed Thanish
d7e031fd00 Use key.isPressed() to get movement direction 2014-03-02 03:27:06 +05:30
Muhammed Thanish
a092557973 Add camera zoomTo(pos) 2014-03-02 02:13:37 +05:30
Muhammed Thanish
7ea9260322 Use WizardSprite 2014-03-02 01:45:49 +05:30
Nick Winter
c2f82690b4 Put Archmage and Artisan avatars in GitHub README. 2014-03-01 11:21:24 -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
Muhammed Thanish
8cc8103288 Add keyboard shortcuts to move the wizard 2014-03-01 19:58:15 +05:30
Nick Winter
7855ca02d8 Hit a really bad victory modal image. 2014-02-28 21:29:14 -08:00
Nick Winter
71ebe7a0aa Lowered Surface framerate in the level editor, since ain't nobody got CPU time for 'dat. 2014-02-28 17:12:23 -08:00
Scott Erickson
4de425bd58 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-28 13:59:33 -08:00
Scott Erickson
2894d4f39c Set up session-repeating scripts. 2014-02-28 11:28:23 -08:00
Nick Winter
9b8eb6a296 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-28 11:27:36 -08:00
Nick Winter
3cee341887 Big performance improvements for scrubbing between frames; look out for bugs. 2014-02-28 11:27:32 -08:00
Scott Erickson
ef9c0a610f Fixed a bug with the casting screen. 2014-02-28 11:10:56 -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
Finn
5b5af5a55a Update names.coffee 
Added the name "Cid" under "Soldier M".
 2014-02-28 12:06:26 +01:00
Nick Winter
e20e9d68cf Construct sprite sheets as ThangTypes load. 2014-02-27 22:15:13 -08:00
Nick Winter
97197bd89d Got rid of potentially unnecessary (and definitely slow) SpriteSheetBuilder _.cloneDeep. Watch out. 2014-02-27 20:54:29 -08:00
Nick Winter
aef1bc63ba Smarter infinite loop detection vs. web-worker-is-still-loading detection. 2014-02-27 20:01:27 -08:00
Scott Erickson
df196cc531 Modals now stop the level from starting until they close. 2014-02-27 16:44:11 -08:00
Scott Erickson
b31527abef Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-27 14:08:04 -08:00
Nick Winter
ffbef0de5b Merge pull request #428 from Darredevil/patch-1 
Added more names for #53
 2014-02-27 11:50:59 -08:00
Scott Erickson
8d828939b6 Fixed a bug where the jingle wouldn't play during level loading if the audio had been loaded previously. 2014-02-26 20:23:13 -08:00
Scott Erickson
4e8c0b65e2 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-26 18:49:43 -08:00
Scott Erickson
7052b0600b Made mouse dragging not interrupt selecting units so much. 2014-02-26 18:42:39 -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
081274579b Forget old goals. 2014-02-26 17:45:08 -08:00
Nick Winter
172242d226 Re-denormalize session if things have changed. Removed some logs. 2014-02-26 17:06:21 -08:00
Scott Erickson
0fd1c03b7f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-26 15:56:25 -08:00
Scott Erickson
c86feb13e8 Fixed the region and point choosers for the level editor. 2014-02-26 15:56:05 -08:00
Darredevil
55ab142d75 Added more names for #53 2014-02-26 23:21:03 +02:00
Michael Schmatz
a052180250 Improved match scheduling 2014-02-26 12:14:02 -08:00
Michael Schmatz
bb76fb241c Fixed simulator 
The format of something must have suddenly changed?
 2014-02-26 09:21:44 -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
Nick Winter
b86c32c3e2 Merge pull request #422 from yangshun/level-not-found 
Redirect to play page for non-existent levels. Fixes issue #396
 2014-02-25 14:17:44 -08:00
Tay Yang Shun
11c5f7419a Used internationalised strings for level not found message 2014-02-26 05:54:33 +08:00
Scott Erickson
a53498224c Tweaked sprite scripts to use given response buttons even if the script is not skippable. 2014-02-25 13:27:02 -08:00
Tay Yang Shun
8a24407d3e Redirect to play page for non-existent levels. Fixes issue #396 2014-02-26 04:59:35 +08:00
Scott Erickson
eee434ab51 Tweaked the coordinate display position to be a bit more above the mouse. 2014-02-25 12:38:47 -08:00
Scott Erickson
356d1b55ed Added a property to prevent scripts from running after certain other scripts have run. 2014-02-25 11:59:23 -08:00
Scott Erickson
f4084ba5cc Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-25 10:50:53 -08:00
Scott Erickson
45e6fadfe2 Added a property to prevent scripts from running after certain other scripts have run. 2014-02-25 10:50:40 -08:00
Scott Erickson
a1a5d5eea0 Fixed some script handling by not having playback changed when the first world is built. 2014-02-25 10:50:12 -08:00
Nick Winter
a440c4dff0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-25 10:48:33 -08:00
Nick Winter
0380a30522 Fixes for not storing default code in other sessions. sass-brunch 1.8. Removed tutorial link for now. Round wizards. 2014-02-25 10:48:23 -08:00
Scott Erickson
168f268d21 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 19:49:12 -08:00
Scott Erickson
242342315f Can now drag the mouse to move around the map. 2014-02-24 19:49:05 -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
4a4a702f1e Fixed a bug where scrubbing playback wouldn't always update sprite existence properly. 2014-02-24 17:01:36 -08:00
Scott Erickson
01b91eb7e2 Lowered the bob height for the wizard a bit. 2014-02-24 16:59:17 -08:00
Nick Winter
6e557d354e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 16:42:37 -08:00
Nick Winter
2e2f184485 Not sure why beam behaves differently, but fixed its scaling. 2014-02-24 16:42:34 -08:00
George Saines
d62630d0a7 final tweaks to dialogue text styling 2014-02-24 16:03:56 -08:00
George Saines
8192a6153d fiddling with text formatting 2014-02-24 15:51:10 -08:00
Scott Erickson
052d35afe7 Added a screen darkener for when the spell is casting. 2014-02-24 14:40:28 -08:00
Scott Erickson
77f923752f Fixed #411. 2014-02-24 12:52:35 -08:00
Scott Erickson
d146febb32 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 09:47:20 -08:00
Scott Erickson
2d6dd36a68 Saturation and lightness was flipped on the spritebuilder. Fixed. 2014-02-24 09:06:22 -08:00
Aidan Matzko
b69fe85134 Silly error names 2014-02-23 15:30:33 -05: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
5f4d5afe4f Sped up CoordinateDisplay hover based on Russ's feedback. 2014-02-23 09:55:40 -08:00
Nick Winter
9eb8bb97f5 Trying out a Ctrl+Shift+B code beautifier option. 2014-02-22 16:58:54 -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
90ec07fc75 Fixed the camera to properly follow thangs again. Also tweaked the camera to center around the torso rather than the feet. 2014-02-22 11:31:31 -08:00
Scott Erickson
9c30b9f0d0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 14:49:17 -08:00
Nick Winter
81d3702b49 Merge pull request #388 from jcvno/patch-1 
Update names.coffee
 2014-02-20 14:38:43 -08:00
Scott Erickson
5bda4d5e5f Fixed the camera to not move around when the world is reset and being cast. 2014-02-20 14:25:39 -08:00
Scott Erickson
5cefb8fc30 Merge branch 'production' 2014-02-20 11:47:02 -08:00
Scott Erickson
6b2e0bc364 Changed how the goal manager handles arriving at goals and figuring out the how many requirement. 2014-02-20 11:43:35 -08:00
Michael Schmatz
e593fd23b4 Improved interface for simulating games 2014-02-20 08:06:14 -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
Nick Winter
dcf7a0d1fd Re-enabled Olark. 2014-02-19 12:43:25 -08:00
Scott Erickson
86f94cb5fd Refactored dynamic sound loading to the level view, since the level loader is no longer in service after finishing loading. 2014-02-19 11:42:33 -08:00
Scott Erickson
bdbebe886c Added a log for figuring out what session is causing NaNs. 2014-02-19 08:19:30 -08:00
Justin Cano
059c50e47d Update names.coffee 2014-02-19 03:03:43 -08:00
Michael Schmatz
dc70fec977 Merge pull request #385 from codecombat/redis 
Merge redis into master
 2014-02-18 12:53:57 -08:00
Michael Schmatz
d02d09ae36 Simulation fixes 2014-02-18 11:46:14 -08:00
Scott Erickson
452a43cae9 Working on the ladder and team views. 2014-02-17 17:42:41 -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
af510c7cc7 60 FPS and support for independent world/surface frame rates. 2014-02-17 11:53:52 -08:00
Nick Winter
1b0f15b5f3 More LevelLoader defense. 2014-02-17 08:15:53 -08:00
Nick Winter
c19c8f3912 Fix for LevelLoader, selection udpating, and non-documentation tome popovers. 2014-02-16 18:29:24 -08:00
Nick Winter
2c41d403bc Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-16 15:30:07 -08:00
Nick Winter
e3824d7698 Many improvements to the spell palette. 2014-02-16 15:30:00 -08:00
Scott Erickson
bbe5399a97 Fixed #370 2014-02-16 12:51:20 -08:00
Nick Winter
f94456295e God needs no options. 2014-02-15 17:38:45 -08:00
Nick Winter
addf4ca245 Improved Simulator memory and performance. 2014-02-15 17:29:54 -08:00
Nick Winter
f3b58a9416 Merged. 2014-02-15 15:45:53 -08:00
Nick Winter
3c7cac8ba9 Trying to do some memory cleanup. 2014-02-15 15:44:45 -08:00
Scott Erickson
8f938bf6fc Scrolling with the mouse now zooms based on mouse position. 2014-02-15 13:45:16 -08:00
Scott Erickson
72712a349c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-15 12:07:28 -08:00
Michael Schmatz
c418e282ae Put in pairwise simulation button 2014-02-14 16:53:37 -08:00
Nick Winter
fdf1e21e72 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-14 16:52:54 -08:00
Nick Winter
50f683534f Support for seeing this.now() in spell palette. 2014-02-14 16:52:50 -08:00
Scott Erickson
a25b1be916 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-14 15:57:54 -08:00
Michael Schmatz
63a5769bcf Fixed various bugs in simulator and put in home view 2014-02-14 15:50:42 -08:00
Scott Erickson
d55e4cd624 Made sure session objects are loaded from the server fresh, no caching. 2014-02-14 15:35:54 -08:00
Michael Schmatz
643cafc89f Refactored level handler and level session schema 2014-02-14 14:55:30 -08:00
Scott Erickson
13caae2690 Fixed the massive memory leak. 2014-02-14 14:10:55 -08:00
Scott Erickson
a8c483a59f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-14 14:10:35 -08:00
Scott Erickson
55fcad2cc3 Fixed a couple bugs with the wizard. 2014-02-14 14:10:28 -08:00
Scott Erickson
7faa401177 Trying to improve memory by clearing out all properties of destroyed objects. 2014-02-14 13:31:26 -08:00
Scott Erickson
1349a59084 Refactored destroy functions to have super be the last thing. 2014-02-14 10:57:47 -08:00
Michael Schmatz
7cec574e17 Started simulator refactor 2014-02-14 10:49:19 -08:00
Scott Erickson
476cc87628 Set up the ladder to be able to compete against other sessions. 2014-02-13 16:42:35 -08:00
Scott Erickson
97b4e7661d Level loader now loads session based on the team property in the url. 2014-02-13 15:51:41 -08:00
Scott Erickson
b8051689b3 Fixed the goal manager from polluting the goals in the level with the isPositive property. 2014-02-13 15:50:53 -08:00
Scott Erickson
23964abee9 Set up the goal manager to only use goals from the level.goals property, rather than from scripts. 2014-02-13 09:26:42 -08:00
Nick Winter
8a80b9770d More work on docs. Got rid of Docs.coffee. 2014-02-12 18:54:45 -08:00
Nick Winter
d2345432ff Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-12 16:42:31 -08:00
Nick Winter
dc8c4394e1 Spell palette entries now using property docs from components. 2014-02-12 16:42:09 -08:00
Scott Erickson
8176e2258f Set up the goal manager to use goals from the new level goals property, rather than from scripts. Backward-compatible for now. 2014-02-12 16:20:25 -08:00
Nick Winter
cdf268ce4f Merged. 2014-02-12 13:10:58 -08:00
Nick Winter
5655084981 Fixed a ton more leaks. 2014-02-12 12:41:41 -08:00
Scott Erickson
59f0d8a93e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-12 09:55:35 -08:00
Scott Erickson
533069dba8 Fixed a bug with the goals. 2014-02-12 09:55:19 -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