Ruben Vereecken
9c0353a2f0
Merged in master
2014-07-13 21:18:32 +02:00
Scott Erickson
843ed97643
Another fix for mongoose i18n locale object hack.
2014-07-13 10:05:58 -07:00
Nick Winter
89dc724d31
Merge pull request #1298 from TheSecretSquad/issue#1213CoordinateDisplay
...
Centered CoordinateDisplay background and label
2014-07-11 20:48:53 -07:00
Pete DiSalvo
e3183650c5
Centered CoordinateDisplay background and label
2014-07-11 22:10:13 -04:00
Nick Winter
17ba4bc8a7
Starting to limit some property documentation to specific code languages. Fixed Criss-Cross squares on frame 0. Removed comment box highlighting from the gutter.
2014-07-11 18:07:00 -07:00
Nick Winter
3d5cd29519
Removed some logging.
2014-07-10 17:35:59 -07:00
Nick Winter
f17e24013b
Fixed #1217 (scaleFactor, debug shapes).
2014-07-10 14:22:15 -07:00
Scott Erickson
a3c524424c
Merge branch 'nameable_users' of https://github.com/rubenvereecken/codecombat into rubenvereecken-nameable_users
2014-07-10 11:13:28 -07:00
Nick Winter
9ee373428f
Fixed some schema issues related to snippets and code languages.
2014-07-10 08:31:40 -07:00
Ruben Vereecken
ac95d775e6
Users can now be gotten by slug
2014-07-09 20:23:05 +02:00
Ruben Vereecken
b065a524c1
Got down the basic layout for achievement overview
...
Achievement style is now compatible between overview and popup
2014-07-09 15:06:47 +02:00
Nick Winter
c19a31a58c
Fixed some wizard positioning issues in multiplayer.
2014-07-08 18:51:10 -07:00
Nick Winter
31be904b03
Working on flippable tile highlight bounds marks.
2014-07-08 16:43:36 -07:00
Scott Erickson
c1f77e3f07
Merge branch 'supermodel_patch' of https://github.com/rubenvereecken/codecombat into rubenvereecken-supermodel_patch
2014-07-07 18:48:26 -07:00
Scott Erickson
49c8360d5b
Fixed me emitting 'me:synced' and anything listening for that.
2014-07-07 16:53:34 -07:00
Scott Erickson
aea1d0e8f2
Changed the angel logigng to use info instead of log, to more easily differentiate.
2014-07-06 15:01:39 -07:00
Ruben Vereecken
e33bb44ffc
Start of new user routing and views are there
2014-07-06 20:45:27 +02:00
Ruben Vereecken
51bc8e5a7c
Merged master
2014-07-06 20:07:47 +02:00
Ruben Vereecken
1f02b99942
Refactored showNotFound into notFoundView
2014-07-06 20:01:47 +02:00
Ruben Vereecken
601c4e2731
Merged with master
2014-07-05 16:47:16 +02:00
Scott Erickson
41a8d21bfe
Merged conflicts.
2014-07-04 18:11:50 -07:00
Scott Erickson
c76032b0af
Merged conflicts.
2014-07-04 18:11:26 -07:00
Scott Erickson
eed521fb8c
Merged conflicts.
2014-07-04 17:54:30 -07:00
Scott Erickson
85a6b648a5
Merged conflicts.
2014-07-04 17:54:24 -07:00
Scott Erickson
4e284d81b7
Handled conflicts, throwing out changes to ladder_tab.coffee.
2014-07-04 17:36:10 -07:00
Ruben Vereecken
bb1c07570d
added isTranslationPatch method to patches
2014-07-04 19:27:41 +02:00
Ruben Vereecken
fce9f0031b
All edits are now tracked
...
intermediate
intermediate
2014-07-04 19:27:38 +02:00
Ruben Vereecken
a933f9737d
Creating achievement demo
...
intermediate
2014-07-04 19:27:37 +02:00
Ruben Vereecken
1fe2c67ffe
Added tests for repeatable achievements, including complicated xp
...
Intermediate
2014-07-04 19:27:37 +02:00
Tery Lim
9090ce7714
Merge master into branch
2014-07-04 22:37:16 +08:00
Tery Lim
329f0e7e22
Clean up for coffeescript convention
2014-07-04 22:23:47 +08:00
Scott Erickson
2855d2a402
Made the deltas lib conflict identifying library able to handle many-to-many conflicts.
...
Made conflict finding a bit more liberal, in that any messing with arrays (adding, removing or moving things inside) will conflict with any other such change.
2014-07-03 17:41:58 -07:00
Tery Lim
618ade4946
Clean up mixed quotes
2014-07-01 12:23:22 +08:00
Nick Winter
58bf85d234
Simulator handles when there are no Greed matches to randomly simulate.
2014-06-27 08:50:04 -07:00
Nick Winter
802d43651e
Exposing Vector z property. Getting ready to use new builtin property documentation.
2014-06-27 00:36:18 -07:00
Nick Winter
dd9b8a0018
Migrating from tileGroupNumber to tileGroupLetter.
2014-06-24 16:32:44 -07:00
Nick Winter
580d002a98
Messing with marks.
2014-06-24 15:45:33 -07:00
Scott Erickson
9b873cfab4
Patch modal handles invalid patches.
2014-06-24 17:25:01 -04:00
Scott Erickson
ee0b14eb61
Changed the versions history modal to show name and date.
2014-06-24 16:41:55 -04:00
Michael Schmatz
988ad6ffda
Attempting to fix G+
2014-06-24 11:29:43 -07:00
Nick Winter
815ef88e78
Fixed bugs with camera bobbing with bobbing units and gold views showing up when empty.
2014-06-23 10:36:42 -07:00
Nick Winter
81f8334f37
Some fixes for CocoSprite alphas.
2014-06-21 22:31:10 -07:00
Nick Winter
6813279871
Fixed an infinite loop timeout issue.
2014-06-21 10:56:55 -07:00
Nick Winter
564c463431
Stop tracking Simulator events to Mixpanel.
2014-06-21 09:17:56 -07:00
Nick Winter
c9dcc290cb
Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes.
2014-06-20 17:19:18 -07:00
Fergus Leen
88aa8d234c
Facebook friends patch
2014-06-20 02:18:40 +01:00
Nick Winter
bb8b9b2e93
bid -> makeBid.
2014-06-19 17:27:41 -07:00
Michael Schmatz
34f5377754
Increased infinite loop timeout
2014-06-19 17:16:08 -07:00
Michael Schmatz
40fd1674ad
Temporary fix for bid function in hover debugger
2014-06-19 17:09:45 -07:00
Nick Winter
7b59c42f5d
Added stupid method argument compilation info for bid(blockNumber) to various Aether compilation steps.
2014-06-19 15:41:35 -07:00
Michael Schmatz
a1b7025730
Emergency linkedin hot fix
2014-06-19 08:36:22 -07:00
Michael Schmatz
548eaefae1
Add debug variable inspection progress bar
2014-06-18 13:43:04 -07:00
Scott Erickson
ee791da34c
Moved services into their own folder, and made no services run for both testing and demo pages.
2014-06-16 11:40:09 -07:00
Ruben Vereecken
1c671a3c25
Refactored vendor loading
2014-06-16 11:40:09 -07:00
Ruben Vereecken
2e40a53674
Extracting third party scripts out of main
2014-06-16 11:40:08 -07:00
Scott Erickson
4932317982
Finally got the demo view working (mostly). Need to turn off third party ajax requests.
2014-06-16 11:40:08 -07:00
Scott Erickson
1786eab09d
Initial work on a demo view. But brunch won't build demo-app.js for some reason.
2014-06-16 11:40:08 -07:00
Nick Winter
1502cdc64b
Merge branch 'jayant1992-master'
2014-06-13 08:17:12 -07:00
Ruben Vereecken
dcdcca751f
Fiddled with creating xp functions
2014-06-12 19:44:56 +02:00
Ruben Vereecken
509be067c3
Added support for the operator in LocalMongo
2014-06-12 19:41:00 +02:00
Ruben Vereecken
a61d0e5569
Added support for diminished exp for repeatables. Needs tweaking though.
2014-06-12 19:40:59 +02:00
Nick Winter
77920b5416
Improvements to profile views. Added links to players' code.
2014-06-11 19:38:47 -07:00
Scott Erickson
e6dc896bab
Reworking some code to use the new CocoModel.patch method.
2014-06-11 11:34:52 -07:00
Jayant Jain
d5d20377a2
Removes panning upon right click in editor
2014-06-11 15:05:59 +05:30
Corey Prak
8448061f7b
Added more names for #53
2014-06-10 12:52:06 -04:00
Michael Schmatz
f29a41f108
Add linkedIn link, field of study support to LinkedIn import
2014-06-08 18:15:18 -07:00
Michael Schmatz
4072c1b969
Basic functionality done, needs validation error handling
...
As well as formatting
2014-06-07 11:45:49 -07:00
Michael Schmatz
0c0084dd4b
Make single game simulate another task if error
2014-06-06 13:26:15 -07:00
Michael Schmatz
31bb9c8807
Fixed error handling for results with no taskID
2014-06-06 12:47:10 -07:00
Michael Schmatz
1486f31c37
Stop headless simulator from exiting if error
2014-06-06 12:26:28 -07:00
Michael Schmatz
24452026d1
Minor fix for simulator logic
2014-06-06 12:18:02 -07:00
Scott Erickson
49c9c6bfc9
Built the client test view (rebased from feature/testclient).
2014-06-05 16:56:29 -07:00
Ruben Vereecken
df60402d00
Added test
2014-06-02 20:29:12 +02:00
Ruben Vereecken
699aa506f2
Added Local Mongo support for nested documents. Totally forgot those
2014-06-02 20:29:11 +02:00
Ruben Vereecken
e177912a5a
Added '$or' and '$and' to Local Mongo
2014-06-02 20:29:11 +02:00
Ruben Vereecken
b3bddbd785
Finished regular query selectors of Local Mongo
2014-06-02 20:29:11 +02:00
Ruben Vereecken
20af7b090a
Worked on getting the tests to work
2014-06-02 20:29:11 +02:00
Ruben Vereecken
f2f4fef1e0
Wrote tests for the local mongo querier
2014-06-02 20:29:11 +02:00
Ruben Vereecken
99927d1345
Started on the local mongo querier
2014-06-02 20:29:11 +02:00
Scott Erickson
47f28d26d1
Fixed up my refactoring of markToRevert so now _revertAttributes is only populated the first time set is called.
2014-05-30 16:20:20 -07:00
Scott Erickson
7a9928b0c5
Fixed #1102
2014-05-30 13:57:21 -07:00
Scott Erickson
254c6ff7ba
Fixed #1106 a bunch. Patches show up correctly, don't include skipped paths when patching, and skipped paths are now used in the patch modal too.
2014-05-30 13:40:38 -07:00
Nick Winter
f3adc216ed
Protecting our replacement of Math.random via Aether.
2014-05-29 12:26:08 -07:00
Scott Erickson
93f7d8c0a4
Made sure sprites are idle and properly positioned when they load.
2014-05-27 16:41:56 -07:00
Nick Winter
c01bd69625
Better recoverability for non-UserCodeProblem errors during world generation.
2014-05-26 18:45:00 -07:00
Nick Winter
3dd362c01e
Added support for blaming infinite loops.
2014-05-25 12:15:32 -07:00
Nick Winter
6b554e03ef
Merge pull request #1084 from domenukk/feature/step-single-frame
...
Added shortcut for frame single-stepping
2014-05-25 09:37:13 -07:00
Nick Winter
16e1ef760a
Merge branch 'master' of git://github.com/jayant1992/codecombat
2014-05-25 08:51:13 -07:00
Nick Winter
1a6fd75103
Trying to fix some Simulator loading errors.
2014-05-25 08:29:33 -07:00
Dominik Maier
f62cd7f38b
+ added shortcut for frame single-stepping
...
+ fixed single stepping for frames
2014-05-24 17:31:59 +02:00
Jayant Jain
a84049cf16
Fixes issues with dragging thangs onto the map
2014-05-24 12:02:26 +05:30
Jayant Jain
94f70ca9f4
Fixes #1079
2014-05-24 12:02:26 +05:30
Nick Winter
35fc5a5197
Fixed infinite loop detection, I hope.
2014-05-23 21:24:50 -07:00
Nick Winter
690fbc6919
Fixed a bug with Tome trying to retranspile transpiled code on clone spells when remagicking.
2014-05-23 12:04:42 -07:00
Nick Winter
ff171588d9
Trying out text shadow coloring based on team for text event labels.
2014-05-23 09:56:39 -07:00
Nick Winter
26d2816071
Fixed some more memory leaks.
2014-05-22 19:05:11 -07:00
Scott Erickson
bd575ad667
Fixed the placement of wall sprites in the level editor to wait until the sprite sheet is finished being built.
2014-05-22 14:16:39 -07:00
Scott Erickson
5a407492db
Got rid of a bunch of magic numbers in mark scaling. Now assumed all target marks have a width of 10m by default.
2014-05-22 13:48:48 -07:00
Scott Erickson
681adc1dcd
Got rid of a log.
2014-05-22 13:37:08 -07:00
Nick Winter
4c7d7fce03
Fixed some memory leaks.
2014-05-22 12:05:36 -07:00
Scott Erickson
bfa90f671d
Fixes #940 , merging the signup and login modal into a single modal. Created a couple A/B tests for amount of text in the signup modal.
2014-05-22 11:26:08 -07:00
Scott Erickson
104deb2ab8
Disabled CocoModel noty errors for form submissions that handle these errors.
2014-05-22 11:26:08 -07:00
Nick Winter
48f5347075
Fixed gigantor server scoring bug. Cleaned up a bit of logging and error handling. Finished not resetting scores on resubmitting.
2014-05-21 21:56:11 -07:00
Scott Erickson
037dbe97c6
Some remaining work to get the delayed show guide script set up.
2014-05-21 14:50:27 -07:00
Scott Erickson
4929f81fcc
Fixed the level editor preview window not loading on repeated opens.
2014-05-21 14:28:52 -07:00
Scott Erickson
18f694b010
Fixed up the level loader to include session objects as world necessities.
2014-05-21 12:53:28 -07:00
Jayant Jain
c05780de4c
Resolves #170 , thang can be directly placed by dragging onto the map
2014-05-21 10:27:46 -07:00
Scott Erickson
a7f24ab04f
Some work on subscription definitions for the validated Backbone Mediator. Added 'script-manager:tick' channel.
2014-05-20 15:36:15 -07:00
Scott Erickson
70525ec57a
Fixed the music starting when you restart the level, even if music is off.
2014-05-20 13:43:52 -07:00
Nick Winter
88a5685c37
Fix for WizardSprite scale thing.
2014-05-20 12:32:26 -07:00
Scott Erickson
86736d8f4a
Fixed a bug.
2014-05-20 12:22:24 -07:00
Scott Erickson
2b56dffcb0
Fixed a bug where sometimes scripts setting playback would be overridden by the surface resetting playback after casting is done.
2014-05-20 12:21:43 -07:00
Scott Erickson
3f884e71e5
Fixed the LevelLoader in headless settings.
2014-05-20 11:25:32 -07:00
Scott Erickson
93c6f72f07
Asynchronously building things again.
2014-05-20 10:49:19 -07:00
Nick Winter
022722a19f
Fixed cosmetic GoalManager destruction error.
2014-05-20 09:19:31 -07:00
Nick Winter
d058b16283
Fixed some memory leaks.
2014-05-20 08:00:49 -07:00
Scott Erickson
a8abe8c887
Fixed mark sprite scaling some more.
2014-05-19 23:01:48 -07:00
Scott Erickson
f24ee98295
More work on mark sizing.
2014-05-19 22:17:23 -07:00
Scott Erickson
f463966a22
Fixed a bug with thangs not being properly scaled when first created sometimes.
2014-05-19 21:55:41 -07:00
Scott Erickson
6c3ff16bed
Fixed setting registration points for thangs that match world dimensions.
2014-05-19 21:55:31 -07:00
Scott Erickson
b816055f9e
Fixed goal states to handle teams.
2014-05-19 21:55:30 -07:00
Nick Winter
b2cc3d0692
Fixed bug with preloading the world replacing casting the same world if timing was wrong.
2014-05-19 20:12:16 -07:00
Scott Erickson
9ad4602e0f
Fixed a bug with the new goal view.
2014-05-19 20:11:33 -07:00
Michael Schmatz
aba0120e88
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
server/queues/scoring.coffee
2014-05-19 19:04:47 -07:00
Michael Schmatz
97cbf55695
Simulator fetch random Greed games when queue empty
2014-05-19 18:58:45 -07:00
Scott Erickson
b410d91203
Cleaned up the LevelView, organizing it so that initialization code roughly runs in order, and set it up so that the ScriptManager is created earlier.
2014-05-19 17:10:41 -07:00
Scott Erickson
62ad8dd26a
Added a status message to the goals view.
2014-05-19 16:36:45 -07:00
Scott Erickson
9ace31d391
Fixed the target mark.
2014-05-19 16:36:45 -07:00
Scott Erickson
8ae14e21ae
Fixed #1029 . Refactored scaling for sprites a bit.
2014-05-19 16:36:44 -07:00
Nick Winter
68a4483e91
Moved views/play/ladder_view to views/play/ladder/ladder_view and made a new views/play/ladder_home_view.
2014-05-19 11:58:53 -07:00
Nick Winter
5dd8bec393
Fixed issues with initial sprite scaling.
2014-05-19 10:39:24 -07:00
Michael Schmatz
6f2fd8e293
Verification simulator changes
2014-05-19 10:11:23 -07:00
Scott Erickson
df222461bf
Fixed a bug that was bringing the thang editor down.
2014-05-17 11:38:33 -07:00
Scott Erickson
f99a95768e
Set up CocoSprites to have text appear overhead based on events coming from the ShowsText component.
2014-05-17 11:28:57 -07:00
Scott Erickson
4be67113be
Thang events now only appear once per whole frame, rather than for each interpolated frame.
2014-05-17 11:28:57 -07:00
Nick Winter
736fc8c12f
Remove overeager transpile problem showing for JS again.
2014-05-17 09:58:35 -07:00
Nick Winter
418c2f1a2c
Preserve original scripts; don't overwrite with nothing if new world finishes before script initialization.
2014-05-16 17:38:33 -07:00
Nick Winter
a36a7792ec
Fixed problem with IndieSprites not loading, breaking scripts.
2014-05-16 17:18:56 -07:00
Nick Winter
f64e50f85b
Recording flow only for frame of interest.
2014-05-16 16:52:55 -07:00
Scott Erickson
ae64032739
Refactored the Camera to only listen to events that use the same canvas. Fixed the level editor map selection modals.
2014-05-16 15:34:14 -07:00
Michael Schmatz
e631bae248
Level session playtime logging
2014-05-16 15:27:46 -07:00
Michael Schmatz
5b93414862
Add playtime, opponent name, totalScore to match
2014-05-16 14:52:49 -07:00
Nick Winter
c1052d8d7e
Fixed bug with trying to play selection sound for nonexistent sprites.
2014-05-16 10:03:45 -07:00
Nick Winter
fabf607b6a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-15 20:49:15 -07:00
Nick Winter
ca6ea474bf
Fixed some bugs with sprite sound loading and playback.
2014-05-15 20:49:10 -07:00
Scott Erickson
eebbae9b13
Added a global SPRITE_RESOLUTION_FACTOR property.
2014-05-15 17:09:35 -07:00
Michael Schmatz
65aae86dcc
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/lib/simulator/Simulator.coffee
2014-05-15 16:44:16 -07:00
Michael Schmatz
a21d17a168
Have simulator use transpiledCode
2014-05-15 16:43:16 -07:00
Nick Winter
763e0500b2
Tracking simulator clicks.
2014-05-15 15:10:50 -07:00
Nick Winter
b973b749c0
Merged.
2014-05-15 14:57:24 -07:00
Nick Winter
8909d218bc
Moved random seed initialization to Existence System, where it can be configured.
2014-05-15 14:54:31 -07:00
Scott Erickson
2a1d9a3c6c
Turned shadow caching back on, with a little buffer. Makes a bigger diff for maps like Greed on Firefox where they're all over the place.
2014-05-15 13:19:10 -07:00
Scott Erickson
3a1afbb7ca
Turned shadow caching back on. Makes a bigger diff for maps like Greed on Firefox where they're all over the place.
2014-05-15 13:06:42 -07:00
Nick Winter
c1f9d51b37
Added times to runtime errors. Don't load ThangTypes for Thangs that don't exist on the first frame of the world.
2014-05-15 11:27:51 -07:00
Scott Erickson
f653aa3375
Fixed #1008
2014-05-15 10:51:38 -07:00
Nick Winter
dbcafbb29b
Working on level-specific coding languages, with non-writable code in JavaScript.
2014-05-14 21:54:36 -07:00
Scott Erickson
2a17ec5cb9
Refactored out displayObject from CocoSprites.
2014-05-14 17:05:13 -07:00
Nick Winter
d61922ae42
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-14 15:31:19 -07:00
Nick Winter
cc7808251f
Zoom/scroll, ModelModal, and coordinate grabber fixes.
2014-05-14 15:29:55 -07:00
Scott Erickson
a1474652f6
Merge branch 'feature/thangload'
2014-05-14 14:21:40 -07:00
Scott Erickson
00fdaa1d0f
Fixed raster image sprites to update their scales when they load, and to properly place themselves if matching world dimensions.
2014-05-14 12:28:47 -07:00
Nick Winter
698207f533
Merge pull request #996 from gosnat/patch-8
...
Update world.coffee
2014-05-14 11:55:01 -07:00
Nick Winter
7f3e769cbd
Merge pull request #997 from gosnat/patch-6
...
Update GoalManager.coffee
2014-05-14 11:54:50 -07:00
Nick Winter
57f3846abb
Merge pull request #998 from gosnat/patch-7
...
Update thang.coffee
2014-05-14 11:54:46 -07:00
Scott Erickson
7a381df348
Merge branch 'feature/thangload'
2014-05-14 11:48:19 -07:00
Scott Erickson
09fbfdb360
Fixed a bug with the simulator due to the changes made to the supermodel.
2014-05-14 11:13:36 -07:00
Scott Erickson
0be813e424
Figured out how to get the world to properly get shown if the world is created before the level loader is completely finished.
2014-05-14 10:35:16 -07:00
Michael Schmatz
9f9d651b3b
Updates to transpile script and updated aetherOptions
2014-05-14 10:14:18 -07:00
Scott Erickson
54af58baee
SuperModel no longer emits progress going backward ever, and added a way to prevent it from getting to high in the middle of a chain of loading.
2014-05-14 09:24:52 -07:00
Scott Erickson
4b404ae124
Finished tuning the supermodel loading and progress.
2014-05-13 14:39:45 -07:00
Scott Erickson
b4ad34eb8f
LevelLoader only builds and loads thang types in the world on the first frame, letting everything else happen lazily.
2014-05-13 10:51:55 -07:00
gosnat
12f351197d
Update world.coffee
...
add getGoalState
2014-05-13 12:43:39 -05:00
gosnat
72b2c84705
Update thang.coffee
...
add getGoalState
2014-05-13 12:42:48 -05:00
gosnat
25287e0298
Update GoalManager.coffee
...
add getGoalState
2014-05-13 12:41:39 -05:00
Scott Erickson
66af855497
Merge branch 'master' into feature/thangload
2014-05-13 10:27:10 -07:00
Scott Erickson
1d88b6eefe
Most of the way there getting it to work with loading thang types dynamically throughout the play view.
2014-05-13 10:26:33 -07:00
Dominik Maier
bb562aba32
+ Overly lengtly comment changed.
2014-05-13 04:40:15 +02:00
Nick Winter
09bdc9bad9
Fixed initial team setting.
2014-05-12 19:39:16 -07:00
Dominik Maier
521bc31fa5
+ Created function for generating a reproducable seed out of user code - as using JSON.stringify is not garanteed to be the same on every browser for objects.
2014-05-13 04:32:29 +02:00
Dominik Maier
efa39ffcd9
+ Created function for generating a reproducable seed out of user code but it fails inside the web-worker
2014-05-13 04:18:56 +02:00
Dominik Maier
2807e83672
+ "Real" predictable random. Seed depends on usercode map.
2014-05-13 03:34:11 +02:00
Nick Winter
2eefdef191
Working on matching Surface paused state to the pause screen.
2014-05-12 15:54:07 -07:00
Nick Winter
78a0efac78
Fixed long words in Labels and empty GoldView.
2014-05-12 15:03:53 -07:00
Nick Winter
802889d115
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-12 13:28:51 -07:00
Nick Winter
1a5e30d5b5
Dynamic Canvas sizing.
2014-05-12 13:28:46 -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
e1b35251a3
Fixed bug with playback ending early.
2014-05-12 08:35:46 -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
8df3b01f9e
Merged world/lodash/aether breakup for world workers.
2014-05-10 18:52:55 -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
Scott Erickson
f1de2ca8d9
Brought the canvas size down again because it halves the FPS in Firefox at least.
2014-05-09 16:35:10 -07:00
Nick Winter
df88be1ab1
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-09 15:07:55 -07:00
Nick Winter
6040d3b225
Shouldn't use much CPU when totally paused on Surface.
2014-05-09 15:07:30 -07:00
Michael Schmatz
1bbd4e6c68
Fixed frame-related bug
2014-05-09 15:05:50 -07:00
Michael Schmatz
f05af0fbe7
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/assets/javascripts/workers/worker_world.js
2014-05-09 14:50:08 -07:00
Michael Schmatz
66cc427417
Forward simulation optimization
2014-05-09 14:48:43 -07:00
Nick Winter
a74d015d18
Fixed a couple minor bugs.
2014-05-09 14:30:33 -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
Nick Winter
775a2a87e2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-08 11:36:26 -07:00
Michael Schmatz
9c58aef32b
Merged worker_debug and worker_world
2014-05-08 09:47:02 -07:00
Nick Winter
f3c6745b29
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-07 15:37:49 -07:00
Scott Erickson
c037ce14f2
Fixed #958 . LevelLoader wasn't handling cached session objects passed in with the supermodel.
2014-05-07 13:28:42 -07:00
Michael Schmatz
7432112cba
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-07 11:37:04 -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
Scott Erickson
09a47cc5d8
Fixed #951 . The parser was removing the shadow shape but not the tween of the shadow.
2014-05-07 11:11:22 -07:00
Nick Winter
0c30ec0c12
Some weird bugs I noticed with {me}.
2014-05-06 16:58:08 -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
Nick Winter
1f166406ac
Some new names.
2014-05-06 12:47:38 -07:00
Nick Winter
ca8d5c1f3b
Stop bobbing and more marks when world ended.
2014-05-06 11:02:53 -07:00
Michael Schmatz
dddd617a08
userCodeMap issues fixed
...
Now beginning hooking up the UI
2014-05-06 10:06:32 -07:00
Nick Winter
2e6bec5454
Some fixes for my accidental merge of #970 .
2014-05-06 09:49:04 -07:00
Nick Winter
1f3cc8a004
Merge branch 'master' of git://github.com/domenukk/codecombat
2014-05-06 08:00:39 -07:00
Nick Winter
09c8a99a9b
Merge branch 'patch-5' of git://github.com/gosnat/codecombat into gosnat-patch-5
2014-05-06 07:23:51 -07:00
Nick Winter
acccee33a3
Cleaner conditional init syntax.
2014-05-06 07:22:09 -07:00
Nick Winter
3e7edd8c61
Merge branch 'patch-4' of git://github.com/gosnat/codecombat into gosnat-patch-4
2014-05-06 07:18:26 -07:00
Dominik Maier
6d244e8560
+ Merged Simulators
2014-05-06 05:07:34 +02:00
Dominik Maier
ad85bf5b77
Merge remote-tracking branch 'upstream/master'
2014-05-06 03:12:24 +02:00
Dominik Maier
c9bb488794
Created headless-client and an alternative implementation of god
2014-05-06 02:37:14 +02:00
Scott Erickson
056f081cdb
Merge branch 'anonNameCollide' of https://github.com/adi2412/codecombat into adi2412-anonNameCollide
...
Conflicts:
app/views/modal/signup_modal.coffee
2014-05-05 16:48:35 -07:00
Scott Erickson
684e61532a
Fixed a bug with the deltas library identifying conflicts between patches.
2014-05-05 16:35:26 -07:00
Michael Schmatz
97f3694dbf
Basic backend functionality is there
2014-05-05 13:26:37 -07:00
gosnat
939509849c
Update GoalManager.coffee
...
Justification:
For a negative goal like saveThangs, let's say you have 5 thangs on the save list. As things stand, if you don't have a HowMany defined, then the number of needed deaths to fail is
numNeeded = _.size(stateThangs) - Math.min((goal.howMany ? 1), _.size stateThangs) + 1
numNeeded = 5 - Math.min(1, 5) + 1
numNeeded = 5
So you would only fail the goal if all 5 thangs you were supposed to save died. This is contrary to the comment right above this line:
# saveThangs: by default we would want to save all the Thangs, which means that we would want none of them to be "done"
Therefore, I think it should be Math.max rather than Math.min.
numNeeded = _.size(stateThangs) - Math.max((goal.howMany ? 1), _.size stateThangs) + 1
numNeeded = 5 - Math.max(1, 5) + 1
numNeeded = 1
So any of the Thangs on the save list dying is enough to fail the goal.
As a double check, what if the level designer designated a HowMany of 5?
numNeeded = _.size(stateThangs) - Math.max((goal.howMany ? 1), _.size stateThangs) + 1
numNeeded = 5 - Math.max(5, 5) + 1
numNeeded = 1
So this is consistent.
2014-05-05 14:08:41 -05:00
gosnat
93d117100a
Update GoalManager.coffee
...
For compound goals like GetAllToLocation, you should continue adding to the existing list of thang states.
2014-05-05 13:22:57 -05:00
gosnat
39b21da035
Update GoalManager.coffee
...
I'd like to temporarily turn on console logging (lines 240 and 245) to take a peek at why numNeeded doesn't seem to be correct if howMany isn't defined.
2014-05-03 21:36:24 -05:00
Scott Erickson
db9a82d58a
Merge branch 'feature/thangload' of https://github.com/codecombat/codecombat into feature/thangload
2014-05-02 17:03:53 -07:00
Scott Erickson
aee90c72bb
Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel.
2014-05-02 17:03:30 -07:00
Nick Winter
d54149d0f3
Reworked LevelView loading priorities to try to get world simulating earlier.
2014-05-02 12:32:41 -07:00
Scott Erickson
06bc96d7d0
Set up the level loader to get thangtype names first, then load the thang types themselves so the world can be generated in parallel with thang type loading and rendering.
2014-05-02 10:31:20 -07:00
Scott Erickson
2952d7702c
Merge branch 'master' into feature/thangload
...
Conflicts:
app/lib/LevelLoader.coffee
app/views/play/level_view.coffee
2014-05-02 08:20:03 -07:00
Scott Erickson
92687b17de
Merge branch 'master' into feature/thangload
...
Conflicts:
app/lib/LevelLoader.coffee
app/views/play/level_view.coffee
2014-05-02 08:19:47 -07:00
Scott Erickson
26cafd2f19
Fixed #941 . Actually it was no longer crashing probably because of the fix for #934 , but there were still other bugs. Fixed it, and other bugs like it, particularly in the spectate view. Cleaned up a bit, too.
2014-05-01 16:38:27 -07:00
Michael Schmatz
717651d6ff
Progress on thang property serialization
...
There is a bug where thang properties aren’t updated when simulating
forward
2014-05-01 16:08:46 -07:00
Scott Erickson
3bc0c1710e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-01 15:45:00 -07:00
Scott Erickson
31c5890288
Fixed #934
2014-05-01 15:44:50 -07:00
Nick Winter
0f33bae1f1
Hid level done button better. Avoiding building wizard sprite when not needed.
2014-05-01 14:36:26 -07:00
Nick Winter
5376a42f94
Fixed serialization of tracked property arrays.
2014-05-01 13:23:14 -07:00
Michael Schmatz
c9ea301b29
Fixed various bugs with debug worker
2014-05-01 11:12:44 -07:00
Nick Winter
f7bdb7e840
Upgrades for teleportation imnterpolation performance, ACE search box styling.
2014-05-01 10:44:17 -07:00
Nick Winter
541a2756fd
Simulate properly even if Simulator Supermodel starts fully loaded.
2014-04-29 16:54:57 -07:00
Nick Winter
2f174691c5
Fixed #939 .
2014-04-29 16:44:38 -07:00
Nick Winter
04d74fb76f
Fixed bug with scale not updating properly when paused.
2014-04-29 16:04:30 -07:00
Nick Winter
bea0589fad
Fixed #935 .
2014-04-29 15:31:18 -07:00
Nick Winter
369ea8a00f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-28 19:09:04 -07:00
Nick Winter
aea49cc27f
Fixed bobbing.
2014-04-28 18:36:46 -07:00
Scott Erickson
bcad939eae
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-28 18:31:04 -07:00
Scott Erickson
57beb94b5c
Fixed a bug with the levelloader loading articles.
2014-04-28 18:30:47 -07:00
Nick Winter
b954e70d85
Let's try 30 FPS. Fixed Surface destruction bug.
2014-04-28 17:06:43 -07:00
Nick Winter
0b947dbeee
Let's try 30 FPS for a while now.
2014-04-28 16:41:18 -07:00
Nick Winter
bd3c059c2a
Several performance improvements based on profiling.
2014-04-28 16:31:51 -07:00
Michael Schmatz
544cc62cdb
First steps towards hover debugger improvements
2014-04-28 15:05:54 -07:00
Scott Erickson
b9f4093b08
Set up the LevelLoader to load names instead of whole ThangTypes.
2014-04-28 14:58:58 -07:00
Scott Erickson
01f2a556f9
Set up the patches view with the new loading system, fixing a few things in the meanwhile.
2014-04-28 11:09:21 -07:00
Scott Erickson
17a0bf54c6
Merge branch 'master' into feature/loading-views
2014-04-28 10:10:57 -07:00
Nick Winter
fc6ad1dd01
Properly tracking first-frame team gold. Slightly more visible team gold on hover.
2014-04-27 20:11:11 -07:00
Nick Winter
a7179ae3b2
Fixed some more gold view stuff.
2014-04-27 15:33:16 -07:00
Nick Winter
fa0e7f04f7
Fixed a thing.
2014-04-26 14:21:26 -07:00
Scott Erickson
fed5d681f2
Merge branch 'master' into feature/loading-views
2014-04-26 12:54:37 -07:00
Scott Erickson
d5bcec5ad0
Fixed the level editor with the new loading system.
2014-04-25 19:11:32 -07:00
Nick Winter
834c27bbd7
Show spell palette for Thangs with apiProperties that aren't programmable.
2014-04-25 16:57:42 -07:00
Scott Erickson
14d62915f4
Got projection and backups set back up, partially fixed the level editor.
2014-04-25 16:14:05 -07:00
Nick Winter
d8d2a57c38
Listed a few new levels.
2014-04-25 15:00:46 -07:00
Scott Erickson
7640a6365b
Removed some logs.
2014-04-25 14:59:17 -07:00
Scott Erickson
3dc3f62473
Merge branch 'master' into feature/loading-views
...
Conflicts:
app/views/editor/components/main.coffee
2014-04-25 14:31:58 -07:00
Scott Erickson
278d6752c3
Refactored SuperModel, CocoModel and LevelLoader.
...
Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader.
Simplified SuperModel.
2014-04-25 14:30:06 -07:00
Nick Winter
183fe9c496
Code review of 97d3b6.
2014-04-25 10:46:43 -07:00
Michael Schmatz
97d3b6107d
Merge feature/linkedin into master
2014-04-25 08:47:31 -07:00
Michael Schmatz
0dbcc861bf
Various tweaks to employer signup
2014-04-25 07:48:59 -07:00
Michael Schmatz
4f6f845c2d
Employer signup works
2014-04-24 17:36:07 -07:00
Michael Schmatz
6644c6a9ee
Push for george
2014-04-24 15:27:37 -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
Michael Schmatz
628a784ac4
Progress towards LinkedIn integration
2014-04-23 11:25:36 -07:00
Nick Winter
d4cf31c8fe
Improved admin view of pending candidates.
2014-04-23 10:21:58 -07:00
Scott Erickson
c85971e5e6
Added i18n population action to the level editor.
2014-04-22 17:56:41 -07:00
Scott Erickson
e8da248302
Made the level editor not break when using units that are incomplete.
2014-04-22 10:39:15 -07:00
Ting-Kuan
974e5e1b24
remove debugging msg.
2014-04-19 13:09:50 -04:00
Ting-Kuan
692693c181
Merge branch 'master' into feature/loading-views
...
Conflicts:
app/locale/en.coffee
app/views/editor/level/edit.coffee
app/views/kinds/CocoView.coffee
app/views/play/ladder/ladder_tab.coffee
app/views/play/ladder_view.coffee
app/views/play/level/level_loading_view.coffee
2014-04-19 01:15:04 -04:00
dpen2000
75b759b1dc
Add system names into delta messages
2014-04-18 17:25:25 -04:00
dpen2000
b20f8fd260
Refactor getNameById to use mongo db's $in instead of parallel and use a new generic method in Handler.coffee
2014-04-18 21:06:57 +01:00
Ting-Kuan
1c1cf2f189
Fix loading of Level.
2014-04-17 19:23:35 -04:00
Ting-Kuan
360e594f3d
Merge branch 'feature/loading-views' of https://github.com/codecombat/codecombat into feature/loading-views
...
Conflicts:
server/commons/Handler.coffee
2014-04-17 12:58:29 -04:00
Scott Erickson
9ed876d12a
Some bug fixes to get Anya import to work.
2014-04-16 09:25:34 -07:00
Scott Erickson
bf7117d1c6
Merge pull request #854 from dpen2000/ShadowsIssue
...
Fix #736 Invisible thangs still have shadows
2014-04-16 08:38:59 -07:00
Ting-Kuan
2e50d7b15d
Merge branch 'feature/Change-view-to-fit-new-supermodel' into feature/loading-views
...
Conflicts:
app/views/play/ladder/ladder_tab.coffee
app/views/play/ladder_view.coffee
2014-04-16 11:38:05 -04:00
Scott Erickson
94c4179417
Fixed some things that were keeping brunch from working.
2014-04-16 08:03:41 -07:00
edtrist
5aa1afbf7a
Fix console.warning bug that prevents page from loading
2014-04-16 00:03:43 +01:00
dpen2000
eae2ba6913
Fix #736 Invisible thangs still have shadows
2014-04-15 18:32:29 -04:00
Ting-Kuan
af399f4415
Merge branch 'master' into feature/loading-views
2014-04-15 13:34:20 -04:00
Nick Winter
03df078d5a
Couple job profile fixes.
2014-04-15 08:39:18 -07:00
Nick Winter
1239617bd4
Fixed browser majorVersion detection for Safari. Adjusted range radius property regexp.
2014-04-14 16:34:11 -07:00
Nick Winter
89ec5c900b
Trying synchronous spritesheet building during level loading for speed.
2014-04-14 14:50:25 -07:00
Scott Erickson
dd36cdd092
Fixed #836
2014-04-14 11:14:09 -07:00
Nick Winter
8aa36178af
Fixed #769 . Added some analytics timing tracking. Added replacement for $.browser.
2014-04-13 20:31:23 -07:00
Nick Winter
7fcff825a8
Fixed #310 by tweaking the styling to emphasize stroke over fill.
2014-04-13 16:42:21 -07:00
Nick Winter
a9725f2dc6
A bit of error handling.
2014-04-13 14:48:36 -07:00
Ting-Kuan
8e19d8b71f
Change some resource loading logic to fit new SuperModel.
2014-04-13 13:29:43 -04:00
Aditya Raisinghani
ffd057899e
Removed anon name collisions and reset anon user name if name is taken in interim.
2014-04-13 17:55:49 +05:30
Ting-Kuan
508b570fea
Merge branch 'master' into feature/loading-views
...
Conflicts:
.gitignore
app/locale/en.coffee
app/models/SuperModel.coffee
app/views/editor/thang/edit.coffee
app/views/kinds/CocoView.coffee
2014-04-12 17:07:30 -04:00
Scott Erickson
35fe47bbac
Merge branch 'feature/jsondiffpatch'
2014-04-11 22:52:58 -07:00
Scott Erickson
34bf484bf2
Added data merge conflict handling.
2014-04-11 21:11:52 -07:00
Nick Winter
99ead5d193
#223 is done, since goals aren't in scripts, and I just removed some goals-of-scripts stuff.
2014-04-11 19:51:20 -07:00
Ting-Kuan
a6235842b6
Change populate model to accept resource name.
2014-04-11 22:35:20 -04:00
Michael Schmatz
7ddd84248b
Simulator fixes!
...
Fixed memory bug with aggregation framework
2014-04-11 17:11:57 -07:00
Scott Erickson
bbb9fb7a64
Added a patches view.
2014-04-11 14:19:17 -07:00
Nick Winter
10bb17c38a
Added getThangByID method to Thang. Handled a few error corner cases with the time popup.
2014-04-11 14:03:13 -07:00
Scott Erickson
e3a1f170cf
Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader
...
Conflicts:
app/views/kinds/CocoView.coffee
app/views/play/level/level_loading_view.coffee
2014-04-11 11:19:16 -07:00
Scott Erickson
97a7bc7614
Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch
...
Conflicts:
app/initialize.coffee
bower.json
2014-04-11 10:32:19 -07:00
Nick Winter
8d5e129c2c
Merged the jobs in. Look out for Treema bugs from the last four months.
2014-04-11 10:20:12 -07:00
Nick Winter
7a35a6248f
Adding contact form for employers to contact candidates.
2014-04-10 14:59:32 -07:00
Michael Schmatz
e17fbdae73
Fixed common programmables not being saved
2014-04-10 14:08:20 -07:00
Ting-Kuan
a5e6496a7c
Make resources as static class to avoid loading multiple times.
...
Clean debug message.
2014-04-10 16:59:08 -04:00
Scott Erickson
3c832d3707
Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks.
2014-04-10 11:13:33 -07:00
Scott Erickson
66d455285e
Integrated the delta view into the save view for levels.
2014-04-09 19:07:44 -07:00
Nick Winter
dd46f9d039
Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks.
2014-04-09 16:46:44 -07:00
Scott Erickson
f2d21b960f
Added a delta subview for displaying deltas of schema'd data.
2014-04-09 16:09:35 -07:00
Ting-Kuan
3ea4d1677c
able to load level editor.
2014-04-09 15:11:59 -04:00
Nick Winter
3325c55c3f
Fixed #759 .
2014-04-08 14:58:34 -07:00
Ting-Kuan
16fe28ff55
Add ResourceManager.
2014-04-07 16:27:50 -04:00
Nick Winter
255cef83fb
Fixed #738 .
2014-04-03 16:16:53 -07:00
Scott Erickson
0a78368217
Refactored user authentication again. Now the user object is inserted into main.html, which was renamed from index.html so the express static middleware wouldn't serve it.
2014-04-02 13:12:24 -07:00
Nick Winter
bfa71d01ff
Merged.
2014-04-01 10:31:22 -07:00
swapnesh
497563bc0a
Added more names for #53
2014-04-01 17:50:33 +05:30
Nick Winter
a319e183b6
Fixed a little mistake with user signup.
2014-03-31 14:02:15 -07:00
Nick Winter
389323953b
Fixed #180 .
2014-03-31 13:56:13 -07:00
Nick Winter
cb27124285
Fixed #135 .
2014-03-30 17:24:07 -07:00
Nick Winter
8df80ad1bc
Merged AKeeper's ru.coffee additions, taking into account M-r-A's suggestions.
2014-03-30 13:33:21 -07:00
Nick Winter
b0a4a97ff1
Merged
2014-03-30 12:54:48 -07:00
Bia
53c20d3b9d
Added Thang names
2014-03-30 20:43:48 +01:00
Nick Winter
e08265a725
Merge pull request #730 from Darredevil/master
...
Added setGoalState
2014-03-29 14:04:33 -07:00
Darredevil
c4de6ef996
Added setGoalState
2014-03-29 03:54:16 +02:00
Darredevil
0a969bb103
Added setGoalState
2014-03-29 03:53:19 +02:00
Darredevil
e060d4b73d
Added setGoalState
2014-03-29 03:52:02 +02:00
Nick Winter
cf81d51a89
Fixed #46 .
2014-03-28 15:23:12 -07:00
Nick Winter
62f2fe80c3
Updated CoordinateDisplay styles; fixed #10 .
2014-03-28 11:55:24 -07: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
Scott Erickson
fae9034dfc
Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master
...
Conflicts:
app/models/SuperModel.coffee
2014-03-26 14:29:16 -07:00
Nick Winter
544070e578
Fix for infinite loop fix.
2014-03-26 12:34:45 -07:00
Nick Winter
515b8723a3
Simulator handles more errors.
2014-03-26 12:12:43 -07:00
Nick Winter
127eb3cef6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-26 11:32:49 -07:00
Nick Winter
cab343b0b3
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-26 11:25:20 -07:00
Nick Winter
773df44b14
Added infinite loop handling to Simulator.
2014-03-26 11:25:05 -07:00
swapnesh
1118324b41
Migrate from .on, .once to .listenTo, .listenToOnce
2014-03-26 03:25:11 +05:30
kgy01
29aad01697
hide Arrow and Spear if buried use ['Arrow', 'Spear'] for condition
2014-03-25 08:48:26 -04:00
kgy01
a420064bc1
hide spear's shadow if buried
2014-03-25 08:31:38 -04:00
kgy01
3cc422a281
Merge remote-tracking branch 'upstream/master'
2014-03-25 08:10:30 -04:00
kgy01
c48863fae6
Hide arrow's shadow if buried
2014-03-25 08:06:37 -04: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
e9b3db2eb9
Fixed destroy to not break stopListening, which uses off.
2014-03-24 14:27:10 -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
0160538b44
More migrations
2014-03-24 22:28:34 +05:30
Shrihari
5845125b43
Migrate .on, .once - Fixed a small error
2014-03-24 12:32:29 +05:30
Shrihari
67f5270bfc
Migrate .on, .once - Batch 1
2014-03-24 12:23:41 +05:30
Akaza Akari
3e4d7d745a
Script-based movement for all CocoSprites for #140
2014-03-23 23:19:18 -07:00
Nick Winter
dbeb3d445b
Give focus back to spell view on palette click.
2014-03-23 16:48:30 -07:00
Nick Winter
4a47c5b517
Dead Thangs sink down a bit in the layer order.
2014-03-23 16:21:36 -07:00
Nick Winter
9fbd008f59
Merge branch 'ItsLastDay-arrow'
2014-03-23 14:15:24 -07:00
Nick Winter
d85dd9f62c
Bringing in #664 , but only when maximizesArc is on.
2014-03-23 14:15:06 -07:00
Mikhail Koltsov
13338afe3d
Now absolutely done scaling ( #46 )
...
also commented math's out.
2014-03-23 23:51:46 +04:00
Mikhail Koltsov
446726acc9
done rotating, looks good in Zone of Danger ( #46 )
2014-03-23 22:13:07 +04:00
Scott Erickson
8ca5f23749
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-23 09:30:46 -07:00
Scott Erickson
72b88a3ee9
First pass on setting up gplus friends on the ladder page.
2014-03-23 09:30:01 -07:00
Mikhail Koltsov
edeeb3c3eb
some work on arrows
2014-03-23 20:21:11 +04:00
Nick Winter
eec46dcb48
Don't try to draw a grid if it's not going to work (no lands).
2014-03-22 14:28:18 -07:00
Nick Winter
808cf9280b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-22 08:53:02 -07:00
Nick Winter
d289ca825e
Fixed Simulator to actually use protectAPI.
2014-03-22 08:52:47 -07:00
therealbond
7d03c2e520
Merge branch 'master' of https://github.com/therealbond/codecombat
2014-03-22 02:05:19 -04:00
therealbond
b2c500369b
Added more names for #53
2014-03-22 01:56:32 -04:00
Nick Winter
9e4908ade2
A couple ladder tweaks.
2014-03-20 19:18:46 -07:00
Nick Winter
2f3c0b0cc6
Need updated Aether.
2014-03-20 10:43:24 -07:00
Nick Winter
9713f7d142
Merge branch 'arrow' of git://github.com/ItsLastDay/codecombat into ItsLastDay-arrow
2014-03-19 18:01:49 -07:00
Nick Winter
87f16f2550
Merge branch 'Shrihari-range-radii'
2014-03-19 17:17:05 -07:00
Nick Winter
fec8e34a78
Merged.
2014-03-19 17:16:48 -07:00
Scott Erickson
b6c9b6276c
Tweaked logging of sprite building.
2014-03-19 17:11:45 -07:00
Scott Erickson
74e068af0b
Fixed some bugs from the migration from _.cloneDeep to $.extend
2014-03-18 13:47:51 -07:00
Scott Erickson
a461a14d6e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-18 13:08:34 -07:00
Scott Erickson
37a9b7f319
Switching from the slow _.cloneDeep to the fast $.extend
2014-03-18 13:08:26 -07:00
Nick Winter
358d7fa181
Dont' need to load sessions, too.
2014-03-18 11:52:23 -07:00
Nick Winter
4355813d69
Don't throw away fully loaded supermodels in between simulations or refresh tabs when not looking at them.
2014-03-18 11:26:15 -07:00
Shrihari
ee76e41c78
Range radii - renamed few variales for clarity
2014-03-18 18:33:39 +05:30
Shrihari
8f5e8efce0
Range radii - Some cleanup
2014-03-18 18:22:26 +05:30
Shrihari
ea24ae2fd8
Range radii - Some cleanup
2014-03-18 18:13:38 +05:30
Shrihari
22af95e7b9
Added 4 fallback colors for extra ranges
2014-03-18 18:06:44 +05:30
Shrihari
b283757315
Refactored buildRadius() to work with any range radius
2014-03-18 17:39:16 +05:30
Mikhail Koltsov
97f9e548e2
added perspectivizion for arrows (issue #46 )
2014-03-18 00:40:37 +04:00
Scott Erickson
564d267463
Removed a TODO.
2014-03-17 07:33:53 -07:00
Nick Winter
566c9e6c9d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 21:48:37 -07:00
Nick Winter
b51f51f636
Fix for no Camera for creating Marks in the Thang Editor.
2014-03-16 21:48:28 -07:00
Scott Erickson
5a8d1b0a2b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 21:43: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
Nick Winter
af57e88a1a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 21:33:50 -07:00
Nick Winter
f02f4e77d0
Improved next game routing and speed. Hid that catastrophically dangerous reset all games button.
2014-03-16 21:33:46 -07:00
Scott Erickson
17af4cec0c
Slight tweak.
2014-03-16 20:36:02 -07:00
Scott Erickson
dc32add6cb
Merge branch 'simulator-teardown' of https://github.com/adi2412/codecombat into adi2412-simulator-teardown
2014-03-16 20:34:03 -07:00
Scott Erickson
a3df986567
Added a tween for size changes.
2014-03-16 19:27:48 -07:00
Nick Winter
aa4f1baf73
Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions.
2014-03-16 13:23:01 -07:00
Aditya Raisinghani
226ae29caf
Added CocoClass as superclass to Simulator and updated destroy method.
2014-03-16 13:37:17 +05:30
Nick Winter
4e14ff3b11
Merge pull request #565 from jayant1992/master
...
Bugfix for play, usability improvement for editor.
2014-03-15 15:32:17 -07:00
Nick Winter
38bfe222a0
Merge pull request #564 from Shrihari/range-radii
...
Added radii marks for voiceRange, visualRange and attackRange
2014-03-15 15:31:12 -07:00
Jayant Jain
93bb2d0893
Restricts wizard to level bounds when moving around
2014-03-16 03:11:55 +05:30
Jayant Jain
91515b1cea
Clicking a thang in the left list automatically pans to the sprite on the editor map
2014-03-16 03:11:40 +05:30
Shrihari
005a91cec2
Moved createMarks() to setupSprite() to optimize loading
2014-03-16 02:48:19 +05:30
Shrihari
d186ae0a15
Added radii marks for voiceRange, visualRange and attackRange
2014-03-16 02:02:17 +05:30
Nick Winter
4b9c7a3784
Fixed bug with sprites being offset incorrectly when starting with an action not in their ThangType.
2014-03-15 11:31:12 -07:00
Nick Winter
7b1f8d1114
Merge pull request #547 from jayant1992/master
...
Improved panning and zooming for editor
2014-03-15 08:05:02 -07:00
Nick Winter
8276dbf2d1
Merge branch 'loading-view'
2014-03-14 19:44:33 -07:00
Nick Winter
b2efb1bba5
More work on the loading view.
2014-03-14 19:44:19 -07:00
Nick Winter
fc7d403785
Fixed two bugs with destroying sprites.
2014-03-14 17:15:07 -07:00
Nick Winter
efd0d82dea
Working on new loading view design.
2014-03-14 17:06:08 -07:00
Michael Schmatz
357b73be93
Fixed bug in next game button, fixed wizard positions
2014-03-14 16:14:35 -07:00
Jayant Jain
ece932595c
Enables drag-panning for editor and region chooser
2014-03-14 23:57:00 +05:30
Jayant Jain
d8418f7bb2
Fixes issue where panning occurs upon mouse scroll at max/min zoom
2014-03-14 23:57:00 +05:30
Nick Winter
795bd8f63b
Moved Glen from Archmages to About.
2014-03-13 18:27:08 -07: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
Nick Winter
8b572f0647
Using isThang instead of instanceof Thang.
2014-03-13 17:59:17 -07: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
9d8b8e7395
Probably too mean to tell users that their password is wrong three times, so just once will do.
2014-03-13 10:27:32 -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
2d848b4cce
Merged some conflicts.
2014-03-13 08:39:53 -07:00
Nick Winter
4ad0fba860
Merge pull request #537 from jayant1992/master
...
UI and UX improvements to editor
2014-03-13 07:07:13 -07:00
Nick Winter
10e4bc737a
Merge pull request #534 from Shrihari/fix-grid-toggle
...
Fix Grid Toggle consistency
2014-03-13 06:50:56 -07:00
Jayant Jain
17debf49e6
Implements smoother panning around the map for keyboard controls
2014-03-13 18:32:23 +05:30
Shrihari
fb7f64ddb0
Grid toggle consistent with the button and the shortcut
2014-03-13 15:21:00 +05:30
Dominik Kundel
5c97fea363
fixed issue of multiple insertions due to multiple event handlers
2014-03-13 03:38:34 +01:00
Dominik Kundel
60214abb41
Change cursor if moving on map with pressed 'shift'
2014-03-13 02:50:09 +01: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
Ruben Vereecken
96ec29d80e
Added the finishing touch. Solved issue #15
2014-03-13 01:07:47 +01:00
Ruben Vereecken
3856ac597f
Finished perfecting i18n
2014-03-13 00:47:08 +01:00
Scott Erickson
660e9ceca5
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-12 15:12:22 -07:00
Ruben Vereecken
dbc37b177a
Working on test.
2014-03-12 22:48:27 +01:00
Nick Winter
cf663f6775
Merge pull request #530 from rubenvereecken/i18n
...
Added i18n tags for new Ladder views
2014-03-12 14:03:44 -07:00
Ruben Vereecken
8c7c49fdbb
Reverted work done on wrong branch
2014-03-12 21:54:54 +01:00
Scott Erickson
68c5144838
Added AoE circles.
2014-03-12 13:49:36 -07:00
Scott Erickson
853a80dd23
Fixed loading marks so they are positioned correctly when they load and the world is paused.
2014-03-12 12:43:51 -07:00
Ruben Vereecken
76110423c0
Created i18n utility function
2014-03-12 20:30:43 +01:00
Scott Erickson
7e8f74f385
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-12 10:09:06 -07:00
Scott Erickson
fe93d31929
Fixed loading marks so they are positioned correctly when they load and the world is paused.
2014-03-12 10:08:57 -07:00
Nick Winter
f83fe6ce14
Fixed bugs with sprite rotation updating.
2014-03-12 09:31:45 -07:00
Scott Erickson
52733d5a1e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-12 09:15:48 -07:00
Scott Erickson
939c5faa1a
Fixed a bug when a thang has multiple effects.
2014-03-12 09:15:37 -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
Scott Erickson
9cb80783ff
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-11 22:01:47 -07:00
Nick Winter
b560827e32
Working on cleaning up some server errors.
2014-03-11 19:17:58 -07:00
Nick Winter
4f9db0a7f7
Merged in all names.
2014-03-11 18:11:48 -07:00
Darredevil
012c25a817
Added GetALLToLocations and KeepALLFromLocations
2014-03-12 01:57:30 +02:00
Alexandru
5f2587da18
Merge remote-tracking branch 'upstream/master'
2014-03-12 01:38:54 +02:00
Alexandru
4552455284
Merge branch 'master' of https://github.com/Darredevil/codecombat
2014-03-12 01:23:55 +02:00
Scott Erickson
da58b68fa0
Fixed a bug with the music player where sometimes it wouldn't loop.
2014-03-11 16:23:04 -07:00
Sam Epps
11ca60765d
Added some additional names to names.coffee
2014-03-11 17:16:09 +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
c6b1d9089c
Fixed sounds spamming on last frame.
2014-03-10 08:45:36 -07:00
Darredevil
c9a56048ca
Update GoalManager.coffee
2014-03-09 20:35:33 +02:00
Nick Winter
b3964571e1
Fixed bug importing animations into existing ThangTypes that had only containers.
2014-03-08 15:04:11 -08:00
Nick Winter
5bde534757
Fixed parsing for ThangTypes that don't have lib.properties.
2014-03-08 14:53:17 -08:00
Nick Winter
be12d38e34
Taking into account null rects and library width/height subtraction on sprite parsing.
2014-03-08 14:38:35 -08:00
Nick Winter
085fb82cc9
Fixed a multiplayer link and debug mark alpha.
2014-03-07 21:02:10 -08:00
Scott Erickson
2fa40fb2db
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-07 17:37:19 -08:00
Scott Erickson
fe2ced1a67
Gave the health bar a border, made it a little more high res.
2014-03-07 17:37:11 -08:00
Nick Winter
ec86a07906
Changed Camera min/max zoom.
2014-03-07 15:20:54 -08:00
Scott Erickson
8fa9c9c410
Set up the level play view to show the guide on startup based on the showGuide property.
2014-03-07 15:18:56 -08:00
Scott Erickson
d8d917ecf9
Set up better teardown for the ladder view.
2014-03-07 12:15:16 -08:00
Scott Erickson
610fc0694b
Turning off view caching by default now. Should help lower the memory footprint.
2014-03-07 11:57:15 -08:00
Scott Erickson
34278a8648
Merge remote-tracking branch 'origin/master'
2014-03-06 17:27:01 -08:00
Scott Erickson
a4edb76c98
Fixed a couple of the bugs with marks.
2014-03-06 17:25:40 -08:00
Nick Winter
40e896868b
Fixed CocoSprite getOffset to not apply scale to registration points.
2014-03-06 17:21:24 -08:00
Scott Erickson
5b11e132b2
Fixed the effect marks so they properly go away.
2014-03-06 17:13:16 -08:00
Nick Winter
b6335a30ae
More fixes for empty string array serialization.
2014-03-06 16:32:13 -08:00
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
Scott Erickson
71b6ebf8eb
More memory fixes.
2014-02-11 15:47:59 -08:00
Michael Schmatz
76b949ac1e
Various changes before merge
2014-02-11 15:47:06 -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
Michael Schmatz
b29ab56fe2
Fixed simulation goals
2014-02-11 15:26:57 -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
Nick Winter
6505064fb6
Slightly less aggressively preload workers.
2014-02-11 14:38:47 -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
Michael Schmatz
58bfddeebf
Background simulation is now showing signs of life!
2014-02-11 12:58:23 -08:00
Scott Erickson
47eeda5af4
More memory fixes.
2014-02-11 12:54:08 -08:00
Scott Erickson
7ddb97fa22
More memory fixes.
2014-02-11 12:32:12 -08:00
Nick Winter
2d9606a8eb
includeFlow only on the currently selected Thang.
2014-02-11 12:16:53 -08:00
Nick Winter
d22c716dce
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-11 12:02:53 -08:00
Nick Winter
d2a7bfd11c
Added GoldView.
2014-02-11 12:02:27 -08:00
Scott Erickson
7ad6faa0c0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-11 11:31:13 -08:00
Scott Erickson
21c93e85ed
Fixed a bug with tearing down angels.
2014-02-11 11:30:47 -08:00
Michael Schmatz
612a374b3f
Progress on simulator
2014-02-11 11:27:39 -08:00
Nick Winter
f9bb6de3ff
Typoooo
2014-02-11 09:33:35 -08:00
Nick Winter
c61e2496d8
Trying a faint gold coin noise when you kill something worth money.
2014-02-11 09:28:26 -08:00
Michael Schmatz
c0d43ea32b
Merge branch 'master' into feature/task-queue
2014-02-10 17:10:26 -08:00
Nick Winter
7d5db41f5d
God prepares Workers for Angelic consumption ahead of time.
2014-02-10 17:09:19 -08:00
Michael Schmatz
0cbf669474
Added teamSpells persistence
2014-02-10 16:31:21 -08:00
Michael Schmatz
cc3b93a0f8
Transfer teamSpellMap from tome to levelBus
2014-02-10 16:18:39 -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
Scott Erickson
74ddb1135a
Tweaked collision to make missiles not collide with one another.
2014-02-08 12:27:56 -08:00
Michael Schmatz
73b0d98538
Merge branch 'master' into feature/task-queue
...
Conflicts:
server/commons/mapping.coffee
2014-02-07 14:31:34 -08:00
Scott Erickson
72b1b989d8
Tweaked the world to return points that are not 0,0, as that's what the world reports non-existent thangs at.
2014-02-07 11:49:16 -08:00
Scott Erickson
c3bd9cef80
Merge remote-tracking branch 'origin/master'
2014-02-07 11:05:43 -08:00