Marc Zinnschlag
|
54f56b0515
|
Merge remote-tracking branch 'graffy76/usersettings'
Conflicts:
apps/opencs/view/doc/view.cpp
apps/opencs/view/doc/view.hpp
|
12 years ago |
scrawl
|
0c4a963132
|
Container UI rewrite
|
12 years ago |
|
scrawl
|
90b7df439f
|
Fix image buttons
|
12 years ago |
graffy76
|
f6203cac2a
|
update for master
|
12 years ago |
|
scrawl
|
8845c0cee1
|
Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.
|
12 years ago |
|
scrawl
|
f1413ca56b
|
Synced font code ranges.
|
12 years ago |
|
scrawl
|
ef9f0b2fc0
|
Fix size of quest index
|
12 years ago |
|
scrawl
|
78e6dab9d2
|
Dialogue history rewrite WIP
|
12 years ago |
|
scrawl
|
03f4e91ceb
|
Unrelated shadows fix
|
12 years ago |
|
scrawl
|
1f58edb9db
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
|
12 years ago |
Glorf
|
f1a659e2ac
|
Bugfix #730
|
12 years ago |
|
scrawl
|
2a42556aa5
|
Merge branch 'master' into HEAD
|
12 years ago |
Nathan Jeffords
|
718af692c9
|
reworked journal to match bethesda's implemenation
|
12 years ago |
|
Nathan Jeffords
|
85595245ab
|
Updated journal layout to match Bethesda's version more closely
|
12 years ago |
Emanuel Guevel
|
c0102954f1
|
Add non-breaking space to font code range
|
12 years ago |
|
scrawl
|
23b477a938
|
Fix normal maps with spaces in filename not getting loaded
|
12 years ago |
|
scrawl
|
2c70074dd7
|
Fix combinedAlpha
|
12 years ago |
Chris Robinson
|
9d29921913
|
Merge remote-tracking branch 'zini/master' into nifogre
|
12 years ago |
|
scrawl
|
0e7d555cdf
|
Terrain material now uses multiple passes if required, which means it can support an arbitrary number of layers. Also re-enables PSSM.
|
12 years ago |
|
Chris Robinson
|
01a1a0b846
|
Merge remote-tracking branch 'zini/master' into nifogre
Conflicts:
components/nifogre/ogrenifloader.cpp
|
12 years ago |
|
scrawl
|
343e2027af
|
Support NIF detail maps
|
12 years ago |
|
Chris Robinson
|
3768e04a0c
|
Merge remote-tracking branch 'zini/master' into nifogre
|
12 years ago |
|
Chris Robinson
|
88c81bfb24
|
Apply polygon_mode to objects
|
12 years ago |
|
scrawl
|
4daaa4030d
|
Added shader based MyGUI render manager to allow using Ogre's next generation render systems.
|
12 years ago |
|
Chris Robinson
|
e50b6b1cfe
|
Apply texture matrix 0 in the object shader
|
12 years ago |
|
scrawl
|
75b462b974
|
If alpha rejection was forced, we also need to force depth_write and depth_check
|
12 years ago |
|
Marc Zinnschlag
|
8dd7f0c53a
|
Merge remote-tracking branch 'scrawl/normalmap'
|
12 years ago |
|
scrawl
|
a9b56eedc3
|
Support NIF "glow maps", which are basically an emissive channel.
|
12 years ago |
|
Glorf
|
ae3e4ecf8b
|
Finished enchanting
|
12 years ago |
|
scrawl
|
5625d73d84
|
Bump texture support
|
12 years ago |
|
scrawl
|
857f2b33db
|
Fix companion layout align
|
12 years ago |
|
scrawl
|
bc6e1fd981
|
Add missing files
|
12 years ago |
|
scrawl
|
b0199c703c
|
Companion UI
|
12 years ago |
|
scrawl
|
a031c77619
|
Improved enchanting layout
|
12 years ago |
|
Marc Zinnschlag
|
a359ba6a2f
|
Merge remote-tracking branch 'scrawl/graphics'
|
12 years ago |
vorenon
|
a49e524541
|
Reduced width of textboxes in race menu
The width of the text box was too large and MyGui didn't align the texts properly. Fixed with the help of the MyGui layout editor.
|
12 years ago |
|
vorenon
|
f93cefa201
|
Changed Y position of the textboxes
|
12 years ago |
|
vorenon
|
35a6ca010a
|
Adjusted textbox height in race menu
|
12 years ago |
|
scrawl
|
a39c129954
|
Clamp individual light attenuation at 1
|
12 years ago |
|
scrawl
|
7ad1e962e0
|
Merge branch 'master' into graphics
|
12 years ago |
|
Marc Zinnschlag
|
573368849b
|
Merge remote-tracking branch 'glorf/enchanting'
Conflicts:
apps/openmw/CMakeLists.txt
|
12 years ago |
|
scrawl
|
7beda509fe
|
Lighting should be done in view space instead of object space, so that attenuation also works correctly for scaled objects
|
12 years ago |
|
scrawl
|
a2ca679beb
|
Added PC repair feature
|
12 years ago |
|
scrawl
|
20774f8f81
|
Added merchant repair feature
|
12 years ago |
|
scrawl
|
11aed7474e
|
Shadow cast on water
|
12 years ago |
|
scrawl
|
4cbb202306
|
Several tooltip fixes
|
12 years ago |
|
scrawl
|
6c1ff8caca
|
Merge branch 'master' into next
Conflicts:
apps/openmw/mwworld/weather.cpp
components/fileorderlist/model/datafilesmodel.cpp
|
12 years ago |
|
scrawl
|
1666bc7740
|
Armor rating
|
12 years ago |
|
scrawl
|
c0b0227e8a
|
enchanting
|
12 years ago |
|
scrawl
|
83932ebfe8
|
HLSL shader fix
|
12 years ago |