This website requires JavaScript.
3e7936ef00
You can now change resolution by pressing buttons.
Tleety
2016-02-17 17:44:33 +01:00
d1832c1741
WIP Timestamps
Jocke
2016-02-17 17:07:17 +01:00
46987beefb
Updated the serverlist, now prints adress and port of the server.
stiffly
2016-02-17 17:05:10 +01:00
8845054965
Merge remote-tracking branch 'origin/master' into PerformanceTiming
verysecrethero
2016-02-17 16:59:26 +01:00
7dfd68467e
Merge branch 'Menu-Tobias' into ResolutionChange
Tleety
2016-02-17 16:54:06 +01:00
4fd0108443
Working billbording
Teejoon
2016-02-17 16:50:24 +01:00
56bc1fee3d
Added LifeTimeOfEffect in BoostAssault,BoostDefender components.
verysecrethero
2016-02-17 16:43:38 +01:00
52355a63e2
Merge branch 'master' into Respawning
William Moberg
2016-02-17 16:08:00 +01:00
72db672dbf
Ray will not hit objects in octree if they are transparent or invisible.
William Moberg
2016-02-17 16:06:35 +01:00
1c9a1a9904
playerMovementSpeed,playerCrouchSpeed in the player component now also gets AssaultBoosted.
verysecrethero
2016-02-17 16:04:44 +01:00
950ecba1c0
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
stiffly
2016-02-17 15:52:58 +01:00
fdc8f753cb
Implemented primitive server "heartbeat" logic, which sends server info from server to client without being connected.
stiffly
2016-02-17 15:51:26 +01:00
debb1881bf
BoneAttachment working
viktorljung
2016-02-17 15:48:45 +01:00
e8aff02c4e
Merge remote-tracking branch 'origin/master' into AssaultBoost
verysecrethero
2016-02-17 14:58:28 +01:00
0d665c10fe
Merge pull request #114 from teamfisk/HealthPickup
Tobias Dahl
2016-02-17 14:56:45 +01:00
db8bc612bd
AdditiveBlend now working, needs cleanup
viktorljung
2016-02-17 14:55:02 +01:00
23bb1a6405
Cannot respawn inside other players, unless all are blocked.
William Moberg
2016-02-17 14:54:59 +01:00
b8222c7b2e
The rotation of the Pickups are now also included in the AmmoPickup.xml, HealthPickup.xml
HealthPickup
verysecrethero
2016-02-17 14:54:42 +01:00
43bbc063cf
Merge pull request #111 from teamfisk/HealthPickup
Tobias Dahl
2016-02-17 14:39:09 +01:00
f7303ad787
Merge remote-tracking branch 'origin/master' into AssaultBoost
verysecrethero
2016-02-17 14:38:04 +01:00
3e4b87da7c
Merge remote-tracking branch 'origin/master' into HealthPickup
verysecrethero
2016-02-17 14:32:59 +01:00
ac9ce8ea83
Merge remote-tracking branch 'origin/master' into HealthPickup
verysecrethero
2016-02-17 14:30:31 +01:00
99643fd748
Merge pull request #112 from teamfisk/AssaultDash
Tobias Dahl
2016-02-17 14:24:58 +01:00
a6c30100af
FrameWork for menu buttons
Tleety
2016-02-17 14:16:17 +01:00
833015f45e
Small code cleanup for PerformanceTimer
verysecrethero
2016-02-17 13:44:41 +01:00
657125b469
Moved menu code into GUI
Tleety
2016-02-17 13:44:11 +01:00
456cd35a12
Merge remote-tracking branch 'origin/master' into AssaultBoost
verysecrethero
2016-02-17 11:52:06 +01:00
8f28c760dd
You can now AssaultDash in the air
AssaultDash
verysecrethero
2016-02-17 11:47:10 +01:00
b13362360a
Fixed RespawnModel of Pickups
verysecrethero
2016-02-17 11:22:42 +01:00
0af9edc6e5
Editor is properly disabled when disabled in config
Jace
2016-02-17 10:53:20 +01:00
e7118ce8e5
WIP
viktorljung
2016-02-17 10:52:50 +01:00
ec10ef3ffc
Merge remote-tracking branch 'origin/master' into HealthPickup
verysecrethero
2016-02-17 10:32:35 +01:00
4432891437
Fixed crash in Client::parsePlayerDamage.
Jocke
2016-02-17 10:21:50 +01:00
b2a437731e
Small cleanup in the code
verysecrethero
2016-02-16 17:58:27 +01:00
42b49f9dba
Added more timers to Rendering.
verysecrethero
2016-02-16 17:51:39 +01:00
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
verysecrethero
2016-02-16 16:57:46 +01:00
8f84a5ddd6
Buttons are now clickable
Tleety
2016-02-16 16:28:19 +01:00
a006db9e63
WIP Fix dsync
Jocke
2016-02-16 16:06:17 +01:00
17da9a8036
WIP
Teejoon
2016-02-16 15:56:58 +01:00
6bc7131290
Glow Intencity can now be changed in the model component.
Tleety
2016-02-16 14:57:21 +01:00
4214bf10a1
Components for menu/buttons
Tleety
2016-02-16 14:05:57 +01:00
717af2c4a4
Fixed bug in Client::parsePlayerDamage()
Jocke
2016-02-16 10:22:15 +00:00
d666bd893d
fixed bug in Client::parsePlayerDamage
FixNetworkToPlayTest
Jocke
2016-02-16 10:03:52 +00:00
969e7cb0d5
Merge remote-tracking branch 'origin/FixNetworkToPlayTest'
Playtest1
Jace
2016-02-12 09:18:32 +01:00
47a365a8fc
Inverted capture point numbers to fix HUD
Jace
2016-02-12 09:17:39 +01:00
71c03326aa
Debug.EditorEnabled
Jace
2016-02-12 09:17:28 +01:00
ba69c79821
Fixed bug in Server.
Jocke
2016-02-12 09:13:43 +01:00
0a31fa3dfd
Merge branch 'master' of github.com:teamfisk/TacticalZ
Jace
2016-02-12 09:08:17 +01:00
ca457d9c00
Player names
Jace
2016-02-12 09:07:59 +01:00
a08e54a147
Blocked up a path in the Spawns a bit more.
antc13
2016-02-12 08:44:40 +01:00
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.
Jocke
2016-02-12 08:39:20 +01:00
10846be820
Merge pull request #109 from teamfisk/Sound
Jace
2016-02-12 08:23:30 +01:00
9df7b32ca1
Merge remote-tracking branch 'origin/master' into Sound
Sound
stiffly
2016-02-12 08:20:01 +01:00
3d4a7de59d
MiniDump.cpp was not added to CMakeLists.txt.
stiffly
2016-02-12 08:19:47 +01:00
1cdcbf9b32
Merge remote-tracking branch 'origin/master' into Sound
stiffly
2016-02-12 08:19:29 +01:00
9e8d2b99df
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
antc13
2016-02-12 08:16:23 +01:00
ba4877c3f7
Moved Spawn locations and added ammo/health pickups around the map.
antc13
2016-02-12 08:16:12 +01:00
af39b892cd
Now plays a "Empty sound", "reload sound" and "hit mark sound" on appropriate occasions.
stiffly
2016-02-12 08:05:35 +01:00
1ed5107d9b
Merge pull request #108 from teamfisk/MiniDump
Jace
2016-02-12 08:04:25 +01:00
2ce7179d19
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
antc13
2016-02-12 07:49:58 +01:00
eb7b22c757
Latest assets
Jace
2016-02-12 07:48:26 +01:00
b48d491ad7
Complete blue and red player entities
Jace
2016-02-12 07:45:51 +01:00
7d732c75ca
Server now removes players that have disconnected.
Jocke
2016-02-12 07:42:01 +01:00
47f4711b85
Merge remote-tracking branch 'origin/Menu' into WeaponSystem
Jace
2016-02-12 07:18:20 +01:00
78e318c032
Proper snapshot filtering
Jace
2016-02-12 07:14:36 +01:00
bb66f95d43
Enabled server broadcasting PlayerDamage events to other players to make damage indicators work
Jace
2016-02-12 07:03:14 +01:00
cc422cf73a
Fixed PlayerDeath being fired multiple times per frame on the server, causing multiple spawns and other weirdness
Jace
2016-02-12 06:30:19 +01:00
2e5ee633ce
Fixed bug when client would recieve input command from an entity that the client didn't know about
Jace
2016-02-12 06:10:20 +01:00
1e04244590
Fixed network bug sorta
Tleety
2016-02-12 06:00:42 +01:00
f146971db0
Fixed size
viktorljung
2016-02-12 05:45:17 +01:00
60b2c9bc9b
KillFeed
viktorljung
2016-02-12 05:41:05 +01:00
d357e365cb
Merge remote-tracking branch 'origin/TCPConnections' into WeaponSystem
Tleety
2016-02-12 05:21:00 +01:00
a8a3366e8a
Hopeless attempts to fix network bugs
Tleety
2016-02-12 05:17:09 +01:00
7de76376cf
Merge remote-tracking branch 'origin/master' into TCPConnections
TCPConnections
Jocke
2016-02-12 05:16:30 +01:00
422bedb844
MiniDump name now depends on time e.g. TacticalZ Fri 04-20-49.
William Moberg
2016-02-12 04:22:11 +01:00
1da432ba23
WIP sounds
stiffly
2016-02-12 04:03:03 +01:00
787eecce26
WIP
Jace
2016-02-12 04:03:22 +01:00
215b1b1aa4
On crash, takes minidump, then show MessageBox, and exit app.
William Moberg
2016-02-12 03:32:42 +01:00
f49cacf167
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
antc13
2016-02-12 02:47:50 +01:00
a15e01596a
Merge branch 'master' of github.com:teamfisk/TacticalZ
Jace
2016-02-12 02:47:12 +01:00
a5168bd1c2
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
antc13
2016-02-12 02:46:52 +01:00
784e1eb69b
Changed Colors on some materials and changed bridges to red and blue bridges.
antc13
2016-02-12 02:46:44 +01:00
b5e372896f
Added spawner?
Jace
2016-02-12 02:46:42 +01:00
a54156fab3
Added HUD elements to player
Jace
2016-02-12 02:46:16 +01:00
a20707739e
Merge pull request #107 from teamfisk/CapturePointColorFix
Tobias Dahl
2016-02-12 02:39:21 +01:00
4f7a17ff62
ColorFix
CapturePointColorFix
Tleety
2016-02-12 02:38:36 +01:00
987dafb44a
Fixed Health text color
viktorljung
2016-02-12 02:38:11 +01:00
47053285c8
Merge remote-tracking branch 'origin/Menu' into WeaponSystem
Jace
2016-02-12 02:30:38 +01:00
bee0630a26
Merge remote-tracking branch 'origin/master' into WeaponSystem
Jace
2016-02-12 02:27:44 +01:00
1dc3756533
Fixed respawn crash when a player died that had never spawned
Jace
2016-02-12 02:23:13 +01:00
196469299f
Merge pull request #106 from teamfisk/Transparancyfix
Tobias Dahl
2016-02-12 02:22:42 +01:00
e1196204eb
asdfsdaferf
Transparancyfix
Tleety
2016-02-12 02:20:40 +01:00
b9ea314232
Merge remote-tracking branch 'origin/master' into WeaponSystem
Jace
2016-02-12 02:11:11 +01:00
71533b52ae
Map fix
Jace
2016-02-12 02:10:42 +01:00
f75f5f2471
asnfjksdll
PickingFix
Tleety
2016-02-12 02:10:01 +01:00
6442254575
Merge remote-tracking branch 'origin/master' into Menu
viktorljung
2016-02-12 02:09:14 +01:00
9f8b0f7aa9
Merge pull request #104 from teamfisk/AmmoPickup
Jace
2016-02-12 02:08:29 +01:00
021c4e36d7
New HUD XML files
viktorljung
2016-02-12 02:08:24 +01:00
02253ea6e1
Merge pull request #105 from teamfisk/Respawning
Jace
2016-02-12 02:07:36 +01:00
2417175914
New Map with Meshes WIP. Probably final for Playtest.
antc13
2016-02-12 02:06:52 +01:00