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

1259 Commits

Author SHA1 Message Date
William Moberg e2686abb16 Merge branch 'master' into DashEffect 2016-03-13 23:25:38 +01:00
Jace 9d2ce5af8a Player is now spawned as the correct class that they picked. 2016-03-13 23:05:52 +01:00
William Moberg e4145cf292 Fixed dash effect to be supported with the new animations using Fade components. 
Added bool Loop field in Fade component.
 2016-03-13 22:49:24 +01:00
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
viktorljung d587c9a692 Fixed first person strafe animation 2016-03-13 22:17:55 +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
Teejoon f59a9e1d2b Merge remote-tracking branch 'origin/master' into MSAA 
Conflicts:
	resources/Schema/Entities/CP_Rocky2.xml
 2016-03-13 21:28:38 +01:00
Teejoon 5796d07b56 PerformanceTimer will no longer run while in release 2016-03-13 21:25:32 +01:00
viktorljung 93f4384da6 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement 2016-03-13 21:10:39 +01:00
viktorljung 3a0cff7a83 boost check for defender 2016-03-13 21:10:22 +01:00
William Moberg c790b952fb Merge pull request #214 from teamfisk/PerfectSoundForRelease 
Perfect sound for release
 2016-03-13 21:01:21 +01:00
Tleety 27443d4e08 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement 2016-03-13 21:01:15 +01:00
Tleety 20e48eeb08 Killfeed should work now. 2016-03-13 21:01:04 +01:00
viktorljung 1da3ec3c74 ammo share fix? 2016-03-13 20:32:08 +01:00
Teejoon 5aaefc6e53 Animation optimization 2016-03-13 19:01:30 +01:00
stiffly fe090504cf Now listens to SetCamera event and the background music should be working properly. 2016-03-13 17:35:05 +01:00
Teejoon a9d5c5d9d2 Glow is looking good :) 2016-03-13 17:15:36 +01:00
Jocke 5ea0f04b20 Added pop up for client when server timeouts. 2016-03-13 16:21:55 +01:00
viktorljung 04288e5243 Merge fixes 2016-03-13 16:14:13 +01:00
stiffly aa2475dfd6 Stops bgm when the game is reset. 2016-03-13 15:36:56 +01:00
Teejoon 741ed01930 Merge remote-tracking branch 'origin/master' into MSAA 2016-03-13 15:28:00 +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
stiffly 5c343cb254 Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease 2016-03-13 15:10:52 +01:00
viktorljung 7d899a989c Started working on boost HUD thingy 2016-03-13 15:09:50 +01:00
Teejoon bb3a8dba6a Merge branch 'master' into MSAA 2016-03-13 15:06:02 +01:00
stiffly f2c7a9f27a Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease 2016-03-13 14:56:00 +01:00
William Moberg ac20e41a5d Fixed merge conflicts. Scoreboard updates team when a team is picked. Fixed some code standard violations and misspellings. 2016-03-13 14:23:56 +01:00
viktorljung 0963f61976 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement 2016-03-13 13:41:39 +01:00
viktorljung bfb7a4139d Tweaking 2016-03-13 13:41:28 +01:00
William Moberg 4f99f6ef74 Merge branch 'master' into RestartMap 
# Conflicts:
#	src/Game/Systems/CapturePointSystem.cpp
 2016-03-13 13:37:51 +01:00
viktorljung 60c6aa2486 Defender first person tracers done 2016-03-13 02:35:02 +01:00
Tleety bbe61f300c Fade in/out should now work with models and sprites 2016-03-13 02:03:49 +01:00
Teejoon ec7ab417e6 Added so that mipmaps can have diferant formats. Bloom also uses RGB8 on all texture now 2016-03-13 01:47:37 +01:00
Jace 4bd2e7995a fixup! Cheeki breeki 2016-03-13 01:32:29 +01:00
Jace 45bfc374de Cheeki breeki 2016-03-13 01:25:13 +01:00
Tleety f6a8534c15 New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation 2016-03-13 01:23:51 +01:00
Jace 95f9065037 Merge branch 'master' into Dirtybit 
# Conflicts:
#	include/Engine/Sound/SoundManager.h
 2016-03-13 01:07:17 +01:00
Jace a1fda82d3a Turned the Transform namespace into TransformSystem so it would be able to subscribe to EntityDeleted and clean up after itself 2016-03-13 00:57:00 +01:00
stiffly 20d46f63c8 The main menu music would not start again when you returned to the main menu. 2016-03-13 00:16:55 +01:00
Jace f6113b9d9c EEntityDeleted now provides an EntityWrapper instead of just an ID 2016-03-13 00:16:07 +01:00
Teejoon 2e89227061 Merge remote-tracking branch 'origin/master' into MSAA 2016-03-13 00:09:07 +01:00
Jace 7ea90bede7 Merge branch 'master' of github.com:teamfisk/TacticalZ 2016-03-12 23:49:44 +01:00
Jace 2bfbd72189 EntityWrapper::Clone should no longer cause freezes 2016-03-12 23:44:28 +01:00
Jace 1e7f6941ba Merge pull request #208 from teamfisk/Kill-streak-sounds 
Various sound improvements/additions
 2016-03-12 23:06:57 +01:00
Teejoon 5146d21173 MSAA is now working 2016-03-12 22:22:53 +01:00
Jocke b7d88808e2 Redid timers. 2016-03-12 21:38:46 +01:00
Jocke f8f536802f Time for ending the game is now in CapturePointGameMode component. The timer i counted down to 0 and then the map is "Reset". 2016-03-12 20:28:48 +01:00
Jocke 60df30fa59 Scoreboard is now works. 2016-03-12 19:36:12 +01:00
Teejoon 70b0ca8776 Merge remote-tracking branch 'origin/master' into MSAA 2016-03-12 18:04:26 +01:00
Teejoon 90d848e8d9 Made texture getters from draw finalpass from const 2016-03-12 18:04:10 +01:00