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

1558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tleety 51e0b852d2 Adamfix 2016-02-11 15:43:41 +01:00
Tleety 7ccaf5b040 Removed commeted code 2016-02-11 15:42:27 +01:00
Tleety 66e20c3fd9 Merge remote-tracking branch 'origin/master' into Menu 2016-02-11 15:38:18 +01:00
Tleety 6ba1e95da7 Fixed depth sorting for HUD elements. 2016-02-11 15:27:07 +01:00
verysecrethero a8ab49f202 Merge remote-tracking branch 'origin/master' into DoubleJumpEffect 
# Conflicts:
#	include/Game/Systems/PlayerMovementSystem.h
 2016-02-11 15:19:01 +01:00
Adam Byléhn bef50ef96a Merge pull request #97 from teamfisk/Menu 
Menu
 2016-02-11 15:13:12 +01:00
Tleety 9f657ada4e merge fixes 2016-02-11 14:52:52 +01:00
Tleety f0ae365401 Merge remote-tracking branch 'origin/master' into Menu 
# Conflicts:
#	src/Engine/Rendering/Texture.cpp
#	src/Game/Game.cpp
 2016-02-11 14:43:30 +01:00
viktorljung 7d4a4ed7cf Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	src/Engine/Rendering/Skeleton.cpp
 2016-02-11 14:38:23 +01:00
Joachim Pettersson bbbab7b287 Merge pull request #96 from teamfisk/WeaponSystem 
Network improvements and base weapon work
 2016-02-11 14:26:17 +01:00
Jocke fa2e556ab2 fixed some error handling in TCPClient. 2016-02-11 14:07:51 +01:00
viktorljung 97de31be65 Fixed BoneAttachment component 2016-02-11 13:36:27 +01:00
Jace 95289f47d6 Merge branch 'master' into WeaponSystem 2016-02-11 12:58:09 +01:00
Jace ccf4cae74b Merge remote-tracking branch 'origin/Animations' 2016-02-11 12:54:42 +01:00
antc13 2f640d224c New Map with Meshes WIP 2016-02-11 12:23:20 +01:00
verysecrethero f11bd24d53 Added CapturePointMaxTimer in CapturePointComponent. Removed next-capturepoint Color. Modified captureTimer to +-captureTimeToTakeOver after a capture. 2016-02-11 11:46:34 +01:00
Jace 81943516a9 Protected inheritance, not even once. 2016-02-11 11:36:39 +01:00
Jace e350074cb5 Spawner now spawns with orientation 2016-02-11 11:36:15 +01:00
Tleety 350effd8eb New assets and some QA map stuff 2016-02-11 11:32:51 +01:00
viktorljung 607150189c Different animations can now be played on multiple meshes, AnimationOffset seems to make the lighting buggy 2016-02-11 10:51:11 +01:00
Teejoon ecc473d520 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-11 10:30:40 +01:00
Tleety 35e4935497 Some assets and HUD stuff 2016-02-11 10:01:11 +01:00
Jace 0394eacb6b Merge remote-tracking branch 'origin/Animations' into WeaponSystem 2016-02-11 00:18:36 +01:00
William Moberg 73f59b89cc Added method EntityFirstHitByRay, takes an Octree or a vector of sorted entities and outputs the frist entity hit by a ray. 2016-02-11 00:11:37 +01:00
Jace 9d9c6bdf1e Third person animations and shoot effects base work 2016-02-11 00:08:50 +01:00
antc13 92e7d3ecf7 Merge remote-tracking branch 'origin/master' into Importer 
# Conflicts:
#	assets
 2016-02-11 00:08:17 +01:00
antc13 4b8f4981a3 New Map with Meshes, WIP. 2016-02-11 00:05:27 +01:00
Tleety 447f41dbff HUD for capture points now update with Capture point data. 2016-02-10 23:59:13 +01:00
viktorljung 9c08c351b8 fixed reverse Animation looping 2016-02-10 23:33:23 +01:00
Jocke eb244f87c4 Added disconnect functionality and removed some warnings. 2016-02-10 23:27:46 +01:00
viktorljung dded296cde Animation looping fix 2016-02-10 23:19:44 +01:00
Viktor Ljung c3cc5ae70b Merge pull request #92 from teamfisk/Importer 
Importer
 2016-02-10 22:51:46 +01:00
Tleety 64a2354b24 WIP with CapturePointHUDSystem 2016-02-10 22:22:09 +01:00
Teejoon 675a80e905 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-10 22:18:42 +01:00
Teejoon f05d0a1b0c assets 2016-02-10 22:18:27 +01:00
Jocke ec54b1298d Reconnect is now possible. 2016-02-10 21:02:46 +01:00
Tleety f5de267f25 Merge fixes and CapturePointHUD component skeleton added. 2016-02-10 20:58:10 +01:00
Jace 6396925b68 Merge remote-tracking branch 'origin/Animations' into WeaponSystem 2016-02-10 20:47:33 +01:00
verysecrethero a53ab7f745 A few fixes for DashAbility. Default DoubleTapToDash is now set to false. 2016-02-10 20:46:16 +01:00
viktorljung 224e95f34a Fixed BoneAttachment component and optimized animation code a bit 2016-02-10 20:45:24 +01:00
Jocke 95fa1f4bbd Connect Fix for TCP Client 2016-02-10 20:10:20 +01:00
Tleety 2cae4e3fb2 Merge remote-tracking branch 'origin/master' into Menu 
# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	include/Engine/Rendering/RenderQueue.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/QualityAssurance.xml
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/Sprite.vert.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/Model.cpp
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp
 2016-02-10 19:52:42 +01:00
Jace 0825b10c75 Merge remote-tracking branch 'origin/master' into WeaponSystem 
# Conflicts:
#	src/Game/Systems/SoundSystem.cpp
 2016-02-10 19:24:35 +01:00
Jace ed06eacf6f Merge pull request #91 from teamfisk/Sound 
Sound fix
 2016-02-10 19:16:45 +01:00
Jace 3c3149b13e Merge pull request #90 from teamfisk/FrustumCulling 
Correct bounding box for explosion effects
 2016-02-10 19:16:36 +01:00
William Moberg 67cf008122 Bug fixing. 2016-02-10 18:03:58 +01:00
Tleety 53265bbc90 PNG is now a resource. 
You can now load textures threaded.
PNG will now throw exceptions when errors happend
SpriteComponent is now working without billboarding.
 2016-02-10 17:50:17 +01:00
Jocke 7cbdc33f84 Updated submodules 2016-02-10 17:39:23 +01:00
stiffly 8520192805 Merge remote-tracking branch 'origin/master' into Sound 2016-02-10 17:17:58 +01:00
stiffly 1ba9d97ab7 Fixed crash when trying to jump, when no player is spawned. 2016-02-10 17:17:41 +01:00