Nick Winter
d7586025d9
Improved behavior of lint/runtime/transpilation problem error alert showing when not in JS mode.
2014-07-14 11:05:59 -07:00
Ruben Vereecken
a60451368e
Merged in master
2014-07-14 18:58:25 +02:00
Ruben Vereecken
d261f888d7
Refactored profile view to be a userView. Would still like to test remarks though
2014-07-14 12:18:28 +02:00
Nick Winter
1a016394fe
Starting to show opponent code languages.
2014-07-13 20:19:51 -07:00
Nick Winter
b1b9f87ebe
Fixed root test view URL to not need the trailing slash.
2014-07-13 17:34:51 -07:00
Nick Winter
f92b29a4a3
Added rotate to Vector APIs.
2014-07-13 17:25:24 -07:00
Nick Winter
daff7a2640
Merge pull request #1314 from TheSecretSquad/issue#1213
...
Added point marker shape, and split updateSize method into helpers.
2014-07-13 17:08:11 -07:00
Nick Winter
6eea28dc19
Error handling for syntax errors in component code.
2014-07-13 16:40:03 -07:00
Pete DiSalvo
ffb8f9575e
Added point marker shape, and split updateSize method into helpers.
2014-07-13 19:31:34 -04:00
Ruben Vereecken
9db84befa6
Set up a 301 Redirect for account/profile instead of a backbone redirect
2014-07-13 22:34:32 +02:00
Scott Erickson
ebfb329da7
Fixed a bug where pressing escape would not properly end scripts in the session state.
2014-07-13 13:11:45 -07:00
Scott Erickson
3b6d17286b
Small tweak to lower the number of repeated calls to SpriteBoss.updateSounds.
2014-07-13 12:19:51 -07:00
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