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

1240 Commits

Author SHA1 Message Date
Ayumiwii 6542d1b444 Shadow WIP 
- DepthTexture working
 2016-02-05 17:29:53 +01:00
stiffly 454eef8225 WIP. Improving player walk logic. 2016-02-05 17:21:48 +01:00
viktorljung 8034b42c87 spriteComponent WIP 2016-02-05 16:43:57 +01:00
stiffly fbdaf92953 Started refactoring. Put player walk logic in a designated sound system. 2016-02-05 16:39:23 +01:00
Ayumiwii bbf6058c17 Shadow WIP 
- fixed file placing of ShadowPass.cpp
 2016-02-05 16:13:46 +01:00
Ayumiwii 7f1016476b Shadows WIP 
- create 2D texture (depthmap)
 2016-02-05 15:08:56 +01:00
William Moberg e3a44d37d2 Merge branch 'master' into BoxModelCollision 
# Conflicts:
#	src/Game/Systems/PlayerMovementSystem.cpp
 2016-02-05 14:59:14 +01:00
William Moberg 428dca003d Tiny bug fix. 2016-02-05 14:40:50 +01:00
William Moberg 4fe9e4f1c3 Debug cleanup and some bug fixes. 2016-02-05 14:38:08 +01:00
stiffly e90f802d48 Merge remote-tracking branch 'origin/master' into Sound 2016-02-05 13:59:21 +01:00
Teejoon ceab837e27 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer 
Conflicts:
	include/Engine/Rendering/RawModelCustom.h
	src/Engine/Rendering/RawModelCustom.cpp
	src/Engine/Rendering/Skeleton.cpp
 2016-02-05 13:59:01 +01:00
Teejoon d1a309be10 Now supports reading of 3 different types of materials 2016-02-05 13:51:47 +01:00
William Moberg d61e605093 Can walk up "stair-steps". Cleanup WIP. 
Better performance in RectanglevsTriangle check.
Added IsOnGround flag and VerticalStepHeight in Physics.
Lotsa commented code saved for historical reasons, remove later.
 2016-02-05 10:56:34 +01:00
stiffly 71a86cab11 removed event that's not being used 2016-02-05 10:07:56 +01:00
viktorljung b6e0332574 Fixed support for new animation structure, not done yet 2016-02-05 10:07:22 +01:00
Tleety c526a7af55 WIP stencil stuff 2016-02-04 17:58:36 +01:00
Jocke 9232b24a7b WIP Reliable message 2016-02-04 15:49:04 +01:00
Teejoon c272857819 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 
Conflicts:
	src/Engine/Rendering/RawModelCustom.cpp
	tools/MayaExporter/MayaExporter/Skeleton.cpp
 2016-02-04 15:05:00 +01:00
Teejoon 336b058c9f WIP, commit to be able to pull stuff down 2016-02-04 14:58:46 +01:00
Tleety 7c582898f4 Working stencil buffer for the shield. 2016-02-04 14:33:39 +01:00
Jace 3a2b124cae Replication flag in component definition. Component definitions should now inherit from Types/Component.xsd 2016-02-04 13:36:12 +01:00
viktorljung 571c41589a Merge remote-tracking branch 'origin/Importer' into Animations 2016-02-04 11:54:20 +01:00
viktorljung 35376178b1 WIP 2016-02-04 11:54:13 +01:00
Jace 6990e473b3 Adding a clear here makes AMD drivers NOT crash for some reason. We're fixing the symptom but not the underlying cause. 2016-02-04 11:53:35 +01:00
antc13 84499665d0 Changed vertices to skinnedVertices in RawModelCustom.cpp 2016-02-04 11:53:17 +01:00
viktorljung 2733efdc0d Merge remote-tracking branch 'origin/Importer' into Animations 
# Conflicts:
#	include/Engine/Rendering/Skeleton.h
#	src/Engine/Rendering/RawModelCustom.cpp
#	src/Engine/Rendering/Skeleton.cpp
 2016-02-04 11:32:44 +01:00
antc13 356cf72b0f Changed the structure of the Animation Data in both Exporter & Importer. 2016-02-04 11:25:31 +01:00
viktorljung 6aec7555cc WIP Waiting for importer 2016-02-04 11:13:33 +01:00
Tleety 379d211832 some fixes with the stencil states and implemented stencil func/stencilop/stencilmask to renderstate 2016-02-04 11:13:26 +01:00
stiffly 0a8ee1623f Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	assets
 2016-02-04 10:47:30 +01:00
Tleety bc01e147c2 Some state stuff, some draw stuff, some QA map stuff 2016-02-03 18:09:44 +01:00
stiffly 2e3e59a1e2 Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	resources/Schema/Entities/Player.xml
 2016-02-03 16:52:33 +01:00
Jace bd2da7bc9f Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping"" 
This reverts commit b56824786c.
 2016-02-03 16:30:00 +01:00
Jace b56824786c Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping" 
This reverts commit 192de80782, reversing
changes made to 24aac6a00d.
 2016-02-03 16:16:06 +01:00
stiffly c2833b10c4 Hard coded (read retarded) improvements added to player walk logic 2016-02-03 15:55:32 +01:00
stiffly 938caa6ba2 Now uses OnComponentAttached event. Can now queue sound on a source. 2016-02-03 15:48:25 +01:00
Tleety 5665c0f298 Models with Shield and shielded component now added to queues 2016-02-03 14:20:47 +01:00
Tleety 7ffbd8455f Added Queues for the models with shield and shielded components. 2016-02-03 13:53:57 +01:00
Jace 2cbeef4c69 Merge pull request #74 from teamfisk/Warnings-Jocke 
Fixed warnings associated with Network
 2016-02-03 10:37:10 +01:00
Jocke 7bf4f5c30e Merge remote-tracking branch 'origin/master' into TCPConnections 2016-02-03 10:29:36 +01:00
Jocke e133791369 WIP Reliable Message 2016-02-03 10:28:15 +01:00
stiffly a64d227cab Assured the volume channels were working. Playing around with drumloop 2016-02-03 10:17:53 +01:00
Tleety 73716c28e2 pickpass fix 2016-02-02 17:40:22 +01:00
Tleety a3b7bd7df5 Fix in picking pass, QA map fix. Blue and red ray change. Player weapon change. 2016-02-02 17:39:57 +01:00
William Moberg 214dad2afc Removed commented code. 2016-02-02 17:25:59 +01:00
William Moberg affcc5305b Collision affects velocity correctly, no wierd ice cream sliding along walls. 2016-02-02 17:19:59 +01:00
Teejoon 4357759715 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-02 17:18:54 +01:00
Teejoon bb4a65a1db Non-skined mesh WIP 2016-02-02 17:18:42 +01:00
Tleety 55854f5c0d Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 2016-02-02 16:30:57 +01:00
Tleety b131f56f5e Made a quality assurance world that will need to be used before creating a pull request 2016-02-02 16:06:42 +01:00