 verysecrethero
|
df05f1909b
|
Completed the code to trigger the 3rd person camera on death. Cleaned up PlayerDeathSystem. Fixed HealthSystemTest. Removed the test for PlayerDeathSystem
|
2016-01-28 11:43:38 +01:00 |
|
 antc13
|
2efbedd4b4
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
|
2016-01-27 18:46:03 +01:00 |
|
|
antc13
|
8834d5f7a0
|
Fixed Animation Export
|
2016-01-27 18:37:56 +01:00 |
|
 Jace
|
13f020ddf5
|
Fixed #49 being able to parent an entity to itself, which resulted in infinite infinite loops everywhere! D:
|
2016-01-27 18:37:43 +01:00 |
|
 Tleety
|
8bcafc1151
|
WIP
|
2016-01-27 18:07:05 +01:00 |
|
|
verysecrethero
|
7497ff39d2
|
Simon added Copy method to ComponentWrapper. Its being used in PlayerDeathSystem to copy model,animation,transform. TODO: 3rd person camera, cleanup, tests
|
2016-01-27 18:00:31 +01:00 |
|
|
Jace
|
65da634c71
|
File dropping into resource paths in the editor
|
2016-01-27 17:51:47 +01:00 |
|
 viktorljung
|
c9b982bc89
|
Added BoneAttachment to Entity.xsd
|
2016-01-27 17:31:57 +01:00 |
|
|
viktorljung
|
2ec5023752
|
Changed Animation and BoneAttachment "Name" field to "AnimationName" and "BoneName"
|
2016-01-27 17:27:34 +01:00 |
|
|
Tleety
|
97cbc55223
|
Some debug features for color corrections and glow strength fix.
|
2016-01-27 17:21:00 +01:00 |
|
|
viktorljung
|
405002777c
|
Merge remote-tracking branch 'origin/EditorUsefulness' into Animations
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/FastWorld.xml
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Game/Game.cpp
|
2016-01-27 17:16:49 +01:00 |
|
|
viktorljung
|
8fc8d56ee1
|
Added BoneAttachment component
|
2016-01-27 17:14:16 +01:00 |
|
|
Jace
|
c519ba2536
|
Component fields in the editor are now sorted in the order they're defined
|
2016-01-27 17:12:07 +01:00 |
|
|
Jace
|
4b7613a659
|
Sorted editor component dropdown and made it always be fully expanded to show as many components as possible
|
2016-01-27 17:07:48 +01:00 |
|
|
Jace
|
7408da401b
|
Merge pull request #56 from teamfisk/NormalSpecularMapping
Transparency fix and support for Normal and Specular maps
|
2016-01-27 16:44:10 +01:00 |
|
|
Tleety
|
a63ecb8133
|
Some wierd shader faults and merge error fixe
|
2016-01-27 15:54:36 +01:00 |
|
 stiffly
|
950f3f3cf7
|
Fixed last commit. Removed the wrong thing.
|
2016-01-27 15:43:40 +01:00 |
|
|
Jace
|
788407b709
|
Made CollisionSystem aware of entities
|
2016-01-27 15:42:50 +01:00 |
|
|
Tleety
|
0e70dc6fa3
|
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-27 15:41:31 +01:00 |
|
|
stiffly
|
246f56c823
|
Removed brainless logic.
|
2016-01-27 15:40:01 +01:00 |
|
|
Tleety
|
44302bb0f3
|
Specular support. Some edits to EditorTestWorld.xml aswell as some debugmodes for textures in the model component
|
2016-01-27 15:38:54 +01:00 |
|
|
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
|
6615fe9438
|
Enabled multithreaded build for MSVC
|
2016-01-27 15:09:34 +01:00 |
|
|
Jace
|
113448dbf0
|
Added DEBUG preprocessor definition in Debug and RelWithDebInfo mode
|
2016-01-27 15:09:23 +01:00 |
|
|
verysecrethero
|
5cdf6db340
|
Modified HealthSystem so it actually publishes the DeathEvent. Modified EPlayerHealthPickup. Fixed 2 tests. Started work on PlayerDeathSystem
|
2016-01-27 14:46:45 +01:00 |
|
|
Tleety
|
5c9616d4af
|
Fixed asset name
|
2016-01-27 13:55:23 +01:00 |
|
|
Tleety
|
a954cbbf50
|
Normal map support
|
2016-01-27 13:52:27 +01:00 |
|
|
Jace
|
dec2234019
|
Merge branch 'Cleanup'
# Conflicts:
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-27 13:44:15 +01:00 |
|
|
Jace
|
0334ec3fa7
|
Merge remote-tracking branch 'origin/Animations'
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Game/Systems/WeaponSystem.cpp
|
2016-01-27 13:36:49 +01:00 |
|
|
Jace
|
5fcd26cd3e
|
Made TriggerSystem make use of Octree
|
2016-01-27 13:35:16 +01:00 |
|
|
Tleety
|
8102f3a2ea
|
Working transparency in most common cases.
Transparency check is automatically set if the alpha color value is under 1
|
2016-01-27 12:59:44 +01:00 |
|
|
Tleety
|
cbb17d22d4
|
WIP
|
2016-01-27 12:10:00 +01:00 |
|
|
Jace
|
8bed5194d8
|
"Proper" handling of conditional rendering of entities parented to camera or entities that should be hidden from the active local player perspective
|
2016-01-27 11:36:24 +01:00 |
|
 William Moberg
|
90f05442aa
|
Merge branch 'master' into BoxModelCollision
# Conflicts:
# include/Engine/Core/Octree.h
# resources/Schema/Entities/CollisionTestLevel.xml
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Core/Octree.cpp
|
2016-01-27 10:52:27 +01:00 |
|
|
Jace
|
eb42217885
|
Merge pull request #38 from teamfisk/CoolDeathAnimation
Cool death animation
|
2016-01-27 10:51:22 +01:00 |
|
|
Jace
|
7e12d00874
|
Merge branch 'master' into CoolDeathAnimation
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-27 10:43:23 +01:00 |
|
|
William Moberg
|
6ea490e215
|
Tried a horrible recursive method, extreme framedrop.
|
2016-01-27 10:34:26 +01:00 |
|
|
antc13
|
57a5cb58e1
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
|
2016-01-27 09:37:14 +01:00 |
|
|
antc13
|
c5b1afb0d4
|
Exporter Fix
|
2016-01-27 09:37:01 +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
|
b6fd18baed
|
Hacked in serverside effects
|
2016-01-25 11:56:40 +01:00 |
|
|
Jace
|
4245264029
|
Weapon RayZ
Weapon RayZ
|
2016-01-25 11:26:33 +01:00 |
|
|
William Moberg
|
3389b965eb
|
Test on game level v1.
|
2016-01-25 10:55:05 +01:00 |
|
|
viktorljung
|
d12246833e
|
Some further small fizes to resolution //Tobias
|
2016-01-25 01:26:41 +01:00 |
|
|
stiffly
|
44baa47bba
|
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
# Conflicts:
# include/Engine/Common.h
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-25 01:21:15 +01:00 |
|
|
Jace
|
b95c1fdfa4
|
Merge remote-tracking branch 'origin/Menu'
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/RenderingWorld.xml
# src/Game/Game.cpp
|
2016-01-25 00:25:03 +01:00 |
|
|
Jace
|
7b348379ac
|
Quaternions are never the solution.
|
2016-01-25 00:22:55 +01:00 |
|
|
viktorljung
|
6aeb281249
|
Resolution fix in render stages //Tobias
|
2016-01-25 00:07:17 +01:00 |
|
|
Jace
|
04f6233d99
|
Crude animations
|
2016-01-24 23:44:29 +01:00 |
|