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

1164 Commits

Author SHA1 Message Date
Jace ce0d3b9fbe Fixed texture freeing. Destructor was never called because base destructors weren't virtual. 2016-03-12 17:53:34 +01:00
Jace 068e151741 Merge pull request #173 from teamfisk/ExplosionEffectV2 
Explosion effect v2
 2016-03-12 15:25:12 +01:00
Tleety dc09ba9158 Resolution should now use a dropdown 2016-03-11 20:02:25 +01:00
Tobias Dahl 2f61171d16 Merge pull request #185 from teamfisk/TextColor 
Text that handles color, alpha and icon parsing
 2016-03-11 15:25:06 +01:00
Tleety 26337ff243 Merge remote-tracking branch 'origin/master' into Menu 2016-03-11 15:07:52 +01:00
Tleety 0ca627eb8b Merge remote-tracking branch 'origin/master' into Menu 2016-03-11 14:57:59 +01:00
Tobias Dahl 530c0fd9b0 Merge pull request #204 from teamfisk/RendererBugFixes 
Getting ShaderID fewer times
 2016-03-11 14:57:36 +01:00
William Moberg f036817c0c Merge pull request #203 from teamfisk/SplitSnapshots 
Split snapshots
 2016-03-11 14:35:18 +01:00
Jocke e45d0e8232 fix. 2016-03-11 14:32:55 +01:00
Jocke 62d1cb9a69 fixed request. 2016-03-11 14:24:59 +01:00
Tleety 44398eac58 Options now has some different resolutions. 2016-03-11 14:11:58 +01:00
Jocke 06bddd9d54 Fixed requests. 2016-03-11 14:07:03 +01:00
Tleety bb0531a459 WIP 2016-03-11 13:10:08 +01:00
Tleety 8ceaae995d Options menu started working on 2016-03-11 13:00:34 +01:00
Jocke 5f959ded89 Did changes upon pull request's request. 2016-03-11 12:54:59 +01:00
Jocke 2eb863757b renamed variabels 2016-03-11 11:55:16 +01:00
stiffly 03493df213 Merge remote-tracking branch 'origin/master' into EntitiesWithoutTransform 2016-03-11 11:06:23 +01:00
Jocke 7febb7681c Merge remote-tracking branch 'origin/master' into SplitSnapshots 2016-03-11 11:05:41 +01:00
Teejoon e000408593 Getting ShaderID one time per material in total instead of one time every frame 2016-03-11 11:03:09 +01:00
Jocke 33627f917c removed debug info. 2016-03-11 11:01:10 +01:00
verysecrethero 0869afd529 Merge pull request #193 from teamfisk/BoxModelCollision 
Removed collision jittering effects
 2016-03-11 10:48:25 +01:00
Adam Byléhn 56a13d03fc Merge pull request #197 from teamfisk/SpectatorCamera 
Properly unlocked mouse
 2016-03-11 10:43:29 +01:00
Adam Byléhn dad18a200f Merge pull request #202 from teamfisk/Trigger 
Triggersystem updated for the capturepoints
 2016-03-11 10:38:20 +01:00
verysecrethero 551745b0a6 Merge remote-tracking branch 'origin/master' into CapturePointTake 2016-03-10 16:14:18 +01:00
William Moberg d6e3a47182 Merge branch 'master' into Trigger 2016-03-10 16:14:17 +01:00
William Moberg 038a706e28 Don't collide against disabled (invisible) models. Triggers uses model vs. box instead of only box vs. box. 2016-03-10 16:05:30 +01:00
Jace 777f382772 Merge branch 'master' of github.com:teamfisk/TacticalZ 2016-03-10 15:48:05 +01:00
Jace e734d0c953 Oops. 2016-03-10 15:47:32 +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
Jocke 67dfbfff01 Fixed multiply connections 2016-03-10 14:44:06 +01:00
verysecrethero 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
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
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
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
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
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
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