Nick Winter
13fe1bbece
Improved branching choices and set up an A/B/C/D test around branching.
2014-10-23 16:37:09 -07:00
Scott Erickson
4371873d41
Set up thang types to use their raster property as an icon.
2014-10-22 07:53:50 -07:00
Nick Winter
103418fe2b
Removed super-aggressive log which has now served its purpose.
2014-10-21 21:37:49 -07:00
Nick Winter
6539adf53d
Sure wish I could test this bug without a full production deploy.
2014-10-21 20:29:45 -07:00
Nick Winter
49f3a0a298
More logging for the merged models problem.
2014-10-21 20:12:20 -07:00
Nick Winter
399cd048fc
Logging some stuff to get to the bottom of things.
2014-10-21 19:39:13 -07:00
Nick Winter
7c2982d3f1
Adding some logging for crazy save validation bugs. Swapping in flag item slot.
2014-10-21 13:57:49 -07:00
Scott Erickson
cd8f5800a6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-10-21 10:21:46 -07:00
Nick Winter
08d9e39764
LevelLoader and Simulator fixes for simulating hero-ladder matches. Commented out some logging that hasn't been very useful. Fixed some tests.
2014-10-19 21:56:26 -07:00
Nick Winter
1fb48f2b85
Fixed a few bugs. Removed Olark; disabled LinkedIn. Added ladder submission to HeroVictoryModal.
2014-10-19 17:38:10 -07:00
Nick Winter
66c728210b
Fixing flag coloring in new WebGL rendering.
2014-10-18 18:18:12 -07:00
Nick Winter
56a80e3615
Started getting hero-ladder level type working.
2014-10-18 14:51:49 -07:00
Scott Erickson
0dc050abca
Added i18nCoverage backend support.
2014-10-17 12:12:06 -04:00
Scott Erickson
092997bffe
Added i18n coverage logic to the CocoModel.
2014-10-17 10:11:26 -04:00
Nick Winter
2491861d76
A few tweaks for the iPad app.
2014-10-01 22:02:52 -07:00
Scott Erickson
adbfa42f25
Merge branch 'master' into feature/webgl
2014-09-30 10:27:26 -07:00
Matt Lott
8f85e37713
Fix for main thread GoalManager creation
...
Using @shared.goalManager.constructor was yielding an incomplete
GoalManager in IE9.
Also fixing up console.debug in CocoModel for IE10 and earlier.
2014-09-29 17:31:58 -07:00
Scott Erickson
f081d9ed4b
Refactored CocoSprite -> Lank, lank.imageObject -> lank.sprite, SpriteBoss -> LankBoss, spriteLayers -> layerAdapters, sprite -> lank in general. Also got the ThangTypeEditView working again.
2014-09-28 14:00:48 -07:00
Scott Erickson
8adbd87401
Merge branch 'master' into feature/webgl
2014-09-28 10:38:19 -07:00
Nick Winter
cf9cf6f98b
Stopped locking levels for now, since the achievements aren't quite unlocking them correctly.
2014-09-26 03:52:57 -07:00
Nick Winter
98fed4a277
Extended Achievements to support earning heroes, items, levels, and gems. Fixed a few Achievement bugs.
2014-09-26 02:29:04 -07:00
Scott Erickson
06b106f42b
Merged from master.
2014-09-25 10:52:27 -07:00
Nick Winter
c0c436189f
Better preserving supermodel when navigating between new hero levels. Fixed a problem with garbage collection of large CocoModel error callbacks.
2014-09-25 00:02:53 -07:00
Nick Winter
ec548fa33a
AUto-assigning leather boots starting at mazes. Fixed issue with stat display comparison.
2014-09-22 16:09:27 -07:00
Nick Winter
42b52f5593
No more ThangListView for hero levels. Fixed pluralization of level loading goals when there's only one goal. Fixed default playback state to paused. Started playing ambient dungeon/grass sounds. Fixed bug with goals not showing up at first. Refactored how goals, gold, and flags hide themselves initially. Ignored InventoryView ThangTypes when sorting Components during level serialization.
2014-09-21 22:10:52 -07:00
Nick Winter
0d495ba36e
Press Start to begin playing levels. Fixed #1574 .
2014-09-21 14:35:59 -07:00
Nick Winter
2872de71ce
Fixed a bug with hero placeholder loading. Improved game menu modal close button usability.
2014-09-21 13:26:56 -07:00
Nick Winter
e3b75a69ea
Working on PlayLevelModal and ChooseHeroView.
2014-09-19 22:16:05 -07:00
Scott Erickson
63758acd2e
Fixed some tests when run on karma.
2014-09-18 09:46:02 -07:00
Scott Erickson
5af1741333
Merged conflicts.
2014-09-17 16:53:08 -07:00
Nick Winter
1f71a1eaf9
Fixes for loading level previews early, creating new Components, and showing names of ShowsNames Thangs.
2014-09-16 20:19:52 -07:00
Nick Winter
687da38667
Made some performance optimizations that all relate to messing with walls in the level editor.
2014-09-16 17:31:00 -07:00
Scott Erickson
1ef3d150a8
Integrated WebGLLayer and WebGLSprite with CocoSprite.
...
Disabled some features in CocoSprite that'll have to be added back later.
Moved more logic from CocoSprite, like determining registration points for a given animation, to WebGLSprite.
WebGLSprite can now display either rendering containers or SpriteSheets.
2014-09-16 15:36:59 -07:00
Nick Winter
c3573b2fbd
Adding more error handling for George's inventory saving problems.
2014-09-16 15:22:49 -07:00
Nick Winter
5f1e9e7e4b
Made Plans attach second-to-last always.
2014-09-15 14:06:26 -07:00
Scott Erickson
8e401d6853
Merge branch 'master' into feature/webgl
2014-09-15 13:53:58 -07:00
Nick Winter
589268dc4f
Fixes for initializing Hero Placeholder Components.
2014-09-15 13:15:18 -07:00
Scott Erickson
08bdcb2cb6
Built the WebGLLayer which creates sprite sheets based on what CocoSprites are given to it.
2014-09-12 16:33:01 -07:00
Nick Winter
dd2cdf3ef9
Fixed bugs with forking ThangTypes.
2014-09-08 16:03:29 -07:00
Nick Winter
c64c391d74
Workaround for missing document.location inside child window in Windows Chrome.
2014-09-08 14:31:52 -07:00
Nick Winter
2f07c3e8d3
Adding communication with iPad app.
2014-09-06 19:50:31 -07:00
Nick Winter
8c45e22741
Protection and logging for #1463 . Fixed an issue with spectate camera script bounds.
2014-09-04 11:04:23 -07:00
Nick Winter
b1de5e0045
Fixed bug with hero levels not loading inventory. (Might not be in line with the performance that 975c6a was going for.)
2014-09-03 19:19:04 -07:00
Nick Winter
6b6c8dd683
Merged master into feature/realtime-multiplayer; looks good.
2014-09-03 16:14:33 -07:00
Scott Erickson
e1abf115f7
Folderizing thang types in the level editor.
2014-09-03 12:30:08 -07:00
Nick Winter
c1a7b70849
Missed committing part of previous fix.
2014-09-03 10:58:43 -07:00
Scott Erickson
975c6ad2a6
Optimized level serialization a bit more to make placing and moving thangs around in the level editor more fluid.
2014-09-03 09:33:21 -07:00
Nick Winter
681cc4656f
Fixed a bug with revertAttributes getting set during SuperModel duplicate model merging.
2014-09-02 18:28:02 -07:00
Scott Erickson
4a100a501a
Fixed a bug with new levels in the level editor.
2014-09-02 17:53:39 -07:00
Nick Winter
5b0e996f93
Think I may have fixed the color group setting issue again.
2014-09-02 17:46:52 -07:00
Nick Winter
fa0f904fbb
Fixed a couple bugs with Achievements not getting schema defaults.
2014-09-02 16:48:16 -07:00
Scott Erickson
7e627277e1
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-02 12:33:50 -07:00
Scott Erickson
b521aee322
Optimized level serialization a little so that level editing is a bit less painful.
2014-09-02 12:33:34 -07:00
Nick Winter
4b9bf22e22
Thang editor now sets some default Components when you change the kind of a ThangType.
2014-09-02 11:29:33 -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
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
1329d31a63
Hot-swapping inventory works now.
2014-08-31 16:05:20 -07:00
Nick Winter
9b2ee45a4d
Added DPS to item view.
2014-08-31 12:27:52 -07:00
Nick Winter
ef9a983e30
Made ItemView more general. Upgraded Bootstrap from 3.1 to 3.2. Fixed a few bugs.
2014-08-31 12:21:25 -07:00
Nick Winter
85a9a558ef
Fixed #1329 .
2014-08-30 13:43:56 -07:00
Nick Winter
051f1a77ae
Fixed #1152 .
2014-08-30 09:19:41 -07:00
Matt Lott
437ab0feb2
PVP waiting screen in real-time view
2014-08-29 21:46:26 -07:00
Nick Winter
b918f5adfb
Fixed #1262 .
2014-08-29 17:18:38 -07:00
Scott Erickson
2dfe39aafd
Migrated Achievement model's getExpFunction to use the new defaults system.
2014-08-29 12:28:45 -07:00
Scott Erickson
5fd154ca8b
Tweaked the level serialization, leaving in walkDefaults for now because there may still be some components that don't have defaults properly set up. Added a warn log for when this happens so it can be fixed.
2014-08-28 17:57:39 -07:00
Scott Erickson
608d114c5c
Fixed metaschemas not being found.
2014-08-28 15:54:05 -07:00
Scott Erickson
2dde77f8b0
Merge branch 'master' into feature/defaults
2014-08-28 15:26:04 -07:00
Nick Winter
54207f0f7d
Fixed #1000 .
2014-08-28 10:50:20 -07:00
Scott Erickson
8b943d1c2c
Merged conflicts.
2014-08-28 09:59:03 -07:00
Scott Erickson
bcffc5811f
Migrated the Level populating of component and system config defaults to the new Treema utility method.
2014-08-27 18:17:47 -07:00
Nick Winter
ee9e453896
Fixed #828 . Added many other minor refactorings.
2014-08-27 12:24:11 -07:00
Scott Erickson
607a2a133f
Made the SuperModel a little bit more clever about handling duplicate loaded models, hopefully fixed #1108 .
2014-08-26 16:46:23 -07:00
Scott Erickson
98752159ca
Made the SuperModel a little bit more clever about handling duplicate loaded models.
2014-08-26 16:31:53 -07:00
Scott Erickson
ab669739a6
Fixed a bug with the thang component edit view: labels of new components not showing up.
2014-08-26 14:15:21 -07:00
Scott Erickson
fb06e58201
Fixed a bug where CocoModel wouldn't unset properties on revert because saveBackup is now debounced and would reintroduce those properties.
2014-08-26 10:14:36 -07:00
Scott Erickson
3b6de071f7
Getting rid of a debug line.
2014-08-26 09:55:59 -07:00
Scott Erickson
f92a665b8b
Merge conflicts.
2014-08-26 09:53:04 -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
e48b218533
Projected models can now update their projections and re-fetch. Hero ThangTypes now do this.
2014-08-25 15:39:47 -07:00
Scott Erickson
d392994a83
Merge branch 'master' into feature/defaults
2014-08-25 13:00:33 -07:00
Nick Winter
08f2ee248b
No longer constructing SpellViews for non-readable methods.
2014-08-24 22:02:22 -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
Scott Erickson
0721b49216
Refactoring defaults.
2014-08-23 15:51:59 -07:00
Scott Erickson
1c5db3f2b7
First round of getting the site to use the new defaults system, in particular the job profile view.
2014-08-23 11:07:52 -07:00
Scott Erickson
e7dd88498d
Made more clear when thang types and level thangs are missing dependencies.
2014-08-22 14:52:35 -07:00
Nick Winter
d55afa77b7
Began streaming a mighty stream.
2014-08-21 16:27:52 -07:00
Scott Erickson
f8d4e42c67
Set up thang types to now have a raster portrait icon if we want to give them custom ones not based on vector artwork.
2014-08-18 15:25:45 -07: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
Nick Winter
69c22db434
Moved Hero Placeholder replacement logic to Level's denormalizeThang.
2014-08-14 16:35:03 -07:00
Matt Lott
98bed57751
Merge pull request #1441 from differentmatt/master
...
Instrument user code problems
2014-08-14 16:17:47 -07:00
Nick Winter
0f983bdcf1
Crude steps towards using your hero equipment in items levels.
2014-08-14 15:12:15 -07:00
Matt Lott
9b79e2ca27
Instrument user code problems
2014-08-14 13:32:00 -07:00
Scott Erickson
c31a509472
Working on the inventory view. Added a way to get the current equipment config from the inventory view.
2014-08-14 10:44:04 -07:00
Scott Erickson
e3088ad813
Merge branch 'achievements' of https://github.com/rubenvereecken/codecombat into rubenvereecken-achievements
2014-08-13 10:49:10 -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
Nick Winter
2ab83328f3
Added item editor level preview window.
2014-08-12 12:50:41 -07:00
Ruben Vereecken
8ae116200f
Achievements are now i18n'able
2014-08-12 18:18:16 +02:00
Scott Erickson
88252806c7
Fixed #1413 .
2014-08-11 18:47:41 -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
Ruben Vereecken
672b0f54f6
Worked away our NotifyJS dependency - horrible lib
2014-08-11 14:11:26 +02:00
Nick Winter
706ab7a251
Trying to get item ThangType nodes and inventory loading working.
2014-08-10 22:09:13 -07:00
Ruben Vereecken
9f0add22a5
Worked in a lot of changes Scott proposed
2014-08-08 11:54:53 +02: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
29770bd220
Added a function for denormalizing levels, extending level thang components and configs with ones from thang types.
2014-08-06 15:18:22 -07:00
Ruben Vereecken
6267352c6e
Drastically changed the way achievements get grayscaled
2014-08-04 15:29:46 +02:00
Ruben Vereecken
26085f9f3e
Added a bunch of achievements to the script. Restyled big parts.
2014-08-03 23:58:51 +02:00
Ruben Vereecken
871149b2bc
Rechecked and added cool stuff for achievements
2014-07-30 22:23:43 +02:00
Ruben Vereecken
d4043ac3db
Implemented singleplayer and multiplayer games played on profile
2014-07-29 20:11:45 +02:00
Ruben Vereecken
026e6e6378
Added some support to fetch level sessions for the user profile page
2014-07-29 16:50:07 +02:00
Ruben Vereecken
7987e1d05b
Did a bunch related to achievements and user profile page
2014-07-28 20:04:44 +02:00
Ruben Vereecken
a8df3df095
Default image for achievements. Redid border logic
2014-07-28 15:14:11 +02:00
Ruben Vereecken
411bb87985
Added contributor categories to user profile page
2014-07-22 12:50:56 +02:00
Ruben Vereecken
1c6da9711b
Added the Recently Played collection and endpoint
2014-07-21 14:36:10 +02:00
Scott Erickson
4818a81854
Added setProjection so CocoModels can more easily get subsets of data.
2014-07-17 16:22:06 -07:00
Michael Schmatz
bb3c583300
Add approved date to job profile
2014-07-16 10:51:45 -07:00
Ruben Vereecken
0288786098
Merge branch 'master' into achievements
2014-07-15 16:16:46 +02: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
Ruben Vereecken
a60451368e
Merged in master
2014-07-14 18:58:25 +02:00
Ruben Vereecken
9c0353a2f0
Merged in master
2014-07-13 21:18:32 +02:00
Nick Winter
868a6ed43b
Fixed a couple i18n issues. Fixed #1302 .
2014-07-13 09:31:56 -07:00
Nick Winter
373c1688ed
Merge pull request #1287 from rubenvereecken/user_patch
...
Noty errors don't show up on user save fails anymore
2014-07-13 08:54:20 -07:00
Scott Erickson
8cb7cd770c
Fixed i18n population because mongoose has problems with empty objects.
2014-07-12 09:58:28 -07:00
Ruben Vereecken
750d94c478
Noty errors don't show up on user save fails anymore
2014-07-10 10:30:23 +02:00
Ruben Vereecken
ac95d775e6
Users can now be gotten by slug
2014-07-09 20:23:05 +02:00
Ruben Vereecken
5dc54c784d
Added case and demo for user not found. Should be made prettier as soon as users can be queried by name
2014-07-09 18:13:22 +02:00
Michael Schmatz
b76239b4e9
Replaced candidate avatars on employer page
2014-07-07 10:29:35 -07:00
Ruben Vereecken
ea3d1fee74
Starting on achievement overview style
2014-07-07 15:03:28 +02:00
Ruben Vereecken
9055612b24
Fixtures set up, demo start
2014-07-07 12:47:32 +02:00
Ruben Vereecken
75b738f126
User loading now have async callbacks
2014-07-07 12:03:48 +02:00
Ruben Vereecken
ec78f95da1
Prepared things for Scott
2014-07-06 23:16:00 +02:00
Ruben Vereecken
1b9c8b0066
Got users and achievements to load in a neat way
2014-07-06 22:48:33 +02:00
Ruben Vereecken
601c4e2731
Merged with master
2014-07-05 16:47:16 +02:00
Scott Erickson
b635c4cf16
Fixes #1220 . Passing in the raw attributes to the component settings treema would edit the data before the component's set method would get a snapshot of the original data for whatever was the first change in the data.
2014-07-04 20:45:42 -07:00
Ruben Vereecken
39fb2cb1b4
Added achievement preview, exp test, stuff
2014-07-04 19:27:37 +02:00
Ruben Vereecken
a933f9737d
Creating achievement demo
...
intermediate
2014-07-04 19:27:37 +02:00
Ruben Vereecken
fe5b675d18
Achievement polling now successfully tested
...
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
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
Scott Erickson
9b873cfab4
Patch modal handles invalid patches.
2014-06-24 17:25:01 -04:00
Nick Winter
abcc75a6f2
A bit of error logging for #1220 .
2014-06-24 09:43:20 -07:00
Scott Erickson
dde43d5df3
Fixed a case where the supermodel was overriding what a previous supermodel had set for saveBackups.
2014-06-23 16:57:54 -04:00
Nick Winter
dde71485bf
A bit of cleanup.
2014-06-20 20:52:50 -07:00
Nick Winter
0b8a0c8f6f
Added UserRemarks.
2014-06-17 13:03:13 -07:00
Ruben Vereecken
dcdcca751f
Fiddled with creating xp functions
2014-06-12 19:44:56 +02:00
Ruben Vereecken
a61d0e5569
Added support for diminished exp for repeatables. Needs tweaking though.
2014-06-12 19:40:59 +02:00
Scott Erickson
8a728cbb64
More switching of user objects from save to patch.
2014-06-11 14:17:31 -07:00
Scott Erickson
6d15b5e631
Working on User patching.
2014-06-11 13:16:17 -07:00
Scott Erickson
389d530eaa
Built a new 'patch' method for CocoModel, which saves only changed values to the server.
2014-06-10 20:59:37 -07:00
