Commit graph

3000 commits

Author SHA1 Message Date
Azaezel
f9bf4fca4b new method: TSShapeInstance::resetMaterialList(). Sets all object-instance mapto values back to initial state. reskin now does so to avoid having to track origional values independently. (so say, if you've already got skin1 plugged in to one, and nothing in to another, no need to set skin1=skin2 on the first and skin2 or base=skin2 on the second to swap both on over to skin2).
also by request, went ahead and killed case sensitivity for mapto string replacement when reskinning.
2017-11-12 23:58:34 -06:00
Azaezel
9e435a3f34 allows arbitrary material name string replacement, rather than forcing folks to start with base. ie: an entry of skin = "blue; area=fire"; would replace base_area_grid with blue_fire_grid as the used material 2017-10-24 19:15:54 -05:00
Areloch
6479c7592a Merge pull request #2088 from Areloch/EditorTool
Initial implementation of the EditorTool class and world editor hook-in.
2017-10-11 12:00:21 -05:00
Areloch
e023cf3a60 Merge pull request #2056 from Bloodknight/afx_merge_main
Afx merge main
2017-10-11 08:47:47 -05:00
Areloch
f9b7f66571 Merge pull request #2089 from Areloch/VariableInspectorRefactor
Updates the VariableInspector, VariableGroup and VariableField objects
2017-09-27 15:31:26 -05:00
Areloch
73ad69c2f3 Merge pull request #2091 from Areloch/DragNDrop
Enables SDL's ability to drag and drop files onto the game window
2017-09-27 14:01:48 -05:00
Areloch
71d31c57fd Enables SDL's ability to drag and drop files onto the game window and have it call back into script for handling. 2017-09-23 15:43:09 -05:00
Areloch
217df073b4 Merge pull request #2057 from OTHGMars/GFXFormatStrs
Adds missing GFX Texture format strings
2017-09-21 16:56:15 -05:00
Areloch
451b46eeb3 Merge pull request #2087 from Areloch/GridSnapDefaultSizeFix
Sets the default grid snap size to 1 rather than 10.
2017-09-21 02:56:22 -05:00
Areloch
629a25185d Updates the VariableInspector, VariableGroup and VariableField objects to actually be useful. In addition to the original functionality of being able to have a var name passed in and search for all vars with that in it, it also lets you build out a completely custom Inspector.
Unlike the regular Inspector, which requires a specific object or objects, from which the fields are pulled from, this lets you manually create fields, which can tie into any given object and their fields, global vars, and also not only supports the engine types for fields, but also triggers a callback to script if a field type is not found allowing fully custom fields to be handled as needed.
2017-09-21 02:49:36 -05:00
Areloch
bc898e1150 Initial implementation of the EditorTool class and world editor hook-in. 2017-09-21 00:10:44 -05:00
Areloch
f8702b717b Sets the default grid snap size to 1 rather than 10. 1 Seems like a more neutral default value, and also makes it match the displayed '1' in the UI interface as the default as well. 2017-09-17 18:24:44 -05:00
Areloch
6db2f2f5bf Merge pull request #2083 from Azaezel/loopyLODs
Sanity check to ensure detail levels shift in tandem for skinned meshes
2017-09-17 04:52:14 -05:00
Areloch
cd2b97819d Merge pull request #2080 from Areloch/ShaderCommonPathOrderFix
Fixes smCommonShaderPath init order
2017-09-17 04:20:29 -05:00
Areloch
84ec076f97 Merge pull request #2086 from Azaezel/ProfileProblemPing
textureProfile conflict reporting
2017-09-14 22:19:01 -05:00
Azaezel
f70e11c7d7 from@rextimmy: reports the same texture used with 2 conflicting textureProfiles (flipping back and forth causes duplicates) 2017-09-14 13:28:13 -05:00
Azaezel
debfd9b780 Sanity check to ensure detail levels shift in tandem for skinned meshes 2017-09-13 14:58:54 -05:00
Areloch
c57e4f14d2 Merge pull request #2078 from rextimmy/zbias_fixes
Corrects OpenGL projection matrix
2017-09-12 22:49:12 -05:00
Areloch
5220032bd4 Moves the initialization of the shader common path const var so it is set before we do an initial setup of some shadergen fields. 2017-09-11 23:48:49 -05:00
Areloch
df619808cd Merge pull request #2075 from rextimmy/sqlite_fixes
sqlite fixes
2017-09-10 03:43:38 -05:00
rextimmy
bdfe44cc93 Disable sqlite support by default 2017-09-10 09:56:09 +10:00
rextimmy
d7c7847274 Mac compile fix for SQLiteObject 2017-09-10 09:52:25 +10:00
Areloch
ba90126867 Merge pull request #2077 from John3/brokenDocLink
update broken documentation link
2017-09-07 00:54:38 -05:00
Johxz
f738ff461b update documentation link 2017-09-02 08:06:10 -05:00
rextimmy
79118ee00f sqlite fixes 2017-08-31 21:07:23 +10:00
rextimmy
54970b0ad6 Corrects OpenGL projection matrix
Corrects OpenGL glPolygonOffset values
Corrects Direct3D11 DepthBias values
2017-08-25 13:13:47 +10:00
Areloch
ad612e218b Merge pull request #2060 from Bloodknight/add_sqlite
SQLite Integration
2017-08-24 21:58:54 -05:00
Areloch
278debc719 Merge pull request #2068 from John3/navPath
add navPath from inside of WEditor
2017-08-24 21:54:15 -05:00
Areloch
afdf86f220 Merge pull request #2070 from Azaezel/OVRoops
fix for overdark VR scene rendering
2017-08-24 00:06:35 -05:00
Areloch
09fe097258 Merge pull request #2074 from OTHGMars/ovr_srgb_no_dx9
from @Azaezel: fixes flaws found with openvr in production
2017-08-24 00:02:36 -05:00
OTHGMars
b5cc06cc8b Fixed ovr compiling with srgb and DX9 removed. 2017-08-20 06:06:40 -04:00
Areloch
7dbae1911b Merge pull request #2072 from Areloch/VS2017_153_offsetof_patch
Hotfix to make VS2017 15.3 play nice.
2017-08-19 00:09:07 -05:00
Areloch
29edbd0cd2 Hotfix to make VS2017 15.3 play nice. Offsetof behavior - specifically buildin - is unreliable(and broken in debug), so explicitly defining it to use a reliable method for now. 2017-08-18 23:28:25 -05:00
Azaezel
0c35874068 fix for overdark VR scene rendering 2017-08-18 15:42:30 -05:00
Johxz
d1d75ebff7 add nav path from inside of editor 2017-08-15 22:41:36 -05:00
Areloch
21552a06dd Merge pull request #2067 from rextimmy/vs2017_3_fix
Support for VS 15.3 update
2017-08-15 08:32:22 -05:00
rextimmy
d617a1f748 Support for VS 15.3 update 2017-08-15 21:39:22 +10:00
Areloch
da1ac47a93 Merge pull request #2065 from rextimmy/d3d11_crash_fix
Fix potential crash with D3D11
2017-08-14 02:04:10 -05:00
Areloch
04c6307f7a Merge pull request #2066 from rextimmy/color_fix
ColorI::fromLinear fix
2017-08-14 01:57:34 -05:00
rextimmy
1f477914aa ColorI::fromLinear fix 2017-08-13 19:39:44 +10:00
rextimmy
5f69ab1264 Fix potential crash with D3D11 2017-08-12 19:24:09 +10:00
Marc Chapman
ab27ccbc3e Removal of extraneous code 2017-08-11 22:27:18 +01:00
Areloch
f813f16e48 Merge pull request #2062 from Bloodknight/xorswap
OPCODE lib - rewrite swap, add xorswap
2017-08-10 19:48:52 -05:00
Marc Chapman
4d22ff5894 change int to udword 2017-08-10 18:00:13 +01:00
Areloch
f0479d6828 Merge pull request #2063 from Azaezel/DirectXSoundSurpress
adress #1329 -flips off direc6tx sound by default
2017-08-09 22:53:20 -05:00
Azaezel
5b7e973ad5 adress #1329 -flips off direc6tx sound by default 2017-08-09 02:53:27 -05:00
Areloch
88a94342f8 Merge pull request #2051 from lukaspj/correct-terrain-colors-linear
Fix for terrain detail color blending post-linearization
2017-08-08 23:35:24 -05:00
Marc Chapman
04299c972f rewrite swap, add xorswap 2017-08-08 01:39:01 +01:00
Areloch
18c60df4b2 Merge pull request #2055 from Areloch/CommonShaderPath_Improvement
Reworks the $Core::commonShaderPath variable usage
2017-08-04 00:58:34 -05:00
Areloch
8a0074eb1d Merge pull request #2041 from Azaezel/clearTextureStateImmediate
method to make sure we're not getting pixel shader inputs mixed with …
2017-08-04 00:58:13 -05:00