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
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
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
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
16c39df439
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
...
# Conflicts:
# include/Engine/Collision/Collision.h
# src/Engine/Rendering/Model.cpp
# src/Engine/Rendering/RawModelAssimp.cpp
2016-01-15 18:00:30 +01:00
8437b9c734
Commit for Pull
2016-01-15 17:58:26 +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
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
c09fe4ae55
Added a bool option to disable threads in in the configfile regarding resource loading.
2016-01-15 16:18:39 +01:00
63704b2e6b
Now calculating the velocity for the listener correctly.
2016-01-15 15:43:20 +01:00
3de853ac8b
Frustum culling now works correctly for all resolutions
2016-01-15 15:38:14 +01:00
f5ea4d513c
ResourceManager::Load never returns null, throws exceptions instead.
2016-01-15 15:25:01 +01:00
7faed50507
Merge remote-tracking branch 'origin/master' into TextRendering
2016-01-15 13:24:24 +01:00
6fbb962b5e
Merge branch 'Rendering' into TextRendering
...
# Conflicts:
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderQueueFactory.h
# include/Engine/Rendering/Renderer.h
# include/Engine/Rendering/ShaderProgram.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
2016-01-15 13:23:42 +01:00
76f90ab031
The main thread is not mutex blocked while child threads load anymore.
2016-01-15 11:29:46 +01:00
8f257b9a58
Merge remote-tracking branch 'origin/master' into CapturePointTake
...
# Conflicts:
# src/Game/Game.cpp
# src/Tests/ResourceManagerTest.cpp
2016-01-15 11:24:20 +01:00
3e2cb33bc0
Played around with new map MapVersion1. Was fun ヽ(´▽`)/
2016-01-15 11:23:29 +01:00
c8fe6853c0
Removed ShootEvent from CapturePoint
2016-01-15 11:17:22 +01:00
14bc850fab
Merge remote-tracking branch 'origin/master' into Forward+
2016-01-15 11:02:27 +01:00
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
0bf756dc08
Merge remote-tracking branch 'origin/master' into Networking
2016-01-15 10:22:21 +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
32634f742e
Merge remote-tracking branch 'origin/master' into Sound
2016-01-15 09:53:39 +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
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
696f44a673
Added logic for mapping between ServerEntityIDs and LocalEntityIDs removed old code that wasn't used.
...
Added 1 map to Client and renamed m_ServerToClientMap to m_ServerIDToClientID.
// Good to know
To keep this structure please use insertIntoServerClientMaps() when adding items to them.
m_ServerIDToClientID and m_ClientIDToServerID maps between server EntityIDs and local EntityIDs.
To see if a local EntityID exist in m_ClientIDToServerID use clientServerMapsHasEntity(EntityID clientEntityID);
To see if server EntityID exist in m_ServerIDToClientID use serverClientMapsHasEntity(EntityID serverEntityID);
2016-01-14 17:11:54 +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
a8f7d5f6b9
Merge pull request #30 from teamfisk/Rendering
...
Rendering Scenes
2016-01-14 16:43:35 +01:00
71047b08ec
Async load works, using exceptions for special resources.
2016-01-14 16:27:45 +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
773a417a90
Merge branch 'master' into Sound
2016-01-14 14:19:48 +01:00
cca64dca24
Refactoring and commenting.
2016-01-14 13:54:38 +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
db18a45368
We are now sending EPlayerDamage events.
...
Client now listens to EPlayerDamage events and send them to Server.
Server publishes EPlayerDamage events received from Client.
2016-01-14 10:16:11 +01:00
9f185a1e35
Wrecked the last commit. Async loading works now.
2016-01-13 18:51:45 +01:00
a060640da3
Removed unnecessary unnecessary if in Client::OnInputCommand.
...
Change name from Server::parseEvent to Server::parseOnInputCommand
2016-01-13 18:00:12 +01:00
Jace
antc13
stiffly
William Moberg
Tleety
viktorljung
verysecrethero
Jocke
Viktor Ljung