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

228 Commits

Author SHA1 Message Date
stiffly e24a84c52d Server now deletes the player on a new player spawn. 2016-02-11 23:52:55 +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
viktorljung c1860ae383 AmmunitionHUD now working 2016-02-11 23:38:25 +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
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
verysecrethero 4a17e3c8f3 airFriction changed to 2.0 to fix the dash ability in the air 2016-02-11 21:42:29 +01:00
viktorljung 851418b1de Merge remote-tracking branch 'origin/master' into Menu 2016-02-11 21:16:31 +01:00
viktorljung fee50ba3b6 Crash fix 2016-02-11 21:16:10 +01:00
Tobias Dahl 5bcadd5b1a Merge pull request #95 from teamfisk/CapturePointTake 
Fixed CapturePointTimer,Color
 2016-02-11 21:10:30 +01:00
verysecrethero 8f500965d4 Changed DamageIndicator.xml to not use a glowmap and not a depthsort. 2016-02-11 20:34:25 +01:00
Jace e2a8605101 Merge remote-tracking branch 'origin/master' into WeaponSystem 2016-02-11 17:25:37 +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
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
Tleety 7ccaf5b040 Removed commeted code 2016-02-11 15:42:27 +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
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
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 35e4935497 Some assets and HUD stuff 2016-02-11 10:01:11 +01:00
Jace 9d9c6bdf1e Third person animations and shoot effects base work 2016-02-11 00:08:50 +01:00
Tleety 447f41dbff HUD for capture points now update with Capture point data. 2016-02-10 23:59:13 +01:00
Tleety 64a2354b24 WIP with CapturePointHUDSystem 2016-02-10 22:22:09 +01:00
Jace 0825b10c75 Merge remote-tracking branch 'origin/master' into WeaponSystem 
# Conflicts:
#	src/Game/Systems/SoundSystem.cpp
 2016-02-10 19:24:35 +01:00
stiffly 8520192805 Merge remote-tracking branch 'origin/master' into Sound 2016-02-10 17:17:58 +01:00
stiffly 1ba9d97ab7 Fixed crash when trying to jump, when no player is spawned. 2016-02-10 17:17:41 +01:00
Jace 2c0f66d9c7 Merge remote-tracking branch 'origin/master' into WeaponSystem 
# Conflicts:
#	include/Engine/Collision/FillFrustumOctreeSystem.h
#	include/Engine/Core/Octree.h
#	include/Engine/Rendering/RenderSystem.h
#	include/Game/Game.h
#	resources/DefaultInput.ini
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Game/Game.cpp
#	src/Game/Systems/PlayerMovementSystem.cpp
 2016-02-10 17:02:00 +01:00
Jace d931660c56 WIP 2016-02-10 14:43:32 +01:00
Jace 019e85a425 Merge pull request #89 from teamfisk/Animations 
Animations
 2016-02-10 14:40:23 +01:00
viktorljung 08328a781c Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	assets
#	include/Engine/Rendering/Model.h
#	src/Engine/Collision/Collision.cpp
 2016-02-10 14:13:08 +01:00
stiffly c2128790af Now using appropriate variable to see if a player is on ground. Does not check if playervel.y == 0 which will be false if a player is on a obstacle. 2016-02-10 14:07:11 +01:00
verysecrethero b6b96c5f11 Added DoubleJumpHexagon entity. Spawned DoubleJumpHexagon as the player doublejumps. Fixed DoubleJumping bug where you couldnt doublejump on rocks (where velocity wasnt 0.0) 2016-02-10 11:51:58 +01:00
stiffly f6a7b8ea0c Merge remote-tracking branch 'origin/master' into Sound 2016-02-10 11:37:17 +01:00
stiffly 3d2f9fa79d Drum sounds does not start every single time a TriggerTouch happens. Specific and temporary logic for play test. 2016-02-10 11:36:54 +01:00
viktorljung 49e6252ee1 Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CollisionTestLevel.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Collision/Collision.cpp
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/RenderSystem.cpp
 2016-02-10 11:33:45 +01:00
stiffly 94ff12cf66 When using a PlaySoundOnEntity Event, you no longer have to provide the child of an entity as parameter. 2016-02-10 11:15:49 +01:00
Jace 067780c93f Merge pull request #83 from teamfisk/DefenderShield 
Defender shield
 2016-02-10 10:33:36 +01:00
Jace 90192e016a Merge pull request #82 from teamfisk/BoxModelCollision 
Small fixes to collision/trigger-boxes, etc.
 2016-02-10 10:08:54 +01:00
Jace 5cea3bed3a Work in progress weapon system 2016-02-09 23:27:04 +01:00
viktorljung c09c2f4783 Merge remote-tracking branch 'origin/Importer' into Animations 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/RenderingWorld.xml
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Engine/Rendering/Skeleton.cpp
 2016-02-09 22:50:19 +01:00
viktorljung 7212217460 Added animation blending and offset animation component 2016-02-09 22:15:43 +01:00
Jace d83190290f Server now broadcasts certain input commands to all other clients (for stuff like shooting) 2016-02-09 19:37:42 +01:00