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
0183e1bdb7
Fixed enum string parsing bug that would ignore parsing additional fields in a component after it encountered the first enum.
2016-01-21 12:24:08 +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
a6445c65aa
Fixed EntityParser to handle string enums properly.
2016-01-19 12:15:20 +01:00
Jace
3fb975a8d9
Editor widget entities
2016-01-19 11:44:03 +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
f281d220de
Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems.
2016-01-17 01:00:48 +01:00
Jace
b2213dbe9a
Merge remote-tracking branch 'origin/master' into PlayerMovement
...
# Conflicts:
# include/Engine/Collision/Collision.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CollisionTestLevel.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Collision/Collision.cpp
# src/Game/Game.cpp
2016-01-15 20:28:43 +01:00
Jace
db1b972cd1
Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems
2016-01-15 18:32:47 +01:00
5c45dbdd10
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# resources/Schema/Types/Entity.xsd
2016-01-15 16:25:32 +01:00
Jace
ce8dcd3022
Merge pull request #33 from teamfisk/Forward+
...
Forward+
2016-01-15 16:20:53 +01:00
3de853ac8b
Frustum culling now works correctly for all resolutions
2016-01-15 15:38:14 +01:00
76f90ab031
The main thread is not mutex blocked while child threads load anymore.
2016-01-15 11:29:46 +01:00
4cf6dcfc14
Merge branch 'master' into AsyncResourceLoad
...
# Conflicts:
# include/Engine/Rendering/RawModel.h
# src/Engine/Rendering/RenderQueueFactory.cpp
2016-01-15 10:10:57 +01:00
e248b37ea8
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# src/Game/Game.cpp
2016-01-15 09:52:52 +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
6ad1839def
Initial work on PlayerMovementSystem
2016-01-14 17:03:48 +01:00
Jace
71d936f8d1
Start of a movement system with collisions against AABBs
2016-01-14 14:54:12 +01:00
7f0ff6c4d7
Added a sound testing level.
2016-01-14 14:20:34 +01:00
Jace
d6ef527f25
Basic collisions using Octree. Seems buggy over octree boundaries.
2016-01-13 15:34:43 +01:00
a58cc33ed0
WIP, multithreaded loading based on exceptions, very slow probably.
2016-01-13 10:58:31 +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
Jace
2a5e0420c8
Added template entity "Empty.xml" for use as root entity when creating a new map.
2016-01-11 16:40:26 +01:00
Jace
0bcbcda8b8
EntityFilePreprocessor
...
WIP
WIP
EntityFilePreprocessor
2016-01-11 14:35:15 +01:00
Jace
b908a9f9c6
Revert "Forward+"
2016-01-11 13:48:55 +01:00
a7b43b06a2
Camera component and RenderQueue changes
2016-01-08 16:21:59 +01:00
6e6460a000
Commented out the bugged models
2016-01-08 16:15:18 +01:00
330f08b926
Merge remote-tracking branch 'origin/master' into Networking
...
# Conflicts:
# include/Game/PlayerSystem.h
# src/Game/Game.cpp
# src/Game/PlayerSystem.cpp
2015-12-18 14:18:53 +01:00
0f59b863ee
Renamed IF_DEBUG_IS to DEBUG_IF, slightly different behavior and added some safety checking for auto creating AABBs from models.
2015-12-17 17:08:47 +01:00
46ae2d39af
Merge branch 'master' into OctTree
...
# Conflicts:
# src/Game/Game.cpp
2015-12-17 16:44:01 +01:00
50822d09fc
Merge remote-tracking branch 'origin/master' into Networking
...
# Conflicts:
# src/Game/Game.cpp
2015-12-17 14:10:02 +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
dbbbb7b4e7
Working rotations and translations relative to global and local space for children
2015-12-16 17:20:56 +01:00
04a01104b5
Merge branch 'master' into OctTree
...
# Conflicts:
# src/Engine/CMakeLists.txt
# src/Game/Game.cpp
2015-12-15 17:11:11 +01:00
e2417be8c7
Very simple CollisionSystem made, 'Z','Y' to toggle on/off.
2015-12-15 15:36:28 +01:00
fa66e9ff47
Camera Switch event now working, Camera models Rotation still bugged
2015-12-15 15:29:19 +01:00
170610bcb1
Added a TriggerSystem, seems to work as intended.
2015-12-15 14:49:52 +01:00
0a8a9e5099
Merge remote-tracking branch 'origin/master' into Networking
...
# Conflicts:
# src/Engine/Rendering/RenderState.cpp
# src/Game/Game.cpp
2015-12-15 11:50:01 +01:00
ef07a9d536
Merge remote-tracking branch 'origin/master' into Rendering
...
# Conflicts:
# include/Engine/Rendering/RenderQueueFactory.h
2015-12-14 19:11:00 +01:00
05b78265be
Fixed some transparency bugs and started on component based camera
2015-12-14 19:10:00 +01:00
3f77da4a07
Merge remote-tracking branch 'origin/master' into Networking
...
# Conflicts:
# include/Game/Game.h
# resources/DefaultConfig.ini
# src/Game/Game.cpp
2015-12-14 17:07:12 +01:00
bac0a1de26
Removed annoying cube
2015-12-14 16:55:23 +01:00
Jace
2f3843e595
Editor version 1
2015-12-14 13:57:55 +01:00
Jace
7464facab9
Next generation raptor copter
2015-12-12 03:38:17 +01:00
c2435fda2d
Added Component to Components.xsd and Entity.xsd
2015-12-11 14:27:54 +01:00
80f028edf2
Added a very basic PlayerSystem, and a PlayerComponent.
2015-12-11 13:45:19 +01:00
Jace
stiffly
Tleety
William Moberg
viktorljung