 Teejoon
|
6caa7e94a4
|
RGB is now the only channels thats beeing usesed in splatmap
|
2016-02-11 18:28:33 +01:00 |
|
 Jace
|
e2a8605101
|
Merge remote-tracking branch 'origin/master' into WeaponSystem
|
2016-02-11 17:25:37 +01:00 |
|
|
Jace
|
c8c4879554
|
Merge pull request #93 from teamfisk/OctreeRaycasting
Entity in octree hit by ray
|
2016-02-11 17:25:02 +01:00 |
|
 William Moberg
|
14054ad898
|
WIP respawning.
|
2016-02-11 17:08:45 +01:00 |
|
|
Jace
|
e47201ff61
|
First person shoot animations
|
2016-02-11 17:06:34 +01:00 |
|
 antc13
|
1d14094e90
|
NewMap Updated. Still WIP
|
2016-02-11 16:52:10 +01:00 |
|
 verysecrethero
|
3301f66ad1
|
Merge remote-tracking branch 'origin/master' into DamageIndicator
# Conflicts:
# resources/Shaders/Sprite.vert.glsl
|
2016-02-11 16:36:48 +01:00 |
|
 Jocke
|
49d4a45ef8
|
Client crashed when connecting, this was a hot fix.
|
2016-02-11 16:27:33 +01:00 |
|
|
Jocke
|
e0c3a32e66
|
Merge branch 'master' into TCPConnections
# Conflicts:
# include/Engine/Network/Client.h
# include/Engine/Network/Server.h
# include/Game/Game.h
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
# src/Game/Game.cpp
|
2016-02-11 16:26:42 +01:00 |
|
|
William Moberg
|
97b915f130
|
Merge branch 'master' into Respawning
# Conflicts:
# src/Game/Game.cpp
# src/Game/Systems/PlayerSpawnSystem.cpp
# src/Game/Systems/SoundSystem.cpp
|
2016-02-11 16:15:47 +01:00 |
|
|
verysecrethero
|
c9f815fd42
|
Merge remote-tracking branch 'origin/master' into CapturePointTake
# Conflicts:
# src/Game/Systems/CapturePointSystem.cpp
|
2016-02-11 16:09:05 +01:00 |
|
|
William Moberg
|
8eea0c8395
|
WIP respawning.
|
2016-02-11 16:08:19 +01:00 |
|
|
verysecrethero
|
38a3e88999
|
Merge pull request #87 from teamfisk/DoubleJumpEffect
Spawned DoubleJumpHexagon as the player doublejumps
|
2016-02-11 16:00:09 +01:00 |
|
|
verysecrethero
|
4e23e7bf30
|
misc changes do the DoubleJumpHexagon.xml
|
2016-02-11 15:58:58 +01:00 |
|
 Adam Byléhn
|
89cbc70177
|
Merge pull request #99 from teamfisk/Menu
Menu
|
2016-02-11 15:44:17 +01:00 |
|
 Tleety
|
51e0b852d2
|
Adamfix
|
2016-02-11 15:43:41 +01:00 |
|
|
Tleety
|
7ccaf5b040
|
Removed commeted code
|
2016-02-11 15:42:27 +01:00 |
|
|
Tleety
|
66e20c3fd9
|
Merge remote-tracking branch 'origin/master' into Menu
|
2016-02-11 15:38:18 +01:00 |
|
|
Tleety
|
6ba1e95da7
|
Fixed depth sorting for HUD elements.
|
2016-02-11 15:27:07 +01:00 |
|
|
verysecrethero
|
a8ab49f202
|
Merge remote-tracking branch 'origin/master' into DoubleJumpEffect
# Conflicts:
# include/Game/Systems/PlayerMovementSystem.h
|
2016-02-11 15:19:01 +01:00 |
|
|
Adam Byléhn
|
bef50ef96a
|
Merge pull request #97 from teamfisk/Menu
Menu
|
2016-02-11 15:13:12 +01:00 |
|
|
Tleety
|
9f657ada4e
|
merge fixes
|
2016-02-11 14:52:52 +01:00 |
|
|
Tleety
|
f0ae365401
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# src/Engine/Rendering/Texture.cpp
# src/Game/Game.cpp
|
2016-02-11 14:43:30 +01:00 |
|
 viktorljung
|
7d4a4ed7cf
|
Merge remote-tracking branch 'origin/master' into Animations
# Conflicts:
# src/Engine/Rendering/Skeleton.cpp
|
2016-02-11 14:38:23 +01:00 |
|
|
Joachim Pettersson
|
bbbab7b287
|
Merge pull request #96 from teamfisk/WeaponSystem
Network improvements and base weapon work
|
2016-02-11 14:26:17 +01:00 |
|
|
Jocke
|
fa2e556ab2
|
fixed some error handling in TCPClient.
|
2016-02-11 14:07:51 +01:00 |
|
|
viktorljung
|
97de31be65
|
Fixed BoneAttachment component
|
2016-02-11 13:36:27 +01:00 |
|
|
Jace
|
95289f47d6
|
Merge branch 'master' into WeaponSystem
|
2016-02-11 12:58:09 +01:00 |
|
|
Jace
|
ccf4cae74b
|
Merge remote-tracking branch 'origin/Animations'
|
2016-02-11 12:54:42 +01:00 |
|
|
antc13
|
2f640d224c
|
New Map with Meshes WIP
|
2016-02-11 12:23:20 +01:00 |
|
|
verysecrethero
|
f11bd24d53
|
Added CapturePointMaxTimer in CapturePointComponent. Removed next-capturepoint Color. Modified captureTimer to +-captureTimeToTakeOver after a capture.
|
2016-02-11 11:46:34 +01:00 |
|
|
Jace
|
81943516a9
|
Protected inheritance, not even once.
|
2016-02-11 11:36:39 +01:00 |
|
|
Jace
|
e350074cb5
|
Spawner now spawns with orientation
|
2016-02-11 11:36:15 +01:00 |
|
|
Tleety
|
350effd8eb
|
New assets and some QA map stuff
|
2016-02-11 11:32:51 +01:00 |
|
|
viktorljung
|
607150189c
|
Different animations can now be played on multiple meshes, AnimationOffset seems to make the lighting buggy
|
2016-02-11 10:51:11 +01:00 |
|
|
Teejoon
|
ecc473d520
|
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
|
2016-02-11 10:30:40 +01:00 |
|
|
Tleety
|
35e4935497
|
Some assets and HUD stuff
|
2016-02-11 10:01:11 +01:00 |
|
|
Jace
|
0394eacb6b
|
Merge remote-tracking branch 'origin/Animations' into WeaponSystem
|
2016-02-11 00:18:36 +01:00 |
|
|
William Moberg
|
73f59b89cc
|
Added method EntityFirstHitByRay, takes an Octree or a vector of sorted entities and outputs the frist entity hit by a ray.
|
2016-02-11 00:11:37 +01:00 |
|
|
Jace
|
9d9c6bdf1e
|
Third person animations and shoot effects base work
|
2016-02-11 00:08:50 +01:00 |
|
|
antc13
|
92e7d3ecf7
|
Merge remote-tracking branch 'origin/master' into Importer
# Conflicts:
# assets
|
2016-02-11 00:08:17 +01:00 |
|
|
antc13
|
4b8f4981a3
|
New Map with Meshes, WIP.
|
2016-02-11 00:05:27 +01:00 |
|
|
Tleety
|
447f41dbff
|
HUD for capture points now update with Capture point data.
|
2016-02-10 23:59:13 +01:00 |
|
|
viktorljung
|
9c08c351b8
|
fixed reverse Animation looping
|
2016-02-10 23:33:23 +01:00 |
|
|
Jocke
|
eb244f87c4
|
Added disconnect functionality and removed some warnings.
|
2016-02-10 23:27:46 +01:00 |
|
|
viktorljung
|
dded296cde
|
Animation looping fix
|
2016-02-10 23:19:44 +01:00 |
|
 Viktor Ljung
|
c3cc5ae70b
|
Merge pull request #92 from teamfisk/Importer
Importer
|
2016-02-10 22:51:46 +01:00 |
|
|
Tleety
|
64a2354b24
|
WIP with CapturePointHUDSystem
|
2016-02-10 22:22:09 +01:00 |
|
|
Teejoon
|
675a80e905
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
|
2016-02-10 22:18:42 +01:00 |
|
|
Teejoon
|
f05d0a1b0c
|
assets
|
2016-02-10 22:18:27 +01:00 |
|