e25c9ee690
Merge remote-tracking branch 'origin/master' into Shadows
...
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.vert.glsl
# resources/Shaders/ForwardPlusSkinned.vert.glsl
# src/Engine/Rendering/Renderer.cpp
2016-03-09 19:38:55 +01:00
Jace
fce6e90f3c
First person assault weapon idle animation now correct
2016-03-09 19:07:02 +01:00
07d85bacf6
Added file extension to CP_Rocky2 & moved spawn points on the Y axis.
2016-03-09 18:57:45 +01:00
15c1b238ef
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
2016-03-09 18:46:43 +01:00
b8839551a4
Created the map CP_Rocky2 but beware, it's still WIP.
2016-03-09 18:46:26 +01:00
Jace
ce58fac6ba
Merge pull request #192 from teamfisk/Movement
...
Movement
2016-03-09 18:37:56 +01:00
1bfd0cce5e
Idel
2016-03-09 18:36:53 +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
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
48d9463bd3
Merge pull request #190 from teamfisk/RendererBugFixes
...
Renderer bug fixes
2016-03-09 18:01:02 +01:00
974d9101bd
Merge remote-tracking branch 'origin/master' into RendererBugFixes
...
Conflicts:
assets
2016-03-09 17:50:42 +01:00
07cb025de3
Merge pull request #188 from teamfisk/FriendlyHost/Join
...
User friendly server join
2016-03-09 17:49:39 +01:00
fdc37a9fe9
Loads the correct menu
2016-03-09 17:49:04 +01:00
99ccca6273
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 17:38:37 +01:00
e9717c68bd
Merge pull request #191 from teamfisk/Menu
...
Menu
2016-03-09 17:38:18 +01:00
d093284569
Rename variable
2016-03-09 17:37:40 +01:00
85e63acda0
removed standarduniforms
2016-03-09 17:36:30 +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
fad93ca5aa
Merge remote-tracking branch 'origin/master' into RendererBugFixes
...
Conflicts:
include/Engine/Rendering/DrawFinalPass.h
2016-03-09 16:54:26 +01:00
91cad561a4
Some more optimization and fixed sorting of render job objects in RenderSystem
2016-03-09 16:51:24 +01:00
Jace
3ea1177425
Merge pull request #189 from teamfisk/Weapons
...
Basically complete Assault Weapon
2016-03-09 16:17:00 +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
fa0b52caec
When you disconnect you will delete the world and return to the menu.
2016-03-09 15:49:42 +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
1211888ce1
The world is deleted upon connection to a server.
2016-03-09 15:10:32 +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
Jace
ee4db3c12f
Merge pull request #187 from teamfisk/BoneAttachmentFix
...
Inverse seems to be the same as -w
2016-03-09 14:32:27 +01:00
ddde50b690
Inverse seems to be the same as -w
2016-03-09 14:27:50 +01:00
Jace
4c184b8f44
Merge pull request #186 from teamfisk/BoneAttachmentFix
...
BoneAttachments now working perfectly
2016-03-09 13:51:51 +01:00
555b19c41d
BoneAttachments now working perfectly
2016-03-09 13:49:28 +01:00
4ae39dcc36
Merge pull request #182 from teamfisk/DamageIndicator
...
Friendly fire gives no DamageIndicator
2016-03-09 13:26:57 +01:00
67ccb5bee5
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 13:23:31 +01:00
70ec075887
3rd person aim improvements
2016-03-09 13:19:56 +01:00
31ed606ef9
Merge pull request #183 from teamfisk/Menu
...
Menu
2016-03-09 12:33:36 +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
FakeShemp
Jace
antc13
viktorljung
Tobias Dahl
Teejoon
stiffly
William Moberg