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

529 commits

Author SHA1 Message Date
Ruben Vereecken
48a79ad48c New achievement modal fills in level.original query bit 2014-08-18 14:35:57 +02:00
Nick Winter
3b083e15f5 Don't require any Component default properties in hero levels, for maximum defaultability. 2014-08-15 12:27:56 -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
ba1e7005ca Worked around issue with docs tab polluting supermodel for components to save. Another instance of #1108. Actually, same one, but the fix eralier got undone. 2014-08-15 10:50:05 -07:00
Nick Winter
f1a9848366 Fixed a couple errors. 2014-08-15 10:27:36 -07:00
Nick Winter
4a133f6998 Added popovers to community social link logos. 2014-08-15 09:43:55 -07:00
Nick Winter
0f983bdcf1 Crude steps towards using your hero equipment in items levels. 2014-08-14 15:12:15 -07:00
Nick Winter
7286d069a0 Working to get undo/redo working again when manipulating ThangsTabView not using the Treema. 2014-08-14 10:28:50 -07:00
Nick Winter
652d47fb81 Merge pull request #1432 from jayant1992/undo-redo 
Undo redo descriptions
 2014-08-14 09:58:28 -07:00
Nick Winter
7844a2b987 Some fixes for new user views breaking on bad data or certain configurations. 2014-08-13 19:17:26 -07:00
Nick Winter
bdb3e14189 Added missing ForkModal. 2014-08-13 14:26:56 -07:00
Scott Erickson
31e3e7f98e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-08-13 14:06:03 -07:00
Scott Erickson
f9e8bfad9f Made some minor changes. 2014-08-13 13:45:24 -07:00
Nick Winter
b7d5428d5f Made Forking more abstract to apply to ThangTypes, too. 2014-08-13 11:36:00 -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
Jayant Jain
f4b8b76f46 Adds subclass for component config nodes 2014-08-13 12:39:21 +05:30
Jayant Jain
76c784b1de Adds default scripts whenever a new level is created 2014-08-13 12:11:37 +05:30
Jayant Jain
1e52f237b7 Reworks undo-redo and undo-redo descriptions 2014-08-13 06:56:03 +05:30
Jayant Jain
094f26fc63 Removes undo-redo description methods from treema subclasses 2014-08-13 05:28:23 +05:30
Jayant Jain
67ed28e034 Undo redo descriptions for settings tab view 2014-08-13 02:55:36 +05:30
Jayant Jain
d713c35db7 Refactors auto insert ids and adds undo-redo descriptions for ScriptsTabView 2014-08-13 02:55:36 +05:30
Jayant Jain
9c235fa797 Minor refactoring and bug fixes for undo and undo descriptions 2014-08-13 02:55:36 +05:30
Jayant Jain
c6caef6219 Undo redo descriptions for ThangsTabView 2014-08-13 02:55:36 +05:30
Nick Winter
2ab83328f3 Added item editor level preview window. 2014-08-12 12:50:41 -07:00
Jayant Jain
eece235337 Adds preset images 2014-08-12 20:42:42 +05:30
Ruben Vereecken
857d3ca02c Added some simple animations to achievement popups 2014-08-12 12:04:08 +02:00
Jayant Jain
b6e53d87c7 More decorations! (for dungeon preset) 2014-08-12 10:35:09 +05:30
Jayant Jain
5d8264e887 Takes care of overlapping walls for rooms 2014-08-12 10:35:09 +05:30
Jayant Jain
9d001524c6 Adds initial indoor preset for terrain generator 2014-08-12 10:35:09 +05:30
Nick Winter
4cc79e985e A few fixes for adding items to inventories in ThangTypes. 2014-08-11 17:09:44 -07:00
Jayant Jain
4beb85a3e7 Fixes bug with enter press on thangs tab 2014-08-12 04:16:17 +05:30
Scott Erickson
b3572dfad9 Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal. 2014-08-11 15:41:08 -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
Nick Winter
d1e26b40c2 I retook the Nick name. 2014-08-10 17:47:18 -07:00
Scott Erickson
6cac2371c1 Refactored and improved the ThangComponentsEditView and ThangComponentConfigView. Still some things to do. 2014-08-10 13:03:53 -07:00
Ruben Vereecken
47f00f9b5e Added achievement deleting and automatic achievement filling 2014-08-08 17:20:07 +02:00
Jayant Jain
593c31f33c Shows dragged component over other layers 2014-08-08 18:16:12 +05:30
Jayant Jain
93fd301300 Increases add treema line height, components are selected after being added 2014-08-08 18:02:20 +05:30
Jayant Jain
164e049202 Hides randomize button overlay, resolves #1409 2014-08-08 18:02:20 +05:30
Ruben Vereecken
9f0add22a5 Worked in a lot of changes Scott proposed 2014-08-08 11:54:53 +02:00
Scott Erickson
0c5364eebb Removed editorMode. 2014-08-07 14:22:43 -07:00
Nick Winter
4d4e321265 Fixed #1062. Added Item kind to level editor Thang filters. 2014-08-06 08:24:50 -07:00
Nick Winter
852dabc17a Fixes for item equipping, Component saving, and terrain randomization wall snapping/overlap avoidance. 2014-08-06 07:43:56 -07:00
Scott Erickson
d5a8d8dc72 Fixed ComponentDocsView's components collection overwriting data for other level editor data. Related to #1108. 2014-08-05 14:56:11 -07:00
Scott Erickson
c5d496c063 Removed a bit for debugging. 2014-08-05 13:40:36 -07:00
Scott Erickson
30998ecbec Fixed components w/out changes sometimes showing up in the save level modal. 2014-08-05 13:21:45 -07:00
Ruben Vereecken
d42922871e Added related achievements tab to level editor 2014-08-05 15:15:53 +02:00
Ruben Vereecken
7d7d5300c0 Refactored New Model Modal (from SearchView originally) 2014-08-05 14:33:33 +02:00
Ruben Vereecken
5d66560673 Merge remote-tracking branch 'upstream/master' into achievements_progress 
Conflicts:
	app/views/editor/level/LevelEditView.coffee
	server/levels/sessions/LevelSession.coffee
 2014-08-05 11:55:46 +02:00
Ruben Vereecken
3266e3b46b intermediate 2014-08-04 22:21:43 +02:00
Nick Winter
85011d1ed4 No need to explicitly track subviews for determining what the current view is. 2014-08-04 13:21:42 -07:00
Darredevil
a11649b12b Typo fix 2014-08-04 23:15:01 +03:00
Ruben Vereecken
fb3848359e Merge branch 'master' into achievements 2014-08-04 17:55:44 +02:00
Jayant Jain
549f2657ea Styles add button for addComponentsTreema 2014-08-04 07:53:24 +05:30
Jayant Jain
06875ce2b8 Resolves bug with mouseenter and mouseleave callbacks for add components treema 2014-08-04 07:21:02 +05:30
Jayant Jain
9e1513eb56 Add button on hover for addComponentsTreema 2014-08-04 07:05:22 +05:30
Jayant Jain
98f43b679f Adds component upon double click, newly added components are automatically selected 2014-08-04 06:04:35 +05:30
Jayant Jain
03d696c3df Components can now be added to thangs by dragging and dropping 2014-08-04 05:51:12 +05:30
Jayant Jain
2690ef9a59 Reorders script ids upon deletion 2014-07-30 01:05:04 +05:30
Jayant Jain
f0940308ea Newly inserted scripts are automatically assigned id 2014-07-30 00:52:59 +05:30
Jayant Jain
632d9a666e Shows all autocomplete values on click instead of having to type initially 2014-07-30 00:52:59 +05:30
Jayant Jain
0555c2ec14 Initial autocomplete for event checks in scripts tab 2014-07-30 00:52:59 +05:30
Ruben Vereecken
30a6cf1cca Merged in name changes from master 2014-07-29 17:28:13 +02:00
Ruben Vereecken
a8df3df095 Default image for achievements. Redid border logic 2014-07-28 15:14:11 +02:00
Michael Schmatz
d7cb76d10c Merge branch 'pr/1387' 
Conflicts:
	app/views/editor/level/LevelEditView.coffee
 2014-07-25 19:17:16 -07:00
Jayant Jain
69713f5603 Adds randomize button in case of level with no thangs 2014-07-26 01:55:28 +05:30
Darredevil
3b704330d6 Documentation tab for Level Editor 2014-07-25 23:06:04 +03:00
Darredevil
b77b796cef Merge branch 'codecombat-master' 
Conflicts:
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
 2014-07-25 22:48:13 +03:00
Jayant Jain
3e9dbe0d0b Fixes bug in undo/redo on SystemsTabView 2014-07-25 18:07:09 +05:30
Jayant Jain
d3962c19bd Ensures randomised thang clusters do not overlap each other 2014-07-25 18:07:01 +05:30
Jayant Jain
f700ddea0c Adds temporary hack for infinite loops in randomise 2014-07-25 18:06:54 +05:30
Jayant Jain
1790215fea Adds rooms and doors to dungeon preset 2014-07-25 18:06:44 +05:30
Jayant Jain
dc66218c00 Adds undo and redo buttons in editor topbar 2014-07-25 18:06:34 +05:30
Jayant Jain
9a24341fa5 Prevents overlapping of randomly generated thangs 2014-07-25 18:06:25 +05:30
Jayant Jain
3df2de8bec Number of decorations scales appropriately with preset size 2014-07-25 18:06:13 +05:30
Jayant Jain
dce6254d4a Fix for flickering thangs due to exact same coordinates 2014-07-25 18:06:03 +05:30
Jayant Jain
598e727500 Adds an initial dungeon preset, refactors border code to properly create dungeon walls 2014-07-25 18:05:49 +05:30
Jayant Jain
c33491b04d Presets in terrain_generate_modal shown from a list instead of hardcoded 
Conflicts:
	app/templates/editor/level/modal/terrain_randomize.jade
 2014-07-25 17:51:48 +05:30
Jayant Jain
af23c09799 Refactors some code for presets in terrain generator 2014-07-25 17:50:21 +05:30
Scott Erickson
1c3404d03e Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell. 2014-07-23 07:02:45 -07:00
Ruben Vereecken
1c6da9711b Added the Recently Played collection and endpoint 2014-07-21 14:36:10 +02:00
Darredevil
61ebc4d15b Docs tab 2014-07-21 03:52:34 +03:00
Nick Winter
1537754a16 A few bugfixes, plus gigantic child window convenience for me editing levels. 2014-07-19 20:26:13 -07:00
Scott Erickson
e7a70bbd0b Merge conflict handling. 2014-07-18 17:09:41 -07:00
Scott Erickson
97964f7853 More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView. 2014-07-18 17:06:20 -07:00
Scott Erickson
574e9e7804 Removed the deprecated ErrorView. 2014-07-18 16:56:08 -07:00
Scott Erickson
9ad166048d Some work the job profile page. Added a demo view, mainly added a modal view for viewing raw player code. 2014-07-18 16:12:28 -07:00
Scott Erickson
59b723b890 Refactoring View to ModalView. 2014-07-17 17:22:26 -07:00
Scott Erickson
e18b4de583 Refactoring View to CocoView. 2014-07-17 17:20:11 -07:00
Scott Erickson
0e042ee61c Refactoring View to RootView. Refactoring some RootViews to be routed manually. 2014-07-17 17:16:32 -07:00
Nick Winter
6b028513fd Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup. 2014-07-17 15:50:29 -07:00
Nick Winter
03cc2d1af0 Fixed Grass01-Grass05 scaling issues. 2014-07-15 18:08:00 -07:00
Jayant Jain
fa595fcb32 Better positioned level border trees 2014-07-16 05:03:18 +05:30
Jayant Jain
741956b251 Borders and floors are placed inside positive axes 2014-07-16 05:03:18 +05:30
Scott Erickson
3325332626 Fixes #1328. 2014-07-15 11:23:55 -07:00
Scott Erickson
fb83028d87 Added watchers to list of properties to skip in deltas/patches. 2014-07-15 11:23:35 -07:00
Ruben Vereecken
0288786098 Merge branch 'master' into achievements 2014-07-15 16:16:46 +02:00
Scott Erickson
d8d40ab0f6 Fixes #1116 2014-07-14 17:46:12 -07:00
Scott Erickson
888ee6c0bb Fixed deltas in the version history modal. 2014-07-14 16:37:10 -07:00
Nick Winter
f2f3817e10 Fixed Thang Editor scaling. 2014-07-14 14:10:46 -07:00
Ruben Vereecken
a60451368e Merged in master 2014-07-14 18:58:25 +02:00
Nick Winter
f1c8983de2 Don't ask for team again if we already have a child window. 2014-07-14 08:40:36 -07:00
Jayant Jain
c13c7db4ed Less geometric random borders for the terrain generator 2014-07-14 08:11:33 +05:30
Nick Winter
1d9afbabd2 Fixes for duplicate Thang IDs and reverting randomized Thangs. 2014-07-13 18:38:24 -07:00
Jayant Jain
493ebd07e6 Changes randomise to randomize 2014-07-14 06:01:09 +05:30
Jayant Jain
deecd7d2ff Deletes previously randomised thangs when generating again 2014-07-14 01:34:32 +05:30
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
Ruben Vereecken
9c0353a2f0 Merged in master 2014-07-13 21:18:32 +02:00
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
Ruben Vereecken
9055612b24 Fixtures set up, demo start 2014-07-07 12:47:32 +02: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
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
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
a367082cc4 Corrected statistic logic, wrote test case 2014-07-04 19:27:41 +02:00
Ruben Vereecken
bb1c07570d added isTranslationPatch method to patches 2014-07-04 19:27:41 +02:00
Ruben Vereecken
7a4c6daec8 stats.gamesCompleted is now tracked in users 2014-07-04 19:27:37 +02:00
Ruben Vereecken
39fb2cb1b4 Added achievement preview, exp test, stuff 2014-07-04 19:27:37 +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