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

2226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FakeShemp 8e150da7ff Use CommonFunctions::DeleteTexture() instead 2016-03-13 21:25:04 +01:00
viktorljung 148d60f8f8 hp really fixed? 2016-03-13 21:24:27 +01:00
viktorljung 066ca6075d hp fixed? 2016-03-13 21:19:21 +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 e929ecab50 fix??? 2016-03-13 20:58:53 +01:00
antc13 be3d75a5cf Merge branch 'master' of https://github.com/teamfisk/TacticalZ 2016-03-13 20:48:23 +01:00
antc13 b3c935c7cc Fixed rotation/translation on some objects on CP_Rocky2. They somehow got weird rotation values. 2016-03-13 20:48:05 +01:00
viktorljung ee8d7574b2 dash fix? 2016-03-13 20:46:59 +01:00
viktorljung 1da3ec3c74 ammo share fix? 2016-03-13 20:32:08 +01:00
Jace f05b09ca7a Merge branch 'master' of github.com:teamfisk/TacticalZ 2016-03-13 19:54:22 +01:00
Jace e76740d72b Point lights child of a camera no longer visible to other cameras 2016-03-13 19:53:34 +01:00
Jace d3927de7cc Super fancy new class pick, don't overwrite plz 2016-03-13 19:51:01 +01:00
Teejoon 5aaefc6e53 Animation optimization 2016-03-13 19:01:30 +01:00
viktorljung 6bfed76e06 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement 2016-03-13 18:56:04 +01:00
viktorljung 389d27973f Assault boost check 2016-03-13 18:55:45 +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
Tleety fc5ad2d380 Small fix 2016-03-13 17:33:12 +01:00
Teejoon a9d5c5d9d2 Glow is looking good :) 2016-03-13 17:15:36 +01:00
viktorljung 0d287ad5d1 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement 
# Conflicts:
#	resources/Schema/Entities/RayAssaultBlue.xml
 2016-03-13 16:45:57 +01:00
viktorljung 3cee4e4248 defender ray fixes 2016-03-13 16:42:07 +01:00
Teejoon 5f11d1e066 fix 2016-03-13 16:38:50 +01:00
Adam Byléhn 672d6f884d Merge pull request #215 from teamfisk/RestartMap 
Added pop up for client when server timeouts.
 2016-03-13 16:33:51 +01:00
viktorljung 17007a2a41 fix fix 2016-03-13 16:28:39 +01:00
Jocke 5ea0f04b20 Added pop up for client when server timeouts. 2016-03-13 16:21:55 +01:00
FakeShemp 9b5e4c10fd Shadow will actually shut itself off and delete itself now 2016-03-13 16:19:17 +01:00
Tleety 041050ab2f Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement 2016-03-13 16:15:26 +01:00
Tleety 9f752ad3e9 Fadesystem, entities, weapon muzzles should now look good. reload for secondary 2016-03-13 16:15:06 +01:00
viktorljung 04288e5243 Merge fixes 2016-03-13 16:14:13 +01:00
stiffly fb400bb743 Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease 2016-03-13 15:37:14 +01:00
stiffly aa2475dfd6 Stops bgm when the game is reset. 2016-03-13 15:36:56 +01:00
Jace 36c4837813 Merge pull request #213 from teamfisk/Dirtybit 
Linker warnings fix
 2016-03-13 15:29:45 +01:00
Teejoon 741ed01930 Merge remote-tracking branch 'origin/master' into MSAA 2016-03-13 15:28:00 +01:00
William Moberg 2fa3637018 Transform.cpp was deleted since stuff was moved to TransformSystem, takes care of linker warnings. 2016-03-13 15:26:35 +01:00
antc13 52e5e2527a Merge branch 'master' of https://github.com/teamfisk/TacticalZ 2016-03-13 15:21:44 +01:00
antc13 36253a8afd Made minor changes to light positions on CP_Rocky2. Replaced a model & changed glow value on some walls. 2016-03-13 15:21:29 +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
Adam Byléhn b73595eed0 Merge pull request #210 from teamfisk/RestartMap 
Restart map
 2016-03-13 15:10:01 +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
Teejoon f9e640ffc6 Added borders to capture points so that you can see if your inside of outside when not looking down 2016-03-13 14:59:57 +01:00
stiffly f2c7a9f27a Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease 2016-03-13 14:56:00 +01:00
viktorljung 0f4f32188c assault weapon now reloading correctly 2016-03-13 14:55:29 +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