 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 |
|
|
Tleety
|
a954cbbf50
|
Normal map support
|
2016-01-27 13:52:27 +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
|
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 |
|
|
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 |
|
 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
|
d6cc1eaac4
|
Merge remote-tracking branch 'origin/Animations'
|
2016-01-24 23:06:59 +01:00 |
|
|
Jace
|
b6ba8a5bd7
|
Network snapshot buffer size increased, needs to be looked over later
|
2016-01-24 23:05:26 +01:00 |
|
 viktorljung
|
f8b9606cdf
|
Picking animation fix
|
2016-01-24 22:59:53 +01:00 |
|
|
viktorljung
|
84fddf02e2
|
Merge remote-tracking branch 'origin/master' into Animations
|
2016-01-24 22:42:12 +01:00 |
|
|
viktorljung
|
d03b3fb071
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# resources/Schema/Entities/Player.xml
|
2016-01-24 22:23:53 +01:00 |
|
|
stiffly
|
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
|
382eff169f
|
Server refactoring to remove player dependency and lots of fixes.
|
2016-01-24 21:20:43 +01:00 |
|
|
viktorljung
|
a304b00038
|
fixed crashes
|
2016-01-24 21:12:41 +01:00 |
|
|
viktorljung
|
ada1bac2a7
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-24 20:48:17 +01:00 |
|
|
Jace
|
0fb1dbcae1
|
Client now has authority over its own absolute position and orientation until we have reliable input messaging
|
2016-01-24 19:00:50 +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 |
|
|
viktorljung
|
8cf9caf7aa
|
AnimationSystem working
|
2016-01-24 18:31:23 +01:00 |
|
|
stiffly
|
2eaad2aa00
|
Client now responds to deleted entity and component in server
|
2016-01-24 17:16:26 +01:00 |
|
|
Jace
|
235b26ad61
|
WIP shoot
|
2016-01-24 17:16:18 +01:00 |
|
|
viktorljung
|
dd80323342
|
Merge remote-tracking branch 'origin/master' into Animations
|
2016-01-24 17:06:34 +01:00 |
|
|
viktorljung
|
af2f017cb4
|
AnimationSystem base WIP
|
2016-01-24 17:05:34 +01:00 |
|
 antc13
|
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 |
|
|
antc13
|
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 |
|
|
antc13
|
8286d052b3
|
Changed color values from floats to glm::vec4
|
2016-01-24 14:38:17 +01:00 |
|
|
Jace
|
aaa11d2109
|
Merge remote-tracking branch 'origin/master' into PlayerMovement
|
2016-01-24 14:18:23 +01:00 |
|
|
Jace
|
67477ff3ae
|
EEntityDeleted and EComponentDeleted events published by World
|
2016-01-24 13:49:45 +01:00 |
|
|
antc13
|
b5b1140f5c
|
Custom Animations should now work. We also save color values if there's no texture.
|
2016-01-24 13:28:40 +01:00 |
|
|
antc13
|
3baa988ad4
|
Changed .obj files to our own format. DummyScene.mesh may be broken.
|
2016-01-23 20:35:58 +01:00 |
|
|
stiffly
|
a28748b35d
|
Merge remote-tracking branch 'origin/master' into Networking
|
2016-01-23 18:42:16 +01:00 |
|
|
viktorljung
|
fcba0a28b8
|
Merge branch 'master' into Menu
|
2016-01-23 18:27:48 +01:00 |
|
|
viktorljung
|
ef020a3770
|
Text fixed
|
2016-01-23 18:17:20 +01:00 |
|
|
viktorljung
|
160b7183b2
|
WIP
|
2016-01-23 18:07:07 +01:00 |
|
|
antc13
|
f1835fd89c
|
Animations PROBABLY works fine if all joints got keyframes.
|
2016-01-23 18:02:42 +01:00 |
|
|
stiffly
|
ecdb5ed07d
|
Merge remote-tracking branch 'origin/master' into Networking
|
2016-01-23 17:51:06 +01:00 |
|
 Jocke
|
6d2c656a04
|
Merge remote-tracking branch 'origin/Networking' into Networking
|
2016-01-23 16:41:42 +01:00 |
|
|
Jocke
|
2bf0434bcb
|
Remade Snapshot logic from component based to entity based.
|
2016-01-23 16:40:38 +01:00 |
|
|
viktorljung
|
bd62b5873d
|
Revert "Merge pull request #43 from teamfisk/Forward+"
This reverts commit d59ab5aba2, reversing
changes made to bef95235d0.
|
2016-01-23 15:57:26 +01:00 |
|
|
viktorljung
|
aacfc47fb5
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
|
2016-01-23 15:12:19 +01:00 |
|
|
viktorljung
|
680a12d88f
|
HealthMeter
|
2016-01-23 14:53:17 +01:00 |
|
|
Tleety
|
f623232a2b
|
Removed a temp variable.
|
2016-01-23 14:52:29 +01:00 |
|
|
Tleety
|
6a18cb88af
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Renderer.cpp
|
2016-01-23 13:59:21 +01:00 |
|
|
Tleety
|
b499f4b020
|
Fixed some rendering bugs and some code refactoring
|
2016-01-23 12:17:38 +01:00 |
|
|
Jace
|
32f73201c5
|
Basic jumping!
|
2016-01-23 12:15:33 +01:00 |
|