David Cernat
3136a12051
Resolve conflicts in pull request #75
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
8 years ago
scrawl
e7154c3f7c
Add the ItemShadow to various other skins
8 years ago
scrawl
612c3e995f
Add drop shadow to ItemWidget ( Fixes #3545 )
8 years ago
Aesylwinn
b4a000913c
Merge remote-tracking branch 'yar/master' into Even
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwdialogue/filter.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/localscripts.cpp
# components/CMakeLists.txt
# components/compiler/exprparser.cpp
# components/sceneutil/workqueue.cpp
9 years ago
Koncord
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
9 years ago
scrawl
1232607385
Remove pointless widget names in settings layout file
9 years ago
scrawl
3969675afa
Remove unused settings
9 years ago
scrawl
7f89bb273a
Add 'reflect actors' setting for the water shader, default off
9 years ago
scrawl
e8662bea31
Change the way that image origin is converted to OpenGL's lower-left convention
...
Flip the texture coordinates instead of flipping textures.
This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
9 years ago
scrawl
0da6d249fe
Fix the window pinning button's borders not accepting mouse clicks
9 years ago
scrawl
190bf15887
SettingsWindow: support auto-updating of slider labels through the layout file
9 years ago
scrawl
9621b66b78
Move field of view setting to Camera section
9 years ago
scrawl
9d4af59860
Don't attempt to create quest log buttons if textures are unavailable ( Fixes #3063 )
9 years ago
scrawl
34350ddeb1
Fix bug #3028
9 years ago
scrawl
75f11f781c
Use the ScalingLayer for Scroll window
9 years ago
scrawl
516f2765a1
Use the ScalingLayer for journal, books and scrolls
9 years ago
scrawl
08a55febc8
Adjust Scroll window layout to better match MW
9 years ago
scrawl
d85d74e615
Use AdditiveLayer for the hit fader
9 years ago
scrawl
a90ef8afd0
layer renaming
9 years ago
scrawl
13c7235b6b
Remove old FPS setting code
9 years ago
scrawl
47664e1370
Hide the defunct FPS checkbox in settings menu, added hint text for f3 binding
9 years ago
scrawl
a41ebd6695
Comment out object shaders in the settings menu
9 years ago
scrawl
4cc200680c
Comment out shadows tab in settings menu
9 years ago
scrawl
c9d7078b4b
Water: add texture quality setting to the settings window
9 years ago
scrawl
60bc7dbabc
Improve MW_ComboBox skin
9 years ago
scrawl
8cb2c7a9fb
Water: remove defunct "reflect <object type>" settings
...
Not really useful
9 years ago
scrawl
169d76b49b
Fix scrollbar step in count dialog
9 years ago
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
Jiří Kuneš
a5b4e087c5
define owned colours in settings.cfg
10 years ago
Jiří Kuneš
cbc44b33ba
define crosshair owned colour in openmw_hud_box.skin.xml
10 years ago
Jiří Kuneš
75f5972898
show owned - better settings
10 years ago
Jiří Kuneš
df077f8649
color tooltip red when taking item would result in crime
10 years ago
scrawl
9a115fedbc
Add ability to copy&paste the version label in the main menu
10 years ago
scrawl
a2e211675d
Update openmw_layers.xml to newer version
10 years ago
scrawl
c2131e7c31
Make near clip distance configurable
10 years ago
scrawl
c748ea7363
Fix view distance slider
10 years ago
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
scrawl
bec9abd319
Remove name extension for internal MyGUI textures
...
Since they're no longer loaded from disk, the extension makes no sense.
10 years ago
scrawl
24bb2e152c
Apply texture filter setting changes
10 years ago
scrawl
5442bf23a6
Apply video mode & gamma setting changes
10 years ago
scrawl
4dd96f3318
Fix missing tiling in skin
10 years ago
scrawl
fd3d49c171
Fix typo in settings layout
10 years ago
scrawl
4825744a03
Fix inconsistent health bar skin
10 years ago
scrawl
033719ccd7
Correct the icon used for custom map markers
10 years ago
scrawl
c1edc30ad7
Dead code removal
10 years ago
scrawl
157d8bfedd
Remove unused mygui files
10 years ago
scrawl
8817f44d63
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
10 years ago
Ivy Foster
f708944657
Remove toggle sneak menu option
...
Users can change the option in settings.cfg.
10 years ago
Ivy Foster
ba7fc8609c
Add toggle sneak option; fix bug #2119
...
To enable toggle sneak mode, set "toggle sneak = true" in
the [Input] section of settings.cfg.
Outstanding issues:
- In toggle sneak mode, holding the Sneak button causes
rapid, repeated toggling.
- The button in the settings menu doesn't do anything.
10 years ago
Marc Zinnschlag
8b84fa5579
Merge remote-tracking branch 'scrawl/master'
10 years ago