 William Moberg
|
f036817c0c
|
Merge pull request #203 from teamfisk/SplitSnapshots
Split snapshots
|
2016-03-11 14:35:18 +01:00 |
|
 Jocke
|
e45d0e8232
|
fix.
|
2016-03-11 14:32:55 +01:00 |
|
|
William Moberg
|
8ebf818c19
|
Merge pull request #206 from teamfisk/CapturePointFixBranch
CapturePointSystem now sets all children visible/not visible for each
|
2016-03-11 14:26:45 +01:00 |
|
|
Jocke
|
62d1cb9a69
|
fixed request.
|
2016-03-11 14:24:59 +01:00 |
|
 Tobias Dahl
|
edb305b307
|
Merge pull request #175 from teamfisk/EntitiesWithoutTransform
No crash on missing transform in editor system.
|
2016-03-11 14:20:23 +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 |
|
|
Jocke
|
06bddd9d54
|
Fixed requests.
|
2016-03-11 14:07:03 +01:00 |
|
|
Tleety
|
4937bee46a
|
Unresolved externals shit
|
2016-03-11 13:38:48 +01:00 |
|
|
Tleety
|
bb0531a459
|
WIP
|
2016-03-11 13:10:08 +01:00 |
|
|
Tleety
|
8bd38bc465
|
Merge branch 'Menu' of github.com:teamfisk/TacticalZ into Menu
|
2016-03-11 13:00:43 +01:00 |
|
|
Tleety
|
8ceaae995d
|
Options menu started working on
|
2016-03-11 13:00:34 +01:00 |
|
|
Jocke
|
5f959ded89
|
Did changes upon pull request's request.
|
2016-03-11 12:54:59 +01:00 |
|
|
Jocke
|
0fbc482f9c
|
Changed getters to return reinterpret_casted data.
|
2016-03-11 12:22:55 +01:00 |
|
|
Jocke
|
2eb863757b
|
renamed variabels
|
2016-03-11 11:55:16 +01:00 |
|
 Teejoon
|
91aedcbb14
|
Merge branch 'Menu' of https://github.com/teamfisk/TacticalZ into Menu
|
2016-03-11 11:41:11 +01:00 |
|
|
Teejoon
|
cac0522ae7
|
Fixed glow on window resize
|
2016-03-11 11:41:02 +01:00 |
|
|
Tleety
|
26dde21e3d
|
Merge branch 'Menu' of github.com:teamfisk/TacticalZ into Menu
|
2016-03-11 11:32:18 +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 |
|
|
Teejoon
|
e96ad44e44
|
BlurHUDPass now works correct when resizing window.
|
2016-03-11 11:23:23 +01:00 |
|
 stiffly
|
a3ab844cc4
|
Makes sure m_CurrentSelection is valid before using it.
|
2016-03-11 11:12:49 +01:00 |
|
|
stiffly
|
03493df213
|
Merge remote-tracking branch 'origin/master' into EntitiesWithoutTransform
|
2016-03-11 11:06:23 +01:00 |
|
|
Jocke
|
7febb7681c
|
Merge remote-tracking branch 'origin/master' into SplitSnapshots
|
2016-03-11 11:05:41 +01:00 |
|
|
Teejoon
|
e000408593
|
Getting ShaderID one time per material in total instead of one time every frame
|
2016-03-11 11:03:09 +01:00 |
|
|
Jocke
|
33627f917c
|
removed debug info.
|
2016-03-11 11:01:10 +01:00 |
|
|
verysecrethero
|
0869afd529
|
Merge pull request #193 from teamfisk/BoxModelCollision
Removed collision jittering effects
|
2016-03-11 10:48:25 +01:00 |
|
|
Adam Byléhn
|
56a13d03fc
|
Merge pull request #197 from teamfisk/SpectatorCamera
Properly unlocked mouse
|
2016-03-11 10:43:29 +01:00 |
|
|
Adam Byléhn
|
dad18a200f
|
Merge pull request #202 from teamfisk/Trigger
Triggersystem updated for the capturepoints
|
2016-03-11 10:38:20 +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 |
|
 FakeShemp
|
937bf823f3
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-10 21:59:23 +01:00 |
|
|
FakeShemp
|
e35b09cc68
|
Add alpha clipping
Tobbe sa att jag fick pusha direkt
|
2016-03-10 21:59:01 +01:00 |
|
|
William Moberg
|
b172526e62
|
Merge pull request #199 from teamfisk/CapturePointTake
The children of the CapturePointModels now also get their visibility changed
|
2016-03-10 16:37:53 +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 |
|
|
William Moberg
|
d6e3a47182
|
Merge branch 'master' into Trigger
|
2016-03-10 16:14:17 +01:00 |
|
|
verysecrethero
|
8b89df0095
|
Changed to a better validator
|
2016-03-10 16:09:54 +01:00 |
|
|
William Moberg
|
038a706e28
|
Don't collide against disabled (invisible) models. Triggers uses model vs. box instead of only box vs. box.
|
2016-03-10 16:05:30 +01:00 |
|
|
Tleety
|
f9808a61f7
|
Changed sprite text
|
2016-03-10 16:02:03 +01:00 |
|
|
Jocke
|
a8a4b5d2a2
|
Disconnect on udp
|
2016-03-10 15:59:55 +01:00 |
|
 Jace
|
777f382772
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-10 15:48:05 +01:00 |
|
|
Jace
|
78129cf432
|
Fixed picking depth values after depth buffer was changed to a texture.
|
2016-03-10 15:47:47 +01:00 |
|
|
Jace
|
e734d0c953
|
Oops.
|
2016-03-10 15:47:32 +01:00 |
|
|
William Moberg
|
c9fef65c4f
|
Merge pull request #198 from teamfisk/Menu
Menu
|
2016-03-10 15:38:06 +01:00 |
|
|
Tleety
|
7e6288c597
|
Some merge fixes and some sprite fixes.
|
2016-03-10 15:36:33 +01:00 |
|
|
Tleety
|
4322a5d8da
|
Some fixes for sprites
|
2016-03-10 15:21:11 +01:00 |
|
|
FakeShemp
|
b094b9feca
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-10 15:01:27 +01:00 |
|
|
Jocke
|
67dfbfff01
|
Fixed multiply connections
|
2016-03-10 14:44:06 +01:00 |
|
|
verysecrethero
|
0a94373f3f
|
The children of the CapturePointModels now also get their visibility on/off. This is done since a capturepoint is actually 2 models and not just 1
|
2016-03-10 14:38:20 +01:00 |
|
|
Tleety
|
79d0ef4529
|
Changed default value of glow intensity
|
2016-03-10 14:01:45 +01:00 |
|