 Tleety
|
722b795d37
|
Fixed spelling
|
2016-02-19 13:30:41 +01:00 |
|
|
Tleety
|
cf2bf4e14d
|
Merge remote-tracking branch 'origin/master' into ResolutionChange
|
2016-02-19 13:17:31 +01:00 |
|
 Jace
|
2ac584bafb
|
Merge pull request #113 from teamfisk/Menu-Tobias
Menu tobias
|
2016-02-19 13:16:50 +01:00 |
|
|
Tleety
|
6e5335a266
|
Release now return name and entity of the entity that was previously klicked.
|
2016-02-19 13:16:26 +01:00 |
|
|
Tleety
|
fc5d054cb2
|
Entity is now sent with the click events.
Fixed small things
|
2016-02-19 12:49:07 +01:00 |
|
|
Tleety
|
8c9f4bb84b
|
Resize should now be working correctly.
|
2016-02-19 11:42:52 +01:00 |
|
|
Tleety
|
e15a7b9485
|
You can now change resolution without any apparent bugs.
|
2016-02-18 18:00:26 +01:00 |
|
 William Moberg
|
a141da3d8c
|
Merge pull request #118 from teamfisk/AndersTest
Test fixes
|
2016-02-18 15:29:33 +01:00 |
|
 verysecrethero
|
64610e3c03
|
Fixed so some of the tests are working again. Also removed the test errors
|
2016-02-18 11:27:07 +01:00 |
|
|
Jace
|
5dd85d2748
|
Merge pull request #110 from teamfisk/PerformanceTiming
Performance timing
|
2016-02-18 10:33:24 +01:00 |
|
|
Jace
|
261c2e021e
|
Merge pull request #115 from teamfisk/Respawning
Spawn blocking fix
|
2016-02-18 10:26:08 +01:00 |
|
|
William Moberg
|
581a7b470c
|
Merge pull request #94 from teamfisk/AndersTest
Added 3 PickupSpawnSystem test
|
2016-02-18 10:21:37 +01:00 |
|
|
Tleety
|
3e7936ef00
|
You can now change resolution by pressing buttons.
|
2016-02-17 17:44:33 +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 |
|
|
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 |
|
|
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
|
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
|
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 |
|
|
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 |
|
|
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 |
|