 Jace
|
68af853a03
|
Editor entity naming
|
2016-01-19 11:43:03 +01:00 |
|
 stiffly
|
3142c701e3
|
WIP interpolating scale and orientation
|
2016-01-19 11:42:30 +01:00 |
|
 Ayumiwii
|
77e1dacb6f
|
Merge
|
2016-01-19 09:58:52 +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
|
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 |
|
 antc13
|
2a3009212a
|
Importing custom mesh without material.
|
2016-01-18 19:37:55 +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 |
|
|
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 |
|
 Tleety
|
4b29d48f27
|
WIP
|
2016-01-18 17:57:45 +01:00 |
|
 viktorljung
|
2a93e2ae7f
|
Merge remote-tracking branch 'origin/master' into TextRendering
# Conflicts:
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Game.h
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-18 17:44:26 +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
|
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 |
|
|
viktorljung
|
92553f1e93
|
text size can now be entered in the filepath with a comma separator, like this "filepath,16"
|
2016-01-18 17:17:12 +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 |
|
|
Tleety
|
601ce85c05
|
WIP
|
2016-01-18 16:50:41 +01:00 |
|
 verysecrethero
|
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 |
|
|
Ayumiwii
|
37aa1eaa18
|
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
# Conflicts:
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderQueueFactory.h
# include/Engine/Rendering/Renderer.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-18 16:02:43 +01:00 |
|
|
Tleety
|
01a164847c
|
Directional light now fully added to all lists.
|
2016-01-18 15:15:33 +01:00 |
|
|
Tleety
|
794635b6a1
|
Added DirectionalLights to renderqueue jobs
|
2016-01-18 14:58:19 +01:00 |
|
|
Tleety
|
0a3b6f4da1
|
Added DirectionalLightJob
|
2016-01-18 14:57:55 +01:00 |
|
|
Jace
|
3bc7dceca5
|
Made EntityWrapper hashable
|
2016-01-18 14:55:49 +01:00 |
|
|
Tleety
|
4092f6b4d4
|
New Lightstruct working.
|
2016-01-18 14:20:28 +01:00 |
|
|
Ayumiwii
|
35269315cc
|
Rename the thingie
|
2016-01-18 13:51:32 +01:00 |
|
|
Jace
|
504f301e4d
|
Added refactored property sheet for components
|
2016-01-18 13:51:22 +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 |
|
|
Ayumiwii
|
8f8b64f99c
|
First pass that actually work
Not at all done, but it'll have to do for now
|
2016-01-18 11:50:00 +01:00 |
|
|
Jocke
|
d995713d3b
|
Added input queue to Client and Input Listener debug code in server.
|
2016-01-18 11:06:02 +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
|
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
|
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 |
|