1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 05:19:55 +00:00
Commit graph

5765 commits

Author SHA1 Message Date
scrawl
9f0bd95ef1 Added BM trees to transparency overrides 2013-03-04 17:57:35 +01:00
Chris Robinson
4e1e0eaf62 Merge remote-tracking branch 'zini/master' into material-fix
Conflicts:
	components/nifogre/ogrenifloader.cpp
2013-03-03 14:24:05 -08:00
Chris Robinson
5e50436a94 Convert some BooleanValues to StringValues 2013-03-03 14:19:02 -08:00
scrawl
f1d35b73b8 Cleanup 2013-03-03 19:52:20 +01:00
scrawl
359ae06fcf Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 19:35:26 +01:00
scrawl
c9fefc7f5d Simpler, more lightweight underwater effect, changed colors to match vanilla better 2013-03-03 19:28:11 +01:00
Marc Zinnschlag
123a111580 Merge remote-tracking branch 'scrawl/master' 2013-03-03 17:13:05 +01:00
scrawl
f0e3463e9b Disable assertion for comparing iterators from different containers (Bug #605) 2013-03-03 16:50:10 +01:00
scrawl
5341bf9504 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 15:51:58 +01:00
Marc Zinnschlag
3e97943e06 Merge remote-tracking branch 'scrawl/includes' 2013-03-03 15:37:13 +01:00
Marc Zinnschlag
5595675664 Merge remote-tracking branch 'scrawl/effects' 2013-03-03 15:33:23 +01:00
scrawl
05bd94effb Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 15:14:20 +01:00
scrawl
002830e13b Make sure render textures are inactive when in a cell without water 2013-03-03 15:11:45 +01:00
scrawl
867b22ce19 Fix a terrain glitch 2013-03-03 15:11:19 +01:00
scrawl
11f21a1988 Weather update should be before renderer update 2013-03-03 15:10:40 +01:00
scrawl
ac0a23a68d Fix initialization problem 2013-03-03 14:53:47 +01:00
scrawl
9a84f6744f Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr) 2013-03-03 13:11:02 +01:00
scrawl
6037c44ea6 Fix ingredient effect display 2013-03-03 12:41:57 +01:00
scrawl
6f05c4229f Implemented potion & ingredient effect stacking 2013-03-03 12:41:37 +01:00
scrawl
8e05c4159d Magic effect icons for permanent enchantments 2013-03-03 12:17:37 +01:00
scrawl
cf87708c1f Magic effect icons for spells 2013-03-03 12:01:19 +01:00
scrawl
0f6fd80294 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwrender/npcanimation.cpp
	files/mygui/openmw_settings_window.layout
2013-03-03 11:02:38 +01:00
Chris Robinson
21e2c287eb Fix/workaround specular issues
The glossiness should not be multiplied by 255, however the values set in many
of Bloodmoon's meshes would look horrible otherwise. Now we can let the
NiSpecularProperty specify when to enable specular (which is supposed to
default to on, but due to the aforementioned meshes, we default to off).
2013-03-02 19:30:23 -08:00
Chris Robinson
7930aa82b2 Add missing depthFlags to the hash 2013-03-02 19:09:15 -08:00
Chris Robinson
8e35159ad4 Handle NiSpecularProperty 2013-03-02 19:06:28 -08:00
Chris Robinson
8c0326a49c Handle NiZBufferProperty 2013-03-02 18:30:28 -08:00
Chris Robinson
03785f3ecd Handle NiVertexColorProperty 2013-03-02 16:28:32 -08:00
Nathan Jeffords
109dff2d29 renamed high level NIF files... 2013-03-02 13:23:09 -08:00
Chris Robinson
fdfcd5bb47 Material properties are accumulative along the node tree 2013-03-02 12:23:29 -08:00
Nathan Jeffords
d3c1f5e7b2 renamed low-level NIF related files and include guards to conform to naming convention 2013-03-02 10:46:12 -08:00
Nathan Jeffords
0ed2015319 refactored NIFFile parse to get better code/data seperation 2013-03-02 10:07:57 -08:00
Nathan Jeffords
6de6d9ff6e Factored a NIFStream class out of the NIFFile class.
Split NIFFile into two parts, NIFFile which is cached and is a container
for a parsed NIF, and NIFStream which is a class specialized for parsing
NIFs. This required a semi-sweeping change to make all record classes
accept a NIFStream instead of a NIFFile as an agurment to their read
functions.
2013-03-02 09:56:41 -08:00
scrawl
e1957e4ee9 Potion effects should be hidden until discovered 2013-03-02 13:34:26 +01:00
Marc Zinnschlag
326ebb5010 Merge remote-tracking branch 'chris/texture-fix' 2013-03-02 11:20:15 +01:00
Marc Zinnschlag
0f4f91605a some cleanup 2013-03-02 11:19:48 +01:00
Marc Zinnschlag
401903c9ce Merge remote-tracking branch 'lazydev/master' 2013-03-02 11:11:41 +01:00
Chris Robinson
e3fd4b8429 Fix restoring the original texture name when the DDS check fails 2013-03-01 17:57:34 -08:00
lazydev
ccb7ed93b3 fix for https://bugs.openmw.org/issues/593 2013-03-02 03:54:25 +04:00
Marc Zinnschlag
3961fb36d4 Merge remote-tracking branch 'chris/transparency-fixes' 2013-03-01 23:18:35 +01:00
Marc Zinnschlag
6dfcc6e60f Merge remote-tracking branch 'scrawl/cursor' 2013-03-01 23:11:40 +01:00
Chris Robinson
e6b547b9ba Merge remote-tracking branch 'zini/master' into transparency-fixes 2013-03-01 13:32:30 -08:00
scrawl
ef1678e47e Oops, rotation center should be dynamic 2013-03-01 22:32:02 +01:00
scrawl
9810eafe23 Removing now unused oengine/imagerotate 2013-03-01 22:27:53 +01:00
Chris Robinson
238a8feb18 Fix transparency checks 2013-03-01 13:27:25 -08:00
Chris Robinson
166d529c50 Ensure the material is properly built after creating it 2013-03-01 13:26:31 -08:00
scrawl
d8f2d0195a Got rid of the texture rotation hack by rendering the cursor manually. 2013-03-01 18:45:52 +01:00
Chris Robinson
4d76c60971 Merge remote-tracking branch 'zini/master' into nif-fixes 2013-02-28 17:18:05 -08:00
Chris Robinson
2c05a7477c Improve checks for texture resource names that include the "textures\" prefix 2013-02-28 17:16:28 -08:00
Marc Zinnschlag
6238c8d758 Merge remote-tracking branch 'chris/nif-fixes' 2013-02-28 23:34:11 +01:00
Marc Zinnschlag
0d74c8574d Merge remote-tracking branch 'scrawl/mapfixes' 2013-02-28 23:32:28 +01:00