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

854 Commits

Author SHA1 Message Date
Jace 78c7d777e3 Made player models in class select unpickable 2016-03-13 22:09:12 +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
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
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
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
Jace f05b09ca7a Merge branch 'master' of github.com:teamfisk/TacticalZ 2016-03-13 19:54:22 +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
Teejoon 5f11d1e066 fix 2016-03-13 16:38:50 +01:00
Teejoon 741ed01930 Merge remote-tracking branch 'origin/master' into MSAA 2016-03-13 15:28:00 +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
Adam Byléhn b73595eed0 Merge pull request #210 from teamfisk/RestartMap 
Restart map
 2016-03-13 15:10:01 +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
William Moberg 4f99f6ef74 Merge branch 'master' into RestartMap 
# Conflicts:
#	src/Game/Systems/CapturePointSystem.cpp
 2016-03-13 13:37:51 +01:00
antc13 d0a083a1e3 Fixed rotation/translation on some objects on CP_Rocky2. 2016-03-13 13:13:14 +01:00
Teejoon 2e89227061 Merge remote-tracking branch 'origin/master' into MSAA 2016-03-13 00:09:07 +01:00
Teejoon 958850903a Moved ViewSpacePosition calculation from fragmenst shader to vertexshader 2016-03-13 00:08:49 +01:00
Jace 7ea90bede7 Merge branch 'master' of github.com:teamfisk/TacticalZ 2016-03-12 23:49:44 +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 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
Jace ba93ebbe88 Go away crap maps. 2016-03-12 18:21:36 +01:00
antc13 beee2db5fb Merge branch 'master' of https://github.com/teamfisk/TacticalZ 2016-03-12 17:08:21 +01:00
antc13 1bc4b89a53 Added new models with textures to the map. Every model on the map should now be using a texture. 2016-03-12 17:08:07 +01:00
Jace 068e151741 Merge pull request #173 from teamfisk/ExplosionEffectV2 
Explosion effect v2
 2016-03-12 15:25:12 +01:00
Tleety dc09ba9158 Resolution should now use a dropdown 2016-03-11 20:02:25 +01:00
stiffly 157a54e845 Merge remote-tracking branch 'origin/master' into Kill-streak-sounds 2016-03-11 18:19:22 +01:00
antc13 ac096bbf77 Merge branch 'master' of https://github.com/teamfisk/TacticalZ 
# Conflicts:
#	resources/Schema/Entities/CP_Rocky2.xml
 2016-03-11 15:46:39 +01:00
antc13 81634578d9 Updated CP_Rocky2, added a point light to pickups and created 3 different versions of the Floating Crystals above Capture Points. 2016-03-11 15:43:20 +01:00
Tleety 26337ff243 Merge remote-tracking branch 'origin/master' into Menu 2016-03-11 15:07:52 +01:00
FakeShemp 7bdb0d410f Merge branch 'master' of github.com:teamfisk/TacticalZ 2016-03-11 15:04:52 +01:00
FakeShemp 172fb8dfc2 MuzzleFlash entities 2016-03-11 15:04:44 +01:00
Tleety 0ca627eb8b Merge remote-tracking branch 'origin/master' into Menu 2016-03-11 14:57:59 +01:00
William Moberg f036817c0c Merge pull request #203 from teamfisk/SplitSnapshots 
Split snapshots
 2016-03-11 14:35:18 +01:00
verysecrethero 0aedeb61b4 CapturePointSystem now sets all children visible/not visible for each red/blue/spectator 2016-03-11 14:15:46 +01:00
Tleety 44398eac58 Options now has some different resolutions. 2016-03-11 14:11:58 +01:00
Tleety 8ceaae995d Options menu started working on 2016-03-11 13:00:34 +01:00
Tleety 23e6a15c7f Fixed the fill on sprites, added some config button components, started work on option menu 2016-03-11 11:31:53 +01:00
Jocke 7febb7681c Merge remote-tracking branch 'origin/master' into SplitSnapshots 2016-03-11 11:05:41 +01:00
Adam Byléhn 56a13d03fc Merge pull request #197 from teamfisk/SpectatorCamera 
Properly unlocked mouse
 2016-03-11 10:43:29 +01:00
Tleety dab58e09a0 Merge branch 'master' into Menu 2016-03-11 10:20:25 +01:00
Tleety cd6967b310 Merge 2016-03-11 10:20:13 +01:00
viktorljung b3ea26779a Added Unpickable component, which skips the entity in the PickingPass 2016-03-10 16:29:13 +01:00
Tleety ab70aed840 WIP 2016-03-10 16:15:57 +01:00
verysecrethero 551745b0a6 Merge remote-tracking branch 'origin/master' into CapturePointTake 2016-03-10 16:14:18 +01:00
verysecrethero 8b89df0095 Changed to a better validator 2016-03-10 16:09:54 +01:00