BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,075 Commits 116 Branches 0 Tags
4bd2e7995a3c75ffc8f6831dedacf089cf9d43e5
Commit Graph

2075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 50dbbb4ed4 SSAO now send in 0 as Lod level and some optimizations in SSAO and Blur pass. 2016-03-10 13:47:16 +01:00
Tleety 329a15e08b Bloom bad edge clamp fixed 2016-03-10 13:42:33 +01:00
stiffly 28de31d84d FIX #196: Some variables had not been properly initialized and would cause the game to crash. 2016-03-10 13:28:38 +01:00
Jace e9ef0e7060 Disabled GLERROR macro for release builds 2016-03-10 13:19:26 +01:00
Jace 416f55b6ce Merge pull request #196 from teamfisk/RendererBugFixes 
Fixed on window resize memory leak
 2016-03-10 13:11:23 +01:00
Jace 0346f81234 Renderer resizing updated to send EResolutionChanged when the resolution is updated so cameras can update their aspect ratio and have a correct FOV. Renderer::SetResolution actually changes the resolution now too. 2016-03-10 13:09:34 +01:00
Tleety c3255519bf Blur is now looking like real blur 2016-03-10 13:07:41 +01:00
William Moberg bdcb33d992 Mouse always unlocked on game start and on disconnecting (i.e when menu shows). 2016-03-10 12:46:06 +01:00
Teejoon a6ef026db5 Fixed on window resize memory leak 2016-03-10 12:27:25 +01:00
Tleety a2244e87ad WIP, trying to get blur to work with mipmaps 2016-03-10 12:18:06 +01:00
FakeShemp 6c072aae45 Merge remote-tracking branch 'origin/master' into ExplosionEffectV2 
# Conflicts:
#	resources/Schema/Components/ExplosionEffect.xml
#	resources/Shaders/ExplosionEffect.geom.glsl
#	src/Game/Systems/ExplosionEffectSystem.cpp
 2016-03-10 11:49:51 +01:00
FakeShemp 68634126e5 Add moar optimization thingies and some xml clarifications 2016-03-10 11:43:11 +01:00
Jocke a0d60160dd Increased size of socket buffer 2016-03-10 10:58:26 +01:00
Jocke 15c54d2be6 Merge remote-tracking branch 'origin/master' into SplitSnapshots 2016-03-10 10:52:51 +01:00
Viktor Ljung f26b24ef6b Merge pull request #195 from teamfisk/AnimationPickingFixes 
Forgot one console spammer
 2016-03-10 10:49:05 +01:00
viktorljung b0e9cd3965 Forgot one console spammer 2016-03-10 10:47:58 +01:00
stiffly e444a86ec5 Merge remote-tracking branch 'origin/master' into Kill-streak-sounds 2016-03-10 10:36:20 +01:00
Adam Byléhn 5e747f53db Merge pull request #194 from teamfisk/AnimationPickingFixes 
Animation picking fixes
 2016-03-10 10:33:29 +01:00
William Moberg 8a8c375d3a Merge remote-tracking branch 'origin/master' into BoxModelCollision 2016-03-10 09:57:33 +01:00
Tleety 592edf7dba Sprites can now be rendered with the texture ratio in mind 2016-03-09 23:31:54 +01:00
Jace 012420b4da Merge branch 'master' of github.com:teamfisk/TacticalZ 2016-03-09 23:07:44 +01:00
viktorljung 3a213be679 Picking on animated models fixed 2016-03-09 23:06:53 +01:00
Jace 50b0a091ec Fixed editor widgets to take scale of the entity into account when they're moved 2016-03-09 22:45:55 +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 981dc3467e Baggu fixed again 
+Bonus document formatted
 2016-03-09 22:11:17 +01:00
Jace 727b6ba871 Fixed Transform::AbsolutePosition to take scale into account properly maybe? 2016-03-09 22:04:13 +01:00
FakeShemp 42af029a26 fix baggu 2016-03-09 21:25:51 +01:00
Tleety f9935cad42 Merge branch 'master' into Menu 2016-03-09 21:07:40 +01:00
Jocke 37355b1afc Hot fix 2016-03-09 20:12:08 +01:00
Jace e11cdaa662 Removed forced player color on spawn 2016-03-09 20:11:07 +01:00
Tobias Dahl d393f9ade1 Merge pull request #180 from teamfisk/Shadows 
Shadows
 2016-03-09 19:55:41 +01:00
FakeShemp 2e5dfc609a support headshot icons 2016-03-09 19:51:57 +01:00
William Moberg 8936b3d6c3 Probably fixed all the jittering, won't need the jitter guard anymore. 2016-03-09 19:45:26 +01:00
Jocke ad49af2f8c Merge remote-tracking branch 'origin/master' into SplitSnapshots 2016-03-09 19:43:48 +01:00
Jocke 5a7034dfcd popped the right amount of the header 2016-03-09 19:43:18 +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
Jocke 9721cb6a7d Merge remote-tracking branch 'origin/master' into SplitSnapshots 
# Conflicts:
#	include/Engine/Network/Client.h
#	src/Engine/Network/Client.cpp
 2016-03-09 19:14:10 +01:00
Tleety 90b2c70215 Some sprite fixes 2016-03-09 19:12:06 +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
Jocke c36c7d1ea6 Merge remote-tracking branch 'origin/master' into SplitSnapshots 
# Conflicts:
#	src/Engine/Network/Server.cpp
 2016-03-09 18:41:01 +01:00
Jace ce58fac6ba Merge pull request #192 from teamfisk/Movement 
Movement
 2016-03-09 18:37:56 +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
Jocke 3209e36176 We can now send more data with UDP than previously, the splitting seems to work fine but receiving has some problems. 2016-03-09 18:26:33 +01:00