Jace
567173c565
Merge branch 'master' into PlayerMovement
...
# Conflicts:
# src/Engine/Rendering/RenderSystem.cpp
# src/Game/Game.cpp
2016-01-14 18:24:34 +01:00
Jace
5e721325a4
Merge fixes
2016-01-14 18:20:51 +01:00
Jace
627108c6ee
Fixes for #30
...
# Conflicts:
# src/Game/Game.cpp
2016-01-14 18:15:38 +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
a8f7d5f6b9
Merge pull request #30 from teamfisk/Rendering
...
Rendering Scenes
2016-01-14 16:43:35 +01:00
Jace
d34470256b
EntityWrapper to uniquely identify entities and make using them a little easier
2016-01-14 15:43:19 +01:00
Jace
28392def79
Made string passing in World a little more effective
2016-01-14 15:42:55 +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
71d936f8d1
Start of a movement system with collisions against AABBs
2016-01-14 14:54:12 +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
Jace
d6ef527f25
Basic collisions using Octree. Seems buggy over octree boundaries.
2016-01-13 15:34:43 +01:00
Jace
8ed4ba1219
Added missing include for Octree
2016-01-13 12:16:35 +01:00
Jace
311475cbb6
Renamed all OctTree to Octree (More OCD)
2016-01-13 12:15:36 +01:00
Jace
8164a955d6
Renamed OctTree files to Octree (OCD to the max)
2016-01-13 12:15:09 +01:00
2284399538
Removed Close method from Client, Server and Network.
...
Removed legacy variable m_ThreadIsRunning in Client.h and Server.h.
Removed m_EventBroker->Unsubscribe(m_EInputCommand) in Client destructor.
2016-01-12 17:47:03 +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
236230d12c
Packets now dynamically allocates more memory when they need it.
...
Increased local receive buffer for Client and Server() and removed the magic number that was used
In Server.h and Client.h
(char readBuffer[INPUTSIZE] = { 0 }).
Packets start size has now been increased to 512 bytes.
Changed ComponentInfo::FieldsInOrder to store strings instead of pointers.
Removed HasEntity() and are now using ValidEntity() instead.
2016-01-12 12:00:19 +01:00
2450769190
some cleanup
2016-01-12 11:51:47 +01:00
d469fe6e9a
Removed picking event and added a pick function to renderer
2016-01-12 11:45:50 +01:00
3feee7fd35
Changed the structure of how RenderJobs are handled
2016-01-11 17:01:17 +01:00
b37ffc7449
WIP Model component not working.
2016-01-11 14:58:49 +01:00
f0ad28bac4
Removed some comments. Basically did nothing
2016-01-11 14:58:15 +01:00
Jace
4a516a4d86
Added ComponentInfo::FieldsInOrder to be able to loop through component fields in a consistent order based on the component XSD definition
2016-01-11 14:56:53 +01:00
Jace
21aea6f31d
Added World::ValidEntity for checking if an entity exists or not
2016-01-11 14:35:41 +01:00
Jace
297a3fb493
Support for "name" attribute on entities
2016-01-11 14:35:41 +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
6adc98eea5
Now writes entities to file instead of stdout...
2016-01-11 14:35:41 +01:00
Jace
11d547cde8
Entity 0 is now a real entity in the world, created by the first entity read while importing. This makes the difference between map files and entity files automatic, since consecutive entity file loads should automatically get the world as parent, as long as the world entity has been created earlier.
2016-01-11 14:35:41 +01:00
Jace
24b9e951c2
Added stride information to ComponentInfo, refactored FieldOffsets and FieldTypes into new struct Field_t Fields while I was at it.
2016-01-11 14:35:41 +01:00
Jace
81024b4a1d
First work on EntityFileWriter for saving levels
2016-01-11 14:35:41 +01:00
Jace
23e78c4947
Cleaned up code
2016-01-11 14:35:15 +01:00
Jace
3e7f27e1fe
Added error handler for DOM parsers
2016-01-11 14:35:15 +01:00
Jace
ee83394678
Unified some previously duplicated code
2016-01-11 14:35:15 +01:00
Jace
03456ad731
EntityFileParser
2016-01-11 14:35:15 +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
b8db80bc40
Added camera to PickingPass and fixed memory leak
2016-01-11 10:47:39 +01:00
a7b43b06a2
Camera component and RenderQueue changes
2016-01-08 16:21:59 +01:00
2bd60be741
Merge remote-tracking branch 'origin/master' into Forward+
...
# Conflicts:
# resources/Schema/Types/Entity.xsd
2016-01-08 14:14:43 +01:00
dab4ba2164
Pointlights are now using the pointlight component and the Light renderqueue to draw.
2016-01-08 14:12:09 +01:00
beb0967c3b
Merge branch 'master' into OrderedSystemPipeline
...
# Conflicts:
# src/Game/Game.cpp
2016-01-07 16:49:20 +01:00
7fb71f17b2
Destruct all systems properly in the pipeline.
2016-01-07 16:13:52 +01:00
c4642cc530
Merge branch 'master' into OrderedSystemPipeline
...
# Conflicts:
# include/Engine/Core/SystemPipeline.h
2016-01-07 15:07:16 +01:00
a1ed79dfbf
HealthSystemTest has been created. This runs a single test simple test with HealthEvents and HealthSystem. Also some minor changes
2016-01-07 14:53:31 +01:00
638c236ceb
HealthSystem tested and working. Also the 3 new PlayerEvents seems to work. TODO: a proper test in the testclass
2016-01-07 14:53:31 +01:00
f67f22c82d
Added Healthrelated events and start of HealthSystem, also reverted the crash "fix"
2016-01-07 14:53:31 +01:00
fa8775a72e
Renamed vars and added some comments.
2016-01-07 10:28:18 +01:00
Jace
49884d7e60
Fix for crash when unsubscription during event processing (untested)
2016-01-06 13:47:02 +01:00
Jace
Viktor Ljung
viktorljung
Jocke
stiffly
Tleety
William Moberg
verysecrethero