codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-18 11:32:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
6198 commits 27 branches 0 tags 134 MiB
Commit graph

384 commits

Author SHA1 Message Date
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
Scott Erickson
f0ff8c242e Migrating language to codeLanguage on systems and components because they conflict with the search system. 2014-06-10 13:20:14 -07:00
Ruben Vereecken
8d2c62ba84 Got repeatables working flawlessly and improved the achievement popup by a great deal 2014-06-02 20:34:05 +02:00
Ruben Vereecken
bb57756cd9 Processed Scott's feedback. Db endpoint slightly safer, some refactorings. 2014-06-02 20:33:01 +02:00
Ruben Vereecken
d8bb802468 Designing the Notify to show level progress 2014-06-02 20:33:01 +02:00
Ruben Vereecken
d766a24e11 Achievements now popup when polled for by the client 2014-06-02 20:33:01 +02:00
Ruben Vereecken
c26f96f33e Added achievement model and some missing pieces 2014-06-02 20:32:00 +02:00
Nick Winter
852053022a Started the horrifying migration to an inline jobs profile editor. 2014-05-30 22:12:44 -07:00
Scott Erickson
29011fab2a Reworked validation error handling a little, putting better debugging logs in and making level save modal show when there are some. 2014-05-30 17:26:49 -07: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
3602f67c24 Tweaked how editPath is passed to the server so it doesn't foul up validation. 2014-05-30 14:41:41 -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
afc14e593d Fixed models thinking they've got changes when they don't. 2014-05-29 10:48:48 -07:00
Scott Erickson
3b87c9c360 Fixed some remaining jqxhr objects hanging around. 2014-05-27 16:33:57 -07:00
Nick Winter
a481af08d3 Fixed a couple typos with failed resource loading handling. 2014-05-26 20:51:05 -07:00
Nick Winter
4c7d7fce03 Fixed some memory leaks. 2014-05-22 12:05:36 -07:00
Scott Erickson
4b88296265 Set up the supermodel to clear out jqxhrs once they're done, since they take a lot of memory. 2014-05-22 11:47:38 -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
4fc1341a64 Added a way to remove SuperModel resources to fix ladder tab refreshing. 2014-05-21 15:33:28 -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
Nick Winter
8fb1237810 Added noty error messages when unable to save CocoModels. 2014-05-21 10:27:47 -07:00
Scott Erickson
93c6f72f07 Asynchronously building things again. 2014-05-20 10:49:19 -07:00
Nick Winter
a04130f26a Fixed a bug with ladder tab not reloading. 2014-05-20 10:40:15 -07:00
Scott Erickson
ae8d28182c Fixed a bug where sometimes thang avatar views wouldn't render the portrait, because 'loading' wouldn't be set to false properly. 2014-05-19 21:55:30 -07:00
Scott Erickson
8ae14e21ae Fixed #1029. Refactored scaling for sprites a bit. 2014-05-19 16:36:44 -07:00
Scott Erickson
eebbae9b13 Added a global SPRITE_RESOLUTION_FACTOR property. 2014-05-15 17:09:35 -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
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
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
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
Nick Winter
589410ed8e Merged master into feature/thangload. 2014-05-09 12:56:58 -07:00
Scott Erickson
8072629534 Merged the bug fix which I did too. 2014-05-08 13:43:15 -07:00
Nick Winter
775a2a87e2 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-08 11:36:26 -07:00
Scott Erickson
1e938910ed Couple bug fixes. 2014-05-08 11:10:22 -07:00
Scott Erickson
e9fc3df7c1 Set up the versions modal to display changes between versions when you select two of them. 2014-05-08 10:54:39 -07:00
Nick Winter
0c30ec0c12 Some weird bugs I noticed with {me}. 2014-05-06 16:58:08 -07:00
Nick Winter
1f3cc8a004 Merge branch 'master' of git://github.com/domenukk/codecombat 2014-05-06 08:00:39 -07:00
Dominik Maier
6d244e8560 + Merged Simulators 2014-05-06 05:07:34 +02:00
Dominik Maier
c9bb488794 Created headless-client and an alternative implementation of god 2014-05-06 02:37:14 +02:00
Nick Winter
0e0ca785d9 Moved ready-to-rank logic to LevelSession where it can be shared across victory and multiplayer modals and My Matches tab. 2014-05-05 16:59:12 -07:00
Scott Erickson
aee90c72bb Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel. 2014-05-02 17:03:30 -07:00
Scott Erickson
06bc96d7d0 Set up the level loader to get thangtype names first, then load the thang types themselves so the world can be generated in parallel with thang type loading and rendering. 2014-05-02 10:31:20 -07:00
Scott Erickson
92687b17de Merge branch 'master' into feature/thangload 
Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee
 2014-05-02 08:19:47 -07:00
Nick Winter
bd3c059c2a Several performance improvements based on profiling. 2014-04-28 16:31:51 -07:00
Scott Erickson
e5e146c3c1 Got rid of an extraneous log. 2014-04-28 14:59:51 -07:00
Scott Erickson
b9f4093b08 Set up the LevelLoader to load names instead of whole ThangTypes. 2014-04-28 14:58:58 -07:00
Scott Erickson
02a74ae40c Migrated and fixed the rest of the views using the new loading system. 2014-04-28 11:52:04 -07:00
Scott Erickson
01f2a556f9 Set up the patches view with the new loading system, fixing a few things in the meanwhile. 2014-04-28 11:09:21 -07:00
Scott Erickson
14cffc5875 Did some refactoring to simplify using SuperModel and registering models and collections. 2014-04-26 12:54:03 -07:00
Scott Erickson
d5bcec5ad0 Fixed the level editor with the new loading system. 2014-04-25 19:11:32 -07:00
Scott Erickson
14d62915f4 Got projection and backups set back up, partially fixed the level editor. 2014-04-25 16:14:05 -07:00
Scott Erickson
9a2311e792 Removed logic for dynamically finding referenced models. 2014-04-25 15:33:57 -07:00
Scott Erickson
6cd7c723d8 Fixed up showing errors, made sure they work with the play view. 2014-04-25 15:31:38 -07:00
Scott Erickson
3dc3f62473 Merge branch 'master' into feature/loading-views 
Conflicts:
	app/views/editor/components/main.coffee
 2014-04-25 14:31:58 -07:00
Scott Erickson
278d6752c3 Refactored SuperModel, CocoModel and LevelLoader. 
Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader.
Simplified SuperModel.
 2014-04-25 14:30:06 -07:00
Scott Erickson
b7cb4696f0 Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection 2014-04-24 13:31:29 -07:00
Scott Erickson
c85971e5e6 Added i18n population action to the level editor. 2014-04-22 17:56:41 -07:00
edtrist
3962d37681 #889 - moved CocoCollection.coffee to app/collections and updated references 2014-04-22 20:42:26 +01:00
Nick Winter
ab77176ed0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-22 11:11:10 -07:00
Nick Winter
675db1b76f Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents. 2014-04-22 11:11:08 -07:00
Scott Erickson
f57be1ae52 Migrated to the new email system, along with a setting for recruit notifications. 2014-04-21 16:15:23 -07:00
Ting-Kuan
974e5e1b24 remove debugging msg. 2014-04-19 13:09:50 -04:00
Ting-Kuan
7321052c18 Fix supermodel with resource value and fix ladder view under supermodel resource management. 2014-04-19 13:06:47 -04:00
Ting-Kuan
375aca2c0a Fix: Some level systems load forever. 2014-04-19 12:08:40 -04:00
Ting-Kuan
692693c181 Merge branch 'master' into feature/loading-views 
Conflicts:
	app/locale/en.coffee
	app/views/editor/level/edit.coffee
	app/views/kinds/CocoView.coffee
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
	app/views/play/level/level_loading_view.coffee
 2014-04-19 01:15:04 -04:00
dpen2000
75b759b1dc Add system names into delta messages 2014-04-18 17:25:25 -04:00
Ting-Kuan
64f986c286 Remove dependency management in supermodel. 2014-04-17 22:16:29 -04:00
Scott Erickson
8adca4a1da Added a transactional email for when changes are made, to notify watchers. 2014-04-17 17:30:55 -07:00
Ting-Kuan
1c1cf2f189 Fix loading of Level. 2014-04-17 19:23:35 -04:00
Scott Erickson
21e8d7b26f Fixed patches denormalization. 2014-04-17 15:44:19 -07:00
Ting-Kuan
b7439ed1ca Fix loading bar and retry block in ladder_view, #857. 2014-04-17 16:54:26 -04:00
Ting-Kuan
fe96289bf6 debugging: ladder_view doesn't show loading bar. 2014-04-17 15:57:08 -04:00
Scott Erickson
02a7381fa9 Fixed the watch buttons for levels and components. 2014-04-16 11:02:40 -07:00
Scott Erickson
731726dcd3 Merge branch 'master' into feature/jsondiffpatch 2014-04-16 10:42:43 -07:00
Scott Erickson
f88e0ac0ab Set up patches for components. 2014-04-16 10:42:32 -07:00
Ting-Kuan
2e50d7b15d Merge branch 'feature/Change-view-to-fit-new-supermodel' into feature/loading-views 
Conflicts:
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
 2014-04-16 11:38:05 -04:00
Ting-Kuan
c53eb562a3 Remove debug msg. 2014-04-16 02:31:18 -04:00
Ting-Kuan
52a73ceae3 Migrate view to fit new supermodel. 2014-04-16 02:28:59 -04:00
Scott Erickson
58b1019934 Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor. 2014-04-15 15:09:36 -07:00
Nick Winter
f762d95ab8 ModelModal and simple leaderboard pagination. 2014-04-15 15:01:54 -07:00
Ting-Kuan
af399f4415 Merge branch 'master' into feature/loading-views 2014-04-15 13:34:20 -04:00
Ting-Kuan
e58a5ee4b5 add debug msg. 2014-04-15 13:31:52 -04:00
Nick Winter
a9725f2dc6 A bit of error handling. 2014-04-13 14:48:36 -07:00
Ting-Kuan
8e19d8b71f Change some resource loading logic to fit new SuperModel. 2014-04-13 13:29:43 -04:00
Ting-Kuan
573a4ae847 Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815 
Conflicts:
	app/models/SuperModel.coffee
	app/views/editor/thang/edit.coffee
 2014-04-13 10:37:35 -04:00
Ting-Kuan
4979344ee5 Remove schema loading code. 2014-04-13 10:36:09 -04:00
Ting-Kuan
77c4c586dd Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815 
Conflicts:
	app/locale/en.coffee
 2014-04-12 17:13:06 -04:00
Ting-Kuan
508b570fea Merge branch 'master' into feature/loading-views 
Conflicts:
	.gitignore
	app/locale/en.coffee
	app/models/SuperModel.coffee
	app/views/editor/thang/edit.coffee
	app/views/kinds/CocoView.coffee
 2014-04-12 17:07:30 -04:00
Ting-Kuan
7ae3bd5a60 Fix style and supermodel based on #815. 
Fix ladder_view and ladder_tab.
Change error handling functions in CocoView.
 2014-04-12 16:29:49 -04:00
Scott Erickson
30f785f7cf Moved the model schemas into a models folder. 2014-04-12 10:51:02 -07:00
Aditya Raisinghani
e04787475c Rebased master to get updated schemas and added patch schema 2014-04-12 15:16:42 +05:30
Aditya Raisinghani
b932bf1e7c Deleted schemas from /server and modified files to point to /app/schemas 2014-04-12 14:45:59 +05:30
Aditya Raisinghani
6fb5b59a01 Refactored schemas to be in /app 2014-04-12 14:33:55 +05:30
Scott Erickson
35fe47bbac Merge branch 'feature/jsondiffpatch' 2014-04-11 22:52:58 -07:00
Scott Erickson
0eb74ab287 Added buttons for performing actions on patches. 2014-04-11 22:33:09 -07:00
Scott Erickson
34bf484bf2 Added data merge conflict handling. 2014-04-11 21:11:52 -07:00
Ting-Kuan
65a32a262d Before change dependency without name. 2014-04-12 00:03:56 -04:00
Nick Winter
fc9d30ccae Smarter fix for #810, since not all 24-character strings are like MongoDB ids. 2014-04-11 20:38:34 -07:00
Ting-Kuan
a6235842b6 Change populate model to accept resource name. 2014-04-11 22:35:20 -04:00
Scott Erickson
e3a1f170cf Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader 
Conflicts:
	app/views/kinds/CocoView.coffee
	app/views/play/level/level_loading_view.coffee
 2014-04-11 11:19:16 -07:00
Scott Erickson
97a7bc7614 Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 
Conflicts:
	app/initialize.coffee
	bower.json
 2014-04-11 10:32:19 -07:00
Nick Winter
a68f3efb99 Added specific job profile photo support. Improved right column design a bit. 2014-04-10 17:54:28 -07:00
Ting-Kuan
a5e6496a7c Make resources as static class to avoid loading multiple times. 
Clean debug message.
 2014-04-10 16:59:08 -04:00
Scott Erickson
a3951b0fa7 Extended the save version modal to allow submitting patches. 2014-04-10 13:09:44 -07:00
Scott Erickson
66d455285e Integrated the delta view into the save view for levels. 2014-04-09 19:07:44 -07:00
Nick Winter
26cebf7e7e Fixing some recruitment profile bugs. 2014-04-09 18:10:30 -07:00
Nick Winter
dd46f9d039 Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks. 2014-04-09 16:46:44 -07:00
Scott Erickson
f2d21b960f Added a delta subview for displaying deltas of schema'd data. 2014-04-09 16:09:35 -07:00
Ting-Kuan
3ea4d1677c able to load level editor. 2014-04-09 15:11:59 -04:00
Ting-Kuan
6729cfc292 First commit. 2014-04-08 12:03:03 -04:00
Scott Erickson
8fe568d3a4 Fixed schema loading. 2014-04-05 11:48:21 -07:00
Nick Winter
ae9769e3ce Added read only notification in editors. Fixed #374. 2014-04-01 13:15:30 -07:00
Nick Winter
7807fdbbc6 Merged pt-PT locale conflicts. 2014-04-01 10:41:40 -07:00
Bia41
167ee90a70 #673 Replaced .once with @listenToOnce 
Replaced .once with @listenToOnce on CocoModel, as requested on Issue #673
 2014-03-31 05:02:13 +01:00
Scott Erickson
092810eba2 Fixed a small error in the migration. 2014-03-26 14:44:11 -07:00
Scott Erickson
8001e58848 Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master 
Conflicts:
	app/models/SuperModel.coffee
 2014-03-26 14:39:01 -07:00
Scott Erickson
fae9034dfc Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master 
Conflicts:
	app/models/SuperModel.coffee
 2014-03-26 14:29:16 -07:00
swapnesh
1118324b41 Migrate from .on, .once to .listenTo, .listenToOnce 2014-03-26 03:25:11 +05:30
Shrihari
0160538b44 More migrations 2014-03-24 22:28:34 +05:30
Nick Winter
dbeb3d445b Give focus back to spell view on palette click. 2014-03-23 16:48:30 -07:00
Nick Winter
111973e1c8 Maybe this will be better - more on #650. 2014-03-23 10:29:08 -07:00
Nick Winter
7ba959045a A slight enhancement to #650, plus fixing CocoModels thinking they're modified when schema defaults have been added. 2014-03-23 10:00:16 -07:00
dpen2000
6c151acaa7 Optimizations of markToRevert: Switch to using $.extend instead of _.cloneDeep and only when type is not a "ThangType" 2014-03-22 02:22:08 +00:00
dpen2000
60ca991c58 Fix #390 
The issue here was configSchema is an attribute within attributes and so revertAttributes and attributes get the same instance of it when clone is used. Later calls to _.equals fail when only configSchema has changed.
 2014-03-22 01:34:24 +00:00
Scott Erickson
b6c9b6276c Tweaked logging of sprite building. 2014-03-19 17:11:45 -07:00
Scott Erickson
37a9b7f319 Switching from the slow _.cloneDeep to the fast $.extend 2014-03-18 13:08:26 -07:00
Scott Erickson
abd50b9495 Fixed the new build queue system for levels where there are multiple builders for a single thang type. 2014-03-13 15:45:24 -07:00
Scott Erickson
b2e9768127 Set up a build queue for async sprite sheet building, which lessens blocking the main thread. 2014-03-13 13:25:03 -07:00
Scott Erickson
9cb80783ff Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-11 22:01:47 -07:00
Scott Erickson
8ddbb49845 Trying out promises to simplify view loading. 2014-03-11 22:01:38 -07:00
Nick Winter
2b487eeed8 Using /db/thang.type instead of /db/thang_type in URLs, for consistency. 2014-03-11 18:30:25 -07:00
Nick Winter
03abbc44cb Better error messages for missing Component dependencies. 2014-03-09 11:46:53 -07:00
Scott Erickson
57f1588dea Fixed another bug related to the race condition fix. 2014-03-08 14:34:25 -08:00
Scott Erickson
afbe2200a6 Fixed a bug with the new race condition fix. Moving the schemas to the application would be good. 2014-03-08 13:52:34 -08:00
Scott Erickson
2861f62248 Simple fix for a race condition where the user schema might load after /auth/whoami, overwriting /auth/whoami's cookie. 2014-03-08 13:06:04 -08:00