Jace
a3d4eb65d5
Fixes #66 warnings
2016-02-01 17:53:01 +01:00
Jace
be3cfef65f
Merge remote-tracking branch 'origin/master' into EditorUsefulness
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
2016-02-01 16:00:46 +01:00
Jace
65f5bc673f
Functional translation widget in global and local space
2016-02-01 15:47:56 +01:00
Jace
a22bc00d46
*cough*
2016-02-01 13:37:51 +01:00
Jace
5bfcffc142
Fixed widget movement calculations going weird when world origin wasn't on screen
2016-02-01 11:56:21 +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
d3b1053f21
Fixes #59
2016-02-01 10:29:59 +01:00
Jace
13f020ddf5
Fixed #49 being able to parent an entity to itself, which resulted in infinite infinite loops everywhere! D:
2016-01-27 18:37:43 +01:00
Jace
65da634c71
File dropping into resource paths in the editor
2016-01-27 17:51:47 +01:00
Jace
c519ba2536
Component fields in the editor are now sorted in the order they're defined
2016-01-27 17:12:07 +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
0e70dc6fa3
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 15:41:31 +01:00
Jace
dec2234019
Merge branch 'Cleanup'
...
# Conflicts:
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 13:44:15 +01:00
Jace
0334ec3fa7
Merge remote-tracking branch 'origin/Animations'
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Game/Systems/WeaponSystem.cpp
2016-01-27 13:36:49 +01:00
Jace
5fcd26cd3e
Made TriggerSystem make use of Octree
2016-01-27 13:35:16 +01:00
cbb17d22d4
WIP
2016-01-27 12:10:00 +01:00
d12246833e
Some further small fizes to resolution //Tobias
2016-01-25 01:26:41 +01:00
7e92d6f53f
Healthbar on player
2016-01-24 22:21:10 +01:00
ada1bac2a7
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/RenderSystem.cpp
2016-01-24 20:48:17 +01:00
aa20b48188
Merge remote-tracking branch 'origin/master' into Importer
...
# Conflicts:
# resources/Schema/Entities/MovementTest.xml
# resources/Schema/Entities/Player.xml
2016-01-24 16:22:22 +01:00
96a735c542
Changed .obj to .mesh for all meshes.
2016-01-24 16:12:31 +01:00
680a12d88f
HealthMeter
2016-01-23 14:53:17 +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
43b8fd29f6
Fixed widget world movement
2016-01-21 16:21:20 +01:00
Jace
a6548a72b3
Merge remote-tracking branch 'origin/master' into EditorUsefulness
...
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
2016-01-21 16:16:35 +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
b62e42567c
Fixed editor enum selection
2016-01-19 11:35:31 +01:00
Jace
9e3dfff7b6
WIP world pausing
2016-01-19 00:52:17 +01:00
Jace
79eaa7364c
Editor toolbox buttons
2016-01-18 23:59:46 +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
e39e4064f2
Entity tree button mockup
2016-01-17 23:06:32 +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
Jace
d8a24bbfde
Renamed all instances of "Property" to "Field" in ComponentWrapper to maintain consistent naming with ComponentInfo
2016-01-17 00:38:25 +01:00
Jace
9ec32464bc
Added enum support to entity file format, see "Team" component for an example. Use ComponentInfo::Enum to convert enum string keys to its corresponding integer representation at runtime.
2016-01-16 23:12:24 +01:00
Jace
5e721325a4
Merge fixes
2016-01-14 18:20:51 +01:00
Jace
Tleety
viktorljung
antc13