 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 |
|
|
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 |
|
|
viktorljung
|
aa3b8cd652
|
Fixed text color and removed debugging code
|
2016-01-24 13:37:07 +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 |
|
 Jocke
|
7567f47a68
|
Weapon system now searches parents for health component (stops at first health component).
|
2016-01-24 11:56:46 +01:00 |
|
|
Jocke
|
97d70f8e32
|
Fixed in client for shoot event. Weapon system now damages health on any target not only players.
|
2016-01-24 11:36:01 +01:00 |
|
|
antc13
|
3baa988ad4
|
Changed .obj files to our own format. DummyScene.mesh may be broken.
|
2016-01-23 20:35:58 +01:00 |
|
|
Jace
|
1ce9128da8
|
Source-like movement
|
2016-01-23 19:45:23 +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 |
|
|
Viktor Ljung
|
132de88d28
|
Merge pull request #50 from teamfisk/Forward+
Forward+
|
2016-01-23 18:23:16 +01:00 |
|
|
viktorljung
|
df485ccf7b
|
Merge branch 'master' into Forward+
|
2016-01-23 18:21:35 +01:00 |
|
|
viktorljung
|
85a4d98c81
|
Revert "Revert "Merge pull request #43 from teamfisk/Forward+""
This reverts commit bd62b5873d.
|
2016-01-23 18:21:10 +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 |
|
 Tleety
|
5edf5a41f1
|
Transparency bug fix
|
2016-01-23 16:45:26 +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
|
ff6ec82a6c
|
AMD fix
|
2016-01-23 16:27:01 +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 |
|
|
Jace
|
666ef6589e
|
Crouching!
|
2016-01-23 15:06:47 +01:00 |
|
|
Jace
|
b83d773627
|
Infinite respawning for now
|
2016-01-23 15:06:41 +01:00 |
|