Marc Zinnschlag
|
573368849b
|
Merge remote-tracking branch 'glorf/enchanting'
Conflicts:
apps/openmw/CMakeLists.txt
|
2013-03-29 16:48:21 +01:00 |
|
scrawl
|
a2ca679beb
|
Added PC repair feature
|
2013-03-23 08:16:46 +01:00 |
|
scrawl
|
20774f8f81
|
Added merchant repair feature
|
2013-03-22 14:13:10 +01:00 |
|
scrawl
|
4cbb202306
|
Several tooltip fixes
|
2013-03-20 03:31:01 +01:00 |
|
scrawl
|
6c1ff8caca
|
Merge branch 'master' into next
Conflicts:
apps/openmw/mwworld/weather.cpp
components/fileorderlist/model/datafilesmodel.cpp
|
2013-03-20 02:29:03 +01:00 |
|
scrawl
|
1666bc7740
|
Armor rating
|
2013-03-16 22:53:33 +01:00 |
|
scrawl
|
c0b0227e8a
|
enchanting
|
2013-03-16 19:00:14 +01:00 |
|
scrawl
|
83932ebfe8
|
HLSL shader fix
|
2013-03-16 14:36:37 +01:00 |
|
scrawl
|
fdcbdbf35d
|
Rewrote layout tooltips to use the new box layout system, fixes word wrapping delay
|
2013-03-13 19:44:34 +01:00 |
|
pvdk
|
30f3fbac3c
|
Fixed paths to OpenMW icons
|
2013-03-12 21:21:08 +01:00 |
|
scrawl
|
4c588cbab6
|
Levelup dialog is now dynamic; added level descriptions
|
2013-03-12 17:18:47 +01:00 |
|
pvdk
|
31ba332647
|
Moved Windows icon to files/launcher
|
2013-03-12 04:05:14 +01:00 |
|
pvdk
|
75f86f3a85
|
Some changes to the stylesheet and other small GUI improvements
|
2013-03-12 01:03:15 +01:00 |
|
Pieter van der Kloet
|
64c5af314d
|
Removed grayish pixel from the clear button, looks weird with dark colors
|
2013-03-11 01:53:54 +01:00 |
|
Pieter van der Kloet
|
b4d408af5d
|
Added actions to datafiles.ui and implemented them in the launcher
|
2013-03-11 01:48:01 +01:00 |
|
Pieter van der Kloet
|
5e13614e08
|
Improved appearance of combobox and when using dark color themes
|
2013-03-11 01:34:12 +01:00 |
|
Sandy Carter
|
391bad2ccb
|
put .desktop file in the right directory
|
2013-03-09 14:43:44 -05:00 |
|
Marc Zinnschlag
|
2a9d15cd9f
|
Merge remote-tracking branch 'scrawl/master'
|
2013-03-07 16:42:07 +01:00 |
|
scrawl
|
0ee0dbdb97
|
Added "dispose corpse" button, added stealing (all items visible and no penalty yet)
|
2013-03-07 14:00:13 +01:00 |
|
Pieter van der Kloet
|
9145fb210b
|
Merge remote-tracking branch 'upstream/master' into opencsui
|
2013-03-07 03:02:03 +01:00 |
|
Pieter van der Kloet
|
7504ae675b
|
Implemented a file dialog for the editor using launcher .ui
|
2013-03-07 03:00:59 +01:00 |
|
scrawl
|
7f8d659f3c
|
Fix transparency sorting
|
2013-03-05 17:09:20 +01:00 |
|
scrawl
|
ff30bef3b2
|
Mipmap fix
|
2013-03-05 14:27:05 +01:00 |
|
scrawl
|
2486ec6cb9
|
Material fixes (vertex colors, alpha)
|
2013-03-05 13:51:48 +01:00 |
|
Marc Zinnschlag
|
8a887a0aef
|
Merge remote-tracking branch 'potatoesmaster/tradewindow'
|
2013-03-04 19:42:51 +01:00 |
|
Marc Zinnschlag
|
ac810faa7e
|
Merge remote-tracking branch 'scrawl/master'
|
2013-03-04 19:36:58 +01:00 |
|
scrawl
|
9f0bd95ef1
|
Added BM trees to transparency overrides
|
2013-03-04 17:57:35 +01:00 |
|
scrawl
|
cab5315a8e
|
Disable mipmaps generation
|
2013-03-04 16:28:20 +01:00 |
|
Emanuel Guevel
|
215d45aaf7
|
Make trade window's "max sale" button clickable
The HBox widget above it was stealing the input events.
|
2013-03-04 12:24:42 +01:00 |
|
scrawl
|
f1d35b73b8
|
Cleanup
|
2013-03-03 19:52:20 +01:00 |
|
scrawl
|
c9fefc7f5d
|
Simpler, more lightweight underwater effect, changed colors to match vanilla better
|
2013-03-03 19:28:11 +01:00 |
|
scrawl
|
5341bf9504
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
|
2013-03-03 15:51:58 +01:00 |
|
scrawl
|
ac0a23a68d
|
Fix initialization problem
|
2013-03-03 14:53:47 +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 |
|
Pieter van der Kloet
|
f2193bb1ba
|
Made the mainwindow use a .ui file and removed the stylesheet
|
2013-03-03 00:48:09 +01:00 |
|
scrawl
|
d8f2d0195a
|
Got rid of the texture rotation hack by rendering the cursor manually.
|
2013-03-01 18:45:52 +01:00 |
|
Marc Zinnschlag
|
0b629791a8
|
reverting loading bar layout
|
2013-02-28 20:40:32 +01:00 |
|
Lars Söderberg
|
f77ace0885
|
Removed the "hack" mygui.png and misc fixes for this.
|
2013-02-28 20:16:46 +01:00 |
|
vorenon
|
bd597f07ab
|
Centered the loading text
|
2013-02-28 19:22:10 +01:00 |
|
scrawl
|
8966e88050
|
Fix shadows
|
2013-02-27 16:07:15 +01:00 |
|
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
|
2013-02-26 14:54:53 +01:00 |
|
scrawl
|
284ba58e1e
|
Z-up conversion: global map, shader fix
|
2013-02-26 13:52:01 +01:00 |
|
scrawl
|
2e7bc1a368
|
Z-up conversion: local map, fix tcg
|
2013-02-26 13:39:10 +01:00 |
|
scrawl
|
3ef952172d
|
Z-up conversion: water, sky
|
2013-02-26 10:38:48 +01:00 |
|
scrawl
|
8aff033a0c
|
Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog
|
2013-02-25 18:29:11 +01:00 |
|
scrawl
|
a3afb91485
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
|
2013-02-24 18:04:51 +01:00 |
|
Lars Söderberg
|
e32646ee50
|
Prettier repeated borders.
|
2013-02-24 16:57:40 +01:00 |
|
Lars Söderberg
|
62c5568ed9
|
Fix for the loadingbar to resemble vanilla Morrowind.
|
2013-02-24 16:57:07 +01:00 |
|
scrawl
|
0d6a3367d3
|
Water shader no longer depends on object shaders being enabled
|
2013-02-24 10:28:50 +01:00 |
|