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

135 Commits

Author SHA1 Message Date
Jace a715f7fe86 Merge branch 'master' into Movement 
# Conflicts:
#	include/Engine/Network/Client.h
#	resources/DefaultConfig.ini
#	resources/Schema/Entities/OverwatchCamera.xml
#	resources/Schema/Types/Entity.xsd
 2016-03-13 22:22:36 +01:00
Jace 53dd96d44d Merge branch 'master' into UnpickableComponent 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Types/Entity.xsd
 2016-03-13 22:00:10 +01:00
viktorljung 44f46cda8d Merge remote-tracking branch 'origin/master' into Movement 
# Conflicts:
#	include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CP_Rocky2.xml
#	resources/Schema/Entities/MuzzleFlashBlue.xml
#	resources/Schema/Entities/MuzzleFlashFire.xml
#	resources/Schema/Entities/MuzzleFlashRed.xml
#	resources/Schema/Types/Entity.xsd
#	resources/Shaders/Sprite.frag.glsl
#	src/Game/Systems/AbilityCooldownHUDSystem.cpp
#	src/Game/Systems/BoostIconsHUDSystem.cpp
#	src/Game/Systems/PlayerMovementSystem.cpp
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
#	src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
#	src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
 2016-03-13 15:17:15 +01:00
Tleety bbe61f300c Fade in/out should now work with models and sprites 2016-03-13 02:03:49 +01:00
Tleety f6a8534c15 New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation 2016-03-13 01:23:51 +01:00
Tleety 8c2a665ccb Some Entities for endscreen and some basic logic in the EndScreenSystem 2016-03-12 15:45:07 +01:00
Tleety 8ceaae995d Options menu started working on 2016-03-11 13:00:34 +01:00
viktorljung b3ea26779a Added Unpickable component, which skips the entity in the PickingPass 2016-03-10 16:29:13 +01:00
Tleety 704242597a Merge remote-tracking branch 'origin/master' into Menu 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/NewMapWSpectatorCam.xml
#	resources/Schema/Types/Entity.xsd
#	src/Game/Game.cpp
 2016-03-09 11:49:42 +01:00
Tleety a0ca4df3be Some server list components and entities. 2016-03-08 13:29:21 +01:00
stiffly f585f9ada9 Created the NetworkComponent xml file 2016-03-07 16:11:19 +01:00
Joachim Pettersson e6472b9745 Merge pull request #170 from teamfisk/ScoreBoard 
I Hope To God That This Works.
 2016-03-04 04:03:46 +01:00
viktorljung 66c8a17b17 Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	resources/Schema/Types/Entity.xsd
 2016-03-03 23:21:14 +01:00
Tleety 0a21fe15dd Merge remote-tracking branch 'origin/master' into ScoreBoard 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd
 2016-03-03 22:56:39 +01:00
Jace eba296196c Merge remote-tracking branch 'origin/master' into Weapons 
# Conflicts:
#	src/Game/Game.cpp
 2016-03-03 20:05:10 +01:00
William Moberg 398bc725b6 When pick class buttons are clicked they send an InputCommand, not an ButtonClicked event. 2016-03-03 16:32:24 +01:00
viktorljung 8957b0b464 Merge remote-tracking branch 'origin/master' into Animations 2016-03-03 14:05:43 +01:00
Tleety 96bc5db7bb Merge commit '0e8b97dbbade6bb39c6f2b8af6c1cfc43ce67cde' into ScoreBoard 
# Conflicts:
#	resources/Schema/Entities/Player.xml
#	src/Game/Game.cpp
 2016-03-03 13:22:28 +01:00
Jace 0e8b97dbba Made AmmunitionHUD into TextFieldReader which reads any component field on a parent and updates a Text component with the value! 2016-03-03 01:35:32 +01:00
Tleety 40c66f76ae A component for tracking score for players. 2016-03-03 01:28:43 +01:00
Tleety 8005ca377c Merge branch 'master' into ScoreBoard 
# Conflicts:
#	resources/Schema/Components.xsd
 2016-03-02 23:26:33 +01:00
Tleety e1ca104fc9 Merge remote-tracking branch 'origin/master' into HUD-Timers 
# Conflicts:
#	resources/Schema/Entities/Player.xml
 2016-03-02 22:49:26 +01:00
Jace b431a875f7 New weapon behaviours 2016-03-02 22:48:01 +01:00
Tleety 2cb4a307eb Merge branch 'master' into HUD-Timers 
# Conflicts:
#	resources/Schema/Entities/QualityAssurance.xml
#	src/Game/Game.cpp
 2016-03-02 22:42:12 +01:00
Tleety 9c9d1eede6 Components for ScoreScreen Added 2016-03-02 22:34:03 +01:00
Tleety a339c61f5b Merge remote-tracking branch 'origin/master' into Boost-icons 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Types/Entity.xsd
 2016-03-02 21:51:52 +01:00
antc13 7d15313209 Added a FloatingEffectSystem to the game. Pickups now move up and down, if so desired. 2016-03-02 17:22:44 +01:00
Tleety a9a19193ad Component for Boost icons 2016-03-02 17:21:15 +01:00
Joachim Pettersson f8f4b4d939 Merge pull request #151 from teamfisk/CPArrow 
CapturePoint indicator HUD
 2016-03-02 16:48:52 +01:00
verysecrethero 3c8df35be9 Merge remote-tracking branch 'origin/master' into AssaultBoost 
# Conflicts:
#	src/Game/Game.cpp
 2016-03-02 15:59:16 +01:00
Tleety 502a290d36 Merge branch 'master' into HUD-Timers 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/PlayerRed.xml
#	resources/Schema/Types/Entity.xsd
 2016-03-02 14:22:13 +01:00
viktorljung 8422742a9e Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
 2016-03-02 13:50:08 +01:00
Tleety b0a66f9e83 Components for CapturePoint arrow HUD element and a system skeleton 2016-03-01 16:19:59 +01:00
Tobias Dahl dfa224b4dd Merge pull request #142 from teamfisk/Respawning 
Added CapturePointGameMode component with RespawnTime
 2016-03-01 11:28:56 +01:00
William Moberg 658eace093 Added component CapturePointGameMode that contains respawntime. 2016-02-29 18:20:14 +01:00
William Moberg c7dad79e72 Merge branch 'master' into JumpHeightAdjustment 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/PlayerRed.xml
#	src/Game/Systems/PlayerMovementSystem.cpp
 2016-02-29 17:28:40 +01:00
viktorljung 5bc0483f49 Removed AnimationOffset and improved BlendTree 2016-02-29 15:51:37 +01:00
Jace bb76c9d248 WIP multi-weapon behaviours 2016-02-29 06:58:57 +01:00
Tleety 144e548b7a Added AbilityCooldownHUD component and system to track the cooldown on the dashability, this needs to be extended for other abilities when they are implemented. However current dash time needs to be included into the component, since we can currently just see the max cooldown time. 2016-02-28 17:17:24 +01:00
viktorljung 5c3b472a4d Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	include/Engine/Rendering/ModelJob.h
#	resources/Schema/Components.xsd
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Engine/Rendering/Skeleton.cpp
 2016-02-26 10:21:22 +01:00
William Moberg cd315bbaa0 Added DoubleJump component and JumpSpeed in Player component so jumpheight can be adjusted for regular jump and double jump. 2016-02-25 12:12:44 +01:00
Teejoon fa4f007604 Changed name from Indicator to SpriteIndicator. Can now be an indicator for a single team or every one 2016-02-22 18:35:00 +01:00
Teejoon 6fab971734 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates 
Conflicts:
	include/Engine/Rendering/SpriteJob.h
	resources/Schema/Components.xsd
	resources/Schema/Entities/Player.xml
	resources/Schema/Entities/PlayerRed.xml
 2016-02-22 16:43:18 +01:00
viktorljung abd36c81f8 Added BlendTree that stores and blends multiple animations 2016-02-22 15:58:38 +01:00
verysecrethero 7f489b3569 Added Assault,Defender,Sniper Components,Entities. Added ShieldAbility,Sprintability-Component (not implemented). Changed BoostSystem to use a childed Boost to the player. All friendly fire is 0 damage. 2016-02-18 10:40:09 +01:00
verysecrethero 456cd35a12 Merge remote-tracking branch 'origin/master' into AssaultBoost 
# Conflicts:
#	resources/Schema/Components.xsd
 2016-02-17 11:52:06 +01:00
Teejoon 17da9a8036 WIP 2016-02-16 15:56:58 +01:00
Tleety 4214bf10a1 Components for menu/buttons 2016-02-16 14:05:57 +01:00
viktorljung 60b2c9bc9b KillFeed 2016-02-12 05:41:05 +01:00
viktorljung 6442254575 Merge remote-tracking branch 'origin/master' into Menu 
# Conflicts:
#	src/Game/Game.cpp
 2016-02-12 02:09:14 +01:00