Marc Zinnschlag
e7e8bd655f
Merge remote-tracking branch 'scrawl/graphics'
2013-03-05 17:44:28 +01:00
greye
9133182f2f
restore loading CELL records in esmtool
2013-03-05 20:25:20 +04:00
scrawl
7f8d659f3c
Fix transparency sorting
2013-03-05 17:09:20 +01:00
Marc Zinnschlag
d839a4c6c2
Merge remote-tracking branch 'scrawl/graphics'
2013-03-05 16:31:22 +01:00
scrawl
c9f7f1b994
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-03-05 14:37:38 +01:00
scrawl
ff30bef3b2
Mipmap fix
2013-03-05 14:27:05 +01:00
scrawl
fe7b2732d8
Avoid manually updating render targets from within frameRenderingQueued
2013-03-05 14:24:29 +01:00
scrawl
2486ec6cb9
Material fixes (vertex colors, alpha)
2013-03-05 13:51:48 +01:00
Marc Zinnschlag
46de45b9a2
added var type column to globals
2013-03-05 11:37:13 +01:00
Marc Zinnschlag
dc3edc6024
Merge branch 'vartype'
2013-03-05 10:59:08 +01:00
Marc Zinnschlag
1489570b09
change variant in info record to new type
2013-03-05 10:34:03 +01:00
Marc Zinnschlag
1b19ab6028
fixed gmst integers
2013-03-05 08:15:03 +01:00
Marc Zinnschlag
ba4907fbaf
use new Variant type for GMSTs
2013-03-05 08:02:27 +01:00
Marc Zinnschlag
ce49ad54a1
some cleanup and fixing
2013-03-05 08:02:05 +01:00
Marc Zinnschlag
8a887a0aef
Merge remote-tracking branch 'potatoesmaster/tradewindow'
2013-03-04 19:42:51 +01:00
Marc Zinnschlag
83865cb186
Merge remote-tracking branch 'chris/material-fix'
2013-03-04 19:40:22 +01:00
Marc Zinnschlag
ac810faa7e
Merge remote-tracking branch 'scrawl/master'
2013-03-04 19:36:58 +01:00
Chris Robinson
2f14f26b96
Use the full unique mesh name for the material instead of the NIF name
2013-03-04 10:35:13 -08:00
Marc Zinnschlag
a93034b0a9
Merge remote-tracking branch 'k1ll/store_segfault_fix'
2013-03-04 19:27:14 +01:00
Marc Zinnschlag
08a5541e4d
Merge remote-tracking branch 'scrawl/book_scroll_fix'
2013-03-04 19:26:00 +01:00
scrawl
9f0bd95ef1
Added BM trees to transparency overrides
2013-03-04 17:57:35 +01:00
scrawl
d5c6c221c1
Books/scrolls: Fix the take button incorrectly showing
2013-03-04 17:28:01 +01:00
scrawl
ca707aa65f
Transparency should be evaluated per subentity, not per NIF
2013-03-04 16:57:00 +01:00
scrawl
cab5315a8e
Disable mipmaps generation
2013-03-04 16:28:20 +01:00
Marc Zinnschlag
a1ac20c6f3
changed global variable records to new variant type
2013-03-04 14:32:59 +01:00
Marc Zinnschlag
65081f5520
added variant class
2013-03-04 14:32:23 +01:00
Emanuel Guevel
215d45aaf7
Make trade window's "max sale" button clickable
...
The HBox widget above it was stealing the input events.
2013-03-04 12:24:42 +01:00
Emanuel Guevel
8e07638699
Update the trading offer on "max sale" button click
2013-03-04 12:24:41 +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