 Jace
|
162523d3ca
|
Made EntityFileWriter store enums as strings instead of integer values to be resistant to enum value changes!
|
2016-01-19 11:55:27 +01:00 |
|
|
Jace
|
3fb975a8d9
|
Editor widget entities
|
2016-01-19 11:44:03 +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
|
1760f9dfb1
|
Added inequality operator to EntityWrapper
|
2016-01-18 21:17:52 +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
|
3bc7dceca5
|
Made EntityWrapper hashable
|
2016-01-18 14:55:49 +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
|
e34856468a
|
Removed DrawScenePass, since it doesn't seem to be used
|
2016-01-17 06:27:45 +01:00 |
|
|
Jace
|
e2357b8625
|
Fixed absolute position not taking scale into account
|
2016-01-17 06:23:13 +01:00 |
|
|
Jace
|
6ec2258758
|
Added UniformScale component which keeps an entity's scale at a uniform value relative to the screen.
|
2016-01-17 06:22:35 +01:00 |
|
|
Jace
|
9f447afbdb
|
Added EntityWrapper::Valid and bool overload to be check if an entity is valid and still exists in the world more easily
|
2016-01-17 06:20:27 +01:00 |
|
|
Jace
|
f281d220de
|
Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems.
|
2016-01-17 01:00:48 +01:00 |
|
|
Jace
|
6385a98eca
|
Added runtime type size check to ComponentWrapper to avoid corruption when types don't match
|
2016-01-17 00:59:26 +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
|
f65ac65e30
|
Updated component defaults files to match component schema and made schema validation strict.
|
2016-01-16 17:03:57 +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
|
bbabc84127
|
Fixed default values for CPlayerSpawn
|
2016-01-15 20:26:30 +01:00 |
|
|
Jace
|
8bd5a428b9
|
EntityFileParser now ignores component fields not present in component definition instead of crashing.
|
2016-01-15 20:25:48 +01:00 |
|
|
Jace
|
db1b972cd1
|
Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems
|
2016-01-15 18:32:47 +01:00 |
|
|
Jace
|
97e12ff550
|
Made EntityFileParser::MergeEntities return the base entity that was created, and also take an optional parent entity to create it under.
|
2016-01-15 18:31:32 +01:00 |
|
 stiffly
|
d28583ca9e
|
Fixes for #34 (Licenses)
|
2016-01-15 17:20:11 +01:00 |
|
|
Jace
|
0469460029
|
Input binding format changed to allow custom values for bindings. Relevant code must clamp input values to prevent speedhaxx!
|
2016-01-15 16:32:04 +01:00 |
|
|
Jace
|
7b2a21f0b0
|
Merge pull request #34 from teamfisk/Sound
Sound
|
2016-01-15 16:26:55 +01:00 |
|
|
stiffly
|
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 |
|
|
Jace
|
a2e19013c6
|
Merge pull request #32 from teamfisk/AsyncResourceLoad
Async resource load
|
2016-01-15 16:20:36 +01:00 |
|
 William Moberg
|
c09fe4ae55
|
Added a bool option to disable threads in in the configfile regarding resource loading.
|
2016-01-15 16:18:39 +01:00 |
|
|
stiffly
|
be33dfbd69
|
Forgot to change the velocity for the emitters as well...
|
2016-01-15 16:10:02 +01:00 |
|
|
stiffly
|
63704b2e6b
|
Now calculating the velocity for the listener correctly.
|
2016-01-15 15:43:20 +01:00 |
|
 Tleety
|
3de853ac8b
|
Frustum culling now works correctly for all resolutions
|
2016-01-15 15:38:14 +01:00 |
|
|
William Moberg
|
f5ea4d513c
|
ResourceManager::Load never returns null, throws exceptions instead.
|
2016-01-15 15:25:01 +01:00 |
|
|
stiffly
|
d9dd7f535f
|
When changing camera listener is updated. Also fixed some crashes in RenderSystem when there were no cameras available.
|
2016-01-15 13:45:08 +01:00 |
|
|
William Moberg
|
76f90ab031
|
The main thread is not mutex blocked while child threads load anymore.
|
2016-01-15 11:29:46 +01:00 |
|
|
stiffly
|
3e2cb33bc0
|
Played around with new map MapVersion1. Was fun ヽ(´▽`)/
|
2016-01-15 11:23:29 +01:00 |
|
|
Tleety
|
14bc850fab
|
Merge remote-tracking branch 'origin/master' into Forward+
|
2016-01-15 11:02:27 +01:00 |
|
|
Tleety
|
ecf524eb4e
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# include/Engine/Rendering/PickingPass.h
# include/Engine/Rendering/Renderer.h
# resources/Schema/Entities/Test.xml
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
|
2016-01-15 11:01:58 +01:00 |
|
|
William Moberg
|
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 |
|
|
stiffly
|
32634f742e
|
Merge remote-tracking branch 'origin/master' into Sound
|
2016-01-15 09:53:39 +01:00 |
|