 Tleety
|
a6c30100af
|
FrameWork for menu buttons
|
2016-02-17 14:16:17 +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 |
|
|
Tleety
|
8f84a5ddd6
|
Buttons are now clickable
|
2016-02-16 16:28:19 +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 |
|
 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 |
|
|
Jocke
|
7d732c75ca
|
Server now removes players that have disconnected.
|
2016-02-12 07:42:01 +01:00 |
|
|
Jace
|
47f4711b85
|
Merge remote-tracking branch 'origin/Menu' into WeaponSystem
# Conflicts:
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Game/Systems/PlayerSpawnSystem.cpp
|
2016-02-12 07:18:20 +01:00 |
|
|
Jace
|
78e318c032
|
Proper snapshot filtering
|
2016-02-12 07:14:36 +01:00 |
|
|
Jace
|
bb66f95d43
|
Enabled server broadcasting PlayerDamage events to other players to make damage indicators work
|
2016-02-12 07:03:14 +01:00 |
|
|
Jace
|
cc422cf73a
|
Fixed PlayerDeath being fired multiple times per frame on the server, causing multiple spawns and other weirdness
|
2016-02-12 06:30:19 +01:00 |
|
|
Jace
|
2e5ee633ce
|
Fixed bug when client would recieve input command from an entity that the client didn't know about
|
2016-02-12 06:10:20 +01:00 |
|
|
Tleety
|
1e04244590
|
Fixed network bug sorta
|
2016-02-12 06:00:42 +01:00 |
|
 viktorljung
|
f146971db0
|
Fixed size
|
2016-02-12 05:45:17 +01:00 |
|
|
viktorljung
|
60b2c9bc9b
|
KillFeed
|
2016-02-12 05:41:05 +01:00 |
|
|
Tleety
|
d357e365cb
|
Merge remote-tracking branch 'origin/TCPConnections' into WeaponSystem
# Conflicts:
# include/Engine/Network/Server.h
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
|
2016-02-12 05:21:00 +01:00 |
|
|
Tleety
|
a8a3366e8a
|
Hopeless attempts to fix network bugs
|
2016-02-12 05:17:09 +01:00 |
|
|
Jocke
|
7de76376cf
|
Merge remote-tracking branch 'origin/master' into TCPConnections
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Game/Systems/PlayerSpawnSystem.cpp
|
2016-02-12 05:16:30 +01:00 |
|
 William Moberg
|
422bedb844
|
MiniDump name now depends on time e.g. TacticalZ Fri 04-20-49.
|
2016-02-12 04:22:11 +01:00 |
|
|
stiffly
|
1da432ba23
|
WIP sounds
|
2016-02-12 04:03:35 +01:00 |
|
|
Jace
|
787eecce26
|
WIP
|
2016-02-12 04:03:22 +01:00 |
|
|
William Moberg
|
215b1b1aa4
|
On crash, takes minidump, then show MessageBox, and exit app.
|
2016-02-12 03:32:42 +01:00 |
|
|
antc13
|
f49cacf167
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-02-12 02:47:50 +01:00 |
|
|
Jace
|
a15e01596a
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-02-12 02:47:12 +01:00 |
|
|
antc13
|
a5168bd1c2
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-02-12 02:46:52 +01:00 |
|
|
antc13
|
784e1eb69b
|
Changed Colors on some materials and changed bridges to red and blue bridges.
|
2016-02-12 02:46:44 +01:00 |
|
|
Jace
|
b5e372896f
|
Added spawner?
|
2016-02-12 02:46:42 +01:00 |
|
|
Jace
|
a54156fab3
|
Added HUD elements to player
|
2016-02-12 02:46:16 +01:00 |
|
|
Tobias Dahl
|
a20707739e
|
Merge pull request #107 from teamfisk/CapturePointColorFix
ColorFix
|
2016-02-12 02:39:21 +01:00 |
|
|
Tleety
|
4f7a17ff62
|
ColorFix
|
2016-02-12 02:38:36 +01:00 |
|
|
viktorljung
|
987dafb44a
|
Fixed Health text color
|
2016-02-12 02:38:11 +01:00 |
|
|
Jace
|
47053285c8
|
Merge remote-tracking branch 'origin/Menu' into WeaponSystem
# Conflicts:
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
|
2016-02-12 02:30:38 +01:00 |
|