Jayant Jain
b934d22cbd
Batches insertion of thangs to treema to speed up terrain generation
2014-07-14 01:34:32 +05:30
Jayant Jain
1e5edb5efd
Moves randomise modal template and view to editor/level/modal
2014-07-14 01:34:32 +05:30
Jayant Jain
a76a79bb9d
Fixes bug with placing addThang after randomise
2014-07-11 01:07:24 +05:30
Jayant Jain
dbe464df16
Removes console logs
2014-07-11 00:01:19 +05:30
Jayant Jain
38bed0ee93
Random thangs are now created and positioned in the thangs view
2014-07-11 00:01:19 +05:30
Jayant Jain
74205b31d2
Adds code for passing randomised thangs to thang view
2014-07-11 00:01:18 +05:30
Jayant Jain
efa2bee08c
Adds shortcuts for undo/redo for thangs tab view
2014-07-11 00:01:18 +05:30
Scott Erickson
d74a778f67
Made creating components open to everyone!
2014-07-09 12:21:32 -07:00
Scott Erickson
2a309c149c
Enabled submitting patches for thangs and articles.
2014-07-07 15:19:22 -07:00
Scott Erickson
94a6e3961b
Added a button in the level editor to choose which team to play when editing a ladder level.
2014-07-05 13:54:41 -07: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
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
ca8394621d
Fixes #1223
2014-07-04 11:46:33 -07:00
Ruben Vereecken
08030dc785
Cleaned up patch rendering logic
2014-07-04 20:18:26 +02:00
Ruben Vereecken
6e4170012f
Made sure applyDelta is called in all cases
2014-07-04 18:38:15 +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
3862bd2376
Clearing backups of old models when saving new versions of versioned models.
2014-06-24 09:43:20 -07:00
Nick Winter
81f8334f37
Some fixes for CocoSprite alphas.
2014-06-21 22:31:10 -07:00
Nick Winter
59654da24b
Starting more work on integrating additional languages. Improved Component code editing performance with a trusty debounce.
2014-06-17 22:17:44 -07:00
Nick Winter
1502cdc64b
Merge branch 'jayant1992-master'
2014-06-13 08:17:12 -07:00
Scott Erickson
8ab69cf833
Merge pull request #1138 from rubenvereecken/search-endpoint
...
Search endpoint is now without the /search prefix
2014-06-12 11:33:28 -07:00
Ruben Vereecken
2a5c2020ca
Added recalculation button to the achievement editor
2014-06-12 19:41:07 +02:00
Ruben Vereecken
7096a07ce8
Improved logging (winston) and admin-only'd the achievement editor
2014-06-12 19:40:59 +02:00
Ruben Vereecken
5aa211cabd
Got repeatables working flawlessly and improved the achievement popup by a great deal
2014-06-12 19:40:59 +02:00
Ruben Vereecken
0751581113
Search endpoint is now without the /search prefix
...
Intermediate commit for search refactoring
2014-06-12 19:19:30 +02:00
Jayant Jain
ed95206868
Enables moving around the map while an addThang is selected
2014-06-12 01:50:24 +05:30
Jayant Jain
d5d20377a2
Removes panning upon right click in editor
2014-06-11 15:05:59 +05:30
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
Scott Erickson
8f6187125d
Fixed saving new settings for a level.
2014-06-03 12:27:53 -07:00
Ruben Vereecken
ed44ab5f7d
Improved logging (winston) and admin-only'd the achievement editor
2014-06-02 21:07:23 +02: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
d8bb802468
Designing the Notify to show level progress
2014-06-02 20:33:01 +02:00
Ruben Vereecken
aa3fedeb02
Achievements can have icons. Users now have their scores denormalized
2014-06-02 20:32:00 +02:00
Ruben Vereecken
287019242f
Achievement queries are now strings server sided but remain objects for the client
2014-06-02 20:32:00 +02:00
Ruben Vereecken
1b2a251c58
Achievement editor in place and looking mighty fine
2014-06-02 20:31:09 +02:00
Ruben Vereecken
c2d2f2a2b8
Refactorings performed necessary to have searchable for more uses
2014-06-02 20:31:09 +02: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
22c4ddc064
Fixed the settings view putting undefineds in the level documents and causing validation errors.
2014-05-30 17:24:13 -07:00
Scott Erickson
f82ca5c1b6
Fixed #1099
2014-05-30 16:43:55 -07:00
Scott Erickson
bba0e4939d
Fixed #1039
2014-05-30 15:06:33 -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
Ruben Vereecken
84e6b8cd6d
Script event triggers are now fetched from the mediator, resolving issue #1061
2014-05-30 12:38:43 +02:00
Nick Winter
1f32c1c8a1
Merge pull request #1113 from rubenvereecken/issue1110
...
One line fix for issue #1110 . Thang search bar works again.
2014-05-29 15:31:28 -07:00
Ruben Vereecken
ba57899f9f
One line fix for issue #1110 . Thang search bar works again.
2014-05-30 00:16:11 +02:00
Nick Winter
df13bbfaa6
Made right-click duplicate Thang menu actually clone modified Thang.
2014-05-29 12:33:21 -07:00
Nick Winter
90c97008ae
Merge pull request #1098 from rubenvereecken/view-refactoring
...
Refactored getRenderData from SearchView to children
2014-05-28 18:59:02 -07:00
dpen2000
bd444fa547
Fixes #1096 by ensuring progress is reset back to zero so render gets called correctly after ajax call to load patches completes
2014-05-29 02:16:07 +01:00
Ruben Vereecken
5909f15678
Refactored getRenderData from SearchView to children
2014-05-28 17:32:18 +02:00
Jayant Jain
55569ccf2f
Resolves an issue with nanoscroller and initially hidden content
2014-05-24 12:02:26 +05:30
Jayant Jain
f17c5cfb51
Adds nanoscroll to thang tab in level editor
2014-05-24 12:02:26 +05:30
Jayant Jain
cbe5f3a011
Fixes issue with esc key not deselecting the current thang
2014-05-24 12:02:26 +05:30
Jayant Jain
8f1f378bcb
Fixes issue with thang being added twice upon click
2014-05-21 10:27:47 -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
8ae14e21ae
Fixed #1029 . Refactored scaling for sprites a bit.
2014-05-19 16:36:44 -07:00
Scott Erickson
5907ca8619
Fixed scaling in the thang type editor.
2014-05-17 11:49:11 -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
Scott Erickson
2a17ec5cb9
Refactored out displayObject from CocoSprites.
2014-05-14 17:05:13 -07:00
Nick Winter
1aa72541ff
Merged master into feature/thangload.
2014-05-12 09:57:31 -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
589410ed8e
Merged master into feature/thangload.
2014-05-09 12:56:58 -07:00
Scott Erickson
0292be054e
I think this fixes #976 . I believe the client was attempting to save components and systems it didn't have write access to, and that was gumming up the works. Not 100% sure though; reopen if it rears its ugly head once more.
2014-05-08 14:56:02 -07:00
Scott Erickson
3d51969757
Fixed the patch view loading.
2014-05-08 14:54:47 -07:00
Scott Erickson
9c3cefa457
Removed a couple logs I forgot about.
2014-05-08 14:28:18 -07:00
Scott Erickson
8072629534
Merged the bug fix which I did too.
2014-05-08 13:43:15 -07:00
Scott Erickson
57f11ff3ea
Fixed some bugs with the components tab.
2014-05-08 13:40:42 -07:00
Nick Winter
775a2a87e2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-08 11:36:26 -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
Scott Erickson
ed222338e7
Fixed #892 by having the components tab reload whenever it's opened.
2014-05-07 16:24:13 -07:00
Nick Winter
0c30ec0c12
Some weird bugs I noticed with {me}.
2014-05-06 16:58:08 -07:00
Scott Erickson
ffdf11133e
Merge branch 'SetReadOnlyChanges' of https://github.com/dpen2000/codecombat into dpen2000-SetReadOnlyChanges
2014-05-06 11:19:11 -07:00
Scott Erickson
8f9aea1b9b
Fixed the patches view.
2014-05-05 15:19:35 -07:00
Scott Erickson
db9a82d58a
Merge branch 'feature/thangload' of https://github.com/codecombat/codecombat into feature/thangload
2014-05-02 17:03:53 -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
Nick Winter
d54149d0f3
Reworked LevelView loading priorities to try to get world simulating earlier.
2014-05-02 12:32:41 -07:00
Scott Erickson
31c5890288
Fixed #934
2014-05-01 15:44:50 -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
8164c6881c
Fixed a patches resource name.
2014-04-28 11:10:27 -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
dpen2000
0a8ec096f7
Make components read only for anonymous users
2014-04-28 02:03:08 -04:00
dpen2000
3165a2b654
Change all lines setting readonly from being admin only to being authenticated only
2014-04-28 02:03:08 -04: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
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
472f8899dd
Merge branch 'master' of https://github.com/tmrdja/codecombat into tmrdja-master
...
Conflicts:
app/views/editor/level/edit.coffee
2014-04-24 13:17:43 -07:00
Scott Erickson
8ab50205aa
Fixed more buttons in treema.
2014-04-24 11:50:49 -07:00
tmrdja
14ebc957de
Changed responsive view for LevelEditor
2014-04-24 11:51:16 +02:00
Scott Erickson
c85971e5e6
Added i18n population action to the level editor.
2014-04-22 17:56:41 -07:00
Scott Erickson
9c8841e838
Merge remote-tracking branch 'origin/master'
2014-04-22 16:42:50 -07:00
Scott Erickson
5921575a02
Hack to fix a bug with the components view in the thang editor.
2014-04-22 16:42: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
bb0cbf1151
Removed some old code that didn't work out.
2014-04-22 10:43:08 -07:00
