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

1057 Commits

Author SHA1 Message Date
Teejoon 90d848e8d9 Made texture getters from draw finalpass from const 2016-03-12 18:04:10 +01:00
William Moberg a3b3351e55 Merge branch 'master' into Dirtybit 
# Conflicts:
#	include/Engine/Rendering/ExplosionEffectJob.h
#	src/Game/Systems/ExplosionEffectSystem.cpp
 2016-03-12 17:59:50 +01:00
Jace ce0d3b9fbe Fixed texture freeing. Destructor was never called because base destructors weren't virtual. 2016-03-12 17:53:34 +01:00
William Moberg 36b84f7cc3 Fixed so calculating absolute positions, etc. works. Sets the field of all children to dirty if a transform field is altered. Will also set Position to dirty if Scale or Orientation is altered. 
Moved some methods in ComponentWrapper to a .cpp.
 2016-03-12 17:51:03 +01:00
Jocke 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
viktorljung 0b26f23188 3rd person animations idle bug fixed 2016-03-12 15:47:19 +01:00
Jace 068e151741 Merge pull request #173 from teamfisk/ExplosionEffectV2 
Explosion effect v2
 2016-03-12 15:25:12 +01:00
Jocke 0c1a2d3160 WIP 2016-03-12 14:31:15 +01:00
Jace 01db8e0615 Merge remote-tracking branch 'origin/master' into Dirtybit 
# Conflicts:
#	src/Engine/Collision/CollisionSystem.cpp
#	src/Engine/Core/Transform.cpp
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Rendering/AnimationSystem.cpp
#	src/Engine/Rendering/BoneAttachmentSystem.cpp
#	src/Game/Systems/CapturePointSystem.cpp
#	src/Game/Systems/ExplosionEffectSystem.cpp
#	src/Game/Systems/PlayerMovementSystem.cpp
 2016-03-12 04:09:53 +01:00
Jace 5baac926aa Perfectly working abs pos caching using dirty flags! :D 2016-03-12 03:29:41 +01:00
Jace 9b98bbbea8 Fields are now set to dirty when they're changed! 2016-03-12 01:26:03 +01:00
Jace 80649ce51d Updated the ENTIRE CODEBASE TO MATCH 2016-03-12 00:38:33 +01:00
Jace a4b0b108d4 Created a wrapper for field types that is able to detect changes to set dirty flags in the future 2016-03-12 00:38:26 +01:00
stiffly 66d0f9fa47 Added menu music 2016-03-11 20:28:09 +01:00
Teejoon 1ad087dc75 MSAA mostly working. Only merging the MS render buffer to a single texture so that others could use the AA texture easly 2016-03-11 19:05:34 +01:00
stiffly 157a54e845 Merge remote-tracking branch 'origin/master' into Kill-streak-sounds 2016-03-11 18:19:22 +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
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
Jocke 06bddd9d54 Fixed requests. 2016-03-11 14:07:03 +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
Teejoon 0382708b85 Fixed so that we could use DTX5nm as normal map 2016-03-10 19:57:01 +01:00
Teejoon d8f9f15d34 Merge branch 'master' into DDS 
Conflicts:
	assets
	src/Engine/Rendering/Texture.cpp
	src/Engine/Rendering/Util/CommonFunctions.cpp
	src/Game/Game.cpp
 2016-03-10 19:55:25 +01:00
viktorljung b3ea26779a Added Unpickable component, which skips the entity in the PickingPass 2016-03-10 16:29:13 +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
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
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