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

625 commits

Author SHA1 Message Date
Nick Winter
6b9d8161ef Found another place missing cache: false. 2015-02-12 11:17:23 -08:00
Nick Winter
d09636306c Toggling all plausibly-buggy AJAX requests to cache: false for better IE behavior. Look out for bugs! 2015-02-11 13:12:54 -08:00
Nick Winter
6ff39ba48a Not showing particles in IE. 2015-02-11 09:34:27 -08:00
Nick Winter
1d8f91c42f Added campaign world selector portal screen for half of players. 2015-02-05 15:05:33 -08:00
Nick Winter
60d68ca23c Fixed some memory leaks and particle disposal problems. Re-enabled particles. Tweaked particle stylings. 2015-02-02 18:02:57 -08:00
Nick Winter
415cbceaf9 Disabling particles for now until performance can be fixed. 2015-01-31 16:59:03 -08:00
Nick Winter
022d31c19a Basic leaderboards are working. 2015-01-30 21:36:48 -08:00
Nick Winter
4efbe0a12f Leaderboard skeletons. 2015-01-30 21:36:47 -08:00
Nick Winter
fd0e7a8c44 Picked some slightly less awful particle colors for different terrains and level types. Enabled for half the players. 2015-01-29 18:19:03 -08:00
Nick Winter
57d12c199e Tweaks to campaign status view. Hooking up i18n for Campaigns, but it doesn't work yet. 2015-01-29 09:07:25 -08:00
Matt Lott
8b51c3cb5d Stop subscribe modal A/B test 
Group A (original) wins.
 2015-01-28 16:20:10 -08:00
Nick Winter
e3bf8f74ab Trying to stagger LevelSessions saves on wins on replayable levels to see if that might help #2108 at all. 2015-01-22 12:26:37 -08:00
Nick Winter
7dd128780f Unlocking all audition levels in Auditions campaign. 2015-01-21 11:49:56 -08:00
Nick Winter
f86d106077 Showing replayable level difficulty in control bar. 2015-01-16 12:50:10 -08:00
Nick Winter
f691eb9a86 Reimplemented next-level arrow highlighting. Campaign Editor now draws lines to show level unlock patterns. Removed more old WorldMapView stuff. Can now configure Hero Placeholder say cooldowns per-level. 2015-01-13 09:04:20 -08:00
Nick Winter
778647bf19 Fixed layout of non-short item detail property labels. Commented out campaign editor analytics load for now to not kill things. 2015-01-11 10:04:24 -08:00
Scott Erickson
c8298679a4 Tweaked achievement notification handling, also disabling an endless loop of achievement fetching. 2015-01-09 12:38:00 -08:00
Scott Erickson
d69c5941b3 Fixed #1968. 2015-01-08 11:57:31 -08:00
Scott Erickson
c235b1cc15 The noty error for server errors now shows more detailed info. 2015-01-07 16:02:52 -08:00
Scott Erickson
2a4f997b1d Fixed registration point scaling for vector portraits, so they match their raster versions. 2015-01-07 15:11:43 -08:00
Nick Winter
1455dc0550 Working on repeatable achievement posting. Two tests still fail, though, so it's not there yet. 2015-01-07 12:25:43 -08:00
Nick Winter
677ba56ce9 Make sure to save level sessions after difficulty increase. 2015-01-06 12:40:24 -08:00
Nick Winter
9272ceb23e Trying to restore functionality of achievement plugin but without memory leak. 2015-01-05 21:57:23 -08:00
Nick Winter
45b90804ec Noting some TODOs to fix soon. 2015-01-05 20:49:59 -08:00
Scott Erickson
ffc33279b8 Made i18n coverage more strict about making sure every property that needs to be translated is translated. 2015-01-05 15:33:20 -08:00
Nick Winter
947811c01b Replayable once-per-day increasing-difficulty level basics. 2015-01-05 10:44:24 -08:00
Scott Erickson
1446f77a17 Refactored away from having the underscore string library added to the String prototype. 2015-01-04 08:05:46 -08:00
Nick Winter
dbc42fb7e1 Added task system to Thang Editor. 2015-01-01 14:07:11 -08:00
Nick Winter
c13922a2d8 Transferring voice range from Hero Placeholder to heroes. 2014-12-29 20:06:27 -08:00
Scott Erickson
0bdec68cfc Set up a save button. 2014-12-22 16:21:57 -05:00
Scott Erickson
0cd85d7aba Got the CampaignView mostly off the hardcoded data. 2014-12-19 16:46:01 -05:00
Scott Erickson
59318b2f78 Merge branch 'master' into feature/campaign-editor 2014-12-19 12:54:11 -05:00
Matt Lott
9d4c3cc163 A/B Test video tutorial styles 2014-12-17 23:55:11 -08:00
Scott Erickson
1cc6a97e43 Added basic campaign view, working on campaign handlers. 2014-12-16 17:46:24 -08:00
Matt Lott
eadde0590e Turn off fast hero victory modal A/B test 
Didn’t make a difference in level completion, opting for no delay in
showing the modal buttons.
 2014-12-15 14:05:37 -08:00
Matt Lott
c76662c967 Log analytics events internally 2014-12-15 11:45:12 -08:00
Matt Lott
0c81942c71 2nd HoC sub sale 2014-12-11 18:39:03 -08:00
Scott Erickson
0b81796333 Created the Campaign foundation: schema, model, handler. 2014-12-11 11:26:28 -08:00
Matt Lott
d4cfaac7e5 Sub price test 2014-12-10 16:05:55 -08:00
Nick Winter
d51db43823 Added desert campaign. 2014-12-10 10:00:52 -08:00
Matt Lott
8df3eed824 Add revenue tracking to analytics 2014-12-09 13:57:04 -08:00
Nick Winter
7651eaf6cc Fixed A/B test to fire with default English language. 2014-12-09 11:15:03 -08:00
Matt Lott
1aff798c5e A/B Test alternate subscribe modal copy 2014-12-08 23:43:52 -08:00
Matt Lott
b69bdfd360 A/B Test quick victory save/continue buttons 
Fixing typo in hu.coffee
 2014-12-08 14:24:33 -08:00
Nick Winter
499666d7b3 Starting to add first three desert levels. 2014-12-08 13:59:13 -08:00
Nick Winter
4a659903fe Started A/B test for whether the AnnouncesAction and take-damage audio help. 2014-12-07 19:39:23 -08:00
Matt Lott
343ad28761 Fix IE9 missing console object 
Debugging IE9 without debugging tools, when the debugging tools are
kind of the problem.  Fun.
 2014-12-07 15:24:15 -08:00
Nick Winter
9f0ae9ff09 Ditched dependency on index 0 as first unlocked level, instead explicitly granting Dungeons of Kithgard. 2014-12-07 14:57:23 -08:00
Nick Winter
175cdb5151 Now showing SubscribeModal before AuthModal for players who need to sign up before subscribing. 2014-12-06 09:35:13 -08:00
Scott Erickson
836d2905b9 Users who have paid or otherwise have access to all content are now called 'premium', and user objects on client and server have an isPremium getter which checks all relevant properties. 2014-12-05 17:19:52 -08:00
Nick Winter
6344b0c1a3 Unlocked core levels even for non-subscribers, moving extra levels to subscribers-only. 2014-12-05 15:46:15 -08:00
Scott Erickson
eb98cf4952 Hooked up Level handler to deny creating new LevelSessions when the level requires a subscription and the user doesn't have one. 2014-12-03 13:32:28 -08:00
Nick Winter
f82ccfc4cb The sky darkened. 2014-12-03 10:04:50 -08:00
Nick Winter
6cfb45e7a6 Pausing branchingGroup temporarily for school testing. 2014-12-02 09:18:39 -08:00
Matt Lott
1773744bcd Turn off a/b test hide locked levels 
Minor increase in level completion for hiding locked levels was not
statistically significant.  We can run this test again after level
banners and world map paths have been ironed out.
 2014-12-02 09:13:42 -08:00
Scott Erickson
cd5b57a658 Set up our resource retrying mechanism to stop after 20 tries. 2014-12-01 16:09:59 -08:00
Scott Erickson
a48fa41edd CocoViews and CocoModels now notify users of connection errors and automatically retry when getting and putting data goes wrong. 2014-12-01 15:29:19 -08:00
Matt Lott
23e60116d5 A/B test hiding locked levels in world map 2014-11-30 22:11:39 -08:00
Scott Erickson
be809337c4 Refactored to make TreemaUtils generally available but TreemaNode only available for views that need it. 2014-11-29 17:51:40 -08:00
Scott Erickson
31214e854e Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways. 2014-11-28 17:49:41 -08:00
Nick Winter
4b45385571 Working on paper dolls. 2014-11-28 12:11:59 -08:00
Scott Erickson
0f29e098cc ThangTypes with empty portraits now upload them with blank images, to overwrite extant portraits. 2014-11-25 13:28:28 -08:00
Scott Erickson
426202d80a Added a simple payments page. 2014-11-25 11:09:29 -08:00
Nick Winter
98f1eec10c Upgraded choose hero view for locked heroes. Went back to animated heroes instead of feature images. Removed some server logs. 2014-11-25 09:28:50 -08:00
Nick Winter
9accd0cb04 You can now buy cross-class items once you have a hero of that class. When you click to buy an item you can't afford, it takes you to the gem shop. Increased amount of items you can purchase a bit more. 2014-11-24 10:51:20 -08:00
Nick Winter
a1ebdb7101 Adjusted amount of items you can buy so that you can theoretically spend much more than you earn, while still not unlocking powerful stuff too early. 2014-11-24 09:05:59 -08:00
Nick Winter
b7949424e6 Re-enabled branchingGroup A/B test. Restricted Builder's Hammer in The Gauntlet. 2014-11-22 21:36:14 -08:00
Nick Winter
f16c1b5030 Fixed a few UX issues Chloe found. 2014-11-22 20:56:46 -08:00
Matt Lott
fcb098b3aa Remove cast button text A/B test 2014-11-22 16:50:49 -08:00
Scott Erickson
b86e3c30dc Set up level achievements to be created manually by the client, hopefully making them a bit more stable. 2014-11-20 22:09:54 -08:00
Nick Winter
2393165d9a Turned off some completed A/B tests. Fixed an achievement recalculation typo Scott found. 2014-11-20 21:57:47 -08:00
Nick Winter
e97ba54c94 Reduced how much we're sending to Mixpanel. Turned off experimental languages A/B test. 2014-11-20 20:31:17 -08:00
Nick Winter
f5f2d57db6 Paused branchingGroup A/B test and set everyone to no-practice. Realized that no-practice wasn't working at all, so fixed that. 2014-11-20 19:56:44 -08:00
Scott Erickson
13de055c0b Set up a basic achievements list modal for the world map. 2014-11-19 14:56:40 -08:00
Nick Winter
3ad67130c7 A few bugfixes for new EaselJS problems and misaligned small-item-shop unequippable button. 2014-11-18 18:43:53 -08:00
Nick Winter
f1a4249f18 More reductions in memory usage for iPad. 2014-11-18 11:21:29 -08:00
Nick Winter
547ba692e1 Turned off DOM highlight noise after A/B test insignificantly showed it hurting. 2014-11-18 08:05:20 -08:00
Nick Winter
6ef9532b1d Fixed missing colon in bg.coffee. 2014-11-18 06:50:13 -08:00
Matt Lott
f56d01419f Update sync pvp teams and real-time playback 
-Non-creator will switch teams upon joining a sync pvp game, if creator
is on same team
-Team swapping should only affect level session
-Real-time multiplayer submit now reloads PlayLevelView to ease loading
both player’s latest level sessions, and then automatically starts
real-time playback.
 2014-11-17 15:07:10 -08:00
Nick Winter
0f70b7e552 Admins can play all heroes. Fixed another bug with playback controls being disabled when they shouldn't be. 2014-11-15 12:46:57 -08:00
Nick Winter
b7c2a33ddc Fixed some i18n on the PlayHeroesModal, and started showing special hero skills. 2014-11-15 07:40:10 -08:00
Scott Erickson
913dda65aa Created the VectorIconSetupModal, a quick way to get portraits aligned to a container. 2014-11-12 14:14:07 -08:00
Nick Winter
26beb8a034 A few improvements to ItemDetailsView formatting to deal with spells granted. 2014-11-12 11:02:05 -08:00
Nick Winter
f1947d7d9d Fixed a couple bugs. 2014-11-11 18:16:45 -08:00
Nick Winter
0af7b4d5b7 Preparing for being able to use multiple hero classes. Deleted old ChooseHeroView. Improvements to missile trajectories. 2014-11-11 16:37:00 -08:00
Nick Winter
ce04541d3a Working on tying item purchasability to player level, plus other small tweaks to the item store. 2014-11-10 22:07:55 -08:00
Matt Lott
c5b26a4376 A/B test experimental languages hero select 
Test group not shown experimental languages on first hero select.
 2014-11-10 11:08:21 -08:00
Matt Lott
9c6485b142 A/B test automatically starting first level 
When loading the world map, if user hasn’t already started it.
 2014-11-09 21:33:50 -08:00
Nick Winter
14e8f6a653 Preparing for some of these new levels. 2014-11-08 19:33:00 -08:00
Matt Lott
d43fd49d12 Use testGroupNumber in cast button text A/B test 2014-11-07 21:56:49 -08:00
Nick Winter
03852fb44f Plannable pickUpFlags support and fixes for playing Coinucopia. 2014-11-06 18:21:54 -08:00
Nick Winter
2afc7c830a Implemented getHeroStats. 2014-11-05 13:28:54 -08:00
Scott Erickson
dc48cab6d1 Added a getHeroStats function stub. 2014-11-05 12:23:34 -08:00
Nick Winter
6efcbc5ead Hid Crawlways of Kithgard. A/B testing Haunted Kithmaze vs. The First Kithmaze. Renamed New Sight to Dread Door and awarded its glasses later. 2014-11-05 10:40:37 -08:00
Nick Winter
3a811a05fd Paying attention to level-specific Allied significantProperty overrides in Hero Placeholder replacement. 2014-11-04 16:09:29 -08:00
Nick Winter
ff1f9d488c Hiding items with no stats or properties in the item shop for non-admins. Simple Boots show as owned. Enabled item shop for non-admins. 2014-11-04 07:52:23 -08:00
Scott Erickson
33d14918b0 Implementation of Heald's design of the PlayItemsModal. Added purchasing logic to the server to support it. Refactored header font from Bangers to Open Sans Condensed. 2014-11-03 20:48:59 -08:00
Nick Winter
01fccf5ab7 Started highlight arrow sound A/B test. Hid more of the HUD when hiding. Support for knowing whether your killer was hurt when firing world:thang-died notes. 2014-10-30 19:18:03 -07:00
Nick Winter
47c090f7c7 Hiding locked items with no slot selected. Silhouetting items that are too far above you. Only showing items with a gem cost in the inventory screen. Sorting items by gem cost. Animating double-clicking items to show their motion to the slot, sort of. 2014-10-30 13:07:04 -07:00
Nick Winter
5ba1f61abe Added i18n support for level code comments. 2014-10-28 21:15:47 -07:00
Scott Erickson
9e6fd119a0 Achievements populate i18n whenever they're edited now. 2014-10-28 13:09:07 -07:00
Scott Erickson
7477633909 Trying to better get around mongoose stripping out empty i18n objects. 2014-10-28 11:21:26 -07:00
Scott Erickson
cea04d27ad Built diplomat-specific views for editing levels, components, achievements and thang types. 2014-10-27 17:16:22 -07:00
Matt Lott
8f923f9e1e Replacing http PATCHs with PUTs 
We’re keeping the patch behavior though.
Real patch calls return incorrect http responses in some environments,
like Browserstack and schools.
 2014-10-27 16:09:52 -07:00
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