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

920 Commits

Author SHA1 Message Date
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
viktorljung 89bc063ef0 Merge remote-tracking branch 'origin/Importer' into Animations 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
 2016-02-02 15:01:34 +01:00
stiffly 88ad127d8d plays notification on captured/lost point 2016-02-02 14:57:03 +01:00
viktorljung dba2fbdc0c WIP 2016-02-02 14:52:31 +01:00
antc13 e8186a7062 Changed the way we're exporting animations. 2016-02-02 14:47:22 +01:00
stiffly d763789490 Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	src/Engine/Sound/SoundSystem.cpp
 2016-02-02 13:38:49 +01:00
Jocke 6a3f585fb9 Fixed warnings associated with Network.cpp, Client.cpp, Server.cpp and Packet.cpp. 
BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT': macro redefinition was fixed by https://svn.boost.org/trac/boost/ticket/11539
 2016-02-02 13:26:15 +01:00
stiffly cb0feb0b84 Tested hurt event. Randomizes between several different ones. 2016-02-02 13:25:25 +01:00
Tleety 7b4826cb44 Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 2016-02-02 13:24:31 +01:00
Jace 0e5f6da9a9 Merge pull request #73 from teamfisk/CapturePointFixBranch 
Several changes/fixes based on the latest broken refactoring in master
 2016-02-02 13:22:03 +01:00
verysecrethero 42b52a6766 Several changes/fixes based on the latest broken refactoring. 
Fixed Simon's mistake in CapturePointLogic. William fixed so TriggerSystem works again with CapturePoints.
 2016-02-02 11:37:22 +01:00
William Moberg 796e3eac79 Merge branch 'master' into BoxModelCollision 2016-02-02 10:16:48 +01:00
Tleety 8299b99e2f Test world changes and some other small fixes 2016-02-01 19:08:46 +01:00
Tleety c708f1582c Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 2016-02-01 18:30:30 +01:00
Tleety 782c1a388a Comment 2016-02-01 18:23:40 +01:00
Tleety a188a3f7fa Removed widget pointlight since it is now redundant 2016-02-01 18:22:36 +01:00
Tleety ed7d00c1d8 Bug where widgets did not get their ambient light now fixed. 2016-02-01 18:19:38 +01:00
William Moberg 30b1dab764 More efficient collision resolution case + comments. 2016-02-01 18:06:28 +01:00
Jace 9090be8acf Merge branch 'Warnings-Simon' 2016-02-01 17:53:55 +01:00
Jace a3d4eb65d5 Fixes #66 warnings 2016-02-01 17:53:01 +01:00
stiffly 5474a18753 #68 Fixed warning in SoundSystem.cpp 2016-02-01 17:15:51 +01:00