7ba0e4ea9d
Run, Strafe and jump animations now playing
2016-03-04 08:35:02 +01:00
Jace
6f8023b285
HACK: Added Activate button for spawners in editor. Right now it includes the event from Game, but SpawnerSystem should probably be moved to Engine.
2016-03-02 22:48:01 +01:00
Jace
7624c6ee0a
Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world.
2016-03-02 20:12:59 +01:00
Jace
26d6546d79
Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation
2016-03-02 18:53:40 +01:00
Jace
6eb0b83d6b
Fixed editor camera speed changing when scrolling on UI elements
2016-03-01 22:47:43 +01:00
Jace
9e6c67596d
Basic editor copy and paste. Doesn't actually copy the entity until you paste it.
2016-02-25 17:51:28 +01:00
Jace
2b4e00e4b0
Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.
2016-02-08 13:33:55 +01:00
Jace
a3d4eb65d5
Fixes #66 warnings
2016-02-01 17:53:01 +01:00
Jace
65f5bc673f
Functional translation widget in global and local space
2016-02-01 15:47:56 +01:00
Jace
ee92200300
Improved editor pause logic. Editor now pauses when it's enabled and makes sure UI is up to date with the current state.
2016-02-01 10:45:37 +01:00
Jace
65da634c71
File dropping into resource paths in the editor
2016-01-27 17:51:47 +01:00
Jace
4b7613a659
Sorted editor component dropdown and made it always be fully expanded to show as many components as possible
2016-01-27 17:07:48 +01:00
Jace
31e7340daf
Ignoring interpolation and rendering for local player entities!
2016-01-23 00:40:37 +01:00
Jace
55ee2bb3bf
Player input properly separated from editor input and server
2016-01-22 21:35:31 +01:00
Jace
ca2aab449e
Basic movement and camera management between players and editor
2016-01-22 16:12:51 +01:00
Jace
8cf83454d7
Fixed input going through editor UI
2016-01-21 17:45:20 +01:00
Jace
75dcdcec41
Fixed inconsistent editor input controls. Left mouse = select and move. Right mouse = camera.
2016-01-21 17:00:47 +01:00
Jace
fc06a4babc
Editor keyboard shortcuts:
...
Ctrl+S to save the currently selected entity file (iterates to the base parent)
Ctrl+N to create a new empty entity under the selection
Ctrl+O to import an entity file
Del to delete an entity
2016-01-21 15:58:27 +01:00
Jace
b9147344e1
Semi-working translation widget
2016-01-21 14:14:22 +01:00
Jace
f1345419b6
EditorWidgetSystem that takes care of moving widgets around
2016-01-21 10:30:19 +01:00
Jace
8854794cbc
fixup! Editor widget selection and creation
2016-01-19 14:31:56 +01:00
Jace
d030e8f699
Editor widget selection and creation
2016-01-19 13:28:02 +01:00
Jace
267a60ef30
Better loading of editor toolbox icons
2016-01-19 11:43:38 +01:00
Jace
68af853a03
Editor entity naming
2016-01-19 11:43:03 +01:00
Jace
9e3dfff7b6
WIP world pausing
2016-01-19 00:52:17 +01:00
Jace
51979d7f0c
Changed System to take World through constructor and store it instead, cause it makes more sense.
2016-01-18 23:59:33 +01:00
Jace
3fc44e944c
Editor entity reparenting.
2016-01-18 21:20:20 +01:00
Jace
d4242bbead
Editor entity create and delete.
2016-01-18 19:26:00 +01:00
Jace
631dd57eeb
Editor entity import, save, delete, component attach, component delete.
2016-01-18 18:55:19 +01:00
Jace
9cb5f4bd2f
Added a stats window
2016-01-18 18:54:57 +01:00
Jace
504f301e4d
Added refactored property sheet for components
2016-01-18 13:51:22 +01:00
Jace
0d50ede6f5
Base work on reimplementing editor GUI
2016-01-17 07:34:20 +01:00
Jace
4786986abd
Rendering pipeline fixes across the board and base work on refactored editor
2016-01-17 06:29:25 +01:00
96371a08c8
Changed Picking colors from vec2 to ivec2. Picking now working for multiple scenes (Solution not perfect in the editor, yet)
2016-01-14 15:26:06 +01:00
e7f02f14a0
Added Transform.h that holds all the AbsoluteTransformation functions. Camera now working better with scenes. Changed Modeljob Matrix to only hold the model matrix instad of all matrix info
2016-01-14 11:12:02 +01:00
0f17f9a888
Merge remote-tracking branch 'origin/master' into Rendering
...
# Conflicts:
# include/Engine/Editor/EditorSystem.h
# include/Engine/Rendering/EPicking.h
# include/Engine/Rendering/Renderer.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/RawModel.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
2016-01-12 16:13:20 +01:00
d469fe6e9a
Removed picking event and added a pick function to renderer
2016-01-12 11:45:50 +01:00
Jace
39dd27726d
MAJOR BREAKING CHANGE: EntityID 0 is now a valid entity. Use EntityID_Invalid as sentry for checks!
...
Also contains inseparable editor changes.
2016-01-11 14:35:41 +01:00
Jace
e9128efd13
Translation widget planes
2015-12-17 15:30:43 +01:00
Jace
a655f0bae5
Drag-and-drop asset picking and base work for showing component field tooltips in the editor
2015-12-17 15:30:43 +01:00
aeca1dec18
Merge remote-tracking branch 'origin/master' into Rendering
...
# Conflicts:
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Game/Game.cpp
2015-12-17 11:17:58 +01:00
Jace
661532e355
Slightly more usable entity tree
2015-12-16 12:05:55 +01:00
Jace
322aedaf72
Basic transformation widgets
2015-12-16 09:47:38 +01:00
d9ea0192d1
Added RenderSystem and removed RenderQueueFactory
2015-12-14 20:07:02 +01:00
Jace
cddd9026fb
Toggle editor with "ToggleEditor" command. Enable editor with "Debug.EnableEditor" config variable.
2015-12-14 16:12:52 +01:00
Jace
fb2cd0c6ae
Fixed float angle wrapping
2015-12-14 15:20:55 +01:00
Jace
545869e342
Added scene graph UI to Editor
2015-12-14 13:58:28 +01:00
Jace
2f3843e595
Editor version 1
2015-12-14 13:57:55 +01:00
Jace
e5084e13ec
Added EditorSystem
2015-12-14 13:57:51 +01:00
viktorljung
Jace