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

2220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
viktorljung a65d8c86d1 3rd person reload effect 2016-03-14 01:48:48 +01:00
viktorljung 0764c9bab2 Merge remote-tracking branch 'origin/master' into Movement 2016-03-14 01:20:20 +01:00
Teejoon c61d33ebd9 NewScorebord 2016-03-14 01:08:22 +01:00
Adam Byléhn 50abeda99a Merge pull request #218 from teamfisk/DashEffect 
Dash effect
 2016-03-14 00:58:00 +01:00
viktorljung 424dffd1e0 removed shadows on 1st person hands and weapons 
added shielded component on 3rd person weapons
 2016-03-14 00:47:21 +01:00
viktorljung d1c11f20f2 Merge remote-tracking branch 'origin/master' into Movement 2016-03-14 00:39:16 +01:00
viktorljung 1bba40449f Tracers done 2016-03-14 00:38:36 +01:00
Tleety fd482dd670 Axyz logo in menu 2016-03-14 00:37:29 +01:00
viktorljung f5343251c5 fixed for real now? 2016-03-14 00:28:30 +01:00
Tleety c493ebca8e Viewpunch for sidearm and defender 2016-03-14 00:23:51 +01:00
William Moberg ef9a449077 Merge branch 'master' into DashEffect 2016-03-14 00:07:45 +01:00
viktorljung 5207248a49 3rd person tracers fixed 2016-03-14 00:04:51 +01:00
William Moberg 12d0c68fbf Weapon should fade on dash effect afterimage. 2016-03-13 23:57:47 +01:00
viktorljung 1bf65d896a Sidearm tracer fixed 2016-03-13 23:42:21 +01:00
Tleety b89f68ae2f Merge branch 'master' of github.com:teamfisk/TacticalZ 2016-03-13 23:30:26 +01:00
Tleety 36185b43ef Killfeed in overwatch camera 2016-03-13 23:30:17 +01:00
viktorljung 4adf7dc507 Assault tracer fixed 2016-03-13 23:29:50 +01:00
William Moberg e2686abb16 Merge branch 'master' into DashEffect 2016-03-13 23:25:38 +01:00
William Moberg be91fc5005 WIP dash effect fade weapon 2. 2016-03-13 23:23:36 +01:00
William Moberg 0084224e18 WIP, dash effect fade weapon. 2016-03-13 23:23:05 +01:00
viktorljung 73bcc6e382 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement 2016-03-13 23:12:59 +01:00
viktorljung f393a22011 defender tracer fixed 2016-03-13 23:12:45 +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 fc7f57fd5d Merge remote-tracking branch 'origin/master' 
Conflicts:
	resources/Schema/Entities/ScoreBoard_Main.xml
 2016-03-13 22:27:17 +01:00
Ayumiwii c20830572c Merge branch 'master' of https://github.com/teamfisk/TacticalZ 2016-03-13 22:24:59 +01:00
Ayumiwii 00d77607b4 new scoreboard 2016-03-13 22:24:27 +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
viktorljung 7d32909122 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement 2016-03-13 22:14:11 +01:00
Tleety ce2fcd9109 Now it works 2016-03-13 22:13:37 +01:00
Jace 77bb7a0f5c Merge pull request #200 from teamfisk/UnpickableComponent 
Added Unpickable component, which skips the entity in the PickingPass
 2016-03-13 22:09:23 +01:00
Jace 78c7d777e3 Made player models in class select unpickable 2016-03-13 22:09:12 +01:00
viktorljung 98bd447084 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement 2016-03-13 22:02:45 +01:00
viktorljung fd50ea3a12 Defender friendly boost hud 2016-03-13 22:02:37 +01:00
Tleety 83ae87594f Fixed maxhealth probably 2016-03-13 22:00:48 +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
Jace d9b47ddb62 Merge branch 'master' of github.com:teamfisk/TacticalZ 2016-03-13 21:55:03 +01:00
Jace bc3e699ddb Bumping master to latest assets 2016-03-13 21:54:50 +01:00
antc13 412c92aa7f Merge branch 'master' of https://github.com/teamfisk/TacticalZ 2016-03-13 21:51:37 +01:00
antc13 b76bc74c4b Changed glow intensity on some grid walls. 2016-03-13 21:51:24 +01:00
Tobias Dahl 8c48e96ad1 Merge pull request #211 from teamfisk/MSAA 
MSAA
 2016-03-13 21:47:43 +01:00
Tobias Dahl fe9c5bd686 Merge pull request #217 from teamfisk/revert-216-ShadowOptimization 
Revert "Shadow will actually shut itself off and delete itself now"
 2016-03-13 21:36:12 +01:00
Tobias Dahl 7fa634ef7c Revert "Shadow will actually shut itself off and delete itself now" 2016-03-13 21:35:57 +01:00
Tobias Dahl 080f5ac856 Merge pull request #216 from teamfisk/ShadowOptimization 
Shadow will actually shut itself off and delete itself now
 2016-03-13 21:32:42 +01:00
Jace 4ecbef59bf Merge branch 'master' of github.com:teamfisk/TacticalZ 2016-03-13 21:29:59 +01:00
Jace 8a1217e8b5 Hoodwinked GLFW into creating a fullscreen windowed window by initializing it one pixel higher than the resolution height 2016-03-13 21:29:39 +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
FakeShemp 8e150da7ff Use CommonFunctions::DeleteTexture() instead 2016-03-13 21:25:04 +01:00