Bret Curtis
942f7f776d
Merge pull request #2168 from Capostrophic/gamepad
...
Option to disable controller (feature #3980 )
2019-02-22 15:03:01 +01:00
Chris Djali
cb5a57e41b
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm
...
Shadows
2019-02-20 15:35:49 +00:00
elsid
9626b6ec42
Add option to disable DetourNavigator component to find paths
2019-02-16 15:50:58 +03:00
Capostrophic
39dcbacf44
Option to disable controller (feature #3980 )
2019-02-15 18:40:22 +03:00
AnyOldName3
f3fc888ab9
Merge branch 'osgshadow-test-vdsm-mesa-optimised-shader-2' into osgshadow-test-vdsm
2019-02-09 15:51:30 +00:00
AnyOldName3
9b92943d1a
Don't rely exclusively on a shadow map when out of its depth range
2019-02-05 20:51:56 +00:00
AnyOldName3
abe9ba736e
Add line breaks to make settings more readable.
2019-01-31 15:00:04 +00:00
AnyOldName3
556c9a3382
Add normal-offset shadow mapping to remove shadow acne (flicker)
2019-01-30 22:28:00 +00:00
Capostrophic
731f91759e
Account for inverted tangents on normal-mapped objects (bug #3733 )
2019-01-30 02:03:26 +03:00
Andrei Kortunov
8580a58ba0
Optimize HUD update (do not do unnecessary work)
2019-01-25 21:15:29 +04:00
Andrei Kortunov
8687a49c19
Editor: Added basic info window
2018-12-21 18:51:02 +04:00
AnyOldName3
e2515f6db7
Merge branch 'master' into osgshadow-test-vdsm
2018-12-18 19:51:27 +00:00
Bret Curtis
83e346e1e6
add new bugtracker
2018-12-12 16:18:49 +01:00
Bret Curtis
b8b1a52216
add commit date; revert boost as we are not breaking anything yet
2018-12-12 10:27:09 +01:00
Bret Curtis
fc10adb608
makes openmw.appdata.xml a template that accepts @OPENMW_VERSION@ so we do not have to update it all the time; fix deprecated warning for boost header; un-ignore openmw.appdata.xml
2018-12-11 21:30:37 +01:00
AnyOldName3
2d5da1a6fa
Don't exclusively rely on a shadow map if its bounds have been expanded since the cull traversal.
2018-12-08 20:39:41 +00:00
Capostrophic
7b5932a49d
Add Invert X Axis option (feature #3610 )
2018-12-01 19:08:02 +03:00
AnyOldName3
0a409c0ab8
Make shadow map front-face culling configurable
2018-12-01 00:26:43 +00:00
AnyOldName3
dd207d9e54
Make the shadow polygon offset parameters configurable
2018-11-30 00:55:54 +00:00
AnyOldName3
49487355a5
Merge branch 'osgshadow-test-vdsm' of https://github.com/AnyOldName3/openmw into osgshadow-test-vdsm
2018-11-29 01:26:22 +00:00
AnyOldName3
642002b302
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-29 01:19:01 +00:00
Bret Curtis
caad388c26
bump our versions to 0.46, keep this commit in mind when trying to automate this into one place
2018-11-14 16:32:24 +01:00
Stanislaw Halik
caefe8cda0
fix win32 app manifest copy-paste error
2018-11-11 21:46:15 +01:00
AnyOldName3
02a8c6a7ce
Merge branch 'master' into pr/fix-hidpi-resolution
2018-11-08 23:05:07 +00:00
Bret Curtis
f6243fae83
Merge pull request #1615 from akortunov/holstered_weapons
...
Weapon sheathing
2018-11-08 20:44:20 +01:00
Capostrophic
fcb2cde1dd
Tweak the default chargen and level up messages
2018-11-07 18:00:20 +03:00
Stanislaw Halik
5e3e01cac0
fix resolution on HiDPI displays under Windows
...
The same Windows functionality as scaling user interface elements,
confuses fullscreen games unless they set a particular of metadata to
indicate that they perform the scaling by themselves.
What happened was treating 2160p as 1440p despite the former being
chosen. The same occured with other game title prior to introducing the
metadata bits.
Fortunately with CMake there's no need to invoke the mt.exe "manifest
tool" manually.
Note that the setting of "per-monitor DPI aware" still leaves openmw
confused, hence the choice of global-DPI-aware.
2018-11-05 16:16:09 +00:00
Andrei Kortunov
92e45507d8
Weapon sheathing support, including quivers and scabbards (feature #4673 )
2018-11-05 11:18:20 +04:00
AnyOldName3
0bafa4399b
Use distant shadow maps when the current fragment is outside the depth range of the near ones.
2018-11-03 16:56:33 +00:00
AnyOldName3
ad9dab8593
Switch alpha test from < to <= to fix weird shadows on actors with 50% chameleon
2018-11-03 16:20:56 +00:00
AnyOldName3
3785ba6aa0
Merge upstream/master
2018-10-30 22:38:09 +00:00
Bret Curtis
d6c674660a
Merge pull request #1633 from elsid/pathfinder_detour
...
Use recastnavigation for pathfinding (#2229 )
2018-10-30 20:44:13 +01:00
Marc Zinnschlag
854d85cb47
Merged merge request !42
2018-10-30 17:05:15 +01:00
Bret Curtis
cbbe69f3f2
additional cleanups for non-essential fallbacks
2018-10-30 12:17:10 +01:00
Bret Curtis
9b83a2345b
remove unnecessary fallbacks
2018-10-29 20:54:21 +01:00
Bret Curtis
988914725a
wip 1
...
wip2
add more Level_UP and QA text
the rest of the questions
2018-10-29 17:03:49 +01:00
Capostrophic
8757b3edd1
Add icons for Edit and Touch actions (kudos to akortunov)
2018-10-28 21:06:42 +03:00
Capostrophic
89b8eb029f
Add icons for record context menu actions
2018-10-28 20:35:58 +03:00
elsid
49d81241db
Merge branch 'master' into pathfinder_detour
2018-10-28 17:08:09 +03:00
Bret Curtis
e7892361f6
Merge pull request #1994 from akortunov/actor_culling
...
Minor tweaks for actors processing range setting
2018-10-28 14:44:12 +01:00
elsid
abc51a8a17
Add settings option to set max number of polygons per navmesh tile
2018-10-28 15:36:47 +03:00
Andrei Kortunov
06d226a1b7
Minor tweaks for actors processing range setting
2018-10-28 15:08:24 +04:00
Marc Zinnschlag
9dd0d641bc
Merged pull request #1931
2018-10-28 11:02:33 +01:00
Capostrophic
d27d48eb22
Fix revert record icon
2018-10-27 19:45:40 +03:00
Andrei Kortunov
e7de6b974a
Optimize actors processing
...
1. Do not update physics and animations for actors outside processing range (bug #4647 )
2. Do not render such actors
3. Add transparency to actors near processing border, so they will not pop up suddenly
2018-10-25 22:52:59 +04:00
AnyOldName3
e22ab64ebf
Fix typo in lighting.glsl
2018-10-22 17:35:01 +01:00
AnyOldName3
85b97d19d3
Add alpha threshold for shadow casting.
2018-10-17 14:02:26 +01:00
AnyOldName3
474770eca8
Switch shadow map rendering to a specialised, simplified shader.
2018-10-16 21:23:31 +01:00
AnyOldName3
ce15369bbd
Convert colorMode shader define to a uniform
2018-10-15 23:12:15 +01:00
elsid
ed73d130f9
Cache navmesh tiles
...
Use LRU modification to hold currently used items. Use RecastMesh binary
data for item key.
Store original pointer of btCollisionShape in user pointer to make available
it as an identifier within all duplicates. Use pointer to heights data array
for btHeightfieldTerrainShape.
2018-10-13 22:22:12 +03:00
elsid
7c80bb9411
Support multiple threads for async nav mesh updater
2018-10-13 22:16:34 +03:00
elsid
dc09674362
Add command and settings option to enable actors paths render
2018-10-13 22:16:32 +03:00
elsid
c3298d13a6
Add log sinks (stdout and file)
2018-10-13 22:16:31 +03:00
elsid
c26773bd29
Log update NavMesh status
2018-10-13 22:16:29 +03:00
elsid
faaf50446d
Option to initially enable NavMesh render
2018-10-13 22:16:28 +03:00
elsid
ed3a255f65
Do not use NavMesh to find changed tiles
2018-10-13 22:16:28 +03:00
elsid
373adc6ec4
Option to enable/disable file names revisions
2018-10-13 22:16:27 +03:00
elsid
41caca24ee
Options to enable/disable write recast mesh and nav mesh into file
2018-10-13 22:16:26 +03:00
elsid
6d233ae868
Option in settings to enable/disable detour navigator debug log
2018-10-13 22:16:26 +03:00
elsid
fafba8ea0c
Use recastnavigation to find path
2018-10-13 22:16:25 +03:00
AnyOldName3
0124be5713
Merge upstream/master
2018-10-10 21:23:19 +01:00
Marc Zinnschlag
6a9618f0f5
Merged pull request #1948
2018-09-29 11:03:26 +02:00
Capostrophic
f20f49daa6
Content selector: allow to copy paths to clipboard (feature #2847 )
2018-09-29 02:09:13 +03:00
Marc Zinnschlag
3dc15d39e3
Merged pull request #1936
2018-09-28 11:30:13 +02:00
Capostrophic
ba2fd8b795
Rename reflected absorb spells setting and add it to Advanced tab
2018-09-26 21:21:03 +03:00
Capostrophic
52da65b776
Fix issues with sun specularity (bug #4527 )
2018-09-23 03:39:06 +03:00
Marc Zinnschlag
7be9f2ca45
Merged pull request #1891
2018-09-21 11:38:19 +02:00
Andrei Kortunov
276b7830a9
Mass potion creation (feature #4642 )
2018-09-20 15:45:14 +04:00
Andrei Kortunov
62f6f174cf
Show attack speed of ranged weapons
2018-09-19 12:23:21 +04:00
Marc Zinnschlag
06b2a23e74
Merged pull request #1768
2018-09-17 12:10:21 +02:00
Andrei Kortunov
275d10e1f7
Add missing icons for UniversalId tables and use them in the editor menu (feature #912 )
2018-09-12 22:37:19 +04:00
Andrei Kortunov
c9c0230d2a
Scale journal fonts separately from common ones
2018-09-12 14:31:01 +04:00
Andrei Kortunov
8da099713e
Minor layout fixes to fit different font size
2018-09-12 14:31:01 +04:00
Andrei Kortunov
adbaeb7cca
Improve GUI scaling (bug #3288 )
2018-09-12 14:31:01 +04:00
AnyOldName3
80082308f0
Merge upstream (shadermanager log system revamp)
2018-08-17 18:22:13 +01:00
Capostrophic
37f9d45182
Remove an outdated checkbox from the advanced page
2018-08-15 16:04:29 +03:00
Bret Curtis
4cb9b52b81
fix rebase issue
2018-08-14 23:15:30 +02:00
AnyOldName3
1098bd2467
Optimise lighting.glsl for Mesa users.
2018-08-14 21:35:23 +01:00
Yohaulticetl
640b32da56
Fixed merge conflicts
2018-08-14 19:57:48 +02:00
Yohaulticetl
d6f607e823
Fixed wrong starting index
2018-08-14 19:56:40 +02:00
Yohaulticetl
7e9ce99062
Made the werewolf check optional
2018-08-14 19:56:40 +02:00
Yohaulticetl
d19cbdb652
Factored strength into hand-to-hand combat
2018-08-14 19:44:03 +02:00
AnyOldName3
3b3721897d
Make indoor shadows disableable.
2018-08-08 23:56:11 +01:00
AnyOldName3
a2b54714d4
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-08-08 23:28:06 +01:00
AnyOldName3
8f4125134f
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-08-02 15:51:06 +01:00
Capostrophic
ab29f9e13f
Add permanent barter disposition change option (feature #3103 )
2018-08-01 17:31:35 +03:00
Marc Zinnschlag
e8139a5cc7
Merged pull request #1835
2018-08-01 15:46:31 +02:00
AnyOldName3
cc23a968d1
Merge upstream/master
2018-08-01 14:13:45 +01:00
AnyOldName3
f717c9e56d
Sort out some tabs which snuck into the water shader
2018-08-01 14:07:02 +01:00
Capostrophic
4d48ede6f1
Add two missing gameplay settings to Advanced tab
2018-08-01 13:36:31 +03:00
Andrei Kortunov
2d4ec86b8d
Provide launcher icons
2018-07-28 13:18:38 +04:00
Miloslav Číž
4e3bc3e403
Change wave parameters based on weather
2018-07-11 17:03:59 +02:00
Thunderforge
72f6b1a693
Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface"
2018-06-28 20:13:18 -05:00
AnyOldName3
85aba2e1da
Add toggleable shadow debug overlay.
2018-06-28 17:24:36 +01:00
AnyOldName3
a7e53df278
Move common shadow code to shared shadow shader headers
2018-06-24 23:40:52 +01:00
AnyOldName3
933ed77ef6
Fix water shader alignment issues noticed while removing tabs.
2018-06-22 01:05:45 +01:00
AnyOldName3
b25b356081
Sort out shader indentation
2018-06-22 01:02:01 +01:00
AnyOldName3
553094669b
Merge upstream/master (& fix merge conflicts)
2018-06-20 00:11:23 +01:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360
2018-06-13 21:16:28 +02:00
Thunderforge
058cfb553c
Adding CFBundleIdentifier to OpenMW's Info.plist file for Macs
2018-06-12 22:18:06 -05:00
Thunderforge
a9ca528fb8
Adding version number of macOS build of OpenMW
2018-06-09 19:42:24 -05:00
Marc Zinnschlag
efb4abbb7f
Merged pull request #1623
2018-06-09 10:49:04 +02:00
Andrei Kortunov
fea34bd73f
Added support for per-group animation files
2018-06-08 17:04:15 +04:00
AnyOldName3
759e6fb804
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-05-27 15:41:42 +01:00
scrawl
31ea7c8edd
Revert "set rebalance soul gem values to true by default"
...
This reverts commit 2963524a01
2018-05-27 10:43:31 +00:00
Marc Zinnschlag
b151a89528
Merged pull request #1568
2018-05-26 12:17:07 +02:00
Marc Zinnschlag
e30ade81be
Merged pull request #1680
2018-05-26 11:21:34 +02:00
Andrei Kortunov
9ac752ea70
Implement filtering in the spells window
2018-05-24 10:48:46 +04:00
declan-millar
2963524a01
set rebalance soul gem values to true by default
2018-05-22 12:59:27 +01:00
declan-millar
9ed4f33048
Replace spelling: soulgem -> soul gem
2018-05-21 19:10:24 +01:00
AnyOldName3
86ce33f437
Update documentation
2018-05-21 16:00:51 +01:00
declan-millar
78e79d5775
Add advanced option to Rebalance soulgem values to the launcher
2018-05-21 13:33:42 +01:00
AnyOldName3
feac7bd88e
Use 3 shadow maps by default as 1 sucks.
2018-05-20 00:17:06 +01:00
AnyOldName3
84284a60a7
Make CSM shader changes controllable by the setting.
2018-05-17 17:35:55 +01:00
AnyOldName3
5d05aadb37
Begin to let settings toggle between CSM and PSSM
2018-05-17 16:57:01 +01:00
AnyOldName3
aa68af4f8b
Make shaders pick the correct shadow cascade level and blend near cascade edges.
2018-05-16 18:20:21 +01:00
AnyOldName3
44b2cf2b7f
Merge upstream.
2018-05-11 19:15:04 +01:00
Nelsson Huotari
4ae75d1d20
Terrain texture brush frame
2018-05-10 11:18:54 +03:00
Marc Zinnschlag
e661e3cf74
Merged pull request #1677
2018-05-07 09:42:41 +02:00
Nelsson Huotari
a2745683e6
new run icon
2018-05-06 22:30:01 +03:00
Nelsson Huotari
e4e225f4e7
Add topic, journal and related -info icons.
2018-05-03 14:32:15 +03:00
Alexander Olofsson
f0288282be
Slight appdata cleanup and improvement
2018-04-22 12:40:22 +02:00
Nelsson Huotari
af558e07a3
implement +6 icons
2018-04-15 12:47:52 +03:00
Nelsson Huotari
69aacdff17
Lamoot's new icon set
2018-04-15 12:35:45 +03:00
scrawl
fc72483ddf
Merge pull request #1673
2018-04-14 19:53:20 +00:00
Capostrophic
b08d7b4a3b
Use centroid interpolation for shader lighting ( fixes #4143 )
2018-04-14 00:30:28 +03:00
scrawl
0982d2175a
Merge pull request #1473
2018-04-09 20:23:43 +00:00
scrawl
35300c04cd
Merge pull request #1671
2018-04-09 20:23:35 +00:00
Capostrophic
cddc0914c8
Option to charge for all companions travelling ( fixes #4064 )
2018-04-09 19:19:50 +03:00
scrawl
c610b8acc8
Merge pull request #1649
2018-04-02 17:37:31 +00:00
scrawl
80a8ef6d49
Merge pull request #1661
2018-04-02 17:18:39 +00:00
Capostrophic
baaf65bc2c
Add vanilla enchanted weaponry behavior option, on by default ( fixes #4136 )
2018-03-31 11:46:23 +03:00
bret curtis
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
2018-03-27 20:20:40 +02:00
Capostrophic
2d119e834a
Add vanilla absorb attribute behavior option, on by default ( Fixes #4135 )
2018-03-27 14:27:23 +03:00
Thunderforge
d42791e260
Moving testing options to Advanced page
2018-03-15 22:11:54 -05:00
Thunderforge
f07a12af73
Changing label "and may cause issues" to "and will cause issues"
2018-03-08 18:09:18 -06:00
scrawl
e81faf5f2f
Add an option to disable GUI keyboard navigation (Bug #4333 )
2018-03-08 23:39:35 +00:00
Harald H
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
2018-03-08 21:23:24 +01:00
Thunderforge
6931f6cadc
Adding message indicating the purpose of the "Testing" block
2018-03-07 18:37:43 -06:00
Thunderforge
da74ca5ce0
Add testing options to the Settings page
2018-03-05 21:26:59 -06:00
Chris Robinson
01dbac7b15
Don't use a different setting for distant viewing distance
2018-03-04 11:37:57 -08:00
Chris Robinson
41669467ae
Make settings for distant fog parameters
2018-03-04 11:37:57 -08:00
AnyOldName3
6d29375d5e
Turning on shadows will now force shaders on
2018-03-03 15:50:36 +00:00
AnyOldName3
e46bf28e5f
Add object shadows setting
2018-03-03 15:13:36 +00:00
AnyOldName3
94c7cf414f
Update documentation to clarify the effects of using shadows without shaders.
2018-03-01 18:28:32 +00:00
Thunderforge
4292351993
Adding Max Quicksaves setting to Launcher
2018-02-27 20:17:21 -06:00
scrawl
9e9c278527
Merge pull request #1597
2018-02-27 23:48:45 +00:00
AnyOldName3
d1a2955fa1
Merge upstream
2018-02-27 14:29:14 +00:00
Miloslav Číž
db6107f12f
Merge branch 'master' into screenshot360
2018-02-25 11:25:19 +01:00
Capostrophic
534f3ef094
Bring UI dimensions and positions more in line with Morrowind UI
2018-02-24 12:23:44 +03:00
Daniel Vukelich
104495a9a4
Set default number of quicksaves to 1
2018-02-13 21:05:24 -05:00
scrawl
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting
2018-02-13 00:40:41 +00:00
Thunderforge
a78acbac85
Changing page description to address Zini's concerns
2018-02-04 13:38:11 -06:00
Thunderforge
cc0f7d19dc
Removing "Use these settings at your own risk"
2018-02-02 12:09:25 -06:00
Thunderforge
04f79c34a2
Fixing typo "Tooltip" -> "Tool Tip"
2018-01-28 23:31:40 -06:00
Thunderforge
8837046d9c
Adding panel for advanced settings.cfg options
2018-01-28 22:49:49 -06:00
AnyOldName3
9f20aaccfb
Add some more advanced settings to control shadows.
2018-01-25 16:08:34 +00:00
AnyOldName3
6ec893b618
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-01-22 15:54:13 +00:00
Daniel Vukelich
97924d97c7
Add the option for multiple quicksave slots
...
With more than 1 quicksave slot, slots will be created each time you
quicksave until the maximum number (configured in settings) of
quicksaves has been reached. After that, the oldest quicksave slot will
be replaced each time you quicksave. Saves are numbered sequentially,
unless the maximum number of slots is 1, in which case it is not numbered.
2018-01-12 20:09:39 -05:00
scrawl
dd5ebe225b
Merge pull request #1580
2018-01-11 01:54:28 +00:00
Thunderforge
bd072b131b
Moving controller file out of the controllers subdirectory
2018-01-02 20:58:43 -06:00
Thunderforge
096e734df6
Adding gamecontrollerdb.txt file that got left behind due to being on .gitignore
2018-01-01 22:42:45 -06:00
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
2018-01-01 22:16:54 -06:00
Thunderforge
a5e4f95ed4
Updating controller mappings to latest version
2018-01-01 22:16:54 -06:00
Bret Curtis
7367899634
update openmw.appdata.xml to fix https://lintian.debian.org/tags/appstream-metadata-legacy-format.html
2018-01-01 19:47:36 +01:00
Miloslav Číž
3b741dc4b7
Revert "Add slider for refraction size in settings window"
...
This reverts commit ee40b41285
2018-01-01 13:28:14 +01:00
AnyOldName3
c3e0398d1c
Add settings
2017-12-27 02:32:17 +00:00
Miloslav Číž
ee40b41285
Add slider for refraction size in settings window
2017-12-09 14:03:56 +01:00
AnyOldName3
0e481a457e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2017-12-08 23:26:08 +00:00
Miloslav Číž
a142a67972
Add default settings for 360 screenshots
2017-12-06 21:16:30 +01:00
Miloslav Číž
b69c16e682
Add setting option to scale water refractions
2017-12-06 20:39:09 +01:00
Miloslav Číž
390838e084
Replace switch with ifs in shader
2017-12-01 21:03:29 +01:00
Miloslav Číž
ea5e078526
Update shaders in CMakeLists
2017-12-01 19:54:48 +01:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
2017-11-29 22:37:50 +00:00
scrawl
2136003e1c
Reapply commit a3f821cdc which got lost in a merge
2017-11-21 22:43:56 +00:00
Andrei Kortunov
ea36956ff1
Reworked trade window
2017-11-21 10:00:53 +04:00
scrawl
cc3c27f241
Clean up layout files to use Spacer class
2017-11-20 23:20:04 +00:00
scrawl
a3f821cdcd
Disable keyboard for trade +/- buttons
...
For one, because their RepeatClick handler breaks the keyboard function, and because its redundant anyway (just press Up/Down arrow with the edit box focused to do the same thing)
2017-11-20 23:20:04 +00:00
AnyOldName3
0f6f097cf2
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-11-17 18:24:08 +00:00
AnyOldName3
3d18ddc8e4
Take into account previous #line directives when expanding @foreach shader macros
2017-11-17 17:18:33 +00:00
scrawl
5a93b6a324
Enable word-wrapping for the console history
2017-11-15 17:20:05 +00:00
Miloslav Číž
af38d3a47d
get rid of sphericalscreenshot class
2017-11-15 17:01:16 +01:00
Miloslav Číž
226fb9c26b
render cubemaps in OGL coordinates
2017-11-15 16:07:01 +01:00
Miloslav Číž
1c3d45f641
dirty 360 screenshot GPU setup
2017-11-15 15:20:59 +01:00
scrawl
b7eda61f7a
Fix overlapping widgets in trade window layout ( Fixes #4205 )
2017-11-11 21:59:21 +00:00
scrawl
b9baee51d5
Fix overlapping widgets in trade window layout ( Fixes #4205 )
2017-11-10 22:51:29 +00:00
AnyOldName3
590531595b
Create @foreach shader preprocessor macro in preparation for moving shadow setup out of shadermanager.cpp
2017-11-10 02:02:27 +00:00
AnyOldName3
25432146f7
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-11-07 22:08:21 +00:00
AnyOldName3
715f29165b
Dynamically adjust shaders to have the required number of shadow maps.
2017-11-07 20:22:45 +00:00
AnyOldName3
56fa33af66
Enable parallel split shadow maps
2017-11-07 00:32:04 +00:00
Miloslav Číž
282800b5b2
Create LICENSE ( #1532 )
...
* Create LICENSE
Let's add the license file so that GitHub officially registers it and displays it next to the project.
* move license files
* update licenses in cmakelists.txt
* fix link in README
2017-11-05 15:37:38 +00:00
AnyOldName3
3f63ebce77
Theoretically, at least, fix everything (except hte sky issue which is resolved in another branch)
2017-11-05 14:37:36 +00:00
AnyOldName3
e15d461921
Add (potentially physically-flawed) shadow support to the water shader
2017-10-30 20:06:52 +00:00
David Walley
41dc82abad
Update Links to Documentation in settings.cfg files ( #1523 )
...
* Update settings-default.cfg
* Update settings.cpp
2017-10-28 16:05:30 +00:00
AnyOldName3
147455626e
Merge OpenMW/master
2017-10-13 21:39:15 +01:00
AnyOldName3
26a7b48d69
Attempt to make a VDSM work, and also to set up a debug HUD, but without success.
2017-10-13 18:19:29 +01:00
AnyOldName3
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
2017-10-11 21:58:55 +01:00
AnyOldName3
e0ce284272
Fix the same shader preprocessor variable issue for the third time now
2017-10-08 01:34:54 +01:00
AnyOldName3
2b78fb436d
Fix issue with shader preprocessor variables
2017-10-08 00:44:35 +01:00
AnyOldName3
b94bbe00cb
Merge remote-tracking branch 'upstream/master' into osgshadow-test
2017-10-08 00:18:02 +01:00
scrawl
12510efab7
Fade screen out during loading screen (when travelling)
2017-10-04 16:00:38 +00:00
scrawl
d7a5622485
Fix book window buttons overlap
2017-10-03 09:16:46 +00:00
AnyOldName3
ba1e2cab2f
Merge remote-tracking branch 'upstream/master' into osgshadow-test
2017-10-03 03:00:15 +01:00
AnyOldName3
ebd3dcf2b3
Remove unnecessary preprocessor variable in shaders
2017-10-03 02:58:25 +01:00
scrawl
64e27c032b
Merge pull request #1481 from scrawl/keyfocus
...
WindowManager overhaul & improved keyboard support
2017-09-28 22:34:05 +00:00
scrawl
05348ab7ed
Merge pull request #1483 from drummyfish/master
...
water shader improvements plus rain ripple effect (#452 )
2017-09-28 22:31:13 +00:00
Miloslav Číž
64793a55dc
get rid of buggy shader trick
2017-09-28 20:44:43 +02:00
Miloslav Číž
c9c6326d87
fix non-refraction water rain ripples
2017-09-28 19:23:37 +02:00
Miloslav Číž
8416feaf5b
link rain water ripple effect to actual rain
2017-09-28 19:04:31 +02:00
scrawl
0deda69a27
Fix wrong skin for levelup attribute values
2017-09-27 22:04:36 +02:00
scrawl
db650df416
Fix 'blocking' messageboxes not handling key focus properly
2017-09-27 21:41:22 +02:00
scrawl
fb8306b61f
Disable keyfocus for world map button
...
Fixes 'Tab' no longer working as a keybinding for closing the inventory window.
2017-09-27 21:30:31 +02:00
Miloslav Číž
4a332a1807
improve rain ripples
2017-09-27 21:25:14 +02:00
Miloslav Číž
5c50506c83
water shader refactor plus basic rain ripples
2017-09-27 17:13:21 +02:00
scrawl
2d873a13ac
Merge pull request #1469 from drummyfish/master
...
water shader improvements (partially fixes #3365 )
2017-09-27 13:14:22 +00:00
scrawl
879da9c69a
Add key focus for some more button skins
2017-09-27 12:56:06 +00:00
scrawl
7a3fbfb34a
Slightly improve journal window keyboard navigation
2017-09-27 12:56:05 +00:00
scrawl
1714271a76
Improve KeyboardNavigation to better handle modal windows
...
It's no longer possible to cycle to widgets that aren't part of the current modal window.
The window manager will remember the focused widget of a modal window on a limited basis (it'll be discarded when a different modal window opens).
2017-09-27 12:55:58 +00:00
scrawl
a0ee1c5630
Fix order of buttons in book window layout for key cycling
2017-09-27 12:55:52 +00:00
Miloslav Číž
cde2c13900
make water depth independent of view frustum
2017-09-26 14:14:28 +02:00
scrawl
e4c9d84666
Disable NeedKey for ScrollView skins
...
The widget is set to accept key focus by default for no reason I can tell. Fix in MyGUI TBD
2017-09-25 01:20:46 +02:00
scrawl
2c4b0cc408
Hide sneak indicator by default
2017-09-25 00:47:05 +02:00
scrawl
be19f51013
Adjust some more windows to be keyboard friendlier
2017-09-24 19:08:14 +02:00
scrawl
622e3ebd60
Remove excessive padding in some GUI layouts
2017-09-24 19:08:12 +02:00
scrawl
5482ad0482
Fix tab completion in console to not cycle key focus
2017-09-24 19:08:11 +02:00
scrawl
c203a0774a
Adjust some layouts to take better advantage of keyboard navigation
2017-09-24 19:08:11 +02:00
scrawl
c11fe6788f
Add basic keyboard navigation for the GUI
...
(Shift)Tab cycles, arrow keys move to the next button in that direction, Enter/Space accepts.
Note: Unless MyGUI is hacked to bits, clicking on an empty space will annoyingly reset the key focus. Not sure how to deal with that yet.
The visual highlight for selected buttons requires MyGUI commit 632d007429d0bf0c7d7f6c5db4a08353a63dd839 or later to appear (to be released in 3.2.3).
2017-09-24 19:08:11 +02:00
Miloslav Číž
9dececcbd2
rename a constant in water shader
2017-09-22 21:10:05 +02:00
Miloslav Číž
28f58d5a32
add deleted letter in macro
2017-09-22 21:06:03 +02:00
Miloslav Číž
f274bc84cc
fix depth computation in water shader
2017-09-22 21:03:09 +02:00
Miloslav Číž
8df79625e8
fix water shader
2017-09-22 10:53:02 +02:00
Miloslav Číž
658fa0fdae
fix typo
2017-09-21 22:33:57 +02:00
Miloslav Číž
c43baf6e94
remove commented code
2017-09-21 22:31:26 +02:00
Miloslav Číž
16d9773c6c
fix water shader artifacts at shores
2017-09-21 22:25:36 +02:00
AnyOldName3
e33bec97be
Tidy up the mess I made of lighting.glsl a bit by removing two single-line functions that are only ever called in one location.
2017-09-21 02:03:53 +01:00
AnyOldName3
26ecf2088b
Make shadows play nicely with per-vertex lighting
2017-09-21 01:59:02 +01:00
AnyOldName3
c67b3267fb
Stop shadowing ambient lighting from the light casting a shadow when using per-pixel lighting.
2017-09-21 00:49:34 +01:00
AnyOldName3
f50063402d
Adjust shaders to support shadows
2017-09-21 00:25:48 +01:00
scrawl
aaa727757d
Don't use MW_Dialog skin with plain Widgets
...
After MyGUI commit cfdaf5f , the 'Client' area will be used for every type of widget, whereas previously it would only be used for some widgets like 'Window'. Use 'Window' widget where the client was always used.
This fixes a wrong margin when built with cfdaf5f or later.
2017-09-20 22:24:20 +00:00
scrawl
fe6f9ffff4
Fix skins incorrectly named 'Client' to avoid a collision with new MyGUI feature cfdaf5f
2017-09-20 22:24:19 +00:00
scrawl
d07fe91cfe
Don't use MW_Dialog skin with plain Widgets
...
After MyGUI commit cfdaf5f , the 'Client' area will be used for every type of widget, whereas previously it would only be used for some widgets like 'Window'. Use 'Window' widget where the client was always used.
This fixes a wrong margin when built with cfdaf5f or later.
2017-09-20 22:56:57 +02:00
scrawl
186cc1e370
Fix skins incorrectly named 'Client' to avoid a collision with new MyGUI feature cfdaf5f
2017-09-20 22:29:34 +02:00
Andrei Kortunov
3fb3c4c20f
Add scrollbar to a birth effect lists (bug #4105 )
2017-09-17 14:06:01 +04:00
Chris Robinson
ec01b89e59
Increase the default buffer cache sizes
2017-09-14 16:00:42 -07:00
Andrei Kortunov
6ef5d1408f
Disabled transparency for description edit fields
2017-08-20 21:25:36 +04:00
Andrei Kortunov
765f982123
Removed cursor from Favorite Attributes label
2017-08-20 20:48:14 +04:00
scrawl
2611377081
Merge pull request #1350 from akortunov/deathanimationfix
...
Do not allow to loot fighting actors during death animation (bug #3528 )
2017-08-18 22:04:12 +00:00
scrawl
1f2b62c541
Merge pull request #1388 from akortunov/guifixes
...
Make inventory avatar to fit within border
2017-08-11 20:31:02 +00:00
Andrei Kortunov
e4df17ccaf
Make inventory avatar to fit within border (bug #4003 )
2017-08-11 09:02:50 +04:00
scrawl
0f983144a4
Merge pull request #1383 from akortunov/guifixes
...
Enable transparency for interactive messageboxes and tooltips in game mode
2017-08-10 21:55:24 +00:00
Thunderforge
f41a4bb937
Changing "New Installation" to "Retail CD/DVD" for clarity
2017-08-09 00:20:49 -05:00
Andrei Kortunov
56f5a5dee3
Added transparency to 'owned' tooltip
2017-08-08 22:57:39 +04:00
Andrei Kortunov
8c1c80ab91
Disable transparency for persuation dialogue menu
2017-08-08 20:39:25 +04:00
Andrei Kortunov
6cb3c83248
Add transparency for interactive messageboxes in game mode
2017-08-08 20:36:50 +04:00
Andrei Kortunov
dd919b9f2c
Do not allow to loot fighting actors during death animation (bug #3528 )
2017-08-07 09:55:50 +04:00
Andrei Kortunov
56a30d7aec
Journalbook layout fixes
2017-08-03 20:27:14 +04:00
Andrei Kortunov
a03cc8216e
Fixed count widget buttons alignment
2017-07-31 18:51:44 +04:00
scrawl
c9d9461d3e
Add Spacer class derived from AutoSizedWidget
...
Using a normal widget as a spacer with HStretch/VStretch may not work properly because for widgets not derived from AutoSizedWidget, the HBox/VBox treat the widget's current size as the requested minimum size. This leads the layout to break when resized more than once.
The new class sets HStretch and VStretch to true by default to save some typing.
2017-07-31 16:20:29 +02:00
scrawl
7d97d1d513
Merge pull request #1247 from pvdk/progressbar
...
Ini-importer progress bar fills the whole width of the ui element now
2017-07-30 23:38:49 +00:00
Thunderforge
b98e175161
Renaming duplicate horizontalSpacer variable
2017-07-30 17:40:56 -05:00
scrawl
59b92dc67b
Merge pull request #1349 from Thunderforge/prevent-parchment-from-being-cut-off
...
UI adjustments to prevent parchment scroll from being cut off (fixes #3910 )
2017-07-30 22:01:58 +00:00
scrawl
196eedf1b0
Fix key focus issue with the journal hotkey
2017-07-30 23:51:07 +02:00
Nikolay Kasyanov
fd0be7008d
[macOS] Fixes accidental loading of plugins from system-wide Qt install
...
I was too eager to remove the workaround in 014a2fc0e9http://doc.qt.io/qt-5/qt-conf.html .
Also, moves Qt plugins from Contents/MacOS to Contents/PlugIns
for consistency.
2017-07-30 15:43:45 +02:00
Thunderforge
072fbcaee3
UI adjustments to prevent parchment scroll from being cut off ( fixes #3910 )
2017-07-25 22:12:29 -05:00
Thunderforge
8ded95201d
Move Morrowind Content Language label to section header
2017-07-24 22:56:58 -05:00
scrawl
20606a2aff
Add 'prediction time' setting for cell/terrain pre-loading
2017-07-19 16:44:37 +02:00
Andrei Kortunov
6795163265
Disable transparency for all popup lists
2017-07-16 23:03:53 +04:00
Andrei Kortunov
5bb9f1b187
Make popup in character select menu non-transparent
2017-07-16 13:18:59 +04:00
Andrei Kortunov
2b22d10ebc
Spellview fixes
2017-07-16 13:14:19 +04:00
Andrei Kortunov
9179a019df
Quick keys menu fixes
2017-07-16 13:11:34 +04:00
Andrei Kortunov
5be1c81913
Fixed Close button handler in EditEffectDialog ( fixes #3956 )
2017-07-15 14:03:36 +04:00
Andrei Kortunov
f4a187a9c2
Move a setting to show enchanting success chance from GUI to Game section
2017-06-03 23:03:24 +04:00
Andrei Kortunov
9a1ba1e559
Show success chance when self-enchanting (Feature #3492 )
2017-06-03 14:39:15 +04:00
scrawl
9fd0d54a35
Merge pull request #1289 from akortunov/newrepair
...
Improved repair and recharge widgets
2017-05-31 22:47:38 +02:00
Andrei Kortunov
10d4cb15ad
Improved repair widget
2017-05-31 19:11:49 +04:00
Andrei Kortunov
1164c3f16e
Improved recharge widget
2017-05-31 19:11:49 +04:00
scrawl
2638327593
Merge pull request #1303 from akortunov/guifixes
...
Character generation layout fixes
2017-05-31 15:25:41 +02:00
Andrei Kortunov
2b28d1a6d2
Select specialization menu layout fix
2017-05-30 17:15:10 +04:00
scrawl
a1661af864
Merge pull request #1301 from akortunov/tooltips
...
Tooltips layout fixes
2017-05-29 00:13:34 +02:00
Andrei Kortunov
f17badb3cd
Makes cells cache size configurable
2017-05-25 13:09:40 +04:00
Andrei Kortunov
da828a1089
Class choice layout fix
2017-05-01 21:37:37 +04:00
Andrei Kortunov
ba78e187c7
Listbox spacing fix
2017-05-01 21:28:42 +04:00
Andrei Kortunov
0e35e6a700
Class generation menu layout fixes
2017-05-01 20:51:54 +04:00
Andrei Kortunov
1520a4d7db
Levelup menu layout fixes
2017-05-01 20:48:39 +04:00
Andrei Kortunov
26ec467df0
Tooltips: faction, magic effects layout fixes
2017-05-01 10:00:51 +04:00
Andrei Kortunov
987677db75
Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes
2017-04-30 22:39:05 +04:00
Andrei Kortunov
27181367e2
Tooltips: skills and attributes layout fixes
2017-04-30 21:26:13 +04:00
Andrei Kortunov
6331cc6ab9
Tooltips: level, race, class, specialization layout fixes
2017-04-30 19:45:36 +04:00
scrawl
9f1527b7da
Merge pull request #1272 from akortunov/guifixes
...
Service menus layout fixes
2017-04-30 12:27:21 +02:00
Andrei Kortunov
bc9080d9d7
Removed 31 symbols cap from service menus
2017-04-23 08:56:54 +04:00
Andrei Kortunov
6c1e3a0618
Merged from upstream master
2017-04-21 08:48:22 +04:00
Andrei Kortunov
c65c643abe
Fixed race menu skills layout
2017-04-20 21:30:13 +04:00
Andrei Kortunov
0a90b48e60
Fixed progressbars layout in review menu
2017-04-20 17:37:37 +04:00
Andrei Kortunov
f0f1df3a96
Properly clear inventory
2017-04-19 20:54:09 +04:00
Andrei Kortunov
aac78d29a4
Service menus layout fixes
2017-04-16 20:30:20 +04:00
scrawl
f63b1e81cd
Merge pull request #1228 from akortunov/master
...
Options to show hidden weapon parameters
2017-04-14 20:01:08 +02:00
scrawl
8d8f293a65
Merge pull request #1246 from akortunov/develop
...
Menu improvements
2017-04-12 23:57:00 +02:00
Andrei Kortunov
1fe3a3efe4
Count dialog layout changes
2017-04-12 19:15:22 +04:00
Andrei Kortunov
72a16dc78b
Merge branch 'master' into pinned since added PR #1250
2017-04-12 13:17:06 +04:00
Andrei Kortunov
506cc47c9d
Add option to show reach and attack speed for melee weapons
2017-04-12 09:12:25 +04:00
Andrei Kortunov
95ce7637f3
Adds persisted pin (feature #2834 , bug #2489 )
2017-04-10 10:18:00 +04:00
MiroslavR
395e97cf40
Remove evil "implicit GetJournalIndex" hack from expression parser
2017-04-03 01:44:26 +02:00
Pieter van der Kloet
8d76903392
Ini-importer progress bar fills the whole width of the ui element now
2017-04-02 03:15:32 +02:00
Andrei Kortunov
df5a43363a
Confirmation dialogs size fix
2017-03-30 17:05:56 +04:00
Andrei Kortunov
e5a0f89934
List scroll fix
2017-03-28 12:49:23 +04:00
Andrei Kortunov
edadcb338c
Savegame dialog improvements
2017-03-27 23:10:57 +04:00
Andrei Kortunov
a35d4334c3
Encumberance text fix
2017-03-27 14:54:04 +04:00
Andrei Kortunov
c9cf0ec977
Buttons and widgets captions vertical alignment
2017-03-27 14:38:40 +04:00
Andrei Kortunov
7d09a5d644
Progress bars vertical alignment
2017-03-27 13:33:28 +04:00
Andrei Kortunov
4daa88351b
Vanilla style progress bars
2017-03-24 21:38:33 +04:00
Andrei Kortunov
b89fdcfd27
Vanilla style drowning widget (partially fixes bug #3801 ).
2017-03-24 09:41:18 +04:00
Andrei Kortunov
1286754fb3
Add a new option to show arrow damage (feature #2923 )
2017-03-18 08:07:36 +04:00
scrawl
19d516cbda
Use the QuadTreeWorld based on distant terrain setting now that it sort of works.
2017-03-14 19:27:56 +01:00
scrawl
e295a72d43
Add align=Center to GUI dialogs ( Fixes #2289 )
2017-02-14 07:58:16 +01:00
scrawl
2ea0db1d1a
Merge pull request #1198 from Allofich/combat
...
Make combat engagement logic more like vanilla
2017-02-10 06:20:04 +01:00
scrawl
93c582064e
Remove item shadows for equipped weapon/spell indicators
2017-02-09 04:13:13 +01:00
scrawl
45ae8d5ffa
Add support for GL_AMBIENT colorMode to shaders as required by particle systems
2017-02-08 18:39:24 +01:00
Allofich
25c64dbb0f
Make combat engagement logic more like vanilla
...
(Fixes #2678 , Fixes #3705 )
2017-02-07 01:25:12 +09:00
scrawl
5f2539adb6
Optimize scrollbar/progress skins by using one widget for the track instead of one widget per pixel
2017-02-04 16:05:22 +01:00
scrawl
2db7292bcb
Add new setting for the number of preloading worker threads
...
If you have CPU cores to spare, consider setting 2 or 3. Up to about 3 threads, preloading performance seems to increase in a linear fashion, but with 4 or more threads I/O bottlenecks and synchronization overhead starts to show.
2017-02-04 02:59:28 +01:00
scrawl
1808b8567e
Add 'small feature culling pixel size' setting specifically for water RTTs, by default set higher than the one in [Camera]
2017-02-01 06:00:14 +01:00
scrawl
fcb4129aee
Add 'small feature culling pixel size' setting
2017-02-01 06:00:14 +01:00
Nikolay Kasyanov
9e8e9aef86
Update gamecontrollerdb.txt from upstream
2017-01-28 11:02:06 +01:00
Leon Krieg
739cd5ba45
Fixed more spelling mistakes
2016-12-15 13:09:40 +01:00
scrawl
5297d7b5be
Merge pull request #1137 from nikolaykasyanov/osx-structure
...
[macOS] Move all resources files inside application bundles (fixes #3566 )
2016-11-25 02:51:32 +01:00
Nikolay Kasyanov
db69342b5d
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
2016-11-23 22:32:54 +01:00
MiroslavR
7e5ba4d435
Fix default values of some GMSTs
2016-11-17 19:43:02 +01:00
MiroslavR
e80636f0ca
Improve performance of repairing/recharging ( Fixes #2493 )
2016-11-06 11:01:46 +01:00
MiroslavR
76ddd9bebb
Add a setting for merchant auto-equipping prevention
2016-10-19 02:22:49 +02:00
scrawl
77bc807305
Attenuate the light ambient in lighting.glsl ( Fixes #3597 )
2016-10-17 15:01:10 +02:00
scrawl
e7154c3f7c
Add the ItemShadow to various other skins
2016-10-13 01:46:57 +02:00
scrawl
612c3e995f
Add drop shadow to ItemWidget ( Fixes #3545 )
2016-10-13 01:42:50 +02:00
scrawl
f291aabc4b
Fix shader compile error for objects without diffuse map
2016-08-09 01:04:02 +02:00
David Carlier
83bab29e4b
Mainly making compilable under OpenBSD.
...
Renaming one resource file as the space led to issue for qt/moc.
2016-08-06 19:00:27 +01:00
Alexander Kurtz
ff3b7de0e7
Update gamecontrollerdb.txt from upstream.
2016-07-07 18:31:49 +02:00
scrawl
bc04989448
Remove unused uniforms
2016-06-17 00:20:53 +02:00
scrawl
8e23c37668
Flip the parallax offset Y component based on tangent parity (Bug #3440 )
2016-06-16 18:07:10 +02:00
scrawl
6f5b68859f
Comment out UV test that is not working
2016-06-16 17:33:54 +02:00
scrawl
6a1fd05074
Fix the coordinate frame for eyeDir, minor cleanup (Bug #3440 )
2016-06-16 17:32:27 +02:00
scrawl
aa5a643e3b
Fix incorrect multiplication order of TBN matrix (Bug #3440 )
2016-06-16 17:31:17 +02:00
Marc Zinnschlag
091e1bf25d
improved scene element visibility buttons
2016-04-23 13:54:19 +02:00
Sergey "Shnatsel" Davidoff
5c8756cb2c
Add composite icon for exterior cell controls in scene view, along with source SVG and a bash script that I used to assemble all possible status combinations
2016-04-21 17:25:53 +03:00
Sergey "Shnatsel" Davidoff
c2c81c6b1a
Reversed the location of original state and current state in scene view icon. This way it's much more obvious, assuming the icon stays on the left of the actual landscape view. See https://forum.openmw.org/viewtopic.php?p=38971#p38971 for more info
2016-04-21 15:18:30 +03:00
scrawl
f3e9fd49f3
Don't add the autodetected mw path in global config file
...
The wizard takes care of detecting the MW installation path already. By having this path permanently in the global cfg-file, there exists no way to *not* use an autodetected installation, which is a problem.
2016-04-17 17:17:07 +02:00
scrawl
e1dda9675d
Add "preload instances" setting, disabling this may help if you are low on memory.
2016-03-30 00:13:37 +02:00
scrawl
6f31b3d79f
Add parallax mapping for objects
2016-03-22 21:46:15 +01:00
scrawl
b59b2c6d6d
Move to parallax.glsl
2016-03-22 21:46:15 +01:00
scrawl
b4dda045a6
Pass the tangent in object space
2016-03-22 21:46:15 +01:00
scrawl
157c11398d
Add terrain parallax mapping
2016-03-22 21:46:15 +01:00
Marc Zinnschlag
563f44b823
Merge remote-tracking branch 'origin/master'
2016-03-03 12:13:11 +01:00
Aesylwinn
9d985d883b
added grid icon
2016-03-02 20:45:04 -05:00
scrawl
6e7c6fdd7e
Implement NiTexturingProperty::DecalTexture
2016-03-01 18:41:36 +01:00
scrawl
414c19f717
Fix detailMapUV bug
2016-03-01 18:40:18 +01:00
scrawl
5e105da3ba
Generate texture coordinates per-pixel when normal map + environment map are used
2016-02-24 21:28:55 +01:00
scrawl
900b522d13
Rename viewPos to viewDirection
2016-02-21 01:28:42 +01:00
scrawl
09684adeff
Update settings documentation
2016-02-21 00:48:18 +01:00
scrawl
0db7163363
Add specular mapping for terrain
2016-02-20 19:55:08 +01:00
scrawl
f01e8a6950
Add specular mapping for objects
2016-02-20 19:55:08 +01:00
scrawl
5cf2441b10
ShaderVisitor: support automatic recognition of normal maps based on file pattern
...
Introduce new settings 'auto use object normal maps', 'auto use terrain normal maps', 'normal map pattern'
2016-02-20 18:00:43 +01:00
scrawl
e2dc46c92e
Update settings
2016-02-19 01:48:07 +01:00
scrawl
6000e48bba
Add terrain shaders and normal map support
...
Textures with _n filename suffix are automatically recognized as terrain normal maps.
2016-02-19 01:37:30 +01:00
scrawl
5e12a1b4ef
Add enchanted item glow to the shader
2016-02-18 23:05:44 +01:00
scrawl
1232607385
Remove pointless widget names in settings layout file
2016-02-18 19:41:06 +01:00
scrawl
a73512afb7
Add shader settings to settings.cfg
2016-02-18 19:38:34 +01:00
scrawl
3969675afa
Remove unused settings
2016-02-18 19:38:34 +01:00
scrawl
e5a37a7023
Add normal map code
2016-02-18 19:37:59 +01:00
scrawl
18e80d5627
Add per-pixel lighting code
2016-02-18 19:37:59 +01:00
scrawl
1223bca3d4
Move doLighting to separate file
2016-02-18 19:37:59 +01:00
scrawl
456816f707
Use diffuse.a / vertex.a, use material emission
2016-02-18 19:37:58 +01:00
scrawl
5fd84074c5
Reimplement detailMap, darkMap and emissiveMap
2016-02-18 19:37:58 +01:00
scrawl
e845c576d4
Use the texture matrix
2016-02-18 19:37:58 +01:00
scrawl
3859c58a8a
Assign gl_ClipVertex in the vertex shader to make clip planes work
2016-02-18 19:37:57 +01:00
scrawl
9376811213
Vertex lighting shader
2016-02-18 19:37:57 +01:00
scrawl
044e0a829a
Add fog
2016-02-18 19:37:57 +01:00
scrawl
a9ad1b09e2
Introduce ShaderManager & ShaderVisitor
...
Actual shaders still to be written.
2016-02-18 19:37:56 +01:00
scrawl
7f89bb273a
Add 'reflect actors' setting for the water shader, default off
2016-02-18 19:36:17 +01:00
scrawl
6fb0022b35
Update preloading settings
...
Disable 'preload fast travel' by default.
Add 'min cache size' and 'max cache size' settings.
Split the 'cache expiry delay' into 'preload cell expiry delay' and 'cache expiry delay'.
2016-02-18 17:47:10 +01:00
scrawl
6806741d9b
Add settings for disabling the individual preloading types
2016-02-09 01:58:33 +01:00
scrawl
a81b10b415
Make the cache expiryDelay configurable
2016-02-07 19:05:55 +01:00
scrawl
5efaa9817c
Add preloading settings
2016-02-07 18:01:14 +01:00
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.
2016-02-05 21:03:11 +01:00
scrawl
7d647088ab
Make the local map cell distance configurable
2016-02-05 01:19:45 +01:00
scrawl
ffcb6ec381
Change the default near clip distance to 1 ( Fixes #3155 )
2016-01-21 23:38:23 +01:00
scrawl
ef20962fc5
Disable fog of war rendering on the HUD map by default
2016-01-11 22:58:08 +01:00
scrawl
0da6d249fe
Fix the window pinning button's borders not accepting mouse clicks
2016-01-11 22:57:53 +01:00
scrawl
190bf15887
SettingsWindow: support auto-updating of slider labels through the layout file
2016-01-11 22:57:16 +01:00
Marc Zinnschlag
9c7bbd667b
Merge branch 'usersettings'
2015-12-15 14:58:04 +01:00
Marc Zinnschlag
d6bd2cb1f0
changed name of openmw-cs user settings file
2015-12-15 14:51:25 +01:00
Chris Robinson
f1faeeae3a
Use separate config options for min and mag texture filters
2015-12-13 17:05:19 -08:00
Chris Robinson
b830a413d3
Rename the texture filter options
...
To avoid compatibility issues with upgrading from or downgrading to older
builds.
2015-12-13 16:02:09 -08:00
Chris Robinson
fb6abb53ae
Simplify the in-game texture options
...
This makes it behave like it originally did, although the config options remain
expanded.
2015-12-13 15:02:36 -08:00
Chris Robinson
76bde5ee13
Separate and expand texture filtering options
2015-12-13 11:25:01 -08:00
scrawl
0f3660e268
Update comment in settings-default.cfg
...
There are antialiasing techniques that address texture/shading aliasing, but the one we use (MSAA) does not.
2015-12-12 02:01:19 +01:00
scrawl
3890afd6f5
Merge pull request #843 from kcat/master
...
Add HRTF options and fix an incorrect SoundID
2015-12-08 13:59:15 +01:00
scrawl
e520d37c87
Override the field of view for first person meshes ( Fixes #858 , Fixes #3051 )
2015-12-07 16:29:30 +01:00
scrawl
9621b66b78
Move field of view setting to Camera section
2015-12-07 16:23:06 +01:00
scrawl
9d4af59860
Don't attempt to create quest log buttons if textures are unavailable ( Fixes #3063 )
2015-12-07 15:33:04 +01:00
Chris Robinson
c75303b652
Add an option to select and enable HRTF
2015-12-05 17:14:53 -08:00
Chris Robinson
d4238a6d91
Add config options for the sound buffer cache size
...
The cache size is specified with a min/max range, intended to avoid constant
unloading once the limit is reached. This way, buffers can be unloaded down to
a reasonable mimimum, allowing some more buffers to be subsequently loaded
without causing more unloading.
2015-11-26 02:13:37 -08:00
cfcohen
fa610c447c
Fix typos. Add "e.g." in places where ranges are only
...
recommmendations. Add more factual limits where that's easy.
2015-11-25 17:42:10 -05:00
cfcohen
ac2eedcb7d
Change wording in warning to be clearer. Correct ranges on contrast
...
and gamma.
2015-11-25 09:24:38 -05:00
cfcohen
e0752ccdd0
Prioritize warning about user settings. Make recommendations for
...
screen number more generic. Remove resolution recommendation.
2015-11-24 00:10:23 -05:00
cfcohen
89100088f3
The latest version of the settings.cfg without any code changes.
2015-11-23 20:07:48 -05:00
cfcohen
d7e27fa9f4
New brief comments version of settings.cfg.
2015-11-23 16:36:59 -05:00
cfcohen
89329dfbaf
Merge remote-tracking branch 'upstream/master'
2015-11-23 16:33:15 -05:00
scrawl
3fe38e3556
Remove unused setting
2015-11-23 03:26:21 +01:00
cfcohen
7b64b35eb3
Added comments (and commentary) to the settings-default.cfg file.
2015-11-22 19:28:09 -05:00
scrawl
34350ddeb1
Fix bug #3028
2015-11-22 15:46:04 +01:00
scrawl
75f11f781c
Use the ScalingLayer for Scroll window
2015-11-08 18:32:41 +01:00
scrawl
516f2765a1
Use the ScalingLayer for journal, books and scrolls
2015-11-08 18:30:22 +01:00
scrawl
08a55febc8
Adjust Scroll window layout to better match MW
2015-11-08 17:52:39 +01:00
scrawl
d85d74e615
Use AdditiveLayer for the hit fader
2015-11-07 18:05:16 +01:00
scrawl
a90ef8afd0
layer renaming
2015-11-07 17:49:11 +01:00
scrawl
13c7235b6b
Remove old FPS setting code
2015-11-07 00:13:13 +01:00
scrawl
47664e1370
Hide the defunct FPS checkbox in settings menu, added hint text for f3 binding
2015-11-07 00:10:49 +01:00
scrawl
a41ebd6695
Comment out object shaders in the settings menu
2015-11-07 00:04:34 +01:00
scrawl
4cc200680c
Comment out shadows tab in settings menu
2015-11-06 23:59:06 +01:00
scrawl
c9d7078b4b
Water: add texture quality setting to the settings window
2015-10-29 00:27:42 +01:00
scrawl
60bc7dbabc
Improve MW_ComboBox skin
2015-10-29 00:25:24 +01:00
scrawl
8cb2c7a9fb
Water: remove defunct "reflect <object type>" settings
...
Not really useful
2015-10-29 00:25:24 +01:00
scrawl
8433e0679f
Water: connect to settings window
2015-10-29 00:25:24 +01:00
scrawl
9f8d36b573
Water code cleanup
2015-10-29 00:25:24 +01:00
scrawl
09631385c3
Use boost ifstream for water resources
2015-10-29 00:25:24 +01:00
scrawl
51e40cf1b8
Water: minor shader cleanup
2015-10-29 00:25:24 +01:00
scrawl
d485dd0782
Water: fix world UV coords
2015-10-29 00:25:24 +01:00
scrawl
9f2f503d37
Water: pass the near and far planes
2015-10-29 00:25:24 +01:00
scrawl
37c9c12962
Water: clipping plane offset
2015-10-29 00:25:23 +01:00
scrawl
e13eb625d3
New water WIP
...
Changes compared to old (Ogre) water:
- Uses depth-texture readback to handle the underwater fog in the water shader, instead of handling it in the object shader
- Different clipping mechanism (glClipPlane instead of a skewed viewing frustum)
- Fixed bug where the reflection camera would look strange when the viewer was very close to the water surface
- Toned down light scattering, made the waterColor a bit darker at night
- Fixed flipped water normals and strange resulting logic in the shader
Still to do: see comments...
2015-10-29 00:25:23 +01:00
scrawl
169d76b49b
Fix scrollbar step in count dialog
2015-09-26 01:20:20 +02:00
Emmanuel Anne
29a84452ab
durations in tooltips : use "show effect duration" setting
2015-09-16 22:42:54 +02:00
scrawl
481f23d955
Implement framerate limit setting
...
The framerate limit can be used to reduce strain on the CPU and GPU, in a way similar to VSync, but without the increased input lag that is typical with VSync.
2015-09-07 16:05:51 +02:00
Marc Zinnschlag
d436dc332b
Merge remote-tracking branch 'jeffreyhaines/gametimetracker'
2015-08-20 20:39:44 +02:00
Jeffrey Haines
d91f197119
Time played display setting
2015-08-19 11:31:43 -04:00
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
Nikolay Kasyanov
dbcce482a6
OS X: enable high resolution mode for OpenMW & OpenCS
...
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
2015-08-15 22:37:09 +02:00
Alexandre Moine
8c8c5328dc
Rewrite of the description
2015-08-04 22:50:53 +02:00
Alexandre Moine
581ea26605
Add appdata file for openmw and install it
2015-08-04 13:06:43 +02:00
Pawel Kubik
47922f6c35
Changed a settings variable responsible for number of loaded exterior cells.
2015-07-24 22:01:49 +02:00
Jiří Kuneš
a5b4e087c5
define owned colours in settings.cfg
2015-07-18 22:17:46 +02:00
Jiří Kuneš
cbc44b33ba
define crosshair owned colour in openmw_hud_box.skin.xml
2015-07-18 21:29:38 +02:00
Jiří Kuneš
75f5972898
show owned - better settings
2015-07-18 17:13:20 +02:00
Jiří Kuneš
df077f8649
color tooltip red when taking item would result in crime
2015-07-18 16:56:57 +02:00
Marc Zinnschlag
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2015-07-18 12:22:37 +02:00
Marc Zinnschlag
edde1fb727
Merge remote-tracking branch 'scrawl/master'
2015-07-18 11:40:36 +02:00
scrawl
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
2015-07-18 03:09:04 +02:00
Jiří Kuneš
15107ca5cf
crosshair owned - settings option
2015-07-17 17:48:38 +02:00
scrawl
9a115fedbc
Add ability to copy&paste the version label in the main menu
2015-07-16 20:11:33 +02:00
scrawl
76328677ef
Add some values to launcher's antialiasing combobox
2015-06-05 02:48:51 +02:00
scrawl
89fc473fae
Remove Render System combo box from the launcher UI
2015-06-05 02:35:13 +02:00
scrawl
a2e211675d
Update openmw_layers.xml to newer version
2015-06-04 02:35:52 +02:00
scrawl
c2131e7c31
Make near clip distance configurable
2015-05-24 02:34:20 +02:00
scrawl
c748ea7363
Fix view distance slider
2015-05-24 01:40:49 +02:00
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
2015-05-23 20:33:44 +02:00
scrawl
0fb59178b6
Settings file cleanup
2015-05-22 20:15:50 +02:00
scrawl
bec9abd319
Remove name extension for internal MyGUI textures
...
Since they're no longer loaded from disk, the extension makes no sense.
2015-05-15 23:21:29 +02:00
scrawl
49df07ea7f
Implement UI scaling factor
2015-05-15 00:41:21 +02:00
scrawl
a73362f036
Settings file cleanup
2015-05-14 21:45:18 +02:00
scrawl
24bb2e152c
Apply texture filter setting changes
2015-05-14 21:42:04 +02:00
scrawl
5442bf23a6
Apply video mode & gamma setting changes
2015-05-14 20:31:16 +02:00
scrawl
3e86dd7df0
Apply runtime changes to field of view & view distance
2015-05-14 18:46:28 +02:00
scrawl
4dd96f3318
Fix missing tiling in skin
2015-05-14 01:32:46 +02:00
scrawl
fd3d49c171
Fix typo in settings layout
2015-05-14 01:18:24 +02:00
scrawl
4825744a03
Fix inconsistent health bar skin
2015-05-13 17:25:54 +02:00
scrawl
033719ccd7
Correct the icon used for custom map markers
2015-05-11 16:38:15 +02:00
dteviot
b0c4be2316
Multi-select + context menu. ( Fixes #2480 )
...
Content selector, added multi-select + context menu to allow check/uncheck the multi-selected items.
2015-05-04 14:52:47 +12:00
scrawl
c1edc30ad7
Dead code removal
2015-05-04 03:29:12 +02:00
scrawl
157d8bfedd
Remove unused mygui files
2015-05-03 17:26:12 +02:00
scrawl
8817f44d63
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
2015-05-02 17:48:24 +02:00
scrawl
cac288d5be
Remove OgreInit
2015-05-01 21:49:36 +02:00
scrawl
a592c1a1c2
Remove unused resources
2015-05-01 18:42:44 +02:00
scrawl
c92592493e
OpenMW: create a window and render the starting cell(s)
2015-04-12 15:38:30 +02:00
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
Ivy Foster
f708944657
Remove toggle sneak menu option
...
Users can change the option in settings.cfg.
2015-03-08 16:15:43 -05:00
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.
2015-03-08 15:23:46 -05:00
Marc Zinnschlag
8b84fa5579
Merge remote-tracking branch 'scrawl/master'
2015-03-02 20:01:31 +01:00
Marc Zinnschlag
36ea374c10
Merge remote-tracking branch 'sandstranger/fixes-for-glsles2'
2015-03-02 19:34:25 +01:00
scrawl
fb0fdf0312
New look for fps counter
2015-03-01 23:58:16 +01:00
sylar
4c57cfc2d3
fixes for glsles2
2015-03-01 09:49:33 +04:00
scrawl
960e99c4f3
Loading screen align fix
2015-02-28 17:43:15 +01:00
scrawl
76732b475a
Remove leftover
2015-02-28 16:37:06 +01:00
scrawl
0cd5437595
gamecontrollerdb.txt updated from upstream, added link and license
2015-02-27 22:37:29 +01:00
scrawl
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
2015-02-27 22:37:22 +01:00
scrawl
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
2015-02-27 22:21:02 +01:00
Digmaster
1e4a845b6f
Minor code cleanup
2015-02-27 22:19:08 +01:00
Marc Zinnschlag
44d1f43b2b
Merge remote-tracking branch 'sandstranger/fixes-for-android'
2015-02-27 10:34:41 +01:00
sylar
edd3f9f95c
small fix for float
2015-02-27 08:58:00 +04:00
sylar
cef725012c
fix transpose error fo gles2
2015-02-27 08:56:20 +04:00
Marc Zinnschlag
093c577895
Merge remote-tracking branch 'dteviot/Bug2344'
2015-02-26 19:05:30 +01:00
scrawl
68f89318e7
Fix canvas align in skill view
2015-02-22 20:56:47 +01:00
dteviot
accc078e0e
Morrowind.ini import progress bar. ( Fixes #2344 )
...
1. Show a "bouncing ball" Progress bar when importing from morrowind.ini.
2. Removed dialog that asks for content list name when import game files from morrowind.ini. Instead, name is time stamp.
3. Removed commented out code.
4. Additional bugfix. No longer create a empty content list when OpenMW.cfg has no content files.
2015-02-22 08:46:12 +13:00
scrawl
a5847afdac
Fix ignored clicks on HUD mini-map ( Fixes #2388 )
2015-02-20 00:00:13 +01:00
scrawl
93ffdb427c
Small tweak to ripples
2015-02-14 15:53:01 +01:00
scrawl
a139e4efb0
Grey out completed quests in journal quests list
2015-02-13 16:51:34 +01:00
jacmoe
ee574e08ef
MIT License header added to all terrain component files.
2015-02-09 20:16:29 +01:00
scrawl
c27c20a859
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
files/materials/water.shader
2015-02-09 19:40:59 +01:00
scrawl
dbd4abd6fe
Fix ripples for D3D - added simpler effect ( Fixes #1649 )
2015-02-09 19:30:11 +01:00
Marc Zinnschlag
e9d6e4f6df
Merge remote-tracking branch 'ace/include-cleanup'
2015-02-09 18:03:28 +01:00
scrawl
e81d2a9dde
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
apps/openmw/mwmechanics/npcstats.cpp
2015-02-08 21:28:29 +01:00
scrawl
c63ab673e1
Revert "Add freedesktop.org mimeinfo for OpenMW save game files"
...
This reverts commit 94002b0758
2015-02-07 23:24:27 +01:00
MiroslavR
1230cf49bf
Properly center jail progress widget, fix a bug with it not disappearing if the console is open
2015-02-07 18:38:41 +01:00
scrawl
9ce3e4b4e1
UI consistency fix in levelup dialog
2015-02-06 01:27:17 +01:00
Marc Zinnschlag
8292b22e2f
Merge remote-tracking branch 'lazaroth/Tweaks'
2015-02-03 20:02:10 +01:00
Lazaroth
42363191a4
Layout tweaks
2015-02-03 15:25:36 +01:00
Marc Zinnschlag
0557d45bd1
renamed opencs into openmw-cs
2015-02-03 13:18:03 +01:00
Lazaroth
7685de1d50
MyGUI tweaks
...
Feedback / testing is needed on this.
Some small button location tweaks and more importantly, some changes to
bring consistency between the Potion maker screen (already in openmw),
Trading screen (already in openmw), Spellmaker screen, Travel screen and
Training screen. It's mainly the top bar I'm talking about and
resizability.
It is not 1:1 towards vanilla, but looks better (IMO) and again, creates
some consistency. This can probably be expanded to the remaining screens
such as Enchanting and Spell and perhaps even the save/load screen to
have OpenMW wide consistency.
2015-02-03 08:13:29 +01:00
Lazaroth
7aa5dbc27e
Default sound level tweak
...
These settings closer match vanilla relative sound levels.
2015-02-03 02:31:03 +01:00
Lazaroth
fc6bd8e784
Water tweaks
...
As per https://forum.openmw.org/viewtopic.php?f=3&t=2492
Also did a quick remove trailing spaces.
2015-02-03 00:23:30 +01:00
Nikolay Kasyanov
6ac4b48705
Update executable name in Info.plist
2015-02-01 16:02:01 +02:00
scrawl
57a259c526
Remove references to no longer used font
2015-01-31 22:40:43 +01:00
scrawl
efbbe73c2a
Fix pinned window caption
2015-01-31 22:40:41 +01:00
scrawl
417f60f467
Use the mooncircle textures ( Fixes #1624 , Fixes #1743 )
2015-01-31 22:40:38 +01:00
scrawl
e0d0997409
Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter
2015-01-31 22:40:38 +01:00
scrawl
dac1290597
Reduce size of water plane and increase subdivisions ( Fixes #969 )
2015-01-31 22:40:37 +01:00
scrawl
9bcc84ceec
Add option to stretch menu backgrounds/cutscenes to the whole screen
2015-01-28 00:22:56 +01:00
scrawl
cfdbe35b0f
Dialogue window text area tweak
2015-01-27 23:12:20 +01:00
scrawl
3d80bb3207
Fix overlap for long window captions
2015-01-27 23:05:20 +01:00
scrawl
4921c6ef9e
Split window caption bars so that the caption can be transparent ( Fixes #531 )
...
Fix transparent window background not applying to the header bar (Fixes #2294 )
2015-01-27 23:05:19 +01:00
scrawl
e2fe9693f3
Add missing tooltips in edit effect dialog
2015-01-11 17:04:58 +01:00
Marc Zinnschlag
7c959c8494
Merge remote-tracking branch 'dteviot/Bug811'
2015-01-11 12:30:32 +01:00
scrawl
f9227beedd
Add warning when loading a savegame that depends on non-existing content files ( Fixes #2261 )
2015-01-11 00:06:52 +01:00
dteviot
063388e0eb
Change "Profile" to "Content List" in user visible strings in Launcher. ( Fixes #810 )
2015-01-10 15:04:45 +13:00
Marc Zinnschlag
f8a3ec3ee3
Merge remote-tracking branch 'scrawl/cmdline-savegame'
2015-01-08 20:57:49 +01:00
scrawl
94002b0758
Add freedesktop.org mimeinfo for OpenMW save game files
...
This allows us to launch OpenMW when the user opens a save game file through the file manager.
2015-01-07 15:08:57 +01:00
scrawl
d02e075bab
Add setting for exterior cell grid size ( Fixes #1537 )
2015-01-07 02:34:29 +01:00
scrawl
e6be979350
Fix default position for spell window
2015-01-05 18:57:23 +01:00
Marc Zinnschlag
ec1df719fe
Merge remote-tracking branch 'mrcheko/master'
2015-01-02 18:08:47 +01:00
mrcheko
a8621e6230
defaults are set to 1.0; remove contrast setting
...
(can be changed in config though); disable gamma control for not Windows
OSs
2015-01-02 16:49:22 +03:00
mrcheko
60a74d5eb8
increase robustness for gamma to persist in the system;
...
use GMST strings for gamma interface
2014-12-31 18:40:01 +03:00
scrawl
363d1f9207
Merge remote-tracking branch 'upstream/master'
2014-12-30 23:01:45 +01:00
mrcheko
04d95810d1
gamma/contrast system reworked
2014-12-30 18:33:11 +03:00
scrawl
9b33eca368
Use scaling factor for HUD map to match original MW
2014-12-24 15:45:14 +01:00
scrawl
5d7dcafa53
Make local map widget size configurable
2014-12-24 15:45:14 +01:00
scrawl
a47de06492
Make local map resolution configurable and use lower default value
...
This seems to be the resolution the original engine is using. The change also significantly reduces cell loading time.
2014-12-24 15:45:14 +01:00
scrawl
703b9c59e9
Add missing tooltips to spell creation dialog
2014-12-24 15:45:13 +01:00
scrawl
37e11b7272
Adjust loading box size for large captions
2014-12-24 15:45:12 +01:00
Sebastian Wick
e85df00158
change setting "borderless" to "window border"
...
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
2014-12-24 15:09:50 +01:00
Sebastian Wick
ebd384455f
disable borderless window by default
...
fix positioning of the in-game graphics settings
2014-12-22 02:56:07 +01:00
Sebastian Wick
639fbfad0b
make borderless setting available to the UI
2014-12-22 02:44:20 +01:00
Sebastian Wick
ec18a2cfa0
add support for borderless windows
2014-12-22 02:16:30 +01:00
scrawl
79237d16a7
Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu
...
This should also improve window resizing performance, the widgets are now just resized instead of recreated.
2014-12-15 13:28:03 +01:00
Digmaster
61d73d186d
Fixed part of settings window being in the incorrect place
2014-12-09 14:56:40 -06:00
Digmaster
bb6ed06a4e
read gamecontrollerdb file location from settings file
2014-12-09 14:37:32 -06:00
Digmaster
073a2f0674
Fixed issue with walking
2014-12-09 00:02:18 -06:00
Digmaster
c37881ead1
Joystick Support
2014-12-08 21:57:32 -06:00
Marc Zinnschlag
6c8a662042
label local/global openmw.cfg files ( Fixes #2196 )
2014-12-08 20:08:59 +01:00
scrawl
b650338d69
Implement drawMode of NiStencilProperty (Feature #1057 )
2014-12-03 18:28:35 +01:00
scrawl
077c619611
Implement Clamp mode for NiTexturingProperty ( Fixes #2050 )
2014-12-01 23:09:46 +01:00
scrawl
6960cac5eb
Disable third person zoom feature by default due to usability issues ( Fixes #2129 )
2014-12-01 23:09:46 +01:00
Marc Zinnschlag
e04ead2bd5
new element visibility button icons
2014-11-28 09:14:02 +01:00
Marc Zinnschlag
50a489321f
updated run button
2014-11-27 09:27:29 +01:00
Sergey Shnatsel Davidoff
f1ff2b2d6a
Add offscreen credits and a note about the use of "Play" icon from elementary icon theme to the SVG masters. Clean up unused offscreen objects in scene view icon.
2014-11-26 00:28:11 +03:00
Sergey Shnatsel Davidoff
54ac54b347
Add the "scene-play.png" icon for launching the game from OpenCS. Also included are SVG source and the GIMP XCF with transparency mask on the edges.
2014-11-26 00:20:45 +03:00
Marc Zinnschlag
7e1f86793c
Merge remote-tracking branch 'shnatsel/master'
2014-11-24 11:27:28 +01:00
cc9cii
69134e3ac2
Add icon to windows executable.
2014-11-24 12:48:36 +11:00
Sergey Shnatsel Davidoff
5a16420231
supply the correct icon (without the red line) for the default rendering state
2014-11-23 19:47:53 +03:00
Sergey Shnatsel Davidoff
c9e7a41e1a
Add my scene view icons: status overview icons, element toggle icons, parts from which they're assembled and the SVG master.
2014-11-23 17:39:01 +03:00
scrawl
e5a6049ea7
Improve clarity of label
2014-11-18 18:03:31 +01:00
scrawl
4fa303d7c4
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/launcher/CMakeLists.txt
2014-11-18 17:43:51 +01:00
Marc Zinnschlag
5eb9fd81e1
use placeholder icons in OpenCS when no proper icon is available
2014-11-13 12:09:10 +01:00
scrawl
273a80e2c0
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-11-11 15:43:46 +01:00
scrawl
07ea352e46
Fix button graphics preventing mouse clicks ( Fixes #2104 )
2014-11-07 00:16:41 +01:00
hasufell
0fd33e3198
Fix morrowind data files detection for custom install locations
2014-11-06 22:27:35 +01:00
Marc Zinnschlag
e5a087f8d6
Merge remote-tracking branch 'miroslavr/master'
2014-10-27 07:17:56 +01:00
Marc Zinnschlag
9d15e0d56f
Merge remote-tracking branch 'sandstranger/fixes-shadows-on-glsles-shaders'
2014-10-27 07:16:32 +01:00
sylar
a5b509ca70
Merge branch 'fixes-shadows-on-glsles-shaders' of https://github.com/sandstranger/openmw
2014-11-26 06:56:28 +04:00
sylar
925f1487b0
fix for world_matrix error
2014-11-26 06:55:41 +04:00
MiroslavR
450e951b2d
Adjusted book layout to better match vanilla
2014-10-26 01:54:25 +02:00
scrawl
c8a273f552
Stats window layout fix
2014-10-25 19:57:01 +02:00
sylar
c9750dc7c6
fixes shadows on glsles
2014-10-25 19:00:23 +04:00
Marc Zinnschlag
18b63d2e16
Merge remote-tracking branch 'lgro/issue_1982_long_class_names_are_cut_off'
2014-10-25 12:05:01 +02:00
Lukasz Gromanowski
d7716e7314
Fixes #1982 : Long class names are cut off in the UI
...
Corrected HBox, AutoSizedTextBox and TextBox positions and alignment.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-25 09:37:51 +02:00
Marc Zinnschlag
94ae222f0e
Merge branch 'settings'
2014-10-19 13:44:15 +02:00
scrawl
6d7f4085a5
Add shader implementation of alpha test
2014-10-17 19:11:06 +02:00
scrawl
5f11ccc298
Show tooltip for non-affordable list items ( Fixes #2025 )
2014-10-17 19:02:31 +02:00
Lukasz Gromanowski
02f0b7caa3
Fixes #1982 : Long class names are cut off in the UI
...
Added HBox widget with AutoSizedTextBox, spacer,
and TextBox for level, race, class caption and text pairs.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-16 23:22:22 +02:00
scrawl
c4e81adb83
Fix settings window being too small for all tabs on some localizations
2014-10-16 15:49:01 +02:00
Marc Zinnschlag
7de6360695
Removed all content from opencs.ini
...
Not needed since we already have reasonable default values within the code. Keeping the file to allow global modifications to these values.
2014-10-16 14:50:25 +02:00
scrawl
c3853b376d
Fix outdated core_layouteditor.xml
2014-10-15 22:48:15 +02:00
Lukasz Gromanowski
f29c4086cd
Fixes #1982 : Long class names are cut off in the UI
...
Increased length of text filed for race, class name
in stats window, and class name cation in chargen create
class window.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-12 15:18:37 +02:00
MiroslavR
29f5cb46ac
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-09 19:17:39 +02:00
sylar
70fd531722
None texturing filtering enable for android by default
2014-10-08 00:15:22 +04:00
sylar
3a625c567d
fixes for shaders glsles
2014-10-07 23:32:19 +04:00
sylar
f75721a217
Add none texture filtering .It is fixes a bug with black objects in shaders glsles
2014-10-07 23:30:31 +04:00
MiroslavR
de2cb8926a
Feature #1697 : Queue fade operations, implement hit fader & werewolf overlay
2014-10-05 17:53:50 +02:00
scrawl
7d36a202a8
Implement cell loading threshold ( Fixes #1874 )
...
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.
Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
2014-10-02 16:50:10 +02:00
scrawl
a33514fa1d
More shader compatibility fixes
2014-10-02 13:55:36 +02:00
scrawl
88da7f5157
Adjust border skin for loading bar and message boxes to match vanilla MW
2014-10-02 00:27:03 +02:00
scrawl
c826de49a5
Potential shader compatibility fix
2014-09-30 22:57:00 +02:00
scrawl
358257ca6b
Rename some skin files to .skin.xml for consistency
2014-09-28 18:11:19 +02:00
scrawl
ff0b4e0583
Add debug window (F10), displays Bullet's profiler output
2014-09-28 18:02:49 +02:00
scrawl
fedfd7129d
Add spacing between buttons to TabControl skin
2014-09-28 15:33:36 +02:00
scrawl
97df7c9b22
Get rid of markers.png and use original MW texture, cleanup
2014-09-26 13:40:10 +02:00
scrawl
4f0fc79ea4
Change global map cell size from 24 to 18 and make it configurable
2014-09-26 12:47:33 +02:00
scrawl
764c6287e1
Remove some garbage
2014-09-26 12:36:55 +02:00
scrawl
9fbc7ebc02
Tweak CountDialog layout
...
First time using the LayoutEditor. Success!
2014-09-25 21:04:59 +02:00
scrawl
b75b464495
Move Cancel buttons to right side of dialog ( Fixes #1715 )
2014-09-25 21:04:58 +02:00
scrawl
0bc840aadd
Add NumericEditBox widget
2014-09-25 21:04:51 +02:00
scrawl
f721b7adfb
Change skin files to use ResourceSkin (Skin is deprecated) - now the SkinEditor can load them
2014-09-25 16:41:27 +02:00
scrawl
6b65502557
Add properties for new widget classes to MyGUI plugin
2014-09-25 16:25:08 +02:00
scrawl
ad318c1f9d
Add XML definition file for the MyGUI plugin
2014-09-25 15:07:15 +02:00
scrawl
088d01d727
Minor cleanup
2014-09-24 23:50:28 +02:00
Marc Zinnschlag
56858c98b1
Merge remote-tracking branch 'miroslavr/master'
2014-09-23 13:23:00 +02:00
MiroslavR
c362ec0f95
Book formatting: Handle line endings as per vanilla, fix tall images causing infinite loop, cleanup
2014-09-21 19:47:52 +02:00
scrawl
ef43196ef2
Add spacing to savegame dialog
2014-09-20 18:34:01 +02:00
scrawl
f5868f7ae1
Fix layout problems in generate class result dialog
2014-09-20 13:07:38 +02:00
scrawl
4cc95cf952
Tweak spacing on some tooltips
2014-09-20 11:02:44 +02:00
scrawl
e42cb8020e
Change all skins to get font colors from fallback settings ( Fixes #704 )
2014-09-20 10:40:09 +02:00
MiroslavR
4f89c3e77a
Rework book formatter ( Fixes #1148 )
2014-09-20 00:11:04 +02:00
Marc Zinnschlag
65ddf7acfe
Merge remote-tracking branch 'scrawl/master'
2014-09-19 15:59:59 +02:00
scrawl
9c0649c11d
Add basic framework to retrieve font colors from fallback settings (Feature #704 )
2014-09-19 11:53:35 +02:00
scrawl
e94268b4e6
Remove some garbage
2014-09-19 10:54:43 +02:00
scrawl
cbc242d857
Move item count text to ItemWidget
2014-09-19 09:29:00 +02:00
scrawl
c5fa0768f1
Fix broken minimum track size for scrollbars
2014-09-14 10:23:23 +02:00
scrawl
413bad2dc6
Fix a MyGUI warning
2014-09-14 09:40:34 +02:00
Marc Zinnschlag
5dd424b6c6
Merge remote-tracking branch 'cc9cii/Bug-No-1655'
2014-09-11 14:14:02 +02:00
scrawl
36a90198e2
Add option to change screenshot image format
2014-09-11 04:32:31 +02:00
cc9cii
6d12374ace
Move windows platform specific files into a common directory.
2014-09-05 22:36:33 +10:00
cc9cii
fa0b3eb298
Add an icon to opencs.exe as well
2014-09-05 20:30:50 +10:00
Marc Zinnschlag
86995adc4a
Merge remote-tracking branch 'cc9cii/Bug-No-1655'
2014-09-05 09:00:12 +02:00
cc9cii
e0e561a105
Add icon to windows exe
2014-09-05 07:17:31 +10:00
MiroslavR
386bb98fd2
Do not attach coin widgets to a box
2014-09-03 03:03:03 +02:00
MiroslavR
5977860e09
Fix broken coin placement in levelup dialog + possible memleak
2014-09-02 22:06:02 +02:00
MiroslavR
98e7ab1b79
Add missing tooltips to enchant dialog
2014-09-01 03:40:11 +02:00
scrawl
4f92044d71
Allow user-created markers on local map ( Fixes #1571 )
2014-08-26 17:45:23 +02:00
MiroslavR
fc21d898f2
Add hand-to-hand tooltip
2014-08-25 03:15:28 +02:00
MiroslavR
e8a245bea3
Enchanting dialog: follow vanilla behavior more closely
2014-08-24 16:41:17 +02:00
MiroslavR
e2f15181f9
Make the "Choose an Attribute" text centered
2014-08-24 16:36:19 +02:00
scrawl
e9e7e96c5f
SaveGameDialog: use ComboBox accept event, not changePosition (improves keyboard navigation)
2014-08-23 16:18:46 +02:00
scrawl
0a9a0a3b14
Slightly improve count dialog layout
2014-08-16 17:11:57 +02:00
MiroslavR
063b40a0ee
Correct tooltip for maxed out skills
2014-08-16 13:30:49 +02:00
scrawl
44b517f66d
Implement hiding inventory windows by double click on caption ( Fixes #1690 )
2014-08-06 20:13:58 +02:00
Marc Zinnschlag
33c36bf0df
Merge remote-tracking branch 'scrawl/master'
2014-08-03 22:23:48 +02:00
scrawl
6cb9382bf0
Adjust screen-sized widgets automatically using Stretch align
2014-08-01 17:15:28 +02:00
scrawl
a18cec7c8e
Use a MyGUI widget to render the screen fader ( Fixes #1741 , Fixes #1719 )
2014-08-01 16:25:41 +02:00
Marc Zinnschlag
7a5f73de9e
added navigation mode icons to buttons
2014-07-30 17:02:23 +02:00
Marc Zinnschlag
bb741eb8d7
Merge remote-tracking branch 'crysthala/master'
2014-07-30 16:49:27 +02:00
crysthala
f25e0b13b2
render window controls icons
...
eyeball dude: first person
flying eye: free cam
orbit2: orbiting cam
2014-07-30 07:55:21 -05:00
Marc Zinnschlag
7991dfb907
Merge remote-tracking branch 'scrawl/master'
2014-07-28 09:03:17 +02:00
Marc Zinnschlag
c9cd7fb6b7
Merge branch 'scripts'
2014-07-28 09:02:24 +02:00
scrawl
fdc6dd6985
Shader compatibility fixes for GLSL ES
2014-07-27 20:33:44 +02:00
Marc Zinnschlag
5e543ac806
added script doortestwarp to blacklist
2014-07-25 11:53:30 +02:00
Marc Zinnschlag
4421e7a5cc
added lighting mode toolbar icons
2014-07-25 11:15:04 +02:00
Marc Zinnschlag
151ef14b67
some cleanup
2014-07-25 11:10:12 +02:00
Marc Zinnschlag
358c76a049
Merge remote-tracking branch 'crysthala/master'
2014-07-24 22:29:29 +02:00
crysthala
919632a505
render lighting icons
2014-07-24 13:12:44 -05:00
scrawl
469d2afffa
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwgui/levelupdialog.cpp
2014-07-24 02:33:46 +02:00
Marc Zinnschlag
f55084463b
added MockChangeScript to script blacklist
2014-07-23 12:35:15 +02:00
scrawl
038a811f16
Rename travel window Ok button to Cancel ( Fixes #1676 )
2014-07-21 23:44:33 +02:00
MiroslavR
3b67e9b329
Rework level up dialog to behave more like vanilla
2014-07-21 20:56:02 +02:00
Marc Zinnschlag
d87630b41a
blacklisting for scripts in OpenMW
2014-07-21 09:34:10 +02:00
scrawl
28a0899d2b
Implement difficulty scaling ( Fixes #1505 )
2014-07-20 16:38:20 +02:00
scrawl
07d0f4458d
Rotate clouds/particles to come from red mountain ( Fixes #245 )
2014-06-27 03:22:00 +02:00
scrawl
44fd526c98
Don't show disposition bar for creatures
2014-06-26 15:36:19 +02:00
Marc Zinnschlag
85965bfd47
Merge remote-tracking branch 'scrawl/master'
2014-06-25 09:58:00 +02:00
scrawl
8eab3abb15
Fix initial view offset for large world maps ( Fixes #1523 )
2014-06-19 19:03:12 +02:00
Marc Zinnschlag
30f8e279ed
Merge remote-tracking branch 'scrawl/master'
2014-06-19 10:35:28 +02:00
scrawl
5645c9185b
Fix location of local data path
2014-06-18 17:18:48 +02:00
scrawl
224163e5a2
Fix console text becoming unreadable when selected ( Fixes #1530 )
2014-06-18 16:57:54 +02:00
scrawl
d4678a8d55
Fix level up dialogue layout ( Fixes #1393 )
2014-06-18 16:57:53 +02:00
scrawl
cb6f1d3a52
Fix wait dialog arrow button step ( Fixes #1524 )
2014-06-17 14:58:11 +02:00
Marc Zinnschlag
2683aa9503
Merge remote-tracking branch 'filkry/bug640_luminescent_water'
2014-06-17 13:08:06 +02:00
Fil Krynicki
cfea7736d9
WIP fix
...
Bug is fixed, but appears to have broken vision underwater. Notes:
+ basically fixed by darkening the colour of water such that it is
darker than refracted terrain
+ also disabled sunlight scattering at night. This may actually be
desirable, but given there is no visible moon it seems unlikely to make
much sense, and blends a lot of green into the water colour appearing
luminescent at night
2014-06-16 17:08:02 -04:00
scrawl
5f5c0c5bff
Remove an unused setting
2014-06-16 03:29:02 +02:00
scrawl
468db7a9c4
Remove terrain limit warning text that no longer applies
2014-06-16 03:16:50 +02:00
scrawl
311acfa8ff
Add delete button to save load menu ( Fixes #1453 )
2014-06-10 02:27:38 +02:00
scrawl
cdd53862cb
Increase width of dialogue topic list ( Fixes #1440 )
2014-06-08 23:15:50 +02:00
scrawl
a3752da79f
Store Always Run control state in settings
2014-06-08 19:50:39 +02:00
scrawl
6db936bb3a
Refactor item icon code into ItemWidget ( Fixes #1391 )
...
- Removed duplicate code
- Fixed missing magic backgrounds during item drag&drop
- Change background texture used for HUD icons
2014-06-05 22:13:18 +02:00
scrawl
d7f3cd75ac
Rewrite journal GUI topic list to use MWList
2014-06-03 16:04:18 +02:00
scrawl
bbc5b125ab
Rewrite journal GUI quest index
...
- Use quest names as identifiers, not quest IDs. This ensures that quests with different IDs, but the same name (e.g. A2_4_MiloCaiusGone and A2_4_MiloGone) are merged properly, as they should.
- Switch display from BookPage to MWList. Handles word-wrapping and scrolling properly.
- Fixes a bug where the quest index would not be updated when opened.
2014-06-03 00:28:33 +02:00
scrawl
5df9ff8e2c
Respect CMAKE_INSTALL_PREFIX in the global openmw.cfg
...
Fixes installing to /usr/local (Bug #1378 )
2014-06-01 23:32:05 +02:00
scrawl
a1bdf20958
Make trade balance label editable
2014-05-31 13:53:36 +02:00
scrawl
d26f756c53
Fix several edit boxes not receiving mouse input
2014-05-30 14:52:47 +02:00
pvdk
2a6a26c0d0
Minor fixes
2014-05-29 21:02:06 +02:00
pvdk
38d825b004
Merge remote-tracking branch 'upstream/master' into wizard
...
Conflicts:
CMakeLists.txt
apps/launcher/maindialog.cpp
2014-05-29 16:42:16 +02:00
scrawl
3cd835e61a
Fix bsa file loading not being case insensitive ( Fixes #1178 )
2014-05-26 17:34:36 +02:00
scrawl
0fe0dc33a6
Fixes #1338 : Bring back a label that got lost
2014-05-19 05:35:16 +02:00
scrawl
15368188dc
Fix sliders in effect editor not being precisely movable
2014-05-17 02:54:51 +02:00
scrawl
f01c3e0eac
Fixes #1037 : Change default footstep volume to match vanilla
2014-05-13 19:38:28 +02:00
scrawl
3ad28ec5aa
Set a proper Page size for all scrollbars. Fixes scrollbars only moving very slowly when interacting with them (as opposed to using mousewheel on the content)
2014-05-11 00:09:02 +02:00
scrawl
6e9458c076
Small fix for dropping items from inventory
...
Some widgets prevented clicking through
2014-05-08 21:04:11 +02:00
graffy76
a17cb1f389
Fixed opencs.ini formatting
2014-05-06 07:37:52 -05:00
graffy76
475214ab62
Implmented QSettings for loading / saving file definitions. Also
...
renamed opencs.cfg to opencs.ini to follow Ini format standards
2014-05-05 05:56:03 -05:00
scrawl
58d868d56a
Change default water setting (current fps is low enough as it is without this setting enabled)
2014-05-02 19:16:10 +02:00
scrawl
6f7fbc867f
Fix several leaks
2014-05-01 16:55:15 +02:00
Marc Zinnschlag
3013c34d9b
Merge remote-tracking branch 'scrawl/master'
2014-04-28 21:46:05 +02:00
Lars Söderberg
d530bbe5cd
Implemented Scrawls alternative workaround.
2014-04-28 18:52:53 +02:00
scrawl
a35f7c73ae
Fixes #1286 (Dialogue topic list clips with window frame)
...
The first problem was with the ScrollView skin, which had a full-sized client area. Since the scrollbar starts out visible, MyGUI expects the client area to be smaller to accomodate for the scrollbar width. As a result, the starting canvas size becomes bigger than the view size.
Another bug was with the MWList code: reducing the canvas size for the scrollbar is not needed, since MyGUI is already doing that, and attempting to do it manually interferes with the view offset.
2014-04-28 18:40:29 +02:00
Lars Söderberg
0513d0837c
Alignment tweaks and autosized buttons workaround
2014-04-28 17:54:55 +02:00
Lars Söderberg
04e5b9c72c
Right aligned version/revision
...
I've always felt that having the version/revision text at the bottom
center in the main menu was a bit out of place. A more common place for
this kind of thing is in one of the corners. I chose bottom right.
Aditionally I right aligned it and changed the v and r in version and
revision to capital letters.
Comments?
2014-04-28 16:23:07 +02:00
Lars Söderberg
b0bdd233ee
Center, switch and change text for confirmation buttons
...
The confirmation buttons for quitting or starting a new game were
driving me crazy by not being ok left and cancel right, as e.g. vanilla
is.
Then I noticed the text isn't the same as in vanilla either. It should
be yes/no, not ok/cancel.
To make it even more authentic I also centered the buttons. Had to
remove autosized buttons for this. I think it looks fine still.
Comments?
2014-04-28 16:05:27 +02:00
scrawl
138fb4e29a
Bug #1265 : Fixed confirmation buttons align
2014-04-28 12:51:46 +02:00
scrawl
4555f6ddf6
Add text shadow to progress bar labels
2014-04-28 11:19:12 +02:00
scrawl
dac0b7090a
Get rid of bigbars.png and smallbars.png
...
Changed loading bar colour to match vanilla
2014-04-27 09:43:48 +02:00
scrawl
14757a856b
Tweak settings window size and encumbrance bar text align
2014-04-27 08:17:14 +02:00
scrawl
dd14dec8dc
Tweak loading screen progress bar positioning to match vanilla
2014-04-27 08:16:35 +02:00
Thomas
a598060071
Added autosave on rest, as well as an option in the settings menu
2014-04-23 23:12:30 -04:00
pvdk
aa07a33906
Fixed most of the memory leaks and started working on correctly exiting the thread
2014-04-18 13:17:37 +02:00
pvdk
a2c129f655
Merge remote-tracking branch 'upstream/master' into wizard
2014-04-16 16:57:53 +02:00
pvdk
21c406316f
Working on the Settings tab: start the importer/wizard
2014-04-16 16:54:55 +02:00
pvdk
cfe66abbc5
Started working on the settings tab
2014-03-30 23:57:30 +02:00
pvdk
bf6103a3a4
Merge branch 'wizardtab' into wizard
...
Conflicts:
files/ui/mainwindow.ui
2014-03-30 23:16:48 +02:00
scrawl
f5810b8e1c
Consider aspect ratio for loading screen background
...
More consistent with the main menu.
2014-03-30 23:07:49 +02:00
pvdk
ef38fae09d
Merge remote-tracking branch 'upstream/master' into wizard
2014-03-29 11:56:35 +01:00
scrawl
f2cd37edd0
Play company logo movie
2014-03-27 19:51:48 +01:00
scrawl
5906d795c0
Refactored video player (now a MyGUI widget)
2014-03-27 19:10:15 +01:00
scrawl
2e4ef93b28
Add proper main menu (background image, logo animation, title music)
2014-03-27 15:25:01 +01:00
scrawl
0e78ffe8c0
Add option to disable SDL's "minimize on focus loss" in fullscreen
2014-03-27 00:10:46 +01:00
scrawl
0a17245633
Refactored settings window
2014-03-22 19:02:14 +01:00
Marek Kochanowicz
5c34823bb0
added some placeholder icons
2014-03-20 13:59:00 +01:00
Marek Kochanowicz
f3475f7ef5
Merge branch 'master' of https://github.com/zinnschlag/openmw into Editor-Dialog
2014-03-18 19:24:10 +01:00
pvdk
9e5e19f9cb
Improved existing installation handling
2014-03-17 18:28:05 +01:00
pvdk
ae5f783a16
Added some eye-candy to the wizard: a watermark and a placeholder icon
2014-03-17 17:50:51 +01:00
Marek Kochanowicz
09ba547630
use tool buttons with icons
2014-03-17 15:35:36 +01:00
pvdk
8fe837ae6e
Merge remote-tracking branch 'upstream/master' into wizard
2014-03-16 20:05:12 +01:00
scrawl
cd0c283795
Add text shadow to version text for better readability
2014-03-15 15:14:59 +01:00
Gašper Sedej
06e02ed77f
Added version and revision number to mainmenu
2014-03-12 10:53:56 +01:00
pvdk
3792b301e9
Wizard now runs the ini-importer to import settings from Morrowind.ini
2014-02-25 15:33:30 +01:00
pvdk
e8170adde5
Some minor changes, implemented suggestions
2014-02-19 19:26:50 +01:00
pvdk
c54217d008
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
CMakeLists.txt
components/CMakeLists.txt
components/config/gamesettings.cpp
2014-02-19 19:26:07 +01:00
Marek Kochanowicz
2afe3f3e57
Introduced multitype icon.
2014-02-13 19:00:35 +01:00
scrawl
975f0e05b4
Fixes #1157 (attribute layout issue)
2014-02-05 05:18:10 +01:00
scrawl
f608ceeffc
Fixes #1158 (Armor rating label issues)
2014-02-05 05:18:10 +01:00
pvdk
f263acdac6
Merge remote-tracking branch 'upstream/master' into versioninfo
2014-02-03 02:27:24 +01:00
Marc Zinnschlag
1b5301eec0
Merge branch 'savedgame'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
2014-02-01 18:16:32 +01:00
scrawl
292d692b40
Loosen window size restrictions
2014-01-29 15:37:26 +01:00
scrawl
82146e7f8d
Use GMSTs for levelup
2014-01-29 15:37:26 +01:00
pvdk
1262eab03a
Added some nice error messages to the installation process
2014-01-28 01:03:47 +01:00
pvdk
802448b217
Added a settings page to the launcher
2014-01-27 20:14:02 +01:00
pvdk
cdbf5c68b0
Implemented selection of installation media and added forgotten file
2014-01-24 22:25:22 +01:00
scrawl
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-24 18:28:35 +01:00
pvdk
fa186f5ec1
Added version information to the launcher
2014-01-22 17:51:10 +01:00
pvdk
0f7f3391f7
WIP: Working on the installation of addons
2014-01-17 13:21:44 +01:00
Marc Zinnschlag
671d0e46e2
Merge remote-tracking branch 'nobrakal/patch-1'
2014-01-16 12:18:54 +01:00
nobrakal
e638b8b8cb
Update openmw.desktop
...
Fix bad output of desktop-file-validate for openmw.dektop
2014-01-16 08:44:56 +01:00
nobrakal
278876d6fb
Update opencs.desktop
...
Fix bad output of desktop-file-validate for opencs.dektop
2014-01-16 08:41:29 +01:00
scrawl
c64dc2c831
Terrain specular mapping: use a "_diffusespec" postfix to indicate specular information is present in the alpha channel. Use alpha directly instead of 1-alpha.
2014-01-11 00:51:03 +01:00
scrawl
2744cde40f
Use a few additional GMSTs
2014-01-10 22:27:31 +01:00
scrawl
d7f69205f6
Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes
2014-01-09 00:06:24 +01:00
scrawl
d97615d5d8
Support separate specular maps
2014-01-07 18:05:44 +01:00
scrawl
780bf5a2cd
Implement pickpocket detection. Play a voiced dialogue entry when detected.
2014-01-07 03:01:33 +01:00
scrawl
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
2014-01-06 00:23:17 +01:00
scrawl
af3569665c
Remove unused font
2014-01-04 05:19:08 +01:00
scrawl
1b96c5d266
Console improvements: Show scrollbar, allow copying text from the history
2014-01-04 05:13:53 +01:00
scrawl
94cdc1efd2
Enable mipmap generator for 1.9+
2013-12-31 00:54:40 +01:00
scrawl
04f9f7af56
Closes #990 : Add option to unlock mouse cursor when in any menu
2013-12-29 00:58:48 +01:00
scrawl
27b45dd3cd
Remove unused input
2013-12-28 16:34:32 +01:00
scrawl
e68e2f82a2
Implement DarkTexture slot. Fix an issue with incorrect transparency override when base texture is empty.
2013-12-26 20:53:51 +01:00
scrawl
0050e6e67b
Support materials with no base (diffuse) texture (should be white). Support alternate UV set for diffuse texture.
2013-12-26 20:53:51 +01:00
scrawl
74e902330f
Fix a terrain shader issue
2013-12-26 20:53:51 +01:00
pvdk
40486370d9
Working on the Unshield functionality
2013-12-25 18:52:34 +01:00
pvdk
3a37761d76
Some minor cleanups
2013-12-24 23:47:04 +01:00
pvdk
445f96434e
Added Morrowind.ini detection logic
2013-12-24 23:09:31 +01:00
scrawl
6a3eb3b355
Better way of reversing layer UV.
2013-12-19 01:31:12 +01:00
pvdk
30710bad70
Modified components widget so the checked items can be stored for all pages to access
2013-12-15 15:13:49 +01:00
pvdk
c82f0ec35f
Implemented the language selection page
2013-12-13 15:30:49 +01:00
pvdk
d7f9604140
WIP: Working on the installation selection and added the ui for the language page
2013-12-13 13:38:49 +01:00
scrawl
37a7ee8fcd
Set alpha value of character animations according to Invisibility / Chameleon effects.
2013-12-08 23:05:21 +01:00
pvdk
8162f8370b
Added all the pages to the wizard
2013-12-08 21:35:57 +01:00
pvdk
f458f0c6c1
Added the Wizard .ui/resource files and some basic source to get started
2013-12-07 23:17:50 +01:00
scrawl
742e0e014d
Remove more cruft in MessageBox. Fixes inconsistent sizing when close to a newline.
2013-12-07 14:15:51 +01:00
Marc Zinnschlag
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
2013-12-07 12:27:06 +01:00
scrawl
062ea627b3
Add parallax mapping for objects
2013-12-05 15:51:07 +01:00
scrawl
69c0bb1723
Add normal, specular & parallax mapping for terrain
2013-12-05 15:51:01 +01:00
scrawl
f695deb29d
Remember window positions
2013-12-05 15:46:23 +01:00
scrawl
5f1878eb54
Add specular mapping (uses alpha channel of diffuse texture)
2013-12-03 18:41:45 +01:00
scrawl
147bc447a5
Add specular lighting for directional light to objects shader
2013-12-03 16:07:07 +01:00
Marc Zinnschlag
04b1657d98
Merge branch 'openmw-27'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
2013-11-30 09:45:41 +01:00
Marc Zinnschlag
eea433f141
restore last played character selection across sessions
2013-11-26 10:37:58 +01:00
scrawl
bda28e2ed0
Increase size of item selection dialog
2013-11-26 06:42:37 +01:00
scrawl
2e87cbc231
Add basic functionality to SaveGameDialog
2013-11-21 20:34:34 +01:00
Bret Curtis
862f2f0883
added keywords for debian and switch to dyn libs in travis
2013-11-20 10:16:51 +01:00
scrawl
3452bd2e0b
Add glow effect for enchanted items
2013-11-20 00:13:12 +01:00
scrawl
cab535dd69
Implement magic item recharging via soulgem use
2013-11-19 06:48:47 +01:00
Lars Söderberg
35434dc053
German fixes
...
Fixes for German language.
2013-11-16 23:15:51 +01:00
Nikolay Kasyanov
df5b52b45b
OpenCS.app icon & bundle properties
2013-11-10 20:11:53 +04:00
Marc Zinnschlag
fb417f9880
Merge remote-tracking branch 'scrawl/openmw-27' into openmw-27
2013-11-07 09:19:55 +01:00
Marc Zinnschlag
d85360e7fd
Merge remote-tracking branch 'scrawl/ui'
2013-11-06 10:21:41 +01:00
Marc Zinnschlag
418ccf705d
Merge branch 'openmw-27'
...
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
2013-11-06 10:21:25 +01:00
scrawl
bf5529819d
Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog.
2013-11-05 19:50:24 +01:00
scrawl
3a827d9c12
Deleted Obliviontt.zip
2013-11-05 00:32:06 +01:00
Marc Zinnschlag
dec1483fa4
Merge branch 'saving' into openmw-27
2013-11-04 08:57:32 +01:00
Alex "rainChu" Haddad
23eaf90846
Breath meter flashes when drowning
2013-10-27 04:05:01 -04:00
graffy76
9b483c3ae3
Fix for file path issues
2013-10-26 22:55:44 -05:00
graffy76
9ce4a04a2d
merge from saving
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/opencs/editor.cpp
apps/opencs/view/doc/filedialog.cpp
apps/opencs/view/doc/filedialog.hpp
2013-10-25 14:44:22 -05:00
graffy76
16d87ea1d1
Merge branch 'master' into esxSelector
2013-10-25 08:11:24 -05:00
graffy76
f9591ddda6
Reimplemented constentselector view class
2013-10-22 21:52:35 -05:00
Marc Zinnschlag
fdba029566
Merge remote-tracking branch 'sirherrbatka/filters' into saving
2013-10-21 18:59:12 +02:00
Marek Kochanowicz
ce2c558257
Missed a file.
2013-10-21 18:40:20 +02:00
Marc Zinnschlag
c995533e07
Merge branch 'dialogue' into saving
...
Conflicts:
apps/opencs/model/world/columnimp.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loaddial.hpp
2013-10-21 16:45:43 +02:00
Marek Kochanowicz
b138533bf3
renamed defaultfilter.omwaddon.project to defaultfilters.
2013-10-20 17:21:09 +02:00
Marek Kochanowicz
96b6787255
Getting rid of extension. Correcting tiny mistake in filters file.
2013-10-20 10:56:27 +02:00
Marek Kochanowicz
cafea438bd
Added missing light filter.
2013-10-20 09:44:10 +02:00
Marek Kochanowicz
762cbf6278
Changed gauntlets filter. It showes now both gauntlets and bracers.
2013-10-19 18:51:36 +02:00
scrawl
3a3f2a37c8
Add cut, copy & paste of text
2013-10-17 12:47:49 +02:00
graffy76
17950210fa
Merge branch 'master' into esxSelector
2013-10-07 06:52:20 -05:00
graffy76
217a4d75b4
Implemented profile function in launcher datafiles page
...
Implemented dependency sorting to ensure dependent files appear latest
in the list.
2013-10-06 21:13:47 -05:00
graffy76
00c78a4aa1
Implementing ContentSelector class in DataFilesPage
...
Moved AdjusterWidget / FileWidget to ContentSelectorView
2013-10-01 21:29:45 -05:00
Marek Kochanowicz
ae5e8b95ff
Solving Issue912
2013-09-23 20:12:04 +02:00
graffy76
513f0c4b3e
Implemented file/adjuster widgets into new addon creation dialog
2013-09-22 23:52:53 -05:00
graffy76
cfdc19c427
Renamed esxSelector to contentSelector
...
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
2013-09-21 23:06:29 -05:00
graffy76
7b7dfa122d
Merge branch 'master' into esxSelector
2013-09-19 16:24:28 -05:00
graffy76
244e581952
Finished implementing drag / drop
...
refactored datafilesmodel (now contentmodel)
refactored esmfil
2013-09-19 06:53:09 -05:00
Marc Zinnschlag
2dc3c0ae4f
integrated startup icons
2013-09-09 09:41:43 +02:00
sirherrbatka
7ecf020fcb
Merge pull request #1 from zinnschlag/master
...
Icons for startup window.
2013-09-08 11:14:41 -07:00
Marek Kochanowicz
294bf6c194
Icons for startup window (check raster/startup).
2013-09-08 12:09:36 +02:00
graffy76
a6e7cf9a8c
Implementing drag and drop
2013-09-07 15:57:40 -05:00
Marc Zinnschlag
5a792b10b9
fixed local openmw.cfg file
2013-09-07 09:30:40 +02:00
Lars Söderberg
f4e9199f78
Various chargen tweaks
2013-08-29 16:21:11 +02:00
scrawl
e5ce94c336
Fix the water being affected by fog on the map
2013-08-27 16:45:51 +02:00
scrawl
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
2013-08-27 15:48:13 +02:00
Marek Kochanowicz
3e174df856
Adding nomadic1 icons. Wooho!
2013-08-27 14:49:29 +02:00
Marc Zinnschlag
fb7273e14a
Merge remote-tracking branch 'sirherrbatka/icons-svg'
...
Conflicts:
.gitignore
2013-08-26 14:52:26 +02:00
Marek Kochanowicz
8cd2d89e4e
Merge branch 'icons-svg' of https://github.com/sirherrbatka/openmw into icons-svg
2013-08-26 10:14:35 +02:00
Marek Kochanowicz
44b4c642b7
Added alternative book icon in scalable folder. No raster just yet. I'm not sure if it will replace old icon.
2013-08-26 10:12:43 +02:00
Lars Söderberg
45083fc89e
Chargen updates
2013-08-25 23:15:29 +02:00
Lars Söderberg
e33239eae5
Various fixes
2013-08-25 23:15:20 +02:00
sirherrbatka
c57fb4fc4f
Delete .directory
2013-08-24 19:20:12 +02:00
Marek Kochanowicz
717e04cac5
More icons. At last!
2013-08-23 12:48:34 +02:00
scrawl
5f7e6f7b10
Fix a material issue, layers per pass wasn't entirely correct
2013-08-21 17:26:11 +02:00
graffy76
6898321676
Reenabling features
...
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
2013-08-20 08:16:56 -05:00
scrawl
ecf7786d11
terrain_num_lights was removed
2013-08-20 12:31:47 +02:00
graffy76
b52645bf2a
Fixes to accommodate master/plugin loading
2013-08-20 03:23:32 -05:00
scrawl
8c8653160d
Crash fix, material fix
2013-08-20 09:52:27 +02:00
scrawl
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
2013-08-19 20:39:37 +02:00
scrawl
e27437f8ed
New terrain renderer - improvements:
...
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
- Fixes several blending issues and cell border seams
- Fix map render to use the terrain bounding box instead of an arbitrary height
- Different LODs are now properly connected instead of using skirts
- Support self shadowing
- Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
- Support a fixed function fallback (though the splatting shader usually performs better)
- Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
2013-08-19 20:34:20 +02:00
graffy76
e614ec3353
Fixing profile code in progress...
2013-08-18 17:11:23 -05:00
graffy76
f6217f9c6a
Moved esx selector classes out of global namespace
2013-08-18 15:11:29 -05:00
graffy76
45277c0082
Minor changes
...
Stretched table columns to fit widget width
Reduced width of opencs file dialog
Hid the file size column for launcher
Added alternating row colors in table view
2013-08-18 09:34:33 -05:00
graffy76
66e50343ad
Fixed row-selection/check feature
2013-08-18 08:54:51 -05:00
graffy76
a9db983233
Fixing row-click selection
2013-08-18 07:29:48 -05:00
graffy76
2878f51cd3
Reimplemented dependency selection feature
...
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
2013-08-17 19:40:28 -05:00
graffy76
49c4e1bf9e
Removed master table widget
2013-08-16 18:23:02 -05:00
graffy76
84e5c2610a
Implemented combobox for game file selection
2013-08-16 18:00:23 -05:00
Lars Söderberg
317d565133
Larger area for window corner diagonal arrows
2013-08-10 08:15:58 +02:00
Lars Söderberg
5b060ffe8d
Varios standardizations, fixes and optimizations
2013-08-09 23:21:25 +02:00
Lars Söderberg
73fb682718
Made the alchemy window resizable
2013-08-09 23:20:51 +02:00
Lars Söderberg
0fabf1fe2e
Updated Alchemy Window
2013-08-08 01:47:19 +02:00
Lars Söderberg
f7ed2ef55f
Standardize align values
...
Updates all align attributes, so all layout files uses the same (new)
system plus fixes a couple of misspellings.
2013-08-07 21:43:19 +02:00
PLkolek
8f4506f5b6
Implemented drowning.
...
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
2013-08-07 16:46:46 +02:00
scrawl
726c93c365
Terrain fixes to match vanilla better - vertices need to be mapped directly to texels for colormap and blendmap (this also caused seams at cell borders), layer uv scale appears to be 8 not 10
2013-08-07 01:34:17 +02:00
Emanuel Guevel
add3bb9904
Add sneaking indicator UI widget
2013-08-03 02:40:01 +02:00
Lars Söderberg
f6f5867256
Fixes the FPS bar
2013-07-31 19:28:11 +02:00
Marc Zinnschlag
0923306404
fixed data-local path
2013-07-31 13:55:56 +02:00
scrawl
3961c276b8
Added enemy health meter
2013-07-30 06:00:20 +02:00
scrawl
91e95e1404
Use the correct slash, chop or thrust animation
2013-07-16 23:32:41 +02:00
scrawl
8407e2b3aa
Fixes the console sometimes receiving text after it was closed
2013-07-14 23:54:28 +02:00
Marc Zinnschlag
b57042cac3
Merge remote-tracking branch 'scrawl/master'
2013-07-13 20:52:30 +02:00
scrawl
d6faad3dd2
Same fix for the book window
2013-07-13 20:26:35 +02:00
scrawl
4a562b585c
Fix journal window with background image != 512x256
2013-07-13 20:24:19 +02:00
Marc Zinnschlag
b17f383c6d
Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'
...
Conflicts:
apps/opencs/view/world/table.cpp
2013-07-11 09:09:52 +02:00
graffy76
bb049806df
Repo permissions commit fix #2
2013-07-10 21:13:59 -05:00
graffy76
f31e5ef851
new files (repo commit fix #2 )
2013-07-10 17:30:21 -05:00
scrawl
58fce74620
Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders
2013-07-06 16:40:57 +02:00
Sebastian Wick
26bd2a5301
use the new scrollbar; range dependent step size; fix
2013-07-05 20:28:46 +02:00
Sebastian Wick
e3d8bdbafe
autorepeat scrollbar
2013-07-02 17:29:47 +02:00
Marc Zinnschlag
12cfe1fdfe
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
2013-06-26 09:48:51 +02:00
graffy76
8f4fd8202e
Deleted ".directory" text files.
...
Files were hidden files added by dolphin.
2013-06-23 21:28:58 -05:00
Sebastian Wick
acaba78a11
wrong number
2013-06-23 23:13:54 +02:00
Sebastian Wick
357974a429
more minor stuff
2013-06-23 21:34:41 +02:00
Sebastian Wick
a1fea97c3b
use SDL for resolution -> multimonitor support
2013-06-23 03:49:30 +02:00
graffy76
75d7d3b7fc
Added base.png
2013-06-21 12:28:07 -05:00
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
2013-06-20 18:06:25 -05:00
graffy76
965d93ea40
Pull to get latest icons
...
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
2013-06-20 16:13:01 -05:00
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
2013-06-17 06:45:44 -05:00
scrawl
4c8a04d9cb
Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2013-06-15 17:41:42 +02:00
Marek Kochanowicz
c174f57a2f
Git changes show that it should upload all the files this time. Let's
...
hope…
2013-06-15 14:40:36 +02:00
graffy76
a5d9d3fd7a
Updated status icons from sirherrbatka
2013-06-15 07:29:20 -05:00
graffy76
97cfbc31b5
Merge color icons
...
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
2013-06-15 06:46:27 -05:00
scrawl
fcf35d3871
Removed the UI cursor sensitivity slider
2013-06-12 20:27:55 +02:00
scrawl
403704b92a
Use openmw.png for SDL_SetWindowIcon
2013-06-12 16:15:04 +02:00
Marc Zinnschlag
bd08677a7f
Merge branch 'openmw24'
2013-06-12 10:37:33 +02:00
scrawl
daab4f55a3
Use Morrowind's fonts
2013-06-06 22:26:06 +02:00
pvdk
b3595a6a2e
Fix for duplicate key/value pairs being written to settings.cfg, Bug #755
2013-06-02 21:43:22 +02:00
Marek Kochanowicz
09ab541102
Colored status icons. Hopefully everybody loves watercolors!
2013-05-31 11:50:03 +02:00
Marek Kochanowicz
e403773e95
Simply removed background from status icons.
2013-05-30 13:33:49 +02:00
graffy76
94db7cdcfe
Added png's of icons
2013-05-29 12:45:15 -05:00
graffy76
35fb9b669a
Final details implemented
...
Png icons, alignments fixed.
2013-05-29 06:38:35 -05:00
graffy76
5a40594b0d
Merge
...
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
2013-05-26 23:21:08 -05:00
Marek Kochanowicz
792f3aaa86
Rastered status icons. ingredients, light, and book icon without emblem.
2013-05-26 17:31:29 +02:00
Marek Kochanowicz
b31f0dfe1f
Raster status icons.
2013-05-26 17:28:27 +02:00
scrawl
de5a08a07d
Version should be 100 for GLSLES
2013-05-25 05:40:35 +02:00
scrawl
c2c88acc7b
GLSLES: only the fragment shader needs precision explicitely set.
2013-05-25 04:26:40 +02:00
scrawl
cc747d8ae4
GLSL ES: precision qualifiers are required
2013-05-25 04:23:07 +02:00
scrawl
1e7cf4ae1c
GLES2 experiment
2013-05-25 04:15:24 +02:00
riothamus
885d12e867
updated hud layout
2013-05-22 22:06:22 -04:00
riothamus
39bd8894a9
Bug 787
2013-05-20 16:39:24 -04:00
Marc Zinnschlag
54f56b0515
Merge remote-tracking branch 'graffy76/usersettings'
...
Conflicts:
apps/opencs/view/doc/view.cpp
apps/opencs/view/doc/view.hpp
2013-05-16 18:04:55 +02:00
Marek Kochanowicz
60893f4b00
New icons from nomadic1 finally. Including dialogue-greetings AKA Ave
...
Caesar icon.
2013-05-14 17:57:35 +02:00
scrawl
0c4a963132
Container UI rewrite
2013-05-11 18:38:27 +02:00
scrawl
90b7df439f
Fix image buttons
2013-05-08 13:55:15 +02:00
graffy76
f6203cac2a
update for master
2013-05-07 20:33:42 -05:00
scrawl
8845c0cee1
Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.
2013-05-07 17:38:24 +02:00
scrawl
f1413ca56b
Synced font code ranges.
2013-05-06 15:17:17 +02:00
scrawl
ef9f0b2fc0
Fix size of quest index
2013-05-05 11:56:08 +02:00
scrawl
78e6dab9d2
Dialogue history rewrite WIP
2013-05-04 14:15:47 +02:00
scrawl
03f4e91ceb
Unrelated shadows fix
2013-05-03 23:08:46 +02:00
scrawl
1f58edb9db
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
2013-05-03 18:17:27 +02:00
Glorf
f1a659e2ac
Bugfix #730
2013-05-02 14:49:30 +02:00
scrawl
2a42556aa5
Merge branch 'master' into HEAD
2013-04-30 14:54:10 +02:00
Nathan Jeffords
718af692c9
reworked journal to match bethesda's implemenation
2013-04-24 20:20:01 -07:00
Nathan Jeffords
85595245ab
Updated journal layout to match Bethesda's version more closely
2013-04-24 20:20:00 -07:00
Emanuel Guevel
c0102954f1
Add non-breaking space to font code range
2013-04-25 01:42:09 +02:00
Marek Kochanowicz
03af0a8ac9
Adding more icons from nomadic1, replacing older with recently redoned.
2013-04-14 10:02:48 +02:00
scrawl
23b477a938
Fix normal maps with spaces in filename not getting loaded
2013-04-12 04:36:28 +02:00
scrawl
2c70074dd7
Fix combinedAlpha
2013-04-11 15:17:47 +02:00
Chris Robinson
9d29921913
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-09 15:12:19 -07:00
scrawl
0e7d555cdf
Terrain material now uses multiple passes if required, which means it can support an arbitrary number of layers. Also re-enables PSSM.
2013-04-09 20:31:00 +02:00
Chris Robinson
01a1a0b846
Merge remote-tracking branch 'zini/master' into nifogre
...
Conflicts:
components/nifogre/ogrenifloader.cpp
2013-04-08 11:46:57 -07:00
scrawl
343e2027af
Support NIF detail maps
2013-04-08 15:17:30 +02:00
Chris Robinson
3768e04a0c
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-07 17:24:47 -07:00
Chris Robinson
88c81bfb24
Apply polygon_mode to objects
2013-04-07 07:38:43 -07:00
scrawl
4daaa4030d
Added shader based MyGUI render manager to allow using Ogre's next generation render systems.
2013-04-07 00:12:04 +02:00
Chris Robinson
e50b6b1cfe
Apply texture matrix 0 in the object shader
2013-04-06 09:45:26 -07:00
scrawl
75b462b974
If alpha rejection was forced, we also need to force depth_write and depth_check
2013-04-05 18:24:12 +02:00
Marek Kochanowicz
01314b7c08
addin more nomadic icons
2013-04-05 12:08:35 +02:00
Marc Zinnschlag
8dd7f0c53a
Merge remote-tracking branch 'scrawl/normalmap'
2013-04-03 19:46:06 +02:00
scrawl
a9b56eedc3
Support NIF "glow maps", which are basically an emissive channel.
2013-04-03 18:51:40 +02:00
Glorf
ae3e4ecf8b
Finished enchanting
2013-04-03 18:02:30 +02:00
scrawl
5625d73d84
Bump texture support
2013-04-03 17:16:34 +02:00
scrawl
857f2b33db
Fix companion layout align
2013-03-31 14:48:48 +02:00
scrawl
bc6e1fd981
Add missing files
2013-03-31 14:36:03 +02:00
scrawl
b0199c703c
Companion UI
2013-03-31 13:13:46 +02:00
Marek Kochanowicz
49b5b90cd5
png icons from nomadic and my rastered icons in raster folder.
2013-03-31 10:13:01 +02:00
Marek Kochanowicz
faf293bd6d
Removing old directory.
2013-03-31 09:50:35 +02:00
scrawl
a031c77619
Improved enchanting layout
2013-03-30 15:56:14 +01:00
Marc Zinnschlag
a359ba6a2f
Merge remote-tracking branch 'scrawl/graphics'
2013-03-30 11:18:41 +01:00
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.
2013-03-30 03:07:34 +01:00
vorenon
f93cefa201
Changed Y position of the textboxes
2013-03-29 21:26:40 +01:00
vorenon
35a6ca010a
Adjusted textbox height in race menu
2013-03-29 20:43:17 +01:00
scrawl
a39c129954
Clamp individual light attenuation at 1
2013-03-29 19:53:52 +01:00
scrawl
7ad1e962e0
Merge branch 'master' into graphics
2013-03-29 19:39:18 +01:00
Marc Zinnschlag
573368849b
Merge remote-tracking branch 'glorf/enchanting'
...
Conflicts:
apps/openmw/CMakeLists.txt
2013-03-29 16:48:21 +01:00
Marek Kochanowicz
623f9c2a58
A new icon for misc iteams. I really hope that scales will do.
2013-03-27 19:52:12 +01:00
Marek Kochanowicz
cf0c55b37f
New random-item. Looks a lot better.
2013-03-26 10:28:43 +01:00
Marek Kochanowicz
37a1fb6b7c
Adding ingredient.svg icon. I need to work on random-item and scrap container icon.
2013-03-26 09:41:26 +01:00
Marek Kochanowicz
b7f95cd271
Random item (dice). Container.svg needs to be scraped, I'm afraid.
2013-03-24 10:19:46 +01:00
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.
2013-03-23 19:53:10 +01:00
Marek Kochanowicz
e97319c0bb
Drawer as container icon looks actually quite good IMHO.
2013-03-23 19:32:37 +01:00
Marek Kochanowicz
cb58ee126e
Drawer as container icon. Look a little better the old crappy chest but changes are needed.
2013-03-23 19:29:52 +01:00
Marek Kochanowicz
59233e54b2
changing potion.svg according to pvdk sugestions
2013-03-23 18:18:19 +01:00
Marek Kochanowicz
43e863b020
Forgot to place the icons in the middle of the page.
2013-03-23 16:22:17 +01:00
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...
2013-03-23 16:16:23 +01:00
scrawl
7beda509fe
Lighting should be done in view space instead of object space, so that attenuation also works correctly for scaled objects
2013-03-23 09:53:38 +01:00
scrawl
a2ca679beb
Added PC repair feature
2013-03-23 08:16:46 +01:00
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.
2013-03-22 18:06:11 +01:00
scrawl
20774f8f81
Added merchant repair feature
2013-03-22 14:13:10 +01:00
Marek Kochanowicz
e46097cd2e
Icons. Currently activator, apparatus, book, container (work in progress), light source, potion, static, weapon.
2013-03-21 20:18:18 +01:00
scrawl
11aed7474e
Shadow cast on water
2013-03-20 18:34:54 +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
scrawl
7046e7ae3d
Water fog fix
2013-02-23 09:02:05 +01:00
scrawl
01102f9c73
Don't emit if there wasn't enough movement
2013-02-23 05:53:20 +01:00
scrawl
db9e49968e
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-23 04:13:51 +01:00
Nathan Jeffords
5e1ec9e128
improved book window layout
2013-02-22 08:32:54 -08:00
Emanuel Guevel
3dc28baa28
Remove "PinToggle" event from layout file
2013-02-20 01:31:10 +01:00
Emanuel Guevel
2dea86bbc7
Make the "lock window" button appealing
2013-02-20 01:30:42 +01:00
Emanuel Guevel
3ba3c71556
Make the "lock window" button to change state visually
2013-02-20 01:30:39 +01:00
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.
2013-02-19 03:08:00 +01:00
scrawl
32b837ebd4
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
2013-02-19 00:15:54 +01:00
scrawl
42883ec64b
cleanup
2013-02-18 02:33:53 +01:00
graffy76
ceefae81e8
fix for the opencs icon
2013-02-17 07:46:50 -06:00
scrawl
492e0f2ccf
Switched objects shaders to vertex lighting, to accomodate badly placed lights in morrowind.
...
Fixed a very obvious land <-> water seam.
2013-02-14 19:45:07 +01:00
scrawl
499f3ac0d1
Slightly better ripple normal blending. Not physically accurate at all, but looks good.
2013-02-05 16:40:41 +01:00
scrawl
3772cd9257
Refraction can be disabled separately now
2013-02-05 14:29:46 +01:00
scrawl
0f37c24d5f
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-02-04 21:55:41 +01:00
scrawl
e949765922
cloud blending now as before (0 -> 0.25 -> 1)
2013-02-04 19:21:47 +01:00
scrawl
bf037b7d29
Removed problematic ModVertexAlpha method, now done in shader
2013-02-04 18:03:03 +01:00
scrawl
15e51b76de
Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth
2013-02-03 15:46:23 +01:00
scrawl
a461b282c1
water ripples (experimental)
2013-02-01 23:43:23 +01:00
scrawl
3ec703e6af
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-02-01 16:25:54 +01:00
Emanuel Guevel
af9e126487
Add unicode number for ellipsis (…) to code range
2013-01-20 17:50:32 +01:00
lazydev
aa514a53d9
Console font change to provide possibility to show cyrillic symbols
2013-01-15 02:22:14 +04:00
scrawl
30136eb449
Update settings UI
2013-01-12 06:36:48 +01:00
scrawl
55769aaf91
Fix selection buffer (i.e. item selection on the inventory character preview) when object shaders were disabled
2013-01-10 01:46:00 +01:00
scrawl
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)
2013-01-09 23:11:15 +01:00
scrawl
bd8d793fec
Removing gamma correction due to caused inconsistencies.
2013-01-09 21:41:40 +01:00
scrawl
111e38ef25
Revert "fog now distance based instead of depth"
...
This reverts commit 7ee038fdd7
2013-01-09 20:18:26 +01:00
scrawl
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +01:00
scrawl
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.
2013-01-03 01:09:03 +01:00
scrawl
a6c3e06e54
fixed fog in some cells
2012-12-15 20:36:17 +01:00
scrawl
5f676f9c6b
Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwscript/miscextensions.cpp
2012-12-11 22:28:23 +01:00
scrawl
44010974fc
workaround for HLSL error X4579
2012-12-10 12:34:28 +01:00
scrawl
c4facc233e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-12-01 11:30:51 +01:00
scrawl
11a8d5d70a
Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap
2012-11-10 21:19:41 +01:00
scrawl
7c22690116
Merge branch 'next' into globalmap
2012-11-10 21:19:10 +01:00
scrawl
5fdc7ad809
forgot to add file
2012-11-10 13:07:26 +01:00
scrawl
ace9ee9c83
persuasion dialog
2012-11-09 20:18:38 +01:00
scrawl
38828acac9
transparent overlay
2012-11-04 12:13:04 +01:00
Marc Zinnschlag
648b53ef93
removed unused launcher.cfg file
2012-10-31 10:09:27 +01:00
scrawl
234716daa6
finished spell creation
2012-10-23 11:42:38 +02:00
scrawl
9f821e5df2
fix shaders
2012-10-22 16:56:43 +02:00
scrawl
0a19b56031
fix gold label
2012-10-17 18:49:49 +02:00
scrawl
e80394c0b5
fix training limit
2012-10-17 18:48:29 +02:00
scrawl
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
2012-10-17 18:17:53 +02:00
scrawl
1a2034b4dd
training window
2012-10-17 18:03:02 +02:00
Lukasz Gromanowski
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>
2012-10-16 23:16:14 +03:00
scrawl
f154031e54
last bits of the gui
2012-10-11 18:26:29 +02:00
gugus
1f4de03613
oooups
2012-10-06 22:33:10 +02:00
gugus
85d9357e3a
Travel GUI
2012-10-06 17:52:46 +02:00
scrawl
025e820703
abstracted code and use it in enchanting window as well
2012-10-03 15:36:10 +02:00
scrawl
1c0dd3ccc5
some editing code
2012-10-03 15:06:54 +02:00
scrawl
7ee038fdd7
fog now distance based instead of depth
2012-10-03 12:03:07 +02:00
scrawl
636f297f10
enchant
2012-09-28 16:52:42 +02:00
scrawl
ac0c1ea986
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
...
Conflicts:
apps/openmw/mwgui/dialogue.cpp
2012-09-27 08:47:47 +02:00
scrawl
73c69e8eda
video playback
2012-09-25 02:35:50 +02:00
scrawl
d393f551ed
edit effect dialog
2012-09-24 08:09:16 +02:00
scrawl
9d7c35ae48
and go
2012-09-23 00:36:20 +02:00
scrawl
f45a6b71a9
Merge branch 'master' into next
2012-09-22 20:48:55 +02:00
Marc Zinnschlag
63772e2301
Merge remote-tracking branch 'scrawl/gamma' into next
2012-09-22 18:27:51 +02:00
scrawl
dbf59d14dc
water gamma correction
2012-09-22 16:52:53 +02:00
Nikolay Kasyanov
8a81a4a334
Fixed typo on openmw.cfg that caused launcher crash on OS X
2012-09-22 13:03:58 +04:00
scrawl
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
2012-09-20 17:41:14 +02:00
scrawl
e5e3d829d0
player arrow & markers
2012-09-20 17:30:09 +02:00
scrawl
86cfc91ef3
global map rendering
2012-09-20 13:56:37 +02:00
Marc Zinnschlag
87a9373a56
Merge remote-tracking branch 'scrawl/gamma' into next
2012-09-20 09:01:58 +02:00
scrawl
b9a3f8e8d7
gamma slider
2012-09-19 23:47:42 +02:00
scrawl
d9f6072f02
gamma correct rendering & adjustment setting
2012-09-19 23:25:07 +02:00
scrawl
32de090079
Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities
2012-09-19 19:34:02 +02:00
scrawl
bf5e30b24f
everything done except health/mana restore
2012-09-19 02:53:06 +02:00
scrawl
ab698bb401
date time label
2012-09-18 20:53:32 +02:00
scrawl
0ba996f290
dialog layout
2012-09-18 18:29:03 +02:00
scrawl
42d25c0af0
fix resources, I renamed those in the last commit, but only in one place
2012-09-16 20:56:49 +02:00
scrawl
76b494100e
finished?
2012-09-15 17:12:42 +02:00
scrawl
95f3a20e2c
Merge branch 'master' into levelup
2012-09-15 14:25:37 +02:00
scrawl
b76a28f69c
beginnings of the gui
2012-09-14 19:44:00 +02:00
scrawl
a308d2e38a
fixed exception, fixed armor label obscuring the items
2012-09-14 15:33:24 +02:00
scrawl
6ac2a12296
item selection working on the preview
2012-09-14 14:34:18 +02:00
scrawl
eef750e6b0
race selection preview
2012-09-13 19:03:31 +02:00
scrawl
5155339cb6
character preview working
2012-09-13 14:56:50 +02:00
scrawl
4f3eb3c34a
character preview WIP
2012-09-13 00:54:32 +02:00
scrawl
a8d9aa98b1
some fixes
2012-09-11 19:18:26 +02:00
scrawl
369db182de
actual progress bar, performance optimization
2012-09-11 16:53:49 +02:00
scrawl
2b339f6c0f
loading screen
2012-09-11 16:37:54 +02:00
scrawl
ad66ebf84f
fix button align on 2 windows
2012-09-10 14:31:19 +02:00
scrawl
996e6280d8
more spell buying window cleanup
2012-09-10 14:10:01 +02:00
scrawl
ba0acd4056
changed some text colors
2012-09-10 13:52:37 +02:00
scrawl
fde69d0c87
Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing
2012-09-10 13:40:34 +02:00
scrawl
bc6a1979b0
replaced everything with the new method
2012-09-10 13:39:22 +02:00
Marc Zinnschlag
273ac0a97f
Merge branch 'spellbuying'
2012-09-10 13:16:02 +02:00
scrawl
b66c8099eb
new system for dynamic sizing of buttons & text boxes
2012-09-10 11:20:27 +02:00
scrawl
bb267dddf6
some stats window cleanup
2012-09-09 23:50:57 +02:00
Marc Zinnschlag
3fad1c0786
fixed a crash
2012-09-09 20:43:21 +02:00
Adam Hogan
08410b9062
Renamed SpellBuyingWindow, took some suggestions from scrawl
2012-09-09 14:10:07 -04:00
Adam Hogan
ebf80943a9
Added spell buying window
2012-09-08 18:17:03 -04:00
Marc Zinnschlag
ef6f033dd1
Merge branch 'multidata'
2012-09-04 11:02:28 +02:00
Marc Zinnschlag
e2bf4694cb
Merge remote-tracking branch 'scrawl/master'
2012-08-31 09:22:32 +02:00
scrawl
ba43f2997f
fix missing character in font for french morrowind version, thanks to jvoisin
2012-08-30 22:08:30 +02:00
scrawl
dbe3cca828
added a separate core.xml file that works with the mygui layout editor
2012-08-29 13:11:06 +02:00
Marc Zinnschlag
4f411ff1eb
Merge remote-tracking branch 'scrawl/master'
2012-08-29 11:17:33 +02:00
scrawl
6ad08dfd33
added settings for crosshair & subtitles
2012-08-29 11:15:17 +02:00
scrawl
5370fecb6f
fix a small input focus issue with the map
2012-08-29 10:51:36 +02:00
scrawl
7eaf5e7f0f
changed the markers to look more like morrowind's (hover effect)
2012-08-28 18:40:11 +02:00
scrawl
5834b4baa5
door markers on the local map
2012-08-28 17:30:34 +02:00
scrawl
6161f81c24
last bits of the quick key menu.
2012-08-27 20:44:14 +02:00
scrawl
c5e55d3cac
fix screenshot function
2012-08-27 15:51:01 +02:00
scrawl
c0f27bd5ef
magic selection window
2012-08-26 11:37:33 +02:00
scrawl
fab4cfecb1
some unfinished work on quick keys window
2012-08-26 10:52:06 +02:00
scrawl
132da92391
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
2012-08-16 13:20:53 +02:00
Marc Zinnschlag
b0506e2220
re-enabling support for multiple data directories
2012-08-16 12:59:28 +02:00
Marc Zinnschlag
f9693ab33a
Merge remote-tracking branch 'scrawl/shadersystem'
2012-08-16 12:03:03 +02:00
scrawl
4ae0a5c02e
fix silhouettes around objects above the water
2012-08-15 19:29:00 +02:00
Pieter van der Kloet
9501e133f5
Updated the EB Garamond font to a higher-resolution version
2012-08-14 03:23:57 +02:00
scrawl
67577c6192
UI cursor & camera sensitivity sliders
2012-08-13 18:48:50 +02:00
scrawl
c7b8787c32
"reset to defaults" button, invert y axis button
2012-08-13 02:55:22 +02:00
scrawl
bc6e4feedc
hotkey window first version
2012-08-13 01:26:15 +02:00
scrawl
976ad7a301
key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw
2012-08-12 22:59:58 +02:00
scrawl
86d6f190bf
Input system rewrite
2012-08-12 20:45:02 +02:00
scrawl
8ac2d11f56
changed shading to be more like MW (completely replace material ambient with vertex colors if present), fixes some too dark daedric ruins
2012-08-11 14:42:14 +02:00
scrawl
f58a4ada7a
Merge branch 'master' into shadersystem
2012-08-11 14:28:31 +02:00
scrawl
f72956b918
- added a simple main menu (with Return, Options and Exit buttons)
...
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
2012-08-10 15:15:48 +02:00
scrawl
993c7150dc
tweaked depth bias
2012-08-07 22:43:11 +02:00
scrawl
15a16aeba1
Fixed DirectX HLSL shaders and re-enabled them in the gui
2012-08-01 04:11:16 +02:00
scrawl
37c7becb07
some potential compability fixes
2012-07-25 23:53:06 +02:00
scrawl
3feb4ce61b
terrain lod morph fix
2012-07-25 19:33:21 +02:00
scrawl
8c8228a15c
fix terrain num lights setting
2012-07-24 00:08:53 +02:00
scrawl
3ebc6fd590
fixed a settings window bug
2012-07-23 20:50:56 +02:00
scrawl
a70f93b024
fix "Crash when running openmw with --start="XYZ", remove HLSL for windows
2012-07-23 20:12:42 +02:00
scrawl
9f9183ff73
depth bias
2012-07-23 18:25:20 +02:00
scrawl
bc7876e980
use alpha map for moons
2012-07-23 13:04:48 +02:00
scrawl
f0b3142966
switch to glsl 1.2
2012-07-23 02:54:50 +02:00
scrawl
6bfcf2bc1b
- exchanged the preprocessor again, no warnings now
...
- disable line directives for now, causing some trouble
2012-07-22 02:45:39 +02:00
scrawl
17a5c22c8f
don't use globbing
2012-07-20 23:31:49 +02:00
scrawl
acc5c3bbbf
some fixes
2012-07-20 17:08:15 +02:00
scrawl
41791ccaa2
add file
2012-07-20 16:44:40 +02:00
scrawl
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
2012-07-20 16:44:03 +02:00
scrawl
21728020f6
fixed the water on local map
2012-07-20 14:45:42 +02:00
scrawl
f5ffea4d4b
new button, water timescale
2012-07-19 23:30:41 +02:00
scrawl
e077814a8c
water
2012-07-19 22:23:07 +02:00
scrawl
9d7470e14c
temp commit
2012-07-19 20:18:34 +02:00
scrawl
739455e6f8
new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc
2012-07-19 16:23:30 +02:00
scrawl
778e59ee37
terrain as it was before, with about 4x less code
2012-07-15 08:21:43 +02:00
scrawl
29f91753f7
correction
2012-07-14 18:44:03 +02:00
scrawl
93c641efa7
terrain albedo
2012-07-14 18:25:43 +02:00
scrawl
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
2012-07-14 11:16:35 +02:00
scrawl
16c2ea3a75
terrain colourmap
2012-07-14 11:13:38 +02:00
scrawl
1429c8d5cb
copy&paste mistake
2012-07-13 12:43:48 +02:00
scrawl
fb109ec7e2
use debug versions of ogre plugins in debug mode
2012-07-13 11:30:47 +02:00
scrawl
7731e9a6fa
finished cleaning up sky
2012-07-13 09:13:12 +02:00
scrawl
b8384162b6
merge
2012-07-13 06:16:55 +02:00
scrawl
cd6e9986b6
forgot to add files
2012-07-11 09:09:38 +02:00
scrawl
ad7383be43
sky
2012-07-11 09:08:55 +02:00
scrawl
e0a99f104b
settings tab "shadows"
2012-07-11 04:28:45 +02:00
scrawl
485adc8bdc
shader mode button in settingswindow
2012-07-11 03:19:51 +02:00
scrawl
865bfc6f47
sync mrt_output setting
2012-07-11 02:31:03 +02:00
scrawl
1a9f59d5d4
shadows
2012-07-10 00:07:33 +02:00
scrawl
07fd9986ef
accidently removed the map.
2012-07-09 20:14:07 +02:00
scrawl
b803d0e949
converted shadow caster shader
2012-07-09 19:46:36 +02:00
scrawl
81d30ff63a
temp commit
2012-07-09 19:20:41 +02:00
scrawl
e517e75d09
update
2012-07-07 01:25:14 +02:00
scrawl
a095572205
fixed some textures, started with sky
2012-07-06 10:31:48 +02:00
scrawl
71c865e2e9
let there be light
2012-07-06 07:10:10 +02:00
scrawl
33c48b9481
update
2012-07-06 04:28:08 +02:00
scrawl
8e683c2e05
vertex colors
2012-07-05 01:38:33 +02:00
scrawl
9bd888d9a1
transparency
2012-07-05 00:39:25 +02:00
scrawl
f8e3213996
fog, mrt depth
2012-07-04 16:57:14 +02:00
scrawl
de9b7a51de
change glsl #version, remove CG from required libraries
2012-07-04 00:33:09 +02:00
scrawl
4ea6530772
hello world.
2012-07-04 00:26:57 +02:00
scrawl
d27863bf8e
rename layout files to .layout to get them recognized by layout editor
2012-07-03 11:34:20 +02:00
scrawl
246c6493df
Merge branch 'master' into graphics
2012-06-08 17:29:36 +02:00
scrawl
b886aea298
change console skin to MW_Window and set the selected object refID as window title
2012-06-02 12:31:23 +02:00
scrawl
fbaedd2c3a
new underwater colors
2012-05-30 16:20:35 +02:00
scrawl
298ae4f7f8
HUD icons for selected weapon / selected spell / selected enchanted item
2012-05-29 18:33:01 +02:00
scrawl
30461438f6
still left: spell success formula
2012-05-29 12:35:03 +02:00
scrawl
c7268233df
spell window layout & opening/closing/pinning logic
2012-05-29 09:02:22 +02:00
scrawl
1b561ce91f
Merge branch 'master' into next
2012-05-29 06:56:23 +02:00
scrawl
69e6bc6588
add water settings to settings window
2012-05-29 06:45:44 +02:00
scrawl
5d03e86613
added field of view and texture filtering to settings window
2012-05-29 04:54:54 +02:00
scrawl
6945afe95b
alchemy window layout
2012-05-29 02:57:19 +02:00
scrawl
6014a90002
added tooltip delay option
2012-05-28 09:46:05 +02:00
scrawl
8f667580bb
ogre 1.8 final release compability fixes
2012-05-27 23:12:45 +02:00
scrawl
10cfe0f5bc
Issue #295 : Class creation dialogs tooltips; plus tons of other improvements
2012-05-27 06:39:10 +02:00
scrawl
63213b36bf
Show a label on the HUD with the cell name when it changes (visible for a few seconds) - like Morrowind
2012-05-26 23:06:15 +02:00
scrawl
313a8e55b7
- Issue #296 : Clicking on HUD elements shows/hides the respective window
...
- Slightly redesigned the map window and minimap, the player arrow now isn't cut off at cell borders anymore
2012-05-26 21:09:21 +02:00
scrawl
750259973e
potion creating works, most of the values are bogus
2012-05-25 18:00:13 +02:00
scrawl
1df1b521a4
show the list of potion effects
2012-05-25 16:20:57 +02:00
scrawl
09c870ad68
first alchemy window layout (not pretty)
2012-05-25 12:58:28 +02:00
scrawl
51b8a76a68
merged by branches together, starting with alchemy window
...
Merge branch 'guimode_stacking' into next
Conflicts:
apps/openmw/mwgui/mode.hpp
2012-05-24 15:57:23 +02:00
scrawl
c2b818373e
adjust tooltip skin, now is never transparent
2012-05-24 15:11:45 +02:00
scrawl
6ea7bdb224
vsync & fps buttons, sound volume apply fix
2012-05-24 11:50:48 +02:00
scrawl
9b94edd561
audio tab with volume sliders
2012-05-24 04:34:53 +02:00
scrawl
cb35f4d208
some unrelated gui cleanup
2012-05-24 03:50:02 +02:00
scrawl
689cf7ce05
ConfirmationDialog
2012-05-23 05:28:25 +02:00
scrawl
656a8f1be9
working menu transparency slider
2012-05-23 01:32:36 +02:00
scrawl
972c035e97
TabControl skin, settings window categories
2012-05-22 23:35:05 +02:00
scrawl
313294c522
settings window (hotkey F2) which does nothing. Yay!
2012-05-22 21:40:42 +02:00
scrawl
343bbaf0fd
integrated video settings in the settings file, the launcher is now useless
2012-05-22 03:36:03 +02:00
Marc Zinnschlag
7938566004
Merge remote branch 'scrawl/graphics'
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-05-21 11:24:36 +02:00
scrawl
8f2c8bbea4
Merge branch 'master' into graphics
2012-05-21 09:50:46 +02:00
scrawl
b2d207130d
vastly improved look of the GUI, skin background textures now use tiling instead of stretching
2012-05-21 08:14:22 +02:00
scrawl
1079bb2677
finished tooltips for everything in the stats window, some gui refactoring
2012-05-21 05:14:07 +02:00
scrawl
8ce4727424
skill tooltips
2012-05-21 01:58:11 +02:00
scrawl
6518eb7794
some cleanup
2012-05-20 22:55:14 +02:00
scrawl
1c7110fbf5
birthsign tooltip
2012-05-20 22:45:30 +02:00
scrawl
8d52ee27dc
attribute tooltips now use a new system that allows complex tooltips to be defined entirely through layout files
2012-05-20 22:06:54 +02:00
scrawl
4fb30544d4
more gui files cleanup
2012-05-19 16:00:00 +02:00
scrawl
7a4de0ed1d
changed more gui stuff to use the new tag system
2012-05-19 15:32:32 +02:00
scrawl
7ef0ad4e39
show faction & birthsign in the stats window
2012-05-19 14:55:09 +02:00
scrawl
24ce88de2a
working mygui tag replacement system for GMST strings
2012-05-19 14:19:21 +02:00
scrawl
41efea4c1d
in the trade window, don't show items that the merchant has equipped.
2012-05-17 21:56:16 +02:00
scrawl
6ae642aa06
complete trade window layout
2012-05-17 21:15:48 +02:00
scrawl
4213b4370f
trade window shows up and shows the vendor's inventory items.
2012-05-17 19:53:04 +02:00
scrawl
5da4da820e
beginnings of trade window layout.
2012-05-17 17:15:44 +02:00
scrawl
0c1d06d9f7
added some trade window stuff, which does nothing yet.
2012-05-17 13:36:25 +02:00
scrawl
8cc49ae2b9
xml files update (layout tweak, added double quotation marks to font)
2012-05-17 12:55:48 +02:00
scrawl
b18ee198b4
use a raycast to determine where to place object, if distance is too far
...
drop it on the ground
2012-05-15 16:47:23 +02:00
scrawl
24a0fecd37
implemented item count selection dialog
2012-05-15 12:51:51 +02:00
scrawl
f300a5621c
Merge branch 'master' into inventoryGUI
2012-05-13 17:45:57 +02:00
scrawl
a54e52586b
fix for a potential directx problem
2012-05-13 12:17:07 +02:00
scrawl
3a93df8db4
dynamic inventory layout like morrowind
2012-05-13 11:25:35 +02:00
scrawl
78b06d0ebf
inventory window pinning
2012-05-12 22:44:12 +02:00
scrawl
822e5fbe1e
add indication which filter is selected
2012-05-12 22:00:15 +02:00
scrawl
0114bf948c
revised filters
2012-05-12 21:28:04 +02:00
scrawl
1abf70692c
added a scrollbar to the item container, dynamic positioning of items, fixed the item count display bug
2012-05-12 18:24:47 +02:00
scrawl
ed6ff0a94a
cleanup 3
2012-05-12 13:12:37 +02:00
scrawl
3a6fde5039
cleanup 2
2012-05-11 16:58:07 +02:00
scrawl
a1b86acc38
Merge branch 'master' into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
files/mygui/core.xml
2012-05-11 16:41:27 +02:00
gugus
8e8f80807e
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/armor.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/clothing.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/light.cpp
apps/openmw/mwclass/lockpick.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/probe.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwclass/weapon.cpp
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
apps/openmw/mwworld/class.cpp
2012-05-11 10:40:40 +02:00
scrawl
a99f74702e
workaround for a white square that appears in menubook_next texture
2012-05-11 09:57:43 +02:00
scrawl
1f1edea6af
make it possible to use scroll wheel when mouse is over a skill in the stats window; set the correct track size for the scrollbar
2012-05-11 08:45:03 +02:00
scrawl
65ccfba191
resize both the left and the right pane of the stats window
2012-05-11 08:15:22 +02:00
scrawl
8a9e05a96b
display text on the book window
2012-05-10 11:03:27 +02:00
scrawl
d69501b061
change daedric font to .zip resource
2012-05-09 02:16:10 +02:00
scrawl
cd351ba3af
simple scroll text parsing (tags are ignored until now)
2012-05-08 00:39:52 +02:00
scrawl
9dd53b32b8
added daedric font for magic scrolls
2012-05-07 02:00:31 +02:00
scrawl
f20d4eeb41
Bug #281 , openmw.font.xml update
2012-05-05 01:44:51 +02:00
scrawl
499dd26398
dialogue window topic list word-wrapping
2012-05-04 23:53:50 +02:00
scrawl
a3d99767f7
next & prev button mouseover
2012-05-04 19:11:32 +02:00
scrawl
c125fba9d2
button mouse-over image change working
2012-05-04 18:44:46 +02:00
scrawl
a4d6d1baff
added a utility for creating texture atlas at runtime
2012-05-04 18:09:45 +02:00
scrawl
5028a83d11
fix stats window layout resizing
2012-05-03 07:03:04 +02:00
scrawl
0e6b82284f
book & scroll windows
2012-05-03 03:33:33 +02:00
scrawl
f733382f74
tooltip now contains info about item enchantment
2012-04-30 00:57:41 +02:00
scrawl
397a978145
DispositionEdit tweaks
2012-04-29 18:57:26 +02:00
scrawl
cca39978d4
changed messagebox text colors
2012-04-29 17:46:09 +02:00
scrawl
50d79a8815
Merge branch 'next' into tooltips
2012-04-29 17:30:34 +02:00
gugus
5603cb312c
Objects can now be selected and follow mouse movements.
2012-04-27 20:54:39 +02:00
scrawl
1b5bfc52a1
Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwgui/window_manager.cpp
2012-04-24 02:02:03 +02:00
scrawl
e443455612
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
2012-04-24 00:54:35 +02:00
gugus
25432d97d2
trying to get selected item. Doesn't work.
2012-04-21 20:35:45 +02:00
Alexander "Ace" Olofsson
f7a03b39c4
Some improvments for windows builds and installer
2012-04-19 14:58:27 +02:00
scrawl
4889902b98
magic effect widget improvements, read name of effect from GMST and don't show duration/target for constant effects
2012-04-18 21:18:53 +02:00
pchan3
215d4e1739
Made adjustments to keep container window within the viewscreen.
2012-04-18 23:09:13 +10:00
scrawl
51a76eda92
Merge branch 'master' into graphics
2012-04-18 01:09:55 +02:00
scrawl
1de1b3e40e
Merge branch 'master' into tooltips
2012-04-17 15:57:08 +02:00
scrawl
13b67faf2f
adding more safety checks
2012-04-16 20:39:41 +02:00
scrawl
f1b80c6ff7
fixed text input box
2012-04-16 19:23:24 +02:00
scrawl
cfa37b0e77
fix another bunch of gui stuff, some strings were untranslated and buttons were not resized to fit their text
2012-04-16 19:14:05 +02:00
scrawl
b3dc1931a9
general GUI refactoring, part 1
2012-04-16 15:48:01 +02:00
Nikolay Kasyanov
582d7ab213
building & packaging improvements for OS X
2012-04-16 15:28:09 +02:00
scrawl
194ecf274c
attribute tooltips
2012-04-16 00:16:35 +02:00
scrawl
705d4c6d54
mostly complete
2012-04-15 21:14:14 +02:00
gugus
58d05fa503
more clean-up. Container window shows up! But there is no working close button.
2012-04-15 20:56:45 +02:00
gugus
a38db39e88
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
2012-04-15 17:54:13 +02:00
gugus
b309d245c5
cleaning up hircine work
2012-04-15 17:52:39 +02:00
scrawl
ab4e03f05f
Merge branch 'master' into tooltips
2012-04-15 17:11:14 +02:00
scrawl
d37bc9cba8
basic mouse-over info for in-game objects
2012-04-15 17:10:08 +02:00
Marc Zinnschlag
f36c8733fa
Merge remote branch 'scrawl/graphics'
2012-04-15 17:02:51 +02:00
scrawl
cac662ca98
basic tooltips
2012-04-14 17:47:44 +02:00
scrawl
fa5a1432c9
map lighting tweak, default settings tweak
2012-04-14 15:58:58 +02:00
k1ll
226f312163
Set the version in the openmw.desktop file via CMake
2012-04-13 17:36:31 +02:00
Marc Zinnschlag
a4fb71a0fc
Merge remote branch 'scrawl/graphics'
2012-04-12 18:46:02 +02:00
scrawl
95f87a8abf
more or less complete list for morrowind.bsa (thanks to artorius)
2012-04-12 16:33:36 +02:00
scrawl
2b8c81e779
removed test.skin file
2012-04-12 14:31:12 +02:00
scrawl
800df7376c
use the cursors from morrowind.bsa and remove mwpointer.png
2012-04-12 14:26:21 +02:00
scrawl
a727bcd4a4
override nif transparency settings (part 1)
2012-04-11 20:13:15 +02:00
scrawl
2a4fcf42a3
basic shadows
2012-04-11 18:53:13 +02:00
scrawl
1df7be7fee
- fixes to texture filtering setting
...
- add a sensible warning to settings-default.cfg, since there have been some confusions with it
2012-04-09 00:10:42 +02:00
scrawl
aa8208efb9
changed compositor to be compatible with Ogre 1.8RC
2012-04-08 22:18:56 +02:00
scrawl
0b2dab0b5d
disable water fog due to some issues
2012-04-08 18:17:52 +02:00
scrawl
a5c6207fe7
add setting to disable the underwater effect
2012-04-08 17:44:00 +02:00
scrawl
b1c84f28a9
Merge branch 'master' into water
...
Conflicts:
files/settings-default.cfg
2012-04-08 16:11:16 +02:00
scrawl
fbfc6e0966
enabled new water by default
2012-04-08 16:06:47 +02:00
scrawl
17eb68e4bc
disable "reflect statics" by default because it performs not so well right now
2012-04-08 15:52:43 +02:00
scrawl
8caa5ff9c4
fixed refraction and underwater distortion artifacts
2012-04-08 15:03:09 +02:00
Marc Zinnschlag
8e6c445111
Merge remote branch 'chris/sound'
2012-04-08 11:13:42 +02:00
Chris Robinson
59ccab0b2c
Add sound volume settings
2012-04-07 16:00:30 -07:00
Chris Robinson
752e89a268
Add a setting to select the sound device name
2012-04-07 15:28:38 -07:00
scrawl
030060e656
settings description
2012-04-07 23:29:36 +02:00
scrawl
9169c0d7c9
slightly improved the quality of the default water setting
2012-04-07 23:18:08 +02:00
scrawl
96911ada95
restored render queue of transparent objects, they are now part of the mrt textures
...
this fixes some issues with transparent objects not visible in the refraction
2012-04-07 22:37:15 +02:00
scrawl
044d649edd
Merge branch 'master' into water
2012-04-07 17:16:35 +02:00
Roman Melnik
bdbb8a8d84
Merge remote-tracking branch 'upstream/master' into windowsPinning
...
Conflicts:
apps/openmw/mwgui/window_manager.cpp (keep both changes)
2012-04-07 17:30:20 +03:00
Roman Melnik
1bf79fd022
Windows pinning: support for MapWindow
...
Set correct skin for the Map Window.
2012-04-07 16:47:41 +03:00
scrawl
bcee5d5943
fix areas with only water (no objects below)
2012-04-06 19:40:37 +02:00
scrawl
c0f991ac0a
underwater depth effect
2012-04-06 18:51:30 +02:00
scrawl
456eb95209
reversed sun and moon paths (sunrise at east)
2012-04-06 18:22:37 +02:00
scrawl
114e8ae2a0
much less underwater distortion
2012-04-06 16:45:45 +02:00
scrawl
2976625b00
better underwater
2012-04-06 15:51:57 +02:00
scrawl
393530e671
more or less fixed the sky for normal viewing angles, still disappears at a certain height though
2012-04-06 15:05:17 +02:00
scrawl
a41eee9a72
specular lighting
2012-04-06 14:07:52 +02:00
Roman Melnik
ef0a185e11
Pinnable windows: hide hud elements
...
Hide elements of the HUD (health/magicka/stamina bars,
minimap) when the corresponding windows (stats/map) are pinned.
Rearrange the remaining hud elements in such cases (like in the
original Morrowind).
2012-04-06 01:17:23 +03:00
scrawl
8bfc81f398
Merge branch 'master' into water
2012-04-05 20:09:38 +02:00
scrawl
622fb568cf
removed MRT setting and figure it out automatically
2012-04-05 19:27:54 +02:00
scrawl
b8a470efcd
put transparent objects in a seperate render queue, in order to not mess up the mrt textures
2012-04-05 19:07:21 +02:00
scrawl
1b89a9e203
various fixes
2012-04-05 15:30:55 +02:00
scrawl
f49131e1b8
renamed setting, automatically disable MRT when unsupported
2012-04-05 13:09:59 +02:00
scrawl
add4ebe445
fresnel effect
2012-04-05 12:59:56 +02:00
scrawl
8ddc8131a5
fresnel test
2012-04-05 11:18:58 +02:00
scrawl
36fd9b9f26
shore transition test
2012-04-05 10:39:22 +02:00
scrawl
ab8b74dcac
forgot adding a file
2012-04-05 08:58:21 +02:00
scrawl
3f05aba76d
got MRT working, some minor quirks to solve (black viewport background)
2012-04-05 01:21:36 +02:00
scrawl
006970fd79
add MRT code to shaders
2012-04-04 19:53:41 +02:00
scrawl
328bdaafb6
fixed a problem with the underwater compositor
2012-04-03 22:53:08 +02:00
scrawl
2fa9bac517
added fog
2012-04-03 22:04:37 +02:00
scrawl
cc4076d42a
basic noise
2012-04-03 21:16:43 +02:00
scrawl
fe63f2b2aa
first reflection test; removed the refraction render (we'll have it for free using MRT and deferred water rendering)
2012-04-03 19:10:02 +02:00
scrawl
6481cf87fc
cleanup resources
2012-04-03 17:07:16 +02:00
scrawl
b3a186e729
simple water without shaders that uses original MW textures
2012-04-03 16:37:54 +02:00
scrawl
8aea311797
added visibility flags for everything
2012-04-03 15:13:47 +02:00
scrawl
fd45208196
re-added code for reflection & refraction rendering
2012-04-03 14:23:23 +02:00
scrawl
ff15f28787
options for texture filtering and mipmaps
2012-04-02 18:01:49 +02:00
scrawl
39ee9e9ab8
setting for field of view
2012-04-02 17:51:51 +02:00
scrawl
00cc45c537
FPS is now a setting instead of commandline option
2012-04-02 16:10:54 +02:00
scrawl
fd662f937a
add settings for viewing distance and fog
2012-04-02 15:51:48 +02:00
scrawl
e5cc9adbb0
added settings for rendering distance of small objects
2012-04-02 15:30:29 +02:00
scrawl
1445ae992d
adding a setting to disable static geometry
2012-04-02 14:24:16 +02:00
Roman Melnik
d09f0610ea
Add basic windows pinning
...
Create WindowPinnableBase class for windows which should be
allowed to be pinned.
Add skin for pinnable windows - currently just a copy of normal
window with 1 extra button (hopefully this can be improved later).
Handle clicking on PinToggle button (pinning/unpinning a window).
2012-04-01 20:36:57 +03:00
scrawl
7b3adb27a3
backend changes, terrain num lights setting
2012-04-01 18:48:37 +02:00
scrawl
f4bbcb48a6
settings-default.cfg
2012-04-01 17:14:49 +02:00
Nikolay Kasyanov
2a7885b514
Synchronized OS X icon with our current app icon
2012-03-31 19:36:07 +04:00
Marc Zinnschlag
46279a001b
Merge remote branch 'scrawl/dialogue'
2012-03-30 15:39:56 +02:00
scrawl
4bbedeb3e7
made all dialogs semi transparent (like in morrowind)
2012-03-30 14:01:43 +02:00
scrawl
d3f31c3498
dialogue window enhancements
2012-03-30 13:53:35 +02:00
scrawl
e6303fc3f4
Merge branch 'master' into water
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
2012-03-28 21:37:20 +02:00
Pieter van der Kloet
426c278505
Changed the OpenMW default font from Comic sans to EB Garamond
2012-03-24 22:02:55 +01:00
Pieter van der Kloet
155cd76f37
Changed Launcher font to EB Garamond and added license info
2012-03-24 20:43:35 +01:00
scrawl
7a3034701f
functional HUD map
2012-03-23 16:51:56 +01:00
scrawl
ce63d29d4a
rotate hud player arrow
2012-03-23 15:26:24 +01:00
scrawl
770b0f2106
gui changes
2012-03-23 10:25:55 +01:00
scrawl
9c3e1f48f0
player arrow
2012-03-23 09:00:00 +01:00
scrawl
6067053f08
Merge branch 'next' into water
...
Conflicts:
CMakeLists.txt
2012-03-22 21:41:32 +01:00
scrawl
cf3515a898
it is now possible to drag the minimap with the mouse
2012-03-22 21:27:21 +01:00
scrawl
cc9f20a04f
MW_MapView skin
2012-03-22 20:25:41 +01:00
scrawl
ab9aa1ba74
Merge branch 'next' into minimap
...
Conflicts:
files/mygui/openmw_map_window_layout.xml
2012-03-22 19:36:37 +01:00
scrawl
70ed5770da
black journal text
2012-03-22 17:32:18 +01:00
scrawl
250fcab7c2
moved the mygui resources to a more suitable location
2012-03-22 17:11:24 +01:00
Jason Hooks
f2093a51db
more cleanup
2012-03-18 22:38:07 -04:00
Jason Hooks
fe9e6a732c
Some cleanup
2012-03-18 22:32:46 -04:00
Jason Hooks
51fb9e67cd
Merge
2012-03-18 21:31:31 -04:00
Marc Zinnschlag
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
2012-03-02 12:11:44 +01:00
Marc Zinnschlag
4c2fffdd61
temporarily disabled multi data path support in OpenMW
2012-02-28 09:27:35 +01:00
scrawl
8b5da06fce
Merge branch 'next' into weather
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-02-20 18:33:13 +01:00
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
2012-02-20 14:34:27 +01:00
Marc Zinnschlag
8186445de9
fix for a very silly bug
2012-02-16 21:06:25 +01:00
Marc Zinnschlag
8244ed5860
workaround for space in paths problem
2012-02-16 09:26:27 +01:00
Marc Zinnschlag
e1defd3595
adjusted the globally installed openmw.cfg file
2012-02-14 09:25:12 +01:00
Pieter van der Kloet
7bf8497215
Fixed CMake problem with Ogre plugins path
2012-02-07 21:41:08 +01:00
Nikolay Kasyanov
705b2955a0
Feature #162 - Need to create app bundle using CMake, not by hand.
...
In progress, working towards plugins support.
2012-01-30 00:28:02 +04:00
Jason Hooks
bf09762b6a
Ground showing up
2012-01-20 19:50:42 -05:00
Jason Hooks
ff2bbc9fc5
Transparent water
2012-01-18 22:42:07 -05:00
Jason Hooks
8798f7dd40
Bringing in some of Azathoth's work
2012-01-14 18:34:14 -05:00
Pieter van der Kloet
6716bf649e
Some stylesheet improvements and a drop-shadow for the scroll background
2011-06-26 23:16:39 +02:00
Nikolay Kasyanov
24947d800a
Fixed launcher config and style location. Launcher will be started when opening bundle
2011-06-26 21:04:17 +04:00
Pieter van der Kloet
db20186e50
Added newline to the end of some files, GitHub was complaining about it
2011-06-24 21:46:20 +02:00
Pieter van der Kloet
118765a274
Renamed the launcher executable and icons, added .desktop file and default config, modified/updated some other files
2011-06-24 21:42:18 +02:00
Pieter van der Kloet
409bd0fe7e
Moved the stylesheet to main.cpp and made some stylesheet-related changes
2011-05-10 22:47:08 +02:00
Pieter van der Kloet
2b0dabe669
Changed profile switching again; Some stylesheet modifications
2011-05-03 02:46:46 +02:00
Pieter van der Kloet
557e659e15
CMake modifications, stylesheet gets copied to destination dir now
2011-05-02 20:07:37 +02:00
Marc Zinnschlag
d47abff25d
create local openmw.cfg file for uninstalled version
2011-04-28 21:55:08 +02:00
Nikolay Kasyanov
eaea48011d
Now working mac app bundle generated during build
...
(includes plugins & resources).
Still need to copy frameworks before deployment.
FindOGRE.cmake finds Ogre plugins dir on OS X.
Default OS X data path set to the data subdir
near .app.
README_Mac updated.
2011-04-28 21:55:05 +02:00
Nikolay Kasyanov
943eea8104
.app bundle finally works
2011-03-08 22:27:57 +03:00
Nikolay Kasyanov
527ac956a7
More correct MacOS X bundle generation
2011-03-07 06:03:39 +03:00
Nikolay Kasyanov
4028600768
Builds on OS X now
2011-03-07 05:09:29 +03:00
Jan-Peter Nilsson
753a4f681e
Search for plugins in orgre lib directory
2011-01-13 21:18:20 +01:00
Jan-Peter Nilsson
4221824681
Build debian package using cpack if dpkg is available
...
Derive version from last tag and get name and email for package maintainer from user's git config if .git is available
2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
d1b482d64a
Update plugins.cfg based on where cmake found ogre libraries
2011-01-12 18:18:06 +01:00
Jan Borsodi
0f860e2fbd
openmw.cfg is now created with a configurable path (via cmake), the default is still "data"
2010-09-10 13:38:17 +02:00
Ardekantur
25ba9933f6
Mac Build - heinous additions for bundle management
2010-06-25 21:28:11 -04:00
Marc Zinnschlag
6b6e42b641
removed unused BSP scene manager from plugins.cfg
2010-06-11 19:59:33 +02:00
Marc Zinnschlag
9a041d7c01
added data option and openmw.cfg file
2010-06-11 19:53:00 +02:00
Nicolay Korslund
e8c6caa0b5
Fixed DOS line endings on certain files
2010-06-06 18:04:39 +02:00
Marc Zinnschlag
e973270f9b
fixed minor bug in previous commit; more clean up
2010-06-06 13:04:23 +02:00
