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

1655 Commits

Author SHA1 Message Date
Jace 0516794db6 Separating RawModel from Model 2016-03-13 14:47:11 +01:00
Jace 95f9065037 Merge branch 'master' into Dirtybit 
# Conflicts:
#	include/Engine/Sound/SoundManager.h
 2016-03-13 01:07:17 +01:00
Jace 993e56ec59 Disabled final model matrix caching for now, since it doesn't seem to work in all cases. (CP_Rocky2 pickup platforms and ceiling doens't get updated for some reason?!?) 2016-03-13 00:57:54 +01:00
Jace a1fda82d3a Turned the Transform namespace into TransformSystem so it would be able to subscribe to EntityDeleted and clean up after itself 2016-03-13 00:57:00 +01:00
Jace f6113b9d9c EEntityDeleted now provides an EntityWrapper instead of just an ID 2016-03-13 00:16:07 +01:00
Jace 7ea90bede7 Merge branch 'master' of github.com:teamfisk/TacticalZ 2016-03-12 23:49:44 +01:00
Jace 2bfbd72189 EntityWrapper::Clone should no longer cause freezes 2016-03-12 23:44:28 +01:00
Jace 1e7f6941ba Merge pull request #208 from teamfisk/Kill-streak-sounds 
Various sound improvements/additions
 2016-03-12 23:06:57 +01:00
William Moberg 91bad517d3 AbsolutePosition should be calculating correctly now, third time. 2016-03-12 19:59:37 +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
stiffly 8e9ddc7b9d playerJump is only done for local player. 2016-03-12 17:51:06 +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
stiffly cc10e5500b 2x jump now only plays for local player 2016-03-12 15:31:44 +01:00
Jace 068e151741 Merge pull request #173 from teamfisk/ExplosionEffectV2 
Explosion effect v2
 2016-03-12 15:25:12 +01:00
stiffly 9bac141a6b WIP fixing pull request 2016-03-12 15:14:36 +01:00
stiffly 9942747d41 WIP pull request fixes 2016-03-12 14:26:09 +01:00
Jace 24bb05ec67 Editor should now set dirty flag when component field changes 2016-03-12 05:17:56 +01:00
Jace df7b4faf24 Now caching resulting absolute model matrices as well 2016-03-12 04:10:14 +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 ee5c13d463 Merge branch 'Dirtybit-imon' into Dirtybit 
# Conflicts:
#	src/Engine/Core/Transform.cpp
 2016-03-12 01:32:09 +01:00
Jace 671079764e Merge branch 'Dirtybit' of github.com:teamfisk/TacticalZ into Dirtybit 2016-03-12 01:26:56 +01:00
Jace 80649ce51d Updated the ENTIRE CODEBASE TO MATCH 2016-03-12 00:38:33 +01:00
stiffly 28d576bfc0 Now the bgm should loop again. 2016-03-11 21:04:33 +01:00
stiffly 66d0f9fa47 Added menu music 2016-03-11 20:28:09 +01:00
Tleety dc09ba9158 Resolution should now use a dropdown 2016-03-11 20:02:25 +01:00
stiffly 157a54e845 Merge remote-tracking branch 'origin/master' into Kill-streak-sounds 2016-03-11 18:19:22 +01:00
Tleety 7759af2c5a Log remove 2016-03-11 15:52:47 +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
FakeShemp 4df936ca70 imon's fix to rule them all 
might have solved dt anormalities
 2016-03-11 14:57:02 +01:00
William Moberg f036817c0c Merge pull request #203 from teamfisk/SplitSnapshots 
Split snapshots
 2016-03-11 14:35:18 +01:00
William Moberg 8ebf818c19 Merge pull request #206 from teamfisk/CapturePointFixBranch 
CapturePointSystem now sets all children visible/not visible for each
 2016-03-11 14:26:45 +01:00
verysecrethero 0aedeb61b4 CapturePointSystem now sets all children visible/not visible for each red/blue/spectator 2016-03-11 14:15:46 +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 4937bee46a Unresolved externals shit 2016-03-11 13:38:48 +01:00
Tleety 8bd38bc465 Merge branch 'Menu' of github.com:teamfisk/TacticalZ into Menu 2016-03-11 13:00:43 +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 0fbc482f9c Changed getters to return reinterpret_casted data. 2016-03-11 12:22:55 +01:00
Jocke 2eb863757b renamed variabels 2016-03-11 11:55:16 +01:00
Teejoon cac0522ae7 Fixed glow on window resize 2016-03-11 11:41:02 +01:00
Teejoon e96ad44e44 BlurHUDPass now works correct when resizing window. 2016-03-11 11:23:23 +01:00
stiffly a3ab844cc4 Makes sure m_CurrentSelection is valid before using it. 2016-03-11 11:12:49 +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