elsid
2d5ccc804b
Exchange binary messages between navmeshtool and launcher
3 years ago
elsid
a21c17ab26
Use crash catcher in launcher
3 years ago
Petr Mikheev
a453e5c198
Reuse the same code to load settings in apps/openmw, apps/launcher, apps/opencs
3 years ago
Bret Curtis
74e7cfc023
remove unused includes: part1
...
remove unused imports: part2
revert one tidy we will keep for c++20
3 years ago
Bret Curtis
d1fb854521
move most of the files from esm to esm3, keep common code in esm; this is make space for a future with esm4
...
esm typo
esm typo
3 years ago
Cody Glassman
8ec0a52605
Toggable day night switch ( #5928 )
3 years ago
elsid
ed3286994c
Fix ASAN error: heap-use-after-free
...
=================================================================
==20931==ERROR: AddressSanitizer: heap-use-after-free on address 0x607000206030 at pc 0x7fc8b0f3a72b bp 0x7ffcee176860 sp 0x7ffcee176008
READ of size 13 at 0x607000206030 thread T0
#0 0x7fc8b0f3a72a in __interceptor_strlen /build/gcc/src/gcc/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:389
#1 0x562e069a0af7 in QString::fromUtf8(char const*, int) /usr/include/qt/QtCore/qstring.h:706
#2 0x562e069a0af7 in Launcher::AdvancedPage::AdvancedPage(Config::GameSettings&, QWidget*) /home/elsid/dev/openmw/apps/launcher/advancedpage.cpp:29
#3 0x562e06959613 in Launcher::MainDialog::createPages() /home/elsid/dev/openmw/apps/launcher/maindialog.cpp:127
#4 0x562e069691d2 in Launcher::MainDialog::setup() /home/elsid/dev/openmw/apps/launcher/maindialog.cpp:228
#5 0x562e06969d88 in Launcher::MainDialog::showFirstRunDialog() /home/elsid/dev/openmw/apps/launcher/maindialog.cpp:188
#6 0x562e06957025 in main /home/elsid/dev/openmw/apps/launcher/main.cpp:35
#7 0x7fc8ad0d9b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)
#8 0x562e0690fced in _start (/home/elsid/dev/openmw/build/gcc/asan/openmw-launcher+0x56ced)
0x607000206030 is located 16 bytes inside of 64-byte region [0x607000206020,0x607000206060)
freed by thread T0 here:
#0 0x7fc8b0fb3f19 in __interceptor_free /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cpp:127
#1 0x7fc8b0de3388 (/usr/lib/libopenal.so.1+0x40388)
previously allocated by thread T0 here:
#0 0x7fc8b0fb4fd6 in __interceptor_posix_memalign /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cpp:226
#1 0x7fc8b0e379cb (/usr/lib/libopenal.so.1+0x949cb)
SUMMARY: AddressSanitizer: heap-use-after-free /build/gcc/src/gcc/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:389 in __interceptor_strlen
Shadow bytes around the buggy address:
0x0c0e80038bb0: 00 00 00 00 00 00 00 00 00 fa fa fa fa fa 00 00
0x0c0e80038bc0: 00 00 00 00 00 00 00 fa fa fa fa fa 00 00 00 00
0x0c0e80038bd0: 00 00 00 00 00 fa fa fa fa fa 00 00 00 00 00 00
0x0c0e80038be0: 00 00 02 fa fa fa fa fa 00 00 00 00 00 00 00 00
0x0c0e80038bf0: 02 fa fa fa fa fa fd fd fd fd fd fd fd fd fa fa
=>0x0c0e80038c00: fa fa fa fa fd fd[fd]fd fd fd fd fd fa fa fa fa
0x0c0e80038c10: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
0x0c0e80038c20: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
0x0c0e80038c30: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
0x0c0e80038c40: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
0x0c0e80038c50: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
Shadow byte legend (one shadow byte represents 8 application bytes):
Addressable: 00
Partially addressable: 01 02 03 04 05 06 07
Heap left redzone: fa
Freed heap region: fd
Stack left redzone: f1
Stack mid redzone: f2
Stack right redzone: f3
Stack after return: f5
Stack use after scope: f8
Global redzone: f9
Global init order: f6
Poisoned by user: f7
Container overflow: fc
Array cookie: ac
Intra object redzone: bb
ASan internal: fe
Left alloca redzone: ca
Right alloca redzone: cb
Shadow gap: cc
==20931==ABORTING
3 years ago
elsid
8fedca5780
Fix navmesh cache progress bar jumps
...
When initial approximation of maximum progress based on numer of cells is too
high comparing to real number of navmesh tiles.
3 years ago
elsid
9e0451c714
Support navmesh generation from launcher
3 years ago
Thomas Lowe
f50cbcad81
* AA combo box no longer disables the AA alpha test checkbox.
...
* Updated AA alpha test description to be more accurate
3 years ago
Thomas Lowe
4f77c18af4
Removed unneeded signal.
3 years ago
Thomas Lowe
5f355a14cd
Changed default setting for anti-alias alpha test to true.
...
Added checkbox in advanced page for anti-alias alpha test, connected to AA combobox in the graphics page.
3 years ago
psi29a
5c5c71778a
Merge branch 'circular' into 'master'
...
Consistently sort content files
See merge request OpenMW/openmw!1350
3 years ago
Alexei Kotov
5afd6b0e46
Merge branch 'adding_settingint_methods' into 'master'
...
Adding saveSettingInt() and loadSettingInt()
See merge request OpenMW/openmw!1167
3 years ago
psi29a
5836d0225f
Merge branch 'leave_butter_to_soften' into 'master'
...
Soft Particles (#6128 )
See merge request OpenMW/openmw!980
3 years ago
Evil Eye
a3e039d862
Explicitely sort by file name after adding all data dirs
3 years ago
glassmancody.info
4461366761
settings update and launcher option
3 years ago
Petr Mikheev
37386f417e
Support *.omwscripts in openmw-launcher
3 years ago
elsid
18d3102148
Do not use union to access FIXED_STRING<4> as int
...
https://en.cppreference.com/w/cpp/language/union :
> It's undefined behavior to read from the member of the union that wasn't most recently written.
3 years ago
pi03k
e4eeb9cce9
Remove 'no relevant classes' moc warning
3 years ago
Thunderforge
42ce22f568
Adding saveSettingInt() and loadSettingInt()
...
Convenience methods for saving and loading integer settings. Versions for QSpinBox and QComboBox are included. Right now, only simple settings are used for it; we have some additional settings that include validation that aren't using these new methods.
3 years ago
elsid
e9b8933b2f
Do no link binaries with Qt where it's not used
...
Define components_qt static library with all qt dependent components that also
depends on other components. Link only cs, wizard and launcher with qt
dependent components.
3 years ago
glassmancody.info
166e23a6d9
fix CI artifacts, missing header
3 years ago
psi29a
b92c6985cd
Merge branch 'auto_in_most_apps' into 'master'
...
Using auto keyword in most apps
See merge request OpenMW/openmw!885
3 years ago
psi29a
7d7427015e
Merge branch 'removing_unused_launcher_imports' into 'master'
...
Removing unused imports in the Launcher
See merge request OpenMW/openmw!884
3 years ago
Cédric Mocquillon
1051745f29
[Launcher] Add new setting 'allow zooming' to advanced tab in the launcher
3 years ago
elsid
4259f7f230
Add setting to enable/disabled notification for saved screenshots
4 years ago
Evil Eye
b2acb322af
Merge branch 'modernize_use_override_for_most_apps' into 'master'
...
Using override keyword in most apps
See merge request OpenMW/openmw!886
4 years ago
Thunderforge
89950e5528
Preventing type conversion of double to float for objectPagingMinSize
4 years ago
Thunderforge
9f2f5174d4
Adding Object Paging Min Size combo box to Advanced -> Visuals
...
Requested in Discord by CMAugust and hammered out with a few other users.
4 years ago
Thunderforge
efcdb2dfdd
Using override keyword in most apps
...
Detected by clang-tidy's modernize-use-override
Future MRs can be created to run this on OpenMW and OpenMW CS
4 years ago
Thunderforge
ded7bd92e6
Using auto keyword in most apps
...
Detected by clang-tidy's modernize-use-auto
4 years ago
Thunderforge
6ba23a028c
Removing unused imports in the Launcher
4 years ago
Thunderforge
4a15868c0e
Moving Lighting Method from Advanced -> Visuals to Graphics -> Lighting
...
The plan is to add additional options to this new tab, and since it's of similar status as the Shaders settings, it makes sense to put them next to them on the Graphics page.
4 years ago
psi29a
4bc7012104
Merge branch 'pack-default-settings' into 'master'
...
Pack default settings
Closes #5925
See merge request OpenMW/openmw!822
4 years ago
AnyOldName3
09f39b29f0
Load defaults.bin instead of settings-default.cfg. Do not decode yet.
4 years ago
AnyOldName3
92325976e9
Update documentation to refer to defaults.bin
4 years ago
Thunderforge
ead51784dc
[Launcher] Replacing static method access through instances
...
This addresses the Clang Tidy check [readability-static-accessed-through-instance](https://clang.llvm.org/extra/clang-tidy/checks/readability-static-accessed-through-instance.html ). It also simplifies the code by reducing the number of parameters we're passing around.
4 years ago
psi29a
b10a817f7e
Merge branch 'useuless_launcher' into 'master'
...
Remove some useless includes from the launcher
See merge request OpenMW/openmw!775
(cherry picked from commit a84bd643b334eb6ac715681c497184ac22212ced)
d3fff8cf Remove some useless includes from the launcher
4 years ago
Simon Meulenbeek
cd419256ad
don't forget to close the audio device after you're done with it.
4 years ago
Andrei Kortunov
33b8233887
Validate GUI scaling and place it to the launcher
4 years ago
psi29a
f1cfdafd4d
Merge branch 'why_are_the_christmas_lights_still_up' into 'master'
...
Remove 8 light limit and add configurable lighting enhancements
See merge request OpenMW/openmw!618
4 years ago
glassmancody.info
582f7b52cf
Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up
4 years ago
glassmancody.info
9e80091aff
clear up force shaders and make it less convoluted
4 years ago
glassmancody.info
d4e7d25d14
Make life not suck for whoever wants to edit lighting shaders
4 years ago
glassmancody.info
4ba473b684
Finalize settings, torch fix
4 years ago
elsid
634556be9d
Add setting to allow following creatures to find path over water surface
4 years ago
Andrei Kortunov
b96929f3fc
Avoid division by zero
4 years ago
Simon Meulenbeek
75b4871bab
Add Audio settings to openmw-launcher
4 years ago
Alexei Dobrohotov
7be7af13d7
Downgrade FOV-dependent view distance factor to a recommendation
4 years ago
Andrei Kortunov
c5a36ad440
Do not cast enums to booleans
4 years ago
fredzio
dbdd397716
Remove deadcode.
4 years ago
Evil Eye
525292b184
Add graphic herbalism to the launcher
4 years ago
Andrei Kortunov
8084a336b5
Replace zeroes and nulls by nullptrs
4 years ago
Alexei Dobrohotov
f49bf028b9
Put a stretch menu background checkbox into the launcher ( #5672 )
4 years ago
Andrei Kortunov
46a1950b0e
Do not use deprecated Qt functions
4 years ago
Bret Curtis
82431b752d
removed unnessary bits that cmake should be doing for us; replace Misc::gcd with std::gcd
4 years ago
psi29a
9d350ec824
Merge branch 'head_bobbing' into 'master'
...
Add head bobbing in first person mode
Closes #5043
See merge request OpenMW/openmw!320
4 years ago
Andrei Kortunov
8ca3c3b123
Mark overrided methods by override keyword
4 years ago
fredzio
ae3306c019
Document async physics settings
...
Add an option to the launcher
Update changelog
4 years ago
Petr Mikheev
be27b51279
Add head bobbing in first person mode
4 years ago
Petr Mikheev
a17fb14b8a
Add "smooth movement" and "NPCs avoid collisions" settings to openmw-launcher and to the docs; update CHANGELOG.md.
4 years ago
AnyOldName3
a495888d3d
Get per-monitor resolution list while SDL is alive
4 years ago
AnyOldName3
5538fea1d1
Display standard resolutions on single-monitor machines
4 years ago
AnyOldName3
b60d5904e2
Correct SDL_GetNumVideoDisplays error message
...
It logged the wrong function
4 years ago
Andrei Kortunov
7c9497c4de
Use two columns when there is too many checkboxes in launcher's tab
4 years ago
Capostrophic
c436f29a1e
Make Advanced tab of the launcher look okay for everyone again
4 years ago
Petr Mikheev
6a4fa8a8b5
Add more settings to openmw-launcher
4 years ago
Capostrophic
9c930e38fa
Add option to always allow stealing from KO'd actors (feature #5545 )
4 years ago
CedricMocquillon
1f4f10c723
Add a tab level in advanced settings
4 years ago
Cédric Mocquillon
2e27de027e
Add members in AdvancedPage class to avoid memory leak when the list of cells names is updated as we recreated a completer at each notification event
4 years ago
CedricMocquillon
998bf5da34
Add new checkbox for the new setting 'trainers training skills based on base skill'
5 years ago
Bret Curtis
355996c2ff
supress -> suppress
5 years ago
psi29a
abc77075b9
Merge branch 'doc-formattopics' into 'master'
...
Follow up to MR 126 - make it more obvious for end users how to set colors
See merge request OpenMW/openmw!234
5 years ago
fredzio
6d4d53fc7c
Add a setting to the launcher to enable/disable the dialogue topic
...
formatting stuff.
5 years ago
Bret Curtis
61a5c6125d
#5480 : Drop Qt4 support and require Qt 5.12 or later.
5 years ago
Bret Curtis
5f0f2f0f16
rename to better reflect what is going on per AnyOldName3 comment; added none option
5 years ago
Bret Curtis
ae729a1ac7
add ability to set the type of near far method to be used in shadow calculation; default to bounding volumes; cleaned up code while there and re-ordered items
5 years ago
Frederic Chardon
513ac8986d
Add link to opencs documentation on readthedocs, available through
...
context menu.
The documentation opens in default browser.
There are 3 contexts:
- global: opens the OpenMW CS User Manual main page
- when a record is selected: opens the "Tables" page
- when the filter field is selected: opens the "Record Filters" page
There is also a link to the OpenCS tutorial in the help menu.
5 years ago
James Moore
a37bdfd492
Implement a refresh button on data files page
5 years ago
Capostrophic
122dffe4c1
Make uncapped Damage Fatigue optional (bug #5264 )
...
Cap Absorb Fatigue
5 years ago
Andrei Kortunov
d57253c5e2
Do not use the QStringList::fromSet, which is deprecated since Qt 5.14
5 years ago
Andrei Kortunov
47a13f1ed2
Do not use deprecated Qt API in the launcher
5 years ago
Capostrophic
0a96f065d7
Launcher: improve first run and missing game data dialogues (bug #4009 )
5 years ago
Brouilles
3889c0fa7b
Add QTranslator support for launcher
...
Add French translation for launcher
Clean launcher main.cpp (appTranslator.load)
Remove french translation
Remove string translation file
Update AUTHORS.md
5 years ago
Alexei Dobrohotov
f332df8839
Fix terrain shadows checkbox loading
5 years ago
Capostrophic
5a5bc0bef8
Uncheck sheathing checkboxes automatically when appropriate
...
Fix their order and bogus saveSettingBool calls
5 years ago
Capostrophic
5eab913a9c
Make additional anim sources dependency more obvious
5 years ago
Capostrophic
7885b8c75e
Sheathing-related changes
...
Add weapon and shield sheathing and use additional anim sources checkboxes into the Advanced tab of the launcher
Remove outdated information from the documentation
5 years ago
Capostrophic
208608cbd0
Fix a typo and a mistake
5 years ago
Capostrophic
0e2380d471
Add the most basic shadow settings into the launcher
5 years ago
Michael Stopa
e4bec88a68
Implement mouse wheel bindings (bug #2679 )
5 years ago
elsid
045ceeac11
Replace foreach macro by for-loop
5 years ago
Capostrophic
9788a776b9
Avoid Qt "opening user openmw.cfg twice" warning
5 years ago
Capostrophic
9502e9f3f7
Disable FPS limit spinbox by default and set the maximum to 1000
...
Make window border and framerate limit labels consistent with other labels
6 years ago
Capostrophic
b87b29eeb0
Make framerate limit configurable in the launcher
6 years ago
Capostrophic
5cd781b3eb
Experimental folder handling rewrite
6 years ago
Capostrophic
686049679c
Launcher: Clone content list button (feature #4784 )
6 years ago
Capostrophic
34ea9ea813
Add an option to restore MCP-like movement behavior
6 years ago
Capostrophic
c7ac06b960
Always account for every follower travelling
6 years ago
terrabyte25
61c3847a12
Add magic animation option to advanced page
6 years ago
Andrei Kortunov
bf5f68a4d8
Replace boost GCD to the homebrew implementation
6 years ago
Andrei Kortunov
a14c832f4f
Fix Boost version check in the launcher
6 years ago
Bret Curtis
735bcf17c2
Merge branch 'boost-gcd-deprecation' into 'master'
...
Fix boost deprecation warning
See merge request OpenMW/openmw!66
6 years ago
AnyOldName3
cd4303da23
Add preprocessor check to determine which common_factor header to use.
6 years ago
Capostrophic
4138e29ca4
Add option to restore the previous ammo behavior
6 years ago
AnyOldName3
c68ccbc6b6
Use new common_factor header in the launcher, too
6 years ago
mp3butcher
9de6c630f2
fix moc achieving to reach unparsable boost code
6 years ago
Marc Zinnschlag
8b30f15df7
Merged pull request #1942
6 years ago
Capostrophic
ba2fd8b795
Rename reflected absorb spells setting and add it to Advanced tab
6 years ago
Andrei Kortunov
bce8de5fe9
Respect selected encoding in the content selector (bug #4467 )
6 years ago
Capostrophic
37f9d45182
Remove an outdated checkbox from the advanced page
6 years ago
Yohaulticetl
640b32da56
Fixed merge conflicts
6 years ago
Yohaulticetl
7e9ce99062
Made the werewolf check optional
6 years ago
Yohaulticetl
d19cbdb652
Factored strength into hand-to-hand combat
6 years ago
Andrei Kortunov
2b90504558
Init SDL2 before Qt4 to avoid crash on Linux (bug #4529 )
6 years ago
Capostrophic
ab29f9e13f
Add permanent barter disposition change option (feature #3103 )
7 years ago
Capostrophic
4d48ede6f1
Add two missing gameplay settings to Advanced tab
7 years ago
Marc Zinnschlag
20d4e27f82
Merged pull request #1821
7 years ago
Andrei Kortunov
2d4ec86b8d
Provide launcher icons
7 years ago
Andrei Kortunov
28a02ac93b
Use file selection dialogue result (bug #4524 )
7 years ago
Thunderforge
72f6b1a693
Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface"
7 years ago
Thunderforge
506d615acc
Moving csignal import from main to graphicspage
7 years ago
Thunderforge
7615e78e52
Move SDL initialization from main.cpp to graphicspage.cpp
7 years ago
Marc Zinnschlag
efb4abbb7f
Merged pull request #1623
7 years ago
Thunderforge
dfa9968565
Renaming Launcher::DataFilesPage::signalSelectedFilesChanged to signalLoadedCellsChanged
7 years ago
Thunderforge
62c4eb8d6a
Explicitly flagging loaded cells changed as queued
7 years ago
Thunderforge
d46590934a
Importing mutex
7 years ago
Thunderforge
e282ece3d1
Fixing bug with autocomplete not loading correctly during startup
7 years ago
Thunderforge
103a7ac628
Using a mutex lock to prevent race conditions
7 years ago
Thunderforge
e26c675829
Changing join to detach so that the thread will not block the UI
7 years ago
Thunderforge
26dfef7970
Changing where we are loading cells to prevent Qt access issue
7 years ago
Thunderforge
78234e9468
Moving autocomplete code to thread
7 years ago
Thunderforge
c2fff61ccd
Changing so that data changes happen only after the addon is checked
7 years ago
Thunderforge
d58cce9c72
Adding WIP code to dynamically change the autocomplete fields
7 years ago
declan-millar
9ed4f33048
Replace spelling: soulgem -> soul gem
7 years ago
declan-millar
78e79d5775
Add advanced option to Rebalance soulgem values to the launcher
7 years ago
Andreas Sturmlechner
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
7 years ago
Thunderforge
fb27f34a32
Add autocomplete to the "Start default character at" field
7 years ago
Thunderforge
d42791e260
Moving testing options to Advanced page
7 years ago
Thunderforge
dcc262ed91
Fixing Skip Menu checkbox not working correctly
7 years ago
Thunderforge
082e166fae
Making "start default character at" field enabled or disabled by the previous checkbox
7 years ago
Thunderforge
da74ca5ce0
Add testing options to the Settings page
7 years ago
Thunderforge
6c3ac834c4
Preventing max quicksaves from being saved to settings.cfg if it is unchanged.
7 years ago
Thunderforge
b6d9b6f544
Formatting improvement for advanced page
7 years ago
Thunderforge
4292351993
Adding Max Quicksaves setting to Launcher
7 years ago
Thunderforge
a67373d116
Fixing "Show Enchant Chance" checkbox setting melee info instead
7 years ago
Thunderforge
8b17844781
Replacing Qt5-only method with Qt4-compatible code
7 years ago
Thunderforge
8837046d9c
Adding panel for advanced settings.cfg options
7 years ago
AnyOldName3
a9b95596bc
Add a missed trailing new line.
7 years ago
AnyOldName3
8c74f16247
Restore trailing new lines to shrink PR
7 years ago
AnyOldName3
5ce34f1cbf
Move new behaviour into macro to reduce code duplication
7 years ago
AnyOldName3
3c0ec0d6d0
If CMake supports it, sets the debugger working directory for Visual Studio
7 years ago
Siimacore
c920d083e4
Correcting https://bugs.openmw.org/issues/3906 .
8 years ago
scrawl
41fb17f39b
Revert "Correcting https://bugs.openmw.org/issues/3906 "
...
This reverts commit b0abed00e5
.
8 years ago
scrawl
f7969fb178
Merge pull request #1317 from Siimacore/master
...
Correcting https://bugs.openmw.org/issues/3906
8 years ago
Siimacore
b0abed00e5
Correcting https://bugs.openmw.org/issues/3906
8 years ago
Bret Curtis
dbf149f9b2
gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now
8 years ago
Bret Curtis
d799954ca0
replace and purge boost::math::gcd and other non-used headers
8 years ago
scrawl
5297d7b5be
Merge pull request #1137 from nikolaykasyanov/osx-structure
...
[macOS] Move all resources files inside application bundles (fixes #3566 )
8 years ago
Nikolay Kasyanov
db69342b5d
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
8 years ago
scrawl
9d125bcaa2
Merge pull request #1129 from PhillipAnd/phillipand-cmake-fix
...
Fix various build issues with Visual Studio environment
8 years ago
Phillip Andrews
c18fc113e5
Changed missing library dependencies to simple fix
8 years ago
Phillip Andrews
aeaedbc57a
Moved install commands to target-specific cmakelists so that all configurations work.
8 years ago
Phillip Andrews
59eba1dede
Changed tabs to spaces, oops
8 years ago
Phillip Andrews
1861302dbd
Include various libraries for Visual Studio environment
8 years ago
Allofich
3420121c3f
Fix shadowing warnings
8 years ago
Nikolay Kasyanov
5d4734c02e
Use local path from configuration manager to load openmw.cfg in launcher
8 years ago
Allofich
125e94ef0e
Fix shadowing warnings
8 years ago
Alexander "Ace" Olofsson
338f0cf53d
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
9 years ago
Rob Cutmore
21d13a48fa
Make setup method of MainDialog class private
9 years ago
Rob Cutmore
a5411c1ec2
Remove unused code
9 years ago
Alexander "Ace" Olofsson
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
9 years ago
Alexander "Ace" Olofsson
2142d0d2d6
Make Qt5 happy
9 years ago
scrawl
177a6f4a68
Launcher: ensure to clear previous settings when reloading settings
9 years ago
scrawl
ace4cfc0a8
Fix 'duplicate setting' errors when running installation wizard
9 years ago
scrawl
2ffcc2a2b4
Fix incorrect path encoding handling in debug message
9 years ago
scrawl
d894d54e41
Improve path conversions
9 years ago
scrawl
84aceedfa2
Add comment
9 years ago
scrawl
325d208b4a
Fix incorrect error message
9 years ago
scrawl
3747843c92
Use QString::toInt instead of atoi
9 years ago
cfcohen
c26463fd91
Should have coded it the way scrawl said, since it's cleaner.
9 years ago
cfcohen
a9c9cc5508
Remove unnecessary copy of mEngineSettings in mInitialSettings.
9 years ago
cfcohen
046538984c
Fix duplicate filename in what() message. Use newly create cfgError
...
utility function consistently throughout code.
9 years ago
cfcohen
ad5eaaa705
Update the OpenMW Launcher so that it only writes changed values to
...
the user settings.cfg file. Add a helpful header to the top of new
settings.cfg files. Remove old code involve whitespace management
that didn't work correctly anayway, and doesn't matter since we're not
adding comments to the file. Remove "automatically generated"
comments.
9 years ago
cfcohen
67c4b17581
Commit files that I thought wre in the previous commit. :-[ I'm
...
accustomed to the hg behavior of commiting all modified files by
default.
9 years ago
cfcohen
18da95e4f8
Make openmw-launcher pass comments through settings.cfg, and reuse the
...
Settings::Manager code to do most of the work. Stop loading both the
global settings-default.cfg and the one in the current directory,
while continuing to prefer the latter one. Cleanup paths slightly and
remove what appears to have been debugging in the launcher settings.
9 years ago
Nikolay Kasyanov
014a2fc0e9
OS X: do not override Qt plugin path
9 years ago
Nikolay Kasyanov
4dcb1a1b17
OS X: remove QPlastiqueStyle usage
9 years ago
scrawl
5602cd9b7b
Fix the launcher's version label for builds with no git commit info
10 years ago
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.
10 years ago
scrawl
c783b50a83
Fix config file priority in the launcher to match OpenMW
10 years ago
scrawl
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
scrawl
609e146a22
Build fixes for windows
10 years ago
scrawl
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
10 years ago
cc9cii
c22c9c271d
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
10 years ago
cc9cii
0efe8f5465
Fix broken launcher build for windows.
10 years ago
scrawl
de98d991b4
Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535."
...
Breaks the saving of content= entry order.
This reverts commit 15fe5d88e2
.
Conflicts:
components/config/gamesettings.cpp
10 years ago
scrawl
b7cd62e4de
Revert "Remove user preference setting option."
...
This reverts commit d3b7cf44d3
.
10 years ago
scrawl
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
scrawl
e13a938896
Add support to build with Qt5 (Task #2665 )
...
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
10 years ago
scrawl
4b5c2398a1
Remove QTextCodec::setCodecForCStrings
...
Not needed, we're using QString::fromUtf8/toUtf8 to handle encodings correctly.
10 years ago
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
10 years ago
scrawl
e66e9916db
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
10 years ago
cc9cii
d3b7cf44d3
Remove user preference setting option.
10 years ago
cc9cii
15fe5d88e2
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- controlled via a checkbox in launcher settings
10 years ago
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
Marc Zinnschlag
913caf96bd
Merge branch 'openmw-36'
10 years ago
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
Marc Zinnschlag
34f106749a
removed a redundant typedef
10 years ago
Nikolay Kasyanov
7d321e0fb7
Fix #2557
...
Don’t show main dialog right away if wizard is selected.
10 years ago
scrawl
ccab8cc9a1
Register Player in the PhysicsSystem
10 years ago
scrawl
c1edc30ad7
Dead code removal
10 years ago
scrawl
e1f4a7f647
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
10 years ago
scrawl
cac288d5be
Remove OgreInit
10 years ago
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
10 years ago
Marc Zinnschlag
093c577895
Merge remote-tracking branch 'dteviot/Bug2344'
10 years ago
dteviot
cc815c63f1
Fix: no longer loose changes when run install wizard or iniimport.
10 years ago
dteviot
84762c4eb8
Progress bar at 0% shows no text.
10 years ago
scrawl
5eadffd0c4
Make launcher's version label selectable so it can be copy-pasted into issue reports
10 years ago
dteviot
9708e8529f
Removed unneeded include.
10 years ago
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.
10 years ago
scrawl
03257ecae5
QString encoding fix
10 years ago
Marc Zinnschlag
6c4920c58e
Merge remote-tracking branch 'scrawl/master'
10 years ago
Marc Zinnschlag
ea21fbcbe6
Merge remote-tracking branch 'dteviot/master'
10 years ago
dteviot
cac250a90d
Fixed typo in comment.
10 years ago
dteviot
9d9cabf40d
Fix: Importer creates a single Content List ( Fixes #2345 )
10 years ago
scrawl
9825b68dfb
Fix SDL eating SIGINT signals in the launcher ( Fixes #2328 )
10 years ago
scrawl
0c6e2170db
Include cleanup
10 years ago
Marc Zinnschlag
82ff737c31
Merge remote-tracking branch 'scrawl/master'
10 years ago
scrawl
57a259c526
Remove references to no longer used font
10 years ago
scrawl
e0d0997409
Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter
10 years ago
dteviot
e298589e7f
Reorganised DataFilesPage.cpp code.
...
Removed some recursive calling of saveSettings() and loadSettings().
10 years ago
Alexander "Ace" Olofsson
942cf26eee
And the missing includes
10 years ago
Alexander "Ace" Olofsson
7a903b7100
Doing forward declaration instead
10 years ago
Alexander "Ace" Olofsson
0c1d762790
Fix build when using new boost with Ogre.
...
This fixes a [Parse error at "BOOST_JOIN"] if you're using - for instance - Boost 1.57.0
10 years ago
dteviot
fcbf7d7deb
Fixed string formatting minor error found by Mingun.
10 years ago
dteviot
05b89be8bf
Launcher sets content list to match values in openmw.cfg ( Fixes #811 )
...
I took the liberty to add accessor & mutator functions for classes ContentListsGameSettings and LauncherSettings , as existing code can reverse order of entries.
Also replaced some "magic strings" with named constants.
10 years ago
dteviot
063388e0eb
Change "Profile" to "Content List" in user visible strings in Launcher. ( Fixes #810 )
10 years ago
dteviot
9d6efcecff
Merge remote-tracking branch 'OpenMW/master' into FixLoadOrderReset
...
Fixed Conflict:
components/contentselector/model/contentmodel.cpp
10 years ago
Marco Schulze
6cd5b78ca7
Fix missing include in apps/launcher/main.cpp
10 years ago
scrawl
363d1f9207
Merge remote-tracking branch 'upstream/master'
10 years ago
dteviot
a62e15d93d
Read profile files from LauncherSettings in load order.
10 years ago
Marc Zinnschlag
2fa0764c89
Merge remote-tracking branch 'swick/master'
10 years ago
scrawl
f931ba2efc
Fix some static analysis issues (coverity)
10 years ago
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
10 years ago
MiroslavR
3cc32b641a
Fix some memory leaks
10 years ago
Sebastian Wick
639fbfad0b
make borderless setting available to the UI
10 years ago
scrawl
8ed376af5e
Launcher: fix changing active profile through the Play page
10 years ago