Jace
a1fda82d3a
Turned the Transform namespace into TransformSystem so it would be able to subscribe to EntityDeleted and clean up after itself
2016-03-13 00:57:00 +01:00
Jace
01db8e0615
Merge remote-tracking branch 'origin/master' into Dirtybit
...
# Conflicts:
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Core/Transform.cpp
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/AnimationSystem.cpp
# src/Engine/Rendering/BoneAttachmentSystem.cpp
# src/Game/Systems/CapturePointSystem.cpp
# src/Game/Systems/ExplosionEffectSystem.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
2016-03-12 04:09:53 +01:00
Jace
80649ce51d
Updated the ENTIRE CODEBASE TO MATCH
2016-03-12 00:38:33 +01:00
a3ab844cc4
Makes sure m_CurrentSelection is valid before using it.
2016-03-11 11:12:49 +01:00
03493df213
Merge remote-tracking branch 'origin/master' into EntitiesWithoutTransform
2016-03-11 11:06:23 +01:00
bdcb33d992
Mouse always unlocked on game start and on disconnecting (i.e when menu shows).
2016-03-10 12:46:06 +01:00
Jace
50b0a091ec
Fixed editor widgets to take scale of the entity into account when they're moved
2016-03-09 22:45:55 +01:00
9cc8124847
Renamed IsAnyParentMissingTransform -> isAnyParentMissingTransform (member function).
2016-03-07 14:34:45 +01:00
a369c26a28
Blend tree nodes can now exist without transform components, without the game crashing.
2016-03-07 14:19:22 +01:00
7ba0e4ea9d
Run, Strafe and jump animations now playing
2016-03-04 08:35:02 +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
53c520123a
Uncommented code.
2016-03-02 17:06:53 +01:00
5c6a652316
Fixed so unregistered components are ignored instead of crashing the game.
2016-03-01 15:53:59 +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
8845054965
Merge remote-tracking branch 'origin/master' into PerformanceTiming
...
# Conflicts:
# resources/Schema/Entities/NewMap.xml
2016-02-17 16:59:26 +01:00
Jace
0af9edc6e5
Editor is properly disabled when disabled in config
2016-02-17 10:53:20 +01:00
4b8f1d95a3
Added static class PerformanceTimer. Changed CMakeLists for engine to include boost timer. Added F2,F3 functions in editor. Added some timing, more to be added
2016-02-16 16:57:46 +01:00
Jace
71c03326aa
Debug.EditorEnabled
2016-02-12 09:17:28 +01:00
Jace
d3bc48f5f7
Major networking refactoring to allow for snapshot filtering outside of netcode
2016-02-09 13:22:21 +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
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
d3b1053f21
Fixes #59
2016-02-01 10:29:59 +01:00
7e92d6f53f
Healthbar on player
2016-01-24 22:21:10 +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
43b8fd29f6
Fixed widget world movement
2016-01-21 16:21:20 +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
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
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
3a4f378ac5
Merge remote-tracking branch 'origin/master' into PlayerMovement
...
# Conflicts:
# src/Game/Game.cpp
2016-01-14 17:07:39 +01:00
Jace
986af01091
Fixed editor component fields with the same name across components being treated as the same value
2016-01-14 17:02:13 +01:00
143648860b
Added world pointer to PickData
2016-01-14 15:32:41 +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
Jace
stiffly
William Moberg
viktorljung
verysecrethero