343e2027af
Support NIF detail maps
12 years ago
3768e04a0c
Merge remote-tracking branch 'zini/master' into nifogre
12 years ago
88c81bfb24
Apply polygon_mode to objects
12 years ago
4daaa4030d
Added shader based MyGUI render manager to allow using Ogre's next generation render systems.
12 years ago
e50b6b1cfe
Apply texture matrix 0 in the object shader
12 years ago
75b462b974
If alpha rejection was forced, we also need to force depth_write and depth_check
12 years ago
01314b7c08
addin more nomadic icons
12 years ago
8dd7f0c53a
Merge remote-tracking branch 'scrawl/normalmap'
12 years ago
a9b56eedc3
Support NIF "glow maps", which are basically an emissive channel.
12 years ago
ae3e4ecf8b
Finished enchanting
12 years ago
5625d73d84
Bump texture support
12 years ago
857f2b33db
Fix companion layout align
12 years ago
bc6e1fd981
Add missing files
12 years ago
b0199c703c
Companion UI
12 years ago
49b5b90cd5
png icons from nomadic and my rastered icons in raster folder.
12 years ago
faf293bd6d
Removing old directory.
12 years ago
a031c77619
Improved enchanting layout
12 years ago
a359ba6a2f
Merge remote-tracking branch 'scrawl/graphics'
12 years ago
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
f93cefa201
Changed Y position of the textboxes
12 years ago
35a6ca010a
Adjusted textbox height in race menu
12 years ago
a39c129954
Clamp individual light attenuation at 1
12 years ago
7ad1e962e0
Merge branch 'master' into graphics
12 years ago
573368849b
Merge remote-tracking branch 'glorf/enchanting'
...
Conflicts:
apps/openmw/CMakeLists.txt
12 years ago
623f9c2a58
A new icon for misc iteams. I really hope that scales will do.
12 years ago
cf0c55b37f
New random-item. Looks a lot better.
12 years ago
37a1fb6b7c
Adding ingredient.svg icon. I need to work on random-item and scrap container icon.
12 years ago
b7f95cd271
Random item (dice). Container.svg needs to be scraped, I'm afraid.
12 years ago
3b5e202b13
Update the status icons. X as removed.svg and backgrounds for status icons stolen from oxygen emblems :P It gives clear look for it.
12 years ago
e97319c0bb
Drawer as container icon looks actually quite good IMHO.
12 years ago
cb58ee126e
Drawer as container icon. Look a little better the old crappy chest but changes are needed.
12 years ago
59233e54b2
changing potion.svg according to pvdk sugestions
12 years ago
43e863b020
Forgot to place the icons in the middle of the page.
12 years ago
001b56714a
Adding new status icons svg files. Qt svg does not allow blur to be used so I think that we should make png files of it but first information on the actual resolution needed is required...
12 years ago
7beda509fe
Lighting should be done in view space instead of object space, so that attenuation also works correctly for scaled objects
12 years ago
a2ca679beb
Added PC repair feature
12 years ago
df8600e636
New anvil icon (repair.svg), edited weapon.svg (added new gradient on dagger blade) and light source.svg (clear to see what happend). container icon is still work in progress.
12 years ago
20774f8f81
Added merchant repair feature
12 years ago
e46097cd2e
Icons. Currently activator, apparatus, book, container (work in progress), light source, potion, static, weapon.
12 years ago
11aed7474e
Shadow cast on water
12 years ago
4cbb202306
Several tooltip fixes
12 years ago
6c1ff8caca
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwworld/weather.cpp
components/fileorderlist/model/datafilesmodel.cpp
12 years ago
1666bc7740
Armor rating
12 years ago
c0b0227e8a
enchanting
12 years ago
83932ebfe8
HLSL shader fix
12 years ago
fdcbdbf35d
Rewrote layout tooltips to use the new box layout system, fixes word wrapping delay
12 years ago
30f3fbac3c
Fixed paths to OpenMW icons
12 years ago
4c588cbab6
Levelup dialog is now dynamic; added level descriptions
12 years ago
31ba332647
Moved Windows icon to files/launcher
12 years ago
75f86f3a85
Some changes to the stylesheet and other small GUI improvements
12 years ago
64c5af314d
Removed grayish pixel from the clear button, looks weird with dark colors
12 years ago
b4d408af5d
Added actions to datafiles.ui and implemented them in the launcher
12 years ago
5e13614e08
Improved appearance of combobox and when using dark color themes
12 years ago
391bad2ccb
put .desktop file in the right directory
12 years ago
2a9d15cd9f
Merge remote-tracking branch 'scrawl/master'
12 years ago
0ee0dbdb97
Added "dispose corpse" button, added stealing (all items visible and no penalty yet)
12 years ago
9145fb210b
Merge remote-tracking branch 'upstream/master' into opencsui
12 years ago
7504ae675b
Implemented a file dialog for the editor using launcher .ui
12 years ago
7f8d659f3c
Fix transparency sorting
12 years ago
ff30bef3b2
Mipmap fix
12 years ago
2486ec6cb9
Material fixes (vertex colors, alpha)
12 years ago
8a887a0aef
Merge remote-tracking branch 'potatoesmaster/tradewindow'
12 years ago
ac810faa7e
Merge remote-tracking branch 'scrawl/master'
12 years ago
9f0bd95ef1
Added BM trees to transparency overrides
12 years ago
cab5315a8e
Disable mipmaps generation
12 years ago
215d45aaf7
Make trade window's "max sale" button clickable
...
The HBox widget above it was stealing the input events.
12 years ago
f1d35b73b8
Cleanup
12 years ago
c9fefc7f5d
Simpler, more lightweight underwater effect, changed colors to match vanilla better
12 years ago
5341bf9504
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
ac0a23a68d
Fix initialization problem
12 years ago
cf87708c1f
Magic effect icons for spells
12 years ago
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
12 years ago
f2193bb1ba
Made the mainwindow use a .ui file and removed the stylesheet
12 years ago
d8f2d0195a
Got rid of the texture rotation hack by rendering the cursor manually.
12 years ago
0b629791a8
reverting loading bar layout
12 years ago
f77ace0885
Removed the "hack" mygui.png and misc fixes for this.
12 years ago
bd597f07ab
Centered the loading text
12 years ago
8966e88050
Fix shadows
12 years ago
d4264353a3
Merge branch 'z-up' into graphics
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/water.cpp
files/materials/water.shader
12 years ago
284ba58e1e
Z-up conversion: global map, shader fix
12 years ago
2e7bc1a368
Z-up conversion: local map, fix tcg
12 years ago
3ef952172d
Z-up conversion: water, sky
12 years ago
8aff033a0c
Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog
12 years ago
a3afb91485
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
12 years ago
e32646ee50
Prettier repeated borders.
12 years ago
62c5568ed9
Fix for the loadingbar to resemble vanilla Morrowind.
12 years ago
0d6a3367d3
Water shader no longer depends on object shaders being enabled
12 years ago
7046e7ae3d
Water fog fix
12 years ago
01102f9c73
Don't emit if there wasn't enough movement
12 years ago
db9e49968e
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
12 years ago
5e1ec9e128
improved book window layout
12 years ago
3dc28baa28
Remove "PinToggle" event from layout file
12 years ago
2dea86bbc7
Make the "lock window" button appealing
12 years ago
3ba3c71556
Make the "lock window" button to change state visually
12 years ago
6cceb04adf
When a custom near clip plane is used, we need to fix up a second viewproj matrix manually to get proper depth values in the vertex shader. This fixes fog on reflections.
12 years ago
32b837ebd4
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
12 years ago
42883ec64b
cleanup
12 years ago
ceefae81e8
fix for the opencs icon
12 years ago
492e0f2ccf
Switched objects shaders to vertex lighting, to accomodate badly placed lights in morrowind.
...
Fixed a very obvious land <-> water seam.
12 years ago
499f3ac0d1
Slightly better ripple normal blending. Not physically accurate at all, but looks good.
12 years ago
3772cd9257
Refraction can be disabled separately now
12 years ago
0f37c24d5f
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
e949765922
cloud blending now as before (0 -> 0.25 -> 1)
12 years ago
bf037b7d29
Removed problematic ModVertexAlpha method, now done in shader
12 years ago
15e51b76de
Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth
12 years ago
a461b282c1
water ripples (experimental)
12 years ago
3ec703e6af
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
af9e126487
Add unicode number for ellipsis (…) to code range
12 years ago
aa514a53d9
Console font change to provide possibility to show cyrillic symbols
12 years ago
30136eb449
Update settings UI
12 years ago
55769aaf91
Fix selection buffer (i.e. item selection on the inventory character preview) when object shaders were disabled
12 years ago
35015ef110
Change default settings to use no object shaders and per vertex lighting, as some lights in MW look clearly broken with per pixel lighting enabled (e.g. fireplace in census office, ghostfence)
12 years ago
bd8d793fec
Removing gamma correction due to caused inconsistencies.
12 years ago
111e38ef25
Revert "fog now distance based instead of depth"
...
This reverts commit 7ee038fdd7
12 years ago
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
12 years ago
1718d735b5
Fix menu/journal/book/scroll buttons when using localised MW-installations
...
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
12 years ago
a6c3e06e54
fixed fog in some cells
12 years ago
5f676f9c6b
Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwscript/miscextensions.cpp
12 years ago
44010974fc
workaround for HLSL error X4579
12 years ago
c4facc233e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
12 years ago
11a8d5d70a
Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap
12 years ago
7c22690116
Merge branch 'next' into globalmap
12 years ago
5fdc7ad809
forgot to add file
12 years ago
ace9ee9c83
persuasion dialog
12 years ago
38828acac9
transparent overlay
12 years ago
648b53ef93
removed unused launcher.cfg file
12 years ago
234716daa6
finished spell creation
12 years ago
9f821e5df2
fix shaders
12 years ago
0a19b56031
fix gold label
12 years ago
e80394c0b5
fix training limit
12 years ago
c64eb96952
Merge branch 'Travel_Dialogue' into training_travel
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwrender/globalmap.cpp
files/mygui/CMakeLists.txt
12 years ago
1a2034b4dd
training window
12 years ago
5e9153e2b8
Issue #423 : Wrong usage of "Version"
...
Remove "Version" line from openmw.desktop file (according to
http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html
it's not required).
Fixes #423
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
12 years ago
f154031e54
last bits of the gui
12 years ago
1f4de03613
oooups
12 years ago
85d9357e3a
Travel GUI
12 years ago
025e820703
abstracted code and use it in enchanting window as well
12 years ago
1c0dd3ccc5
some editing code
12 years ago
7ee038fdd7
fog now distance based instead of depth
12 years ago
636f297f10
enchant
12 years ago
ac0c1ea986
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
...
Conflicts:
apps/openmw/mwgui/dialogue.cpp
12 years ago
73c69e8eda
video playback
12 years ago
d393f551ed
edit effect dialog
12 years ago
9d7c35ae48
and go
12 years ago
f45a6b71a9
Merge branch 'master' into next
12 years ago
63772e2301
Merge remote-tracking branch 'scrawl/gamma' into next
12 years ago
dbf59d14dc
water gamma correction
12 years ago
8a81a4a334
Fixed typo on openmw.cfg that caused launcher crash on OS X
12 years ago
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
12 years ago
e5e3d829d0
player arrow & markers
12 years ago
86cfc91ef3
global map rendering
12 years ago
87a9373a56
Merge remote-tracking branch 'scrawl/gamma' into next
12 years ago
b9a3f8e8d7
gamma slider
12 years ago
d9f6072f02
gamma correct rendering & adjustment setting
12 years ago
32de090079
Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities
12 years ago
bf5e30b24f
everything done except health/mana restore
12 years ago
ab698bb401
date time label
12 years ago
0ba996f290
dialog layout
12 years ago
42d25c0af0
fix resources, I renamed those in the last commit, but only in one place
12 years ago
76b494100e
finished?
12 years ago
95f3a20e2c
Merge branch 'master' into levelup
12 years ago
b76a28f69c
beginnings of the gui
12 years ago
a308d2e38a
fixed exception, fixed armor label obscuring the items
12 years ago
6ac2a12296
item selection working on the preview
12 years ago
eef750e6b0
race selection preview
12 years ago
5155339cb6
character preview working
12 years ago
4f3eb3c34a
character preview WIP
12 years ago
a8d9aa98b1
some fixes
12 years ago
369db182de
actual progress bar, performance optimization
12 years ago
2b339f6c0f
loading screen
12 years ago
ad66ebf84f
fix button align on 2 windows
12 years ago
996e6280d8
more spell buying window cleanup
12 years ago
ba0acd4056
changed some text colors
12 years ago
fde69d0c87
Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing
12 years ago
bc6a1979b0
replaced everything with the new method
12 years ago
273ac0a97f
Merge branch 'spellbuying'
12 years ago
b66c8099eb
new system for dynamic sizing of buttons & text boxes
12 years ago
bb267dddf6
some stats window cleanup
12 years ago
3fad1c0786
fixed a crash
12 years ago
08410b9062
Renamed SpellBuyingWindow, took some suggestions from scrawl
12 years ago
ebf80943a9
Added spell buying window
12 years ago
ef6f033dd1
Merge branch 'multidata'
12 years ago
e2bf4694cb
Merge remote-tracking branch 'scrawl/master'
13 years ago
ba43f2997f
fix missing character in font for french morrowind version, thanks to jvoisin
13 years ago
dbe3cca828
added a separate core.xml file that works with the mygui layout editor
13 years ago
4f411ff1eb
Merge remote-tracking branch 'scrawl/master'
13 years ago
6ad08dfd33
added settings for crosshair & subtitles
13 years ago
5370fecb6f
fix a small input focus issue with the map
13 years ago
7eaf5e7f0f
changed the markers to look more like morrowind's (hover effect)
13 years ago
5834b4baa5
door markers on the local map
13 years ago
6161f81c24
last bits of the quick key menu.
13 years ago
c5e55d3cac
fix screenshot function
13 years ago
c0f27bd5ef
magic selection window
13 years ago
fab4cfecb1
some unfinished work on quick keys window
13 years ago
132da92391
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
13 years ago
b0506e2220
re-enabling support for multiple data directories
13 years ago
f9693ab33a
Merge remote-tracking branch 'scrawl/shadersystem'
13 years ago
4ae0a5c02e
fix silhouettes around objects above the water
13 years ago
9501e133f5
Updated the EB Garamond font to a higher-resolution version
13 years ago
67577c6192
UI cursor & camera sensitivity sliders
13 years ago
c7b8787c32
"reset to defaults" button, invert y axis button
13 years ago
bc6e4feedc
hotkey window first version
13 years ago
976ad7a301
key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw
13 years ago
86d6f190bf
Input system rewrite
13 years ago
8ac2d11f56
changed shading to be more like MW (completely replace material ambient with vertex colors if present), fixes some too dark daedric ruins
13 years ago
f58a4ada7a
Merge branch 'master' into shadersystem
13 years ago
f72956b918
- added a simple main menu (with Return, Options and Exit buttons)
...
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
13 years ago
993c7150dc
tweaked depth bias
13 years ago
15a16aeba1
Fixed DirectX HLSL shaders and re-enabled them in the gui
13 years ago
37c7becb07
some potential compability fixes
13 years ago
3feb4ce61b
terrain lod morph fix
13 years ago
8c8228a15c
fix terrain num lights setting
13 years ago
3ebc6fd590
fixed a settings window bug
13 years ago
a70f93b024
fix "Crash when running openmw with --start="XYZ", remove HLSL for windows
13 years ago
9f9183ff73
depth bias
13 years ago
bc7876e980
use alpha map for moons
13 years ago
f0b3142966
switch to glsl 1.2
13 years ago
6bfcf2bc1b
- exchanged the preprocessor again, no warnings now
...
- disable line directives for now, causing some trouble
13 years ago
17a5c22c8f
don't use globbing
13 years ago
acc5c3bbbf
some fixes
13 years ago
41791ccaa2
add file
13 years ago
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
13 years ago
21728020f6
fixed the water on local map
13 years ago
f5ffea4d4b
new button, water timescale
13 years ago
e077814a8c
water
13 years ago
9d7470e14c
temp commit
13 years ago
739455e6f8
new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc
13 years ago
778e59ee37
terrain as it was before, with about 4x less code
13 years ago
29f91753f7
correction
13 years ago
93c641efa7
terrain albedo
13 years ago
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
13 years ago
16c2ea3a75
terrain colourmap
13 years ago
1429c8d5cb
copy&paste mistake
13 years ago
fb109ec7e2
use debug versions of ogre plugins in debug mode
13 years ago
7731e9a6fa
finished cleaning up sky
13 years ago
b8384162b6
merge
13 years ago
cd6e9986b6
forgot to add files
13 years ago
ad7383be43
sky
13 years ago
e0a99f104b
settings tab "shadows"
13 years ago
485adc8bdc
shader mode button in settingswindow
13 years ago
865bfc6f47
sync mrt_output setting
13 years ago
1a9f59d5d4
shadows
13 years ago
07fd9986ef
accidently removed the map.
13 years ago
b803d0e949
converted shadow caster shader
13 years ago
81d30ff63a
temp commit
13 years ago
e517e75d09
update
13 years ago
a095572205
fixed some textures, started with sky
13 years ago
71c865e2e9
let there be light
13 years ago
33c48b9481
update
13 years ago
8e683c2e05
vertex colors
13 years ago
scrawl
Chris Robinson
Marek Kochanowicz
Marc Zinnschlag
Glorf
vorenon
pvdk
Sandy Carter
Emanuel Guevel
Lars Söderberg
Nathan Jeffords
graffy76
lazydev
scrawl
Lukasz Gromanowski
gugus
Nikolay Kasyanov
Adam Hogan