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

1218 commits

Author SHA1 Message Date
Nick Winter
e9968b648f Fixed bugs with click coordinates messing up mouse-down targeting. 2014-09-11 13:05:31 -07:00
Nick Winter
68808d0e07 Some fixes for how audio is triggered. 2014-09-11 08:38:30 -07:00
Nick Winter
f53f6bf0a3 Misc changes, wishing I could get sounds to work at lower volumes. 2014-09-10 19:55:00 -07:00
Nick Winter
1bd1ca0ced Fixed #1530. Propagated i18n. Starting to add some more events for the iOS app. 2014-09-07 20:54:25 -07:00
Nick Winter
df131ca90a Merge pull request #1519 from keenanjohnson/master 
Added Potion Master names for #53
 2014-09-06 19:55:02 -07:00
Nick Winter
2f07c3e8d3 Adding communication with iPad app. 2014-09-06 19:50:31 -07:00
keenanjohnson
d79fc4c62f Added Potion Master names for #53 2014-09-05 20:18:05 -05:00
Scott Erickson
64ea670ebd Reorganized the Surface into groupings. Changed no logic, just shuffled things around. 2014-09-05 09:21:00 -07:00
Nick Winter
d3eb7a7438 Fixed a few issues with real-time multiplayer flags. 2014-09-04 20:10:04 -07:00
Nick Winter
35f22e0f8c Fixed a few tome / canvas resizing bugs. 2014-09-03 18:35:14 -07:00
Scott Erickson
1094487072 Fixed #1511 2014-09-03 17:47:29 -07:00
Nick Winter
6b6c8dd683 Merged master into feature/realtime-multiplayer; looks good. 2014-09-03 16:14:33 -07:00
Scott Erickson
c70ffbeef5 Fixed onBackground for surface:stage-mouse-down events. 2014-09-02 16:42:03 -07:00
Scott Erickson
55bac798ee Cleared out the thangs tab view mobile handling and just made the left and right columns toggleable all the time. The surface now fills the whole width. 2014-09-02 15:33:23 -07:00
Nick Winter
632559f7db Refactored LevelLoader to load sessions after levels, so that we can do the right thing with hero levels' sessions. Made levels default to type: 'hero'. 2014-09-01 20:53:53 -07:00
Nick Winter
b7d9e7a095 Fixed some click/add behavior in level editor. Fixed level editor canvas resizing. Fixed some dungeon terrain generation issues. Certain Thangs can be placed on top of other Thangs. 2014-09-01 20:07:50 -07:00
Nick Winter
72eb59b7c3 Fixed a few bugs. 2014-09-01 16:14:50 -07:00
Nick Winter
195e027b53 Fix for null/undefined objects in the diffs. 2014-09-01 14:27:47 -07:00
Nick Winter
6df5ca00b2 Fixed #69. 2014-09-01 13:51:30 -07:00
Nick Winter
3e0518cd70 Fixed a few bugs and added a bunch of defensive handling for permissions not existing without new defaults. Fixed longstanding mistake with signup ignoring email newsletter setting. 2014-09-01 09:11:10 -07:00
Nick Winter
040ac4ff4e Fixed bug with black flashes during script playback. 2014-08-31 16:05:21 -07:00
Nick Winter
1329d31a63 Hot-swapping inventory works now. 2014-08-31 16:05:20 -07:00
Nick Winter
a8644d030e Fixed #1355. 2014-08-30 14:30:53 -07:00
Nick Winter
85a9a558ef Fixed #1329. 2014-08-30 13:43:56 -07:00
Matt Lott
437ab0feb2 PVP waiting screen in real-time view 2014-08-29 21:46:26 -07:00
Nick Winter
5503b3a2bc Fixed #1147. 2014-08-29 17:03:02 -07:00
Scott Erickson
570380c2a4 Merge branch 'master' into feature/defaults 2014-08-29 08:14:43 -07:00
Nick Winter
f74a152942 Fixed #1104. 2014-08-28 18:55:33 -07:00
Scott Erickson
9406a8c920 Merge branch 'master' into feature/defaults 2014-08-28 17:58:58 -07:00
Nick Winter
e67b4ae064 Fixed #1090. 2014-08-28 17:08:05 -07:00
Scott Erickson
2dde77f8b0 Merge branch 'master' into feature/defaults 2014-08-28 15:26:04 -07:00
Scott Erickson
154b91c753 Changed LevelLoader to always deeply load components and thang types, not just for hero levels. 2014-08-28 15:19:04 -07:00
Nick Winter
0fa5d264f4 Fixed #1072 by raising selection state so that we can see it if we're selecting an obstacle. 2014-08-28 14:25:37 -07:00
Nick Winter
f79a2848fd Fixed #1038. Focus should now remain on code editor when after clicking on Surface. 2014-08-28 14:00:54 -07:00
Nick Winter
1094d09aa5 Fixed #1226. Fixed #1156. Fixed two other issues with spectate mode. 2014-08-28 11:23:52 -07:00
Nick Winter
d7ae07c012 Fixed Facebook login bug. 2014-08-28 11:16:55 -07:00
Scott Erickson
8b943d1c2c Merged conflicts. 2014-08-28 09:59:03 -07:00
Nick Winter
ec6b3d7e5f Fixed #1481. More Mediator schema fixes. 2014-08-28 09:27:42 -07:00
Nick Winter
cd3bf4d0db Fixed a few bugs. 2014-08-27 18:05:18 -07:00
Nick Winter
92b29915e2 Finished fixing #841. 2014-08-27 17:26:56 -07:00
Nick Winter
3f16aaab61 Fixed a few more Backbone Mediator event validation issues. 2014-08-27 16:31:44 -07:00
Nick Winter
ee9e453896 Fixed #828. Added many other minor refactorings. 2014-08-27 12:24:11 -07:00
Scott Erickson
ac2c39a266 Fixed an infinite loop bug in CoordinateGrid. 2014-08-27 09:49:37 -07:00
Nick Winter
6ff01f7deb Fixed #814. 2014-08-26 18:11:35 -07:00
Scott Erickson
5d804c6d9a Fixed merge conflict. 2014-08-26 15:41:59 -07:00
Nick Winter
a5c18a4140 Fixed #453. 2014-08-26 15:22:13 -07:00
Nick Winter
7300c4b3b8 Finished removing grid from playback options menu. 2014-08-26 14:00:03 -07:00
Nick Winter
35b107cf58 Refactored grid. Fixed #158. 2014-08-26 13:56:57 -07:00
Nick Winter
3e9adf6b1a Fixed issue with IndieSprites no longer coloring properly. 2014-08-26 12:39:30 -07:00
Scott Erickson
f92a665b8b Merge conflicts. 2014-08-26 09:53:04 -07:00
Nick Winter
832402af6e Merged/tweaked GitHub login. 2014-08-26 08:37:11 -07:00
Nick Winter
898bb69477 Added missing Countdown Screen file. 2014-08-26 08:18:06 -07:00
Nick Winter
e666ee1dac Added stop playback button and real-time countdown screen. 2014-08-25 22:05:30 -07:00
Scott Erickson
1406a970ea Bunch of fixes to get the level editor working again. 2014-08-25 20:34:46 -07:00
Nick Winter
6fb0073eae Fixed harmless Wizard startup animation error. 2014-08-25 16:15:34 -07:00
Nick Winter
e48b218533 Projected models can now update their projections and re-fetch. Hero ThangTypes now do this. 2014-08-25 15:39:47 -07:00
Nick Winter
9df0cfb93f A few changes to flags UX. 2014-08-25 14:02:23 -07:00
Scott Erickson
d392994a83 Merge branch 'master' into feature/defaults 2014-08-25 13:00:33 -07:00
Nick Winter
718d586f07 A ton of misc bug fixes and performance improvements, getting ready to merge world streaming and flags back in. 2014-08-24 21:39:34 -07:00
Nick Winter
1a7e4554f0 Fixed a few minor bugs. 2014-08-24 16:48:59 -07:00
Nick Winter
3125c2b129 Add flag cursor and pending flags. 2014-08-24 16:09:06 -07:00
Nick Winter
f44d802934 Fixed a couple bugs. Flags are now colored. 2014-08-24 12:33:46 -07:00
Nick Winter
be07f9cfb9 Many improvements to real-time streaming and flags. 2014-08-23 22:24:00 -07:00
Nick Winter
2dca4d72fc Rudimentary flag buttons are in. 2014-08-23 19:00:35 -07:00
Nick Winter
f59084e651 Sending flag history to the World for to make flag Thangs during simulation. 2014-08-23 17:26:56 -07:00
Scott Erickson
0721b49216 Refactoring defaults. 2014-08-23 15:51:59 -07:00
Nick Winter
c79541f669 Full-screen playback during real-time mode. 2014-08-23 13:54:52 -07:00
Nick Winter
f2adb7ec7f Skipping serialization/deserialization of needless Programmable clones. 2014-08-23 11:16:02 -07:00
Nick Winter
0431f70954 Improved Surface playback fast-forwarding. 2014-08-23 09:52:05 -07:00
Nick Winter
9c0869e566 Press Ctrl+Shift+Enter to cast in real-time, and click on the ground to use your wizard as a flag. OMG, it not only works, but it is really fun! 2014-08-22 21:35:08 -07:00
Nick Winter
6fee881efd Fixed a few more issues with playback. 2014-08-22 17:11:40 -07:00
Nick Winter
ee41796b73 Fixed some wonkiness with the playback scrubbing while streaming worlds. 2014-08-22 15:32:23 -07:00
Nick Winter
92f0a68dd1 World streaming is getting there! 2014-08-22 14:59:32 -07:00
Nick Winter
611ecbf470 Fixed many issues with world streaming. 2014-08-22 12:39:29 -07:00
Nick Winter
9b31e28536 More improvements to world streaming. 2014-08-21 21:23:45 -07:00
Nick Winter
bd380e4a09 World streaming is starting to work! 2014-08-21 17:30:46 -07:00
Nick Winter
d55afa77b7 Began streaming a mighty stream. 2014-08-21 16:27:52 -07:00
Nick Winter
3755cb9d66 Fixed some bugs with sprite layer ordering. 2014-08-20 18:57:33 -07:00
Nick Winter
28176c7f72 Misc workarounds. 2014-08-20 13:26:48 -07:00
Nick Winter
df7f1b2b9b Now have 'free' rotationType, equivalent to previous default of undefined. 2014-08-19 22:33:33 -07:00
Nick Winter
def4d01c8e Starting to let us control the size of the achievements popup, although much more Sass math is needed. 2014-08-19 19:21:36 -07:00
Nick Winter
91db8397a0 Fixed problem with loading levels with no Programmable Thanags, and fixed infinite loops while simulating single games when swapping out Simulators. 2014-08-19 08:09:15 -07:00
Nick Winter
2c6fc67db2 Some simulation and ladder fixes. Preparing Criss-Cross tournament. 2014-08-18 21:49:58 -07:00
Nick Winter
2588ec67ff Fix for buildLoop still trying to loop after LevelLoader destruction for some reason. 2014-08-18 14:09:28 -07:00
Nick Winter
8ca9374de0 Zoom-aware, ratio-based edge avoidance (polish for #1448). 2014-08-18 14:08:54 -07:00
Scott Erickson
86ba46b64c Refactored LevelLoader's loading of session dependencies a bit so it's easy to have it load them on demand. 2014-08-18 13:43:17 -07:00
Pete DiSalvo
a011f118e3 Added CoordinateDisplay edge detection. Doesn't account for camera zoom. 2014-08-16 18:51:47 -04:00
Pete DiSalvo
eed68c0a1c Working orientation. Doesn't account for camera zoom 2014-08-16 18:30:41 -04:00
Pete DiSalvo
31e609c0c8 Added edge detection to camera, and worked on orientations 2014-08-16 18:30:41 -04:00
Pete DiSalvo
dc7529344c Working on orientation 2014-08-16 18:30:41 -04:00
Pete DiSalvo
8f6d162542 Beginning work on edge detection 2014-08-16 18:30:41 -04:00
Nick Winter
5f20e6f05e Thangs get inserted into hero levels without any Components for easy defaulting. Working on moving Hero Placeholder ThangType swapping from LevelLoader to Level, but it's not there yet. 2014-08-15 12:09:56 -07:00
Ruben Vereecken
40818fd7bc GitHub Login implemented 2014-08-15 16:20:45 +02:00
Nick Winter
69c22db434 Moved Hero Placeholder replacement logic to Level's denormalizeThang. 2014-08-14 16:35:03 -07:00
Nick Winter
0f983bdcf1 Crude steps towards using your hero equipment in items levels. 2014-08-14 15:12:15 -07:00
Nick Winter
7286d069a0 Working to get undo/redo working again when manipulating ThangsTabView not using the Treema. 2014-08-14 10:28:50 -07:00
Nick Winter
652d47fb81 Merge pull request #1432 from jayant1992/undo-redo 
Undo redo descriptions
 2014-08-14 09:58:28 -07:00
Ruben Vereecken
3fd396974d Merge branch 'master' into achievements 
Conflicts:
	app/views/DemoView.coffee
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
	server/users/User.coffee
 2014-08-13 10:43:42 +02:00
Jayant Jain
76c784b1de Adds default scripts whenever a new level is created 2014-08-13 12:11:37 +05:30
Nick Winter
4cc79e985e A few fixes for adding items to inventories in ThangTypes. 2014-08-11 17:09:44 -07:00
Nick Winter
9a5cd22069 Can now equip items added from inventory on the Surface side. Sorted out ThangTypes' Components schema defaults and ordering when serializing Levels. 2014-08-11 16:15:46 -07:00
Nick Winter
31d7e641e6 Fixes for equipping items and adding them to the World. 2014-08-11 11:04:38 -07:00
Nick Winter
cf7e2042c9 Got bitten by another case of #1108. 2014-08-11 10:02:39 -07:00
Nick Winter
706ab7a251 Trying to get item ThangType nodes and inventory loading working. 2014-08-10 22:09:13 -07:00
Ruben Vereecken
e6569539dc User page now uses the supermodel for user loading 2014-08-08 19:26:24 +02:00
Ruben Vereecken
47f00f9b5e Added achievement deleting and automatic achievement filling 2014-08-08 17:20:07 +02:00
Ruben Vereecken
3bfd341363 Goal states are now tracked in level sessions (state.goalStates) 2014-08-08 13:10:31 +02:00
Scott Erickson
94ca62f4c5 Fixed a bug I added in some minor final changes. 2014-08-07 18:48:30 -07:00
Scott Erickson
cc025942f8 Extended the LevelLoader to load thang types and components dynamically for hero levels. 2014-08-07 18:27:47 -07:00
Scott Erickson
0c5364eebb Removed editorMode. 2014-08-07 14:22:43 -07:00
Nick Winter
4d4e321265 Fixed #1062. Added Item kind to level editor Thang filters. 2014-08-06 08:24:50 -07:00
Nick Winter
852dabc17a Fixes for item equipping, Component saving, and terrain randomization wall snapping/overlap avoidance. 2014-08-06 07:43:56 -07:00
Nick Winter
74283bafed Made sure items equip themselves within the SpriteBoss, too. 2014-08-05 21:47:51 -07:00
Ruben Vereecken
5d66560673 Merge remote-tracking branch 'upstream/master' into achievements_progress 
Conflicts:
	app/views/editor/level/LevelEditView.coffee
	server/levels/sessions/LevelSession.coffee
 2014-08-05 11:55:46 +02:00
Ruben Vereecken
c165d46e17 Fixed missing errors bug 2014-08-04 20:02:26 +02:00
Ruben Vereecken
6267352c6e Drastically changed the way achievements get grayscaled 2014-08-04 15:29:46 +02:00
Ruben Vereecken
30a6cf1cca Merged in name changes from master 2014-07-29 17:28:13 +02:00
Michael Schmatz
c4e3044a81 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-23 14:44:17 -07:00
Michael Schmatz
07cc01332d Merge branch 'pr/1383' 
Conflicts:
	app/views/play/level/tome/SpellListTabEntryView.coffee
 2014-07-23 14:44:15 -07:00
Nick Winter
26ac94367e Fixed #1372. Minor fixes. 2014-07-23 08:59:42 -07:00
Scott Erickson
1c3404d03e Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell. 2014-07-23 07:02:45 -07:00
Dominik Kundel
9cb704a843 last fix for dimming the editor 2014-07-23 15:09:15 +02:00
Dominik Kundel
be50927fb6 disabled editor works again 2014-07-23 14:38:12 +02:00
Ruben Vereecken
972d231ff5 Refactored router and views to anticipate the renameViews feature 2014-07-21 19:49:16 +02:00
Ruben Vereecken
1c6da9711b Added the Recently Played collection and endpoint 2014-07-21 14:36:10 +02:00
Nick Winter
99e1a8b30a Merge pull request #1357 from TheSecretSquad/issue#1213crosshair 
Changed point marker to crosshair, made it bigger, and changed color to white
 2014-07-20 16:04:29 -07:00
Nick Winter
1537754a16 A few bugfixes, plus gigantic child window convenience for me editing levels. 2014-07-19 20:26:13 -07:00
Pete DiSalvo
9ca3563eed Changed point marker to crosshair, and changed color to white 2014-07-19 20:12:56 -04:00
Scott Erickson
97964f7853 More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView. 2014-07-18 17:06:20 -07:00
Scott Erickson
0e042ee61c Refactoring View to RootView. Refactoring some RootViews to be routed manually. 2014-07-17 17:16:32 -07:00
Nick Winter
6b028513fd Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup. 2014-07-17 15:50:29 -07:00
Nick Winter
42af807e5c Merged in geometry work from #51. 2014-07-16 16:01:37 -07:00
nemoyatpeace
f17112ecf8 Minor adjustment to the aoe script 2014-07-17 00:53:52 +08:00
Nick Winter
085951fa4a Removed more counselor stuff. 2014-07-16 07:47:41 -07:00
Nick Winter
03cc2d1af0 Fixed Grass01-Grass05 scaling issues. 2014-07-15 18:08:00 -07:00
Scott Erickson
fb83028d87 Added watchers to list of properties to skip in deltas/patches. 2014-07-15 11:23:35 -07:00
Ruben Vereecken
0288786098 Merge branch 'master' into achievements 2014-07-15 16:16:46 +02:00
Ruben Vereecken
40ba28f49b Basics for account and user home pages 2014-07-15 16:15:21 +02:00
Nick Winter
b3e8eb8504 Working on something for #1327. 2014-07-14 19:32:35 -07:00
Nick Winter
7b39bd06f3 Fixed #1321. 2014-07-14 17:54:32 -07:00
Scott Erickson
9d22a35194 Merge branch 'nameable_users2' of https://github.com/rubenvereecken/codecombat 2014-07-14 15:13:52 -07:00
Nick Winter
23dc8d2947 Removed a bad log. 2014-07-14 11:21:03 -07:00
Ruben Vereecken
e748417007 GET /auth/name/<name> now serves possible free names 
anonymous users are now warned if their new name is already chosen

User Settings is now without auto-save

Upon name conflict, a user will be suggested a new name which is then submitted if the user chooses to save after all.

Refactored conflicted name checking so it can be used in more places

Signup form now has an optional name field

Covered extra case where the debounced check happened too late. Support for submitting on enter.

Worked in scott's comments and got tests working again
 2014-07-14 20:07:58 +02:00
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
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