c544f349fd
The logic for removing the world is working but when we send the map again the clients memory usage goes crazy.
2016-03-12 17:49:50 +01:00
26337ff243
Merge remote-tracking branch 'origin/master' into Menu
2016-03-11 15:07:52 +01:00
0ca627eb8b
Merge remote-tracking branch 'origin/master' into Menu
2016-03-11 14:57:59 +01:00
0aedeb61b4
CapturePointSystem now sets all children visible/not visible for each red/blue/spectator
2016-03-11 14:15:46 +01:00
44398eac58
Options now has some different resolutions.
2016-03-11 14:11:58 +01:00
4937bee46a
Unresolved externals shit
2016-03-11 13:38:48 +01:00
8ceaae995d
Options menu started working on
2016-03-11 13:00:34 +01:00
0869afd529
Merge pull request #193 from teamfisk/BoxModelCollision
...
Removed collision jittering effects
2016-03-11 10:48:25 +01:00
56a13d03fc
Merge pull request #197 from teamfisk/SpectatorCamera
...
Properly unlocked mouse
2016-03-11 10:43:29 +01:00
8b89df0095
Changed to a better validator
2016-03-10 16:09:54 +01:00
0a94373f3f
The children of the CapturePointModels now also get their visibility on/off. This is done since a capturepoint is actually 2 models and not just 1
2016-03-10 14:38:20 +01:00
bdcb33d992
Mouse always unlocked on game start and on disconnecting (i.e when menu shows).
2016-03-10 12:46:06 +01:00
8a8c375d3a
Merge remote-tracking branch 'origin/master' into BoxModelCollision
2016-03-10 09:57:33 +01:00
Jace
e11cdaa662
Removed forced player color on spawn
2016-03-09 20:11:07 +01:00
8936b3d6c3
Probably fixed all the jittering, won't need the jitter guard anymore.
2016-03-09 19:45:26 +01:00
60ff53112e
Merge remote-tracking branch 'origin/master' into Movement
2016-03-09 18:27:36 +01:00
d42d886dcc
3rd person animations synced with 1st person animations
2016-03-09 18:27:09 +01:00
8a3564ad49
Merge remote-tracking branch 'origin/master' into BoxModelCollision
2016-03-09 18:03:39 +01:00
Jace
1f14087734
Merge branch 'master' of github.com:teamfisk/TacticalZ
2016-03-09 18:02:11 +01:00
Jace
0b58f32f32
Fixed third person animations over network
2016-03-09 18:01:32 +01:00
9581e9ac84
Don't set the player to previous position when uncrouching.
2016-03-09 17:51:26 +01:00
99ccca6273
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 17:38:37 +01:00
d093284569
Rename variable
2016-03-09 17:37:40 +01:00
7e7d98eaae
Merge remote-tracking branch 'origin/master' into Menu
2016-03-09 17:24:41 +01:00
1104166039
TextureSprite Resource that use GL_NEAREST for sampling aswell as some StartMenu changes
2016-03-09 17:24:21 +01:00
7141756992
Merge remote-tracking branch 'origin/Weapons' into Movement
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerAssaultBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackRed.xml
# resources/Schema/Entities/PlayerAssaultRed.xml
# resources/Schema/Entities/aaaatestremoveme.xml
# resources/Schema/Entities/aim_rays.xml
2016-03-09 15:59:36 +01:00
de125663fd
Merge remote-tracking branch 'origin/master' into Movement
...
# Conflicts:
# assets
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackRed.xml
# resources/Schema/Entities/PlayerAssaultRed.xml
# resources/Schema/Entities/aaaatestremoveme.xml
# resources/Schema/Entities/aim_rays.xml
# src/Engine/Rendering/BoneAttachmentSystem.cpp
2016-03-09 15:54:00 +01:00
Jace
34e551663f
Merge remote-tracking branch 'origin/master' into Weapons
...
# Conflicts:
# assets
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackRed.xml
# resources/Schema/Entities/PlayerAssaultRed.xml
# resources/Schema/Entities/aaaatestremoveme.xml
# resources/Schema/Entities/aim_rays.xml
2016-03-09 15:52:13 +01:00
Jace
9d368348d5
Updated 3rd person and 1st person animation trees for assault to allow for third person weapon animations
2016-03-09 15:48:57 +01:00
49040e9c4b
StartMenu system now sets the main menu camera to active as long as it exists.
2016-03-09 15:29:42 +01:00
a76a04260f
StartSystem skeleton and some changes to the StartMenu
2016-03-09 15:10:54 +01:00
877defdfee
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 14:47:24 +01:00
6f69b52358
Merge remote-tracking branch 'origin/Menu' into FriendlyHost/Join
2016-03-09 14:34:41 +01:00
500ebfa08c
Menu should now show the correct server IP instead of default.
...
Start of a StartMenu entity that will show when the game is started.
2016-03-09 14:34:02 +01:00
09171a1a18
WIP connect from menu
2016-03-09 14:33:20 +01:00
4ae39dcc36
Merge pull request #182 from teamfisk/DamageIndicator
...
Friendly fire gives no DamageIndicator
2016-03-09 13:26:57 +01:00
70ec075887
3rd person aim improvements
2016-03-09 13:19:56 +01:00
c9c462f695
The console now print some info when you are trying to connect to server
2016-03-09 12:31:37 +01:00
704242597a
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/NewMapWSpectatorCam.xml
# resources/Schema/Types/Entity.xsd
# src/Game/Game.cpp
2016-03-09 11:49:42 +01:00
00478b4f12
Merge pull request #184 from teamfisk/TeamPickCamera
...
Tiny compiler bug fix.
2016-03-09 11:46:30 +01:00
f24a5a36b4
Tiny compiler bug fix.
2016-03-09 11:44:07 +01:00
697da620d3
Merge pull request #179 from teamfisk/TeamPickCamera
...
Spectator camera system
2016-03-09 11:41:05 +01:00
534d6639e5
Class enum instead of hardcoded ints.
...
Removed superfluous .Valid() checks.
Check for spectator spawnrequest in case they somehow has a class, so we don't get "x players were supposed to be spawned but failed" if it happens.
2016-03-09 11:35:32 +01:00
6456df8ce1
DamageIndicator is now disabled for Friendly fire
2016-03-09 10:44:08 +01:00
95f68cc888
ConnectRequest event and some other shit
2016-03-08 22:24:32 +01:00
6c673db2f4
Merge branch 'TeamPickCamera' of github.com:teamfisk/TacticalZ into TeamPickCamera
2016-03-08 19:24:55 +01:00
7bc3c9f7b1
Don't force to spectator camera if player presses pickTeam/Class prematurely. Players team should be remembered after picked, spawn request is not erased anymore.
2016-03-08 18:26:17 +01:00
3394d65055
Servers now show up in the server list.
2016-03-08 18:13:21 +01:00
7ee4ea637b
Merge remote-tracking branch 'origin/master' into TeamPickCamera
2016-03-08 17:30:22 +01:00
280de0e984
Merge remote-tracking branch 'origin/FriendlyHost/Join' into Menu
...
# Conflicts:
# include/Game/Systems/MainMenuSystem.h
# src/Engine/GUI/MainMenuSystem.cpp
2016-03-08 17:03:50 +01:00
Jocke
Tleety
verysecrethero
Adam Byléhn
William Moberg
Jace
viktorljung