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
Scott Erickson
041f4512e8
Set up marks to all load dynamically, and set up effect marks, which appear above a thang's head and rotate between them if there are multiple.
2014-03-06 15:52:09 -08:00
Scott Erickson
a6c4fe8d02
Merge branch 'master' of https://github.com/rubenvereecken/codecombat into rubenvereecken-master
2014-03-05 20:04:14 -08:00
Scott Erickson
fc42043cb8
Fixed #480
2014-03-05 12:53:48 -08:00
Ruben Vereecken
ee920afea9
Disabled buttons for non-owners in Article Editor
2014-03-03 21:13:02 +01:00
Ruben Vereecken
942b69ea9f
Created hasWriteAccess on Cocomodel, used it for level access
2014-03-03 20:41:35 +01:00
Scott Erickson
c5521a1311
Level now uses the universal wizard thang type.
2014-03-03 11:04:03 -08:00
Scott Erickson
0d054bec8e
Refactored the universal wizard loading to happen silently when you import ThangType.
2014-03-03 10:42:11 -08:00
Scott Erickson
feaeb1dc98
Made the wizard icons colored based on user settings.
2014-03-03 10:21:51 -08:00
Scott Erickson
22e80f6d24
Set up a play modal, starting to refactor wizard thang type loading to be shared across the site.
2014-03-03 09:03:44 -08:00
Nick Winter
e20e9d68cf
Construct sprite sheets as ThangTypes load.
2014-02-27 22:15:13 -08:00
Nick Winter
6f0ed9040a
Fixes for dirt path, fast portraits, and slow transpilation. Starting to move Aether stuff into a Tome worker with Catiline.
2014-02-17 17:38:49 -08:00
Nick Winter
addf4ca245
Improved Simulator memory and performance.
2014-02-15 17:29:54 -08:00
Nick Winter
f3b58a9416
Merged.
2014-02-15 15:45:53 -08:00