 stiffly
|
e0c4394f20
|
Merge. Also fixed interpolation for scale and rotation.
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# include/Game/Game.h
# src/Game/CMakeLists.txt
# src/Game/Game.cpp
|
2016-01-19 14:04:25 +01:00 |
|
|
stiffly
|
3142c701e3
|
WIP interpolating scale and orientation
|
2016-01-19 11:42:30 +01:00 |
|
|
stiffly
|
a6425160fd
|
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
# Conflicts:
# include/Game/InterpolationSystem.h
# src/Game/InterpolationSystem.cpp
|
2016-01-18 18:13:19 +01:00 |
|
|
stiffly
|
88eb3ca2db
|
Scraping queues for interpolation
|
2016-01-18 18:07:59 +01:00 |
|
 Jocke
|
3e90ed564c
|
Moved Struct in InterpolationSystem.h and fixed bug.
|
2016-01-18 18:07:39 +01:00 |
|
|
Jocke
|
14b1d541dc
|
Merge remote-tracking branch 'origin/Networking' into Networking
|
2016-01-18 17:34:32 +01:00 |
|
|
stiffly
|
765509b510
|
Added interpolationsystem to pipeline.
|
2016-01-18 17:34:17 +01:00 |
|
|
Jocke
|
8952c1a7e4
|
Merge remote-tracking branch 'origin/Networking' into Networking
|
2016-01-18 17:28:09 +01:00 |
|
|
Jocke
|
fc305f8bf4
|
Merge remote-tracking branch 'origin/Networking' into Networking
|
2016-01-18 17:27:55 +01:00 |
|
|
stiffly
|
62c3f72355
|
Fixed cmake for interpolationsystem.
|
2016-01-18 17:27:37 +01:00 |
|
|
Jocke
|
70cbb02cb2
|
Merge remote-tracking branch 'origin/Networking' into Networking
|
2016-01-18 17:13:10 +01:00 |
|
|
Jocke
|
0c7f2c5198
|
WIP implemented Interpolation (server logic)
|
2016-01-18 17:12:42 +01:00 |
|
|
stiffly
|
d7780d8248
|
WIP implementing interpolation
|
2016-01-18 17:11:37 +01:00 |
|
 William Moberg
|
bf3f8aea89
|
Merge pull request #36 from teamfisk/PlayerMovement
Player movement
|
2016-01-18 13:32:42 +01:00 |
|
|
William Moberg
|
0669d91767
|
CollisionSystem loops over Collidable components.
|
2016-01-18 13:29:10 +01:00 |
|
|
William Moberg
|
942064c450
|
Removed class PlayerSystem and associated files.
|
2016-01-18 13:07:04 +01:00 |
|
|
Jocke
|
6ba6deb863
|
Removed some debug spam.
|
2016-01-18 11:35:35 +01:00 |
|
|
stiffly
|
cc604f8e9a
|
Merge remote-tracking branch 'origin/Networking' into Networking
|
2016-01-18 11:06:51 +01:00 |
|
|
stiffly
|
e97f4a3563
|
Merge remote-tracking branch 'origin/Networking' into Networking
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
# src/Game/Game.cpp
|
2016-01-18 11:06:27 +01:00 |
|
|
Jocke
|
d995713d3b
|
Added input queue to Client and Input Listener debug code in server.
|
2016-01-18 11:06:02 +01:00 |
|
 Jace
|
fb7e0498a8
|
Merge pull request #35 from teamfisk/DisableMemoryPool
Possible to disable the MemoryPool allocation in Config files.
|
2016-01-18 10:46:53 +01:00 |
|
|
William Moberg
|
a346a329b3
|
Added an option to disable the Pool allocation in Config.ini, in case there is a mess with the MemoryPool.
|
2016-01-18 10:16:35 +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 |
|
|
Jocke
|
db62d767ac
|
Fixed bug in Client::parseSnapshot().
|
2016-01-15 12:06:20 +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 |
|
|
Jocke
|
0bf756dc08
|
Merge remote-tracking branch 'origin/master' into Networking
|
2016-01-15 10:22:21 +01:00 |
|