Jace
181017313d
Made entity parser give more useful errors and fixed the errors that were while I was at it
2016-01-27 15:16:59 +01:00
Jace
5fcd26cd3e
Made TriggerSystem make use of Octree
2016-01-27 13:35:16 +01:00
Jace
505a6c7396
Hiding first person models properly
2016-01-25 14:32:48 +01:00
Jace
8866dd6054
Merge remote-tracking branch 'origin/Networking' into ShootRays
2016-01-25 11:57:44 +01:00
Jace
4245264029
Weapon RayZ
...
Weapon RayZ
2016-01-25 11:26:33 +01:00
06f64f8fbf
Added a player name to the PlayerSpawned event. When a player has spawned the server sends the name to the client which publishes the event.
2016-01-24 22:00:38 +01:00
Jace
0c56a05144
Merge branch 'master' of github.com:teamfisk/TacticalZ
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# src/Engine/Network/Server.cpp
2016-01-24 21:21:51 +01:00
Jace
b4081b3e45
Merge remote-tracking branch 'origin/Networking'
...
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Game/Systems/WeaponSystem.cpp
2016-01-24 18:36:37 +01:00
Jace
235b26ad61
WIP shoot
2016-01-24 17:16:18 +01:00
aa20b48188
Merge remote-tracking branch 'origin/master' into Importer
...
# Conflicts:
# resources/Schema/Entities/MovementTest.xml
# resources/Schema/Entities/Player.xml
2016-01-24 16:22:22 +01:00
4c5d17b203
Merge remote-tracking branch 'origin/master' into Importer
...
# Conflicts:
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Network/Server.cpp
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestHardCodedTestWorld.h
# src/Tests/ResourceManagerTest.cpp
2016-01-24 14:40:52 +01:00
Jace
67477ff3ae
EEntityDeleted and EComponentDeleted events published by World
2016-01-24 13:49:45 +01:00
Jace
db0e67b9bd
Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky
2016-01-23 11:44:16 +01:00
Jace
3ac3311c0c
"inline" caused missing symbol when compiling in Release for some reason
2016-01-23 00:38:11 +01:00
Jace
ca2aab449e
Basic movement and camera management between players and editor
2016-01-22 16:12:51 +01:00
4d60f387ed
Merge pull request #44 from teamfisk/EditorUsefulness
...
Editor refactoring
2016-01-21 17:03:52 +01:00
973ccd34c9
Removed unnecessary string in EPlayerDamage (TypeOfDamage). Renamed a variable in WeaponSystem
2016-01-21 16:30:07 +01:00
Jace
a6548a72b3
Merge remote-tracking branch 'origin/master' into EditorUsefulness
...
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
2016-01-21 16:16:35 +01:00
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
f1345419b6
EditorWidgetSystem that takes care of moving widgets around
2016-01-21 10:30:19 +01:00
Jace
5e70d6eef6
EntityWrapper::Parent helper function
2016-01-21 10:29:48 +01:00
7b34e001ba
Merge remote-tracking branch 'origin/master' into ShootEvent
2016-01-21 10:26:42 +01:00
c2e05de89f
Deleted some components, etc for ShootEvent that will likely be used in a WeaponSystem instead
2016-01-21 10:24:34 +01:00
Jace
f1a54a89b3
Merge pull request #37 from teamfisk/OctTree
...
Oct tree
2016-01-21 09:57:46 +01:00
b098bd2bd3
Merge remote-tracking branch 'origin/master' into ShootEvent
...
# Conflicts:
# include/Engine/Core/ComponentWrapper.h
# include/Game/PlayerSystem.h
# include/Game/Systems/HealthSystem.h
# resources/Schema/Components.xsd
# resources/Schema/Components/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Game/PlayerSystem.cpp
# src/Tests/HealthSystemTest.cpp
# src/Tests/OctTreeTestAnders.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestGameClass.h
# src/Tests/OctTreeTestHardCodedTestWorld.h
2016-01-20 17:53:33 +01:00
8189e3c00c
Logic in CapturePointSystem is working again. Need to update all Tests!
2016-01-20 14:59:18 +01:00
a47317bb32
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
...
# Conflicts:
# include/Engine/Collision/Collision.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
2016-01-19 18:26:45 +01:00
713ebbe18c
Can add any objects that inherit from AABB into the Octree.
2016-01-19 14:50:46 +01:00
Jace
cfe023cc1d
Created ComponentInfo::EnumType which defines which native type to use for enums.
2016-01-19 12:33:53 +01:00
Jace
9e3dfff7b6
WIP world pausing
2016-01-19 00:52:17 +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
1760f9dfb1
Added inequality operator to EntityWrapper
2016-01-18 21:17:52 +01:00
2a3009212a
Importing custom mesh without material.
2016-01-18 19:37:55 +01:00
4c1a49a8a4
Merge remote-tracking branch 'origin/master' into CapturePointTake
...
# Conflicts:
# include/Engine/Core/ComponentWrapper.h
# include/Game/PlayerSystem.h
# include/Game/Systems/HealthSystem.h
# resources/Schema/Components.xsd
# resources/Schema/Components/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Game/CMakeLists.txt
# src/Game/PlayerSystem.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestGameClass.h
# src/Tests/OctTreeTestGameMain.cpp
# src/Tests/OctTreeTestHardCodedTestWorld.h
2016-01-18 16:48:49 +01:00
Jace
3bc7dceca5
Made EntityWrapper hashable
2016-01-18 14:55:49 +01:00
bf3f8aea89
Merge pull request #36 from teamfisk/PlayerMovement
...
Player movement
2016-01-18 13:32:42 +01:00
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
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
c09fe4ae55
Added a bool option to disable threads in in the configfile regarding resource loading.
2016-01-15 16:18:39 +01:00
f5ea4d513c
ResourceManager::Load never returns null, throws exceptions instead.
2016-01-15 15:25:01 +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
c8fe6853c0
Removed ShootEvent from CapturePoint
2016-01-15 11:17:22 +01:00
Jace
stiffly
antc13
William Moberg
verysecrethero