BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,236 Commits 116 Branches 0 Tags
e1196204eb381673f06dd22c38ef58573ccf2cd1
Commit Graph

1236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tleety e1196204eb asdfsdaferf 2016-02-12 02:20:40 +01:00
Jace 9f8b0f7aa9 Merge pull request #104 from teamfisk/AmmoPickup 
Added AmmoPickupSystem with Component, Entity.
 2016-02-12 02:08:29 +01:00
Jace 02253ea6e1 Merge pull request #105 from teamfisk/Respawning 
Automatic respawning
 2016-02-12 02:07:36 +01:00
antc13 2417175914 New Map with Meshes WIP. Probably final for Playtest. 2016-02-12 02:06:52 +01:00
antc13 baff8301b3 Merge branch 'master' of https://github.com/teamfisk/TacticalZ 
# Conflicts:
#	resources/Schema/Entities/NewMap.xml
 2016-02-12 01:43:52 +01:00
antc13 3e42c067ab New Map with meshes WIP Update. 2016-02-12 01:43:20 +01:00
William Moberg 40ae2b8cbb DefaultInput key 'K' to kill player, since we can't respawn when alive. Also moved TakeDamage InputCommand to HealthSystem. 2016-02-12 00:52:58 +01:00
William Moberg f1c2413cf9 Respawning and team picking seems to be working well. 2016-02-12 00:39:27 +01:00
William Moberg 11af6a3078 Merge branch 'master' into Respawning 
# Conflicts:
#	resources/DefaultConfig.ini
#	resources/Schema/Entities/MovementTest.xml
#	src/Game/Systems/SoundSystem.cpp
 2016-02-12 00:29:51 +01:00
verysecrethero af30e51564 Added AmmoPickupSystem with Component, Entity. Changed so PlayerDeathSystem gets updated after Health/Ammo systems, credits to William. 2016-02-11 23:56:40 +01:00
Viktor Ljung 04f77da6f1 Merge pull request #101 from teamfisk/Animations 
Animations
 2016-02-11 23:52:44 +01:00
viktorljung 648d864d6e Merge remote-tracking branch 'origin/master' into Animations 2016-02-11 23:48:30 +01:00
Jace e473194671 Merge branch 'WeaponSystem' 2016-02-11 23:46:23 +01:00
Jace b761439c84 Added config flag Debug.OutOfBodyExperience that allows you to spawn and view a player from a third person perspective, without the active camera being changed. 2016-02-11 23:45:30 +01:00
Jace 44a73ef883 fixup! Merge remote-tracking branch 'origin/master' into WeaponSystem 2016-02-11 23:44:20 +01:00
Jace c4c53944d9 Merge pull request #103 from teamfisk/WeaponSystem 
Working weapon system
 2016-02-11 23:16:44 +01:00
Tobias Dahl bdec4f9d16 Merge pull request #100 from teamfisk/Importer 
Splatmap only using RGB channel and an importer bug fix
 2016-02-11 23:13:10 +01:00
Jace 7cae84d4ee Merge remote-tracking branch 'origin/master' into WeaponSystem 
# Conflicts:
#	include/Engine/Core/EPlayerDamage.h
#	src/Game/Game.cpp
#	src/Game/Systems/Weapon/WeaponSystem.cpp
 2016-02-11 22:52:51 +01:00
Teejoon 4964e732ca Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-11 22:51:52 +01:00
Teejoon 1bb1a1445e Commit assets 2016-02-11 22:51:39 +01:00
Jace d1213f9f59 Working damage dealing, a super cool reload effect and hit markers! 2016-02-11 22:50:44 +01:00
William Moberg dd131e7652 Respawning may work, not been tested over network yet. 2016-02-11 22:49:31 +01:00
William Moberg 06f614b3bb Merge pull request #102 from teamfisk/AssaultDash 
AirFriction changed to 2.0 to fix the dash ability in the air
 2016-02-11 21:46:30 +01:00
verysecrethero 4a17e3c8f3 airFriction changed to 2.0 to fix the dash ability in the air 2016-02-11 21:42:29 +01:00
verysecrethero 22e35489d7 Merge remote-tracking branch 'origin/master' into AssaultDash 2016-02-11 21:31:33 +01:00
Tobias Dahl 5bcadd5b1a Merge pull request #95 from teamfisk/CapturePointTake 
Fixed CapturePointTimer,Color
 2016-02-11 21:10:30 +01:00
Tobias Dahl 42d810b198 Merge pull request #84 from teamfisk/DamageIndicator 
Damage indicator
 2016-02-11 21:08:59 +01:00
verysecrethero 3a15550b57 maybe a good commit 2016-02-11 21:07:47 +01:00
verysecrethero 8f500965d4 Changed DamageIndicator.xml to not use a glowmap and not a depthsort. 2016-02-11 20:34:25 +01:00
viktorljung bd385a0d59 new assets 2016-02-11 20:15:56 +01:00
Jace 5e05e51309 Fixed EntityFirstHitByRay not returning outDistance properly 2016-02-11 20:01:23 +01:00
Jace fee1ed6d6d FIXME: Temporarily removed glow from sprite shader to prevent transparent sprite from occluding other glow 2016-02-11 20:00:59 +01:00
Teejoon f79649cf9a Fixed material file reading bug 2016-02-11 19:38:43 +01:00
Teejoon 2096779eb6 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-11 18:48:21 +01:00
Teejoon 99747c518e commit assets 2016-02-11 18:48:07 +01:00
Teejoon f088aa1d85 Commit the files now.... 2016-02-11 18:45:48 +01:00
Teejoon 0af337bf39 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-11 18:30:24 +01:00
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
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