 FakeShemp
|
178402e964
|
cascade shadow wip
|
2016-02-18 10:08:29 +01:00 |
|
 verysecrethero
|
c3ed429377
|
Added BoostSystem, Added BoostAssault entity XML
|
2016-02-17 18:11:36 +01:00 |
|
 Teejoon
|
c4d3c515e4
|
Marge with Master
|
2016-02-17 18:04:49 +01:00 |
|
|
Teejoon
|
7cc58dc94c
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates
|
2016-02-17 18:00:30 +01:00 |
|
|
Teejoon
|
5e3af7ac5d
|
Player Indicator now working OK. Scaling depending on how far away you are makes the Indicator to hide players head behind it. Shields are making indicators to disappear.
|
2016-02-17 17:58:01 +01:00 |
|
 Tleety
|
3e7936ef00
|
You can now change resolution by pressing buttons.
|
2016-02-17 17:44:33 +01:00 |
|
 stiffly
|
46987beefb
|
Updated the serverlist, now prints adress and port of the server.
|
2016-02-17 17:05:10 +01:00 |
|
|
verysecrethero
|
8845054965
|
Merge remote-tracking branch 'origin/master' into PerformanceTiming
# Conflicts:
# resources/Schema/Entities/NewMap.xml
|
2016-02-17 16:59:26 +01:00 |
|
|
Tleety
|
7dfd68467e
|
Merge branch 'Menu-Tobias' into ResolutionChange
|
2016-02-17 16:54:06 +01:00 |
|
|
Teejoon
|
4fd0108443
|
Working billbording
|
2016-02-17 16:50:24 +01:00 |
|
|
verysecrethero
|
56bc1fee3d
|
Added LifeTimeOfEffect in BoostAssault,BoostDefender components.
|
2016-02-17 16:43:38 +01:00 |
|
 William Moberg
|
52355a63e2
|
Merge branch 'master' into Respawning
|
2016-02-17 16:08:00 +01:00 |
|
|
William Moberg
|
72db672dbf
|
Ray will not hit objects in octree if they are transparent or invisible.
|
2016-02-17 16:06:35 +01:00 |
|
|
verysecrethero
|
1c9a1a9904
|
playerMovementSpeed,playerCrouchSpeed in the player component now also gets AssaultBoosted.
|
2016-02-17 16:04:44 +01:00 |
|
|
stiffly
|
950ecba1c0
|
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
|
2016-02-17 15:52:58 +01:00 |
|
|
stiffly
|
fdc8f753cb
|
Implemented primitive server "heartbeat" logic, which sends server info from server to client without being connected.
|
2016-02-17 15:51:26 +01:00 |
|
 viktorljung
|
debb1881bf
|
BoneAttachment working
|
2016-02-17 15:48:45 +01:00 |
|
|
verysecrethero
|
e8aff02c4e
|
Merge remote-tracking branch 'origin/master' into AssaultBoost
|
2016-02-17 14:58:28 +01:00 |
|
|
Tobias Dahl
|
0d665c10fe
|
Merge pull request #114 from teamfisk/HealthPickup
The rotation of the Pickups are now also included in the AmmoPickup.x…
|
2016-02-17 14:56:45 +01:00 |
|
|
viktorljung
|
db8bc612bd
|
AdditiveBlend now working, needs cleanup
|
2016-02-17 14:55:02 +01:00 |
|
|
William Moberg
|
23bb1a6405
|
Cannot respawn inside other players, unless all are blocked.
|
2016-02-17 14:54:59 +01:00 |
|
|
verysecrethero
|
b8222c7b2e
|
The rotation of the Pickups are now also included in the AmmoPickup.xml, HealthPickup.xml
|
2016-02-17 14:54:42 +01:00 |
|
|
Tobias Dahl
|
43bbc063cf
|
Merge pull request #111 from teamfisk/HealthPickup
Fixed RespawnModel of Pickups
|
2016-02-17 14:39:09 +01:00 |
|
|
verysecrethero
|
f7303ad787
|
Merge remote-tracking branch 'origin/master' into AssaultBoost
|
2016-02-17 14:38:04 +01:00 |
|
|
verysecrethero
|
3e4b87da7c
|
Merge remote-tracking branch 'origin/master' into HealthPickup
# Conflicts:
# resources/Schema/Entities/NewMap.xml
|
2016-02-17 14:32:59 +01:00 |
|
|
verysecrethero
|
ac9ce8ea83
|
Merge remote-tracking branch 'origin/master' into HealthPickup
|
2016-02-17 14:30:31 +01:00 |
|
|
Tobias Dahl
|
99643fd748
|
Merge pull request #112 from teamfisk/AssaultDash
You can now AssaultDash in the air
|
2016-02-17 14:24:58 +01:00 |
|
|
Tleety
|
a6c30100af
|
FrameWork for menu buttons
|
2016-02-17 14:16:17 +01:00 |
|
|
verysecrethero
|
833015f45e
|
Small code cleanup for PerformanceTimer
|
2016-02-17 13:44:41 +01:00 |
|
|
Tleety
|
657125b469
|
Moved menu code into GUI
Button events are now sent when you click.
|
2016-02-17 13:44:11 +01:00 |
|
|
verysecrethero
|
456cd35a12
|
Merge remote-tracking branch 'origin/master' into AssaultBoost
# Conflicts:
# resources/Schema/Components.xsd
|
2016-02-17 11:52:06 +01:00 |
|
|
verysecrethero
|
8f28c760dd
|
You can now AssaultDash in the air
|
2016-02-17 11:47:10 +01:00 |
|
|
verysecrethero
|
b13362360a
|
Fixed RespawnModel of Pickups
|
2016-02-17 11:22:42 +01:00 |
|
 Jace
|
0af9edc6e5
|
Editor is properly disabled when disabled in config
|
2016-02-17 10:53:20 +01:00 |
|
|
viktorljung
|
e7118ce8e5
|
WIP
|
2016-02-17 10:52:50 +01:00 |
|
|
verysecrethero
|
ec10ef3ffc
|
Merge remote-tracking branch 'origin/master' into HealthPickup
|
2016-02-17 10:32:35 +01:00 |
|
 Jocke
|
4432891437
|
Fixed crash in Client::parsePlayerDamage.
|
2016-02-17 10:21:50 +01:00 |
|
|
verysecrethero
|
b2a437731e
|
Small cleanup in the code
|
2016-02-16 17:58:27 +01:00 |
|
|
verysecrethero
|
42b49f9dba
|
Added more timers to Rendering.
|
2016-02-16 17:51:39 +01:00 |
|
|
verysecrethero
|
4b8f1d95a3
|
Added static class PerformanceTimer. Changed CMakeLists for engine to include boost timer. Added F2,F3 functions in editor. Added some timing, more to be added
|
2016-02-16 16:57:46 +01:00 |
|
|
Tleety
|
8f84a5ddd6
|
Buttons are now clickable
|
2016-02-16 16:28:19 +01:00 |
|
|
Jocke
|
a006db9e63
|
WIP Fix dsync
|
2016-02-16 16:06:17 +01:00 |
|
|
Teejoon
|
17da9a8036
|
WIP
|
2016-02-16 15:56:58 +01:00 |
|
|
Tleety
|
6bc7131290
|
Glow Intencity can now be changed in the model component.
|
2016-02-16 14:57:21 +01:00 |
|
|
Tleety
|
4214bf10a1
|
Components for menu/buttons
|
2016-02-16 14:05:57 +01:00 |
|
|
Jocke
|
717af2c4a4
|
Fixed bug in Client::parsePlayerDamage()
|
2016-02-16 10:22:15 +00:00 |
|
|
Jace
|
969e7cb0d5
|
Merge remote-tracking branch 'origin/FixNetworkToPlayTest'
|
2016-02-12 09:18:32 +01:00 |
|
|
Jace
|
47a365a8fc
|
Inverted capture point numbers to fix HUD
|
2016-02-12 09:17:39 +01:00 |
|
|
Jace
|
71c03326aa
|
Debug.EditorEnabled
|
2016-02-12 09:17:28 +01:00 |
|
|
Jocke
|
ba69c79821
|
Fixed bug in Server.
|
2016-02-12 09:13:43 +01:00 |
|