BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,933 Commits 116 Branches 0 Tags
e96ad44e4449a460ced393457357f75d2d11905e
Commit Graph

790 Commits

Author SHA1 Message Date
Tleety dab58e09a0 Merge branch 'master' into Menu 2016-03-11 10:20:25 +01:00
Tleety cd6967b310 Merge 2016-03-11 10:20:13 +01:00
Tleety ab70aed840 WIP 2016-03-10 16:15:57 +01:00
verysecrethero 551745b0a6 Merge remote-tracking branch 'origin/master' into CapturePointTake 2016-03-10 16:14:18 +01:00
verysecrethero 8b89df0095 Changed to a better validator 2016-03-10 16:09:54 +01:00
Tleety f9808a61f7 Changed sprite text 2016-03-10 16:02:03 +01:00
William Moberg c9fef65c4f Merge pull request #198 from teamfisk/Menu 
Menu
 2016-03-10 15:38:06 +01:00
Tleety 7e6288c597 Some merge fixes and some sprite fixes. 2016-03-10 15:36:33 +01:00
Tleety 4322a5d8da Some fixes for sprites 2016-03-10 15:21:11 +01:00
Tleety 79d0ef4529 Changed default value of glow intensity 2016-03-10 14:01:45 +01:00
Jace dd63f4a1b4 Fixed FOV being used to calculate projection matrix being degrees when it should be radians, AGAIN. FOV angles are now correct! 2016-03-10 13:51:18 +01:00
Tleety 329a15e08b Bloom bad edge clamp fixed 2016-03-10 13:42:33 +01:00
Tleety c3255519bf Blur is now looking like real blur 2016-03-10 13:07:41 +01:00
Tleety a2244e87ad WIP, trying to get blur to work with mipmaps 2016-03-10 12:18:06 +01:00
Tleety 592edf7dba Sprites can now be rendered with the texture ratio in mind 2016-03-09 23:31:54 +01:00
viktorljung 4e6ff16e58 Shadows for animated models and removed spam in console 2016-03-09 22:43:04 +01:00
Tleety 087facc22e Textures are now able to keep their scale even though the sprite is scaled. 2016-03-09 22:22:32 +01:00
FakeShemp 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
antc13 07d85bacf6 Added file extension to CP_Rocky2 & moved spawn points on the Y axis. 2016-03-09 18:57:45 +01:00
antc13 15c1b238ef Merge branch 'master' of https://github.com/teamfisk/TacticalZ 2016-03-09 18:46:43 +01:00
antc13 b8839551a4 Created the map CP_Rocky2 but beware, it's still WIP. 2016-03-09 18:46:26 +01:00
viktorljung 1bfd0cce5e Idel 2016-03-09 18:36:53 +01:00
viktorljung 60ff53112e Merge remote-tracking branch 'origin/master' into Movement 2016-03-09 18:27:36 +01:00
viktorljung d42d886dcc 3rd person animations synced with 1st person animations 2016-03-09 18:27:09 +01:00
Teejoon 974d9101bd Merge remote-tracking branch 'origin/master' into RendererBugFixes 
Conflicts:
	assets
 2016-03-09 17:50:42 +01:00
Teejoon 85e63acda0 removed standarduniforms 2016-03-09 17:36:30 +01:00
Tleety 7e7d98eaae Merge remote-tracking branch 'origin/master' into Menu 2016-03-09 17:24:41 +01:00
Tleety 1104166039 TextureSprite Resource that use GL_NEAREST for sampling aswell as some StartMenu changes 2016-03-09 17:24:21 +01:00
Teejoon fad93ca5aa Merge remote-tracking branch 'origin/master' into RendererBugFixes 
Conflicts:
	include/Engine/Rendering/DrawFinalPass.h
 2016-03-09 16:54:26 +01:00
Teejoon 91cad561a4 Some more optimization and fixed sorting of render job objects in RenderSystem 2016-03-09 16:51:24 +01:00
viktorljung 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
viktorljung 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
Tleety 49040e9c4b StartMenu system now sets the main menu camera to active as long as it exists. 2016-03-09 15:29:42 +01:00
Tleety a76a04260f StartSystem skeleton and some changes to the StartMenu 2016-03-09 15:10:54 +01:00
Tleety 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
viktorljung 70ec075887 3rd person aim improvements 2016-03-09 13:19:56 +01:00
Tleety 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
Tobias Dahl 697da620d3 Merge pull request #179 from teamfisk/TeamPickCamera 
Spectator camera system
 2016-03-09 11:41:05 +01:00
William Moberg b782e73556 Falsified DepthSort for SpectatorCamera buttons and CP-HUD elements. 2016-03-09 10:56:05 +01:00
Tleety 95f68cc888 ConnectRequest event and some other shit 2016-03-08 22:24:32 +01:00
Tleety 3394d65055 Servers now show up in the server list. 2016-03-08 18:13:21 +01:00
verysecrethero 7ee4ea637b Merge remote-tracking branch 'origin/master' into TeamPickCamera 2016-03-08 17:30:22 +01:00
Tleety ba9208085b WIP 2016-03-08 16:52:56 +01:00
Teejoon d51bea798a Merge remote-tracking branch 'origin/Render_Optimization' into RendererBugFixes 2016-03-08 16:20:23 +01:00
Teejoon 155d700a44 WIP 2016-03-08 16:19:56 +01:00
Tleety f8ab52c72c WIP 2016-03-08 16:15:54 +01:00
viktorljung f934f972e8 Merge remote-tracking branch 'origin/Weapons' into Movement 
# Conflicts:
#	resources/Schema/Entities/PlayerDefenderBlue.xml
 2016-03-08 14:34:21 +01:00