 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 |
|
 viktorljung
|
51b8846b3a
|
Ammo sharing done
|
2016-03-12 18:29:49 +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 |
|
 Tleety
|
d51ea3cabd
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-12 17:04:00 +01:00 |
|
|
Tleety
|
548efeb11e
|
EndScreen should now show when a team win
|
2016-03-12 17:03:50 +01:00 |
|
|
viktorljung
|
4ba011a098
|
Ammosharing over network test WIP
|
2016-03-12 17:01:46 +01:00 |
|
|
viktorljung
|
01cb3afb4b
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
# Conflicts:
# resources/Schema/Entities/PlayerAssaultBlue.xml
# resources/Schema/Entities/PlayerDefenderBlue.xml
|
2016-03-12 15:48:41 +01:00 |
|
|
viktorljung
|
0b26f23188
|
3rd person animations idle bug fixed
|
2016-03-12 15:47:19 +01:00 |
|
|
Tleety
|
8c2a665ccb
|
Some Entities for endscreen and some basic logic in the EndScreenSystem
|
2016-03-12 15:45:07 +01:00 |
|
|
Jace
|
068e151741
|
Merge pull request #173 from teamfisk/ExplosionEffectV2
Explosion effect v2
|
2016-03-12 15:25:12 +01:00 |
|
|
Tleety
|
8e266984f4
|
Player HUD should now be ok, color of health still shit tho
|
2016-03-12 14:37:26 +01:00 |
|
|
viktorljung
|
060585a388
|
Aim fixed for all weapons
|
2016-03-12 02:39:06 +01:00 |
|
|
viktorljung
|
2a209c5d8e
|
AmmoSharing beta
|
2016-03-11 23:58:26 +01:00 |
|
|
Tleety
|
dc09ba9158
|
Resolution should now use a dropdown
|
2016-03-11 20:02:25 +01:00 |
|
|
viktorljung
|
e0a6b09d36
|
Defender early alpha
|
2016-03-11 19:16:34 +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 |
|
|
viktorljung
|
266aca467e
|
Merge remote-tracking branch 'origin/Weapons' into Movement
# Conflicts:
# resources/Schema/Entities/MovementTest.xml
|
2016-03-11 11:25:43 +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
|
cc127ad772
|
Updated defender blendtree
|
2016-03-10 21:31:19 +01:00 |
|
|
Jace
|
1992b6cde1
|
WIP Defender tracers
|
2016-03-10 21:15:27 +01:00 |
|
|
Jace
|
c82be79bb8
|
Functionally working defender weapon
|
2016-03-10 19:26:14 +01:00 |
|
|
viktorljung
|
0d2e8c1cbe
|
Merge branch 'master' into Movement
|
2016-03-10 16:31:45 +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 |
|
|
viktorljung
|
59e487f9bb
|
PlayerDefenderBlue Updated blendtree
|
2016-03-10 16:05:46 +01:00 |
|
|
Tleety
|
f9808a61f7
|
Changed sprite text
|
2016-03-10 16:02:03 +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 |
|
|
Tleety
|
79d0ef4529
|
Changed default value of glow intensity
|
2016-03-10 14:01:45 +01:00 |
|
|
Jace
|
dd63f4a1b4
|
Fixed FOV being used to calculate projection matrix being degrees when it should be radians, AGAIN. FOV angles are now correct!
|
2016-03-10 13:51:18 +01:00 |
|