Sebastian Wick
|
e3d8bdbafe
|
autorepeat scrollbar
|
12 years ago |
Marc Zinnschlag
|
12cfe1fdfe
|
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
|
12 years ago |
graffy76
|
8f4fd8202e
|
Deleted ".directory" text files.
Files were hidden files added by dolphin.
|
12 years ago |
Sebastian Wick
|
acaba78a11
|
wrong number
|
12 years ago |
Sebastian Wick
|
357974a429
|
more minor stuff
|
12 years ago |
Sebastian Wick
|
a1fea97c3b
|
use SDL for resolution -> multimonitor support
|
12 years ago |
graffy76
|
75d7d3b7fc
|
Added base.png
|
12 years ago |
graffy76
|
101c147217
|
Final changes for record status icon feature, incl. window size user
preference
1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements
|
12 years ago |
graffy76
|
965d93ea40
|
Pull to get latest icons
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
|
12 years ago |
graffy76
|
f87eb67968
|
Fixed conflicts
Merge branch 'cs-windows' of https://github.com/Glorf/openmw
Conflicts:
apps/opencs/model/settings/usersettings.cpp
apps/opencs/model/settings/usersettings.hpp
apps/opencs/view/settings/usersettingsdialog.cpp
|
12 years ago |
scrawl
|
4c8a04d9cb
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
|
12 years ago |
Marek Kochanowicz
|
c174f57a2f
|
Git changes show that it should upload all the files this time. Let's
hope…
|
12 years ago |
graffy76
|
a5d9d3fd7a
|
Updated status icons from sirherrbatka
|
12 years ago |
graffy76
|
97cfbc31b5
|
Merge color icons
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
|
12 years ago |
scrawl
|
fcf35d3871
|
Removed the UI cursor sensitivity slider
|
12 years ago |
scrawl
|
403704b92a
|
Use openmw.png for SDL_SetWindowIcon
|
12 years ago |
Marc Zinnschlag
|
bd08677a7f
|
Merge branch 'openmw24'
|
12 years ago |
scrawl
|
daab4f55a3
|
Use Morrowind's fonts
|
12 years ago |
pvdk
|
b3595a6a2e
|
Fix for duplicate key/value pairs being written to settings.cfg, Bug #755
|
12 years ago |
Marek Kochanowicz
|
09ab541102
|
Colored status icons. Hopefully everybody loves watercolors!
|
12 years ago |
Marek Kochanowicz
|
e403773e95
|
Simply removed background from status icons.
|
12 years ago |
graffy76
|
94db7cdcfe
|
Added png's of icons
|
12 years ago |
graffy76
|
35fb9b669a
|
Final details implemented
Png icons, alignments fixed.
|
12 years ago |
graffy76
|
5a40594b0d
|
Merge
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
|
12 years ago |
Marek Kochanowicz
|
792f3aaa86
|
Rastered status icons. ingredients, light, and book icon without emblem.
|
12 years ago |
Marek Kochanowicz
|
b31f0dfe1f
|
Raster status icons.
|
12 years ago |
scrawl
|
de5a08a07d
|
Version should be 100 for GLSLES
|
12 years ago |
scrawl
|
c2c88acc7b
|
GLSLES: only the fragment shader needs precision explicitely set.
|
12 years ago |
scrawl
|
cc747d8ae4
|
GLSL ES: precision qualifiers are required
|
12 years ago |
scrawl
|
1e7cf4ae1c
|
GLES2 experiment
|
12 years ago |
riothamus
|
885d12e867
|
updated hud layout
|
12 years ago |
riothamus
|
39bd8894a9
|
Bug 787
|
12 years ago |
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 |
Marek Kochanowicz
|
60893f4b00
|
New icons from nomadic1 finally. Including dialogue-greetings AKA Ave
Caesar icon.
|
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 |
Marek Kochanowicz
|
03af0a8ac9
|
Adding more icons from nomadic1, replacing older with recently redoned.
|
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 |
Marek Kochanowicz
|
01314b7c08
|
addin more nomadic icons
|
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 |
Marek Kochanowicz
|
49b5b90cd5
|
png icons from nomadic and my rastered icons in raster folder.
|
12 years ago |
Marek Kochanowicz
|
faf293bd6d
|
Removing old directory.
|
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 |
Marek Kochanowicz
|
623f9c2a58
|
A new icon for misc iteams. I really hope that scales will do.
|
12 years ago |
Marek Kochanowicz
|
cf0c55b37f
|
New random-item. Looks a lot better.
|
12 years ago |
Marek Kochanowicz
|
37a1fb6b7c
|
Adding ingredient.svg icon. I need to work on random-item and scrap container icon.
|
12 years ago |
Marek Kochanowicz
|
b7f95cd271
|
Random item (dice). Container.svg needs to be scraped, I'm afraid.
|
12 years ago |
Marek Kochanowicz
|
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 |
Marek Kochanowicz
|
e97319c0bb
|
Drawer as container icon looks actually quite good IMHO.
|
12 years ago |
Marek Kochanowicz
|
cb58ee126e
|
Drawer as container icon. Look a little better the old crappy chest but changes are needed.
|
12 years ago |
Marek Kochanowicz
|
59233e54b2
|
changing potion.svg according to pvdk sugestions
|
12 years ago |
Marek Kochanowicz
|
43e863b020
|
Forgot to place the icons in the middle of the page.
|
12 years ago |
Marek Kochanowicz
|
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 |
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 |
Marek Kochanowicz
|
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 |
scrawl
|
20774f8f81
|
Added merchant repair feature
|
12 years ago |
Marek Kochanowicz
|
e46097cd2e
|
Icons. Currently activator, apparatus, book, container (work in progress), light source, potion, static, weapon.
|
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 |
scrawl
|
fdcbdbf35d
|
Rewrote layout tooltips to use the new box layout system, fixes word wrapping delay
|
12 years ago |
pvdk
|
30f3fbac3c
|
Fixed paths to OpenMW icons
|
12 years ago |
scrawl
|
4c588cbab6
|
Levelup dialog is now dynamic; added level descriptions
|
12 years ago |
pvdk
|
31ba332647
|
Moved Windows icon to files/launcher
|
12 years ago |
pvdk
|
75f86f3a85
|
Some changes to the stylesheet and other small GUI improvements
|
12 years ago |
Pieter van der Kloet
|
64c5af314d
|
Removed grayish pixel from the clear button, looks weird with dark colors
|
12 years ago |
Pieter van der Kloet
|
b4d408af5d
|
Added actions to datafiles.ui and implemented them in the launcher
|
12 years ago |
Pieter van der Kloet
|
5e13614e08
|
Improved appearance of combobox and when using dark color themes
|
12 years ago |
Sandy Carter
|
391bad2ccb
|
put .desktop file in the right directory
|
12 years ago |
Marc Zinnschlag
|
2a9d15cd9f
|
Merge remote-tracking branch 'scrawl/master'
|
12 years ago |
scrawl
|
0ee0dbdb97
|
Added "dispose corpse" button, added stealing (all items visible and no penalty yet)
|
12 years ago |
Pieter van der Kloet
|
9145fb210b
|
Merge remote-tracking branch 'upstream/master' into opencsui
|
12 years ago |
Pieter van der Kloet
|
7504ae675b
|
Implemented a file dialog for the editor using launcher .ui
|
12 years ago |
scrawl
|
7f8d659f3c
|
Fix transparency sorting
|
12 years ago |
scrawl
|
ff30bef3b2
|
Mipmap fix
|
12 years ago |
scrawl
|
2486ec6cb9
|
Material fixes (vertex colors, alpha)
|
12 years ago |
Marc Zinnschlag
|
8a887a0aef
|
Merge remote-tracking branch 'potatoesmaster/tradewindow'
|
12 years ago |
Marc Zinnschlag
|
ac810faa7e
|
Merge remote-tracking branch 'scrawl/master'
|
12 years ago |
scrawl
|
9f0bd95ef1
|
Added BM trees to transparency overrides
|
12 years ago |
scrawl
|
cab5315a8e
|
Disable mipmaps generation
|
12 years ago |
Emanuel Guevel
|
215d45aaf7
|
Make trade window's "max sale" button clickable
The HBox widget above it was stealing the input events.
|
12 years ago |
scrawl
|
f1d35b73b8
|
Cleanup
|
12 years ago |
scrawl
|
c9fefc7f5d
|
Simpler, more lightweight underwater effect, changed colors to match vanilla better
|
12 years ago |
scrawl
|
5341bf9504
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
|
12 years ago |
scrawl
|
ac0a23a68d
|
Fix initialization problem
|
12 years ago |
scrawl
|
cf87708c1f
|
Magic effect icons for spells
|
12 years ago |
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
|
12 years ago |
Pieter van der Kloet
|
f2193bb1ba
|
Made the mainwindow use a .ui file and removed the stylesheet
|
12 years ago |
scrawl
|
d8f2d0195a
|
Got rid of the texture rotation hack by rendering the cursor manually.
|
12 years ago |
Marc Zinnschlag
|
0b629791a8
|
reverting loading bar layout
|
12 years ago |
Lars Söderberg
|
f77ace0885
|
Removed the "hack" mygui.png and misc fixes for this.
|
12 years ago |
vorenon
|
bd597f07ab
|
Centered the loading text
|
12 years ago |
scrawl
|
8966e88050
|
Fix shadows
|
12 years ago |
scrawl
|
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 |
scrawl
|
284ba58e1e
|
Z-up conversion: global map, shader fix
|
12 years ago |
scrawl
|
2e7bc1a368
|
Z-up conversion: local map, fix tcg
|
12 years ago |
scrawl
|
3ef952172d
|
Z-up conversion: water, sky
|
12 years ago |
scrawl
|
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 |
scrawl
|
a3afb91485
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
|
12 years ago |
Lars Söderberg
|
e32646ee50
|
Prettier repeated borders.
|
12 years ago |
Lars Söderberg
|
62c5568ed9
|
Fix for the loadingbar to resemble vanilla Morrowind.
|
12 years ago |
scrawl
|
0d6a3367d3
|
Water shader no longer depends on object shaders being enabled
|
12 years ago |
scrawl
|
7046e7ae3d
|
Water fog fix
|
12 years ago |
scrawl
|
01102f9c73
|
Don't emit if there wasn't enough movement
|
12 years ago |
scrawl
|
db9e49968e
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
|
12 years ago |
Nathan Jeffords
|
5e1ec9e128
|
improved book window layout
|
12 years ago |
Emanuel Guevel
|
3dc28baa28
|
Remove "PinToggle" event from layout file
|
12 years ago |
Emanuel Guevel
|
2dea86bbc7
|
Make the "lock window" button appealing
|
12 years ago |
Emanuel Guevel
|
3ba3c71556
|
Make the "lock window" button to change state visually
|
12 years ago |
scrawl
|
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 |
scrawl
|
32b837ebd4
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
|
12 years ago |