 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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Jace
|
0a31fa3dfd
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-02-12 09:08:17 +01:00 |
|
|
Jace
|
ca457d9c00
|
Player names
|
2016-02-12 09:07:59 +01:00 |
|
 antc13
|
a08e54a147
|
Blocked up a path in the Spawns a bit more.
|
2016-02-12 08:44:40 +01:00 |
|
|
Jocke
|
2c3122bbdb
|
increased Network buffer size, fixed 2 crashes and re-added the ability to kill oneself with the use of a key bound to TakeDamage,Value.
|
2016-02-12 08:39:20 +01:00 |
|
|
Jace
|
10846be820
|
Merge pull request #109 from teamfisk/Sound
Added weapon sounds.
|
2016-02-12 08:23:30 +01:00 |
|
|
stiffly
|
9df7b32ca1
|
Merge remote-tracking branch 'origin/master' into Sound
|
2016-02-12 08:20:01 +01:00 |
|
|
stiffly
|
3d4a7de59d
|
MiniDump.cpp was not added to CMakeLists.txt.
|
2016-02-12 08:19:47 +01:00 |
|
|
stiffly
|
1cdcbf9b32
|
Merge remote-tracking branch 'origin/master' into Sound
# Conflicts:
# src/Game/Systems/PlayerSpawnSystem.cpp
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
|
2016-02-12 08:19:29 +01:00 |
|
|
antc13
|
9e8d2b99df
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-02-12 08:16:23 +01:00 |
|
|
antc13
|
ba4877c3f7
|
Moved Spawn locations and added ammo/health pickups around the map.
|
2016-02-12 08:16:12 +01:00 |
|
|
stiffly
|
af39b892cd
|
Now plays a "Empty sound", "reload sound" and "hit mark sound" on appropriate occasions.
|
2016-02-12 08:05:35 +01:00 |
|
|
Jace
|
1ed5107d9b
|
Merge pull request #108 from teamfisk/MiniDump
Minidump on crash
|
2016-02-12 08:04:25 +01:00 |
|
|
antc13
|
2ce7179d19
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-02-12 07:49:58 +01:00 |
|
|
Jace
|
eb7b22c757
|
Latest assets
|
2016-02-12 07:48:26 +01:00 |
|
|
Jace
|
b48d491ad7
|
Complete blue and red player entities
|
2016-02-12 07:45:51 +01:00 |
|