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
gus
5951abfae2
fix some script instructions
2013-03-03 13:59:38 +00:00
scrawl
ac0a23a68d
Fix initialization problem
2013-03-03 14:53:47 +01:00
gus
7fb2ff18a3
Fix bug induced by previous commit (player orientation wasn't stored correctly), and fix NPC not beeing able to move with certain angles (like angle Z 70) because the trace function was hitting NPC own hitboxes. The solution prposed here is a little hacky, but i works. Need a little clean up(mBody shouldn't be public)
2013-03-03 13:06:45 +00:00
gus
e1882dce32
correcting a bug: player orientation wasn't stored correctly, and objects orientation wasn't properly retrived.
2013-03-03 13:02:41 +00: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
graffy76
eb90bd71ba
Fixed triggering confirmation messages boxes when more than one view is
...
open.
2013-03-02 21:34:55 -06: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
Pieter van der Kloet
0a6e3701ab
Made the Play page use a .ui file too
2013-03-03 01:49:41 +01:00
Chris Robinson
03785f3ecd
Handle NiVertexColorProperty
2013-03-02 16:28:32 -08:00
Pieter van der Kloet
f2193bb1ba
Made the mainwindow use a .ui file and removed the stylesheet
2013-03-03 00:48:09 +01:00
Pieter van der Kloet
2b6bb9657b
Added Qt Designer .ui files
2013-03-02 23:49:31 +01:00
Pieter van der Kloet
a3c5c868ec
Merge remote-tracking branch 'upstream/master' into launcherui
2013-03-02 23:01:53 +01:00
Nathan Jeffords
109dff2d29
renamed high level NIF files...
2013-03-02 13:23:09 -08:00
k1ll
dde43e8c87
Some cleanup
2013-03-02 21:46:31 +01:00
Chris Robinson
fdfcd5bb47
Material properties are accumulative along the node tree
2013-03-02 12:23:29 -08:00
graffy76
bf6c855e6d
Final changes to implement save-on-close features
2013-03-02 12:49:26 -06: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
k1ll
9acd4061cc
Fix dangling static references in mShared
2013-03-02 17:04:17 +01:00
graffy76
9193ddc9d3
Merge branch 'master' into saveOnClose
2013-03-02 09:24:42 -06:00
graffy76
a2e36594c9
Completed "abort save on close" feature
2013-03-02 09:22:44 -06:00
graffy76
f85be6a744
80% complete save-on-close feature
2013-03-02 07:57:41 -06: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
