 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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
 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 |
|
|
Jace
|
d6cc1eaac4
|
Merge remote-tracking branch 'origin/Animations'
|
2016-01-24 23:06:59 +01:00 |
|
|
Jace
|
d0de169613
|
Instagib!
|
2016-01-24 23:05:52 +01:00 |
|
|
viktorljung
|
79fe7693a6
|
picking values fixed
|
2016-01-24 23:05:45 +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 |
|
|
viktorljung
|
7e92d6f53f
|
Healthbar on player
|
2016-01-24 22:21:10 +01:00 |
|
|
Jace
|
47d2fb6a9b
|
Fixed wrong drawing function used in PickingPass
|
2016-01-24 22:20:42 +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
|
0c557317a9
|
Merge remote-tracking branch 'origin/master' into Menu
|
2016-01-24 21:16:05 +01:00 |
|
|
viktorljung
|
a304b00038
|
fixed crashes
|
2016-01-24 21:12:41 +01:00 |
|
 Tleety
|
d4797b0808
|
Some entity files
|
2016-01-24 21:08:01 +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
|
25890c8d6c
|
Merge remote-tracking branch 'origin/Networking'
|
2016-01-24 19:01:15 +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
|
9f3d887ac4
|
Networking bugfixes
|
2016-01-24 18:37:36 +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
|
8d61632c26
|
No longer spawns a f**king sphere.
|
2016-01-24 17:40:43 +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 |
|
 Viktor Ljung
|
f80fb5eda8
|
Merge pull request #52 from teamfisk/Importer
Importer
|
2016-01-24 17:05:02 +01:00 |
|
 antc13
|
aa115befa9
|
UnitRaptor is now displayed while models are being loaded in.
|
2016-01-24 17:04:12 +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
|
96a735c542
|
Changed .obj to .mesh for all meshes.
|
2016-01-24 16:12:31 +01:00 |
|
|
Jace
|
3261e21d96
|
Coloring players depending on team and created a blue spawn in MovementTest
|
2016-01-24 15:46:01 +01:00 |
|
|
antc13
|
666f1fd878
|
Removed temp variables & the "forced" animation in DrawFinalPass
|
2016-01-24 15:30:20 +01:00 |
|
|
Jace
|
373bb33cf0
|
Player jumping taking air acceleration into account
|
2016-01-24 15:20:34 +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 |
|