mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 20:53:52 +00:00
Code Issues Releases Wiki Activity
35178 commits 107 branches 66 tags 133 MiB
Commit graph

860 commits

Author SHA1 Message Date
elsid
2d5ccc804b
Exchange binary messages between navmeshtool and launcher 2022-03-30 19:24:54 +02:00
elsid
a21c17ab26
Use crash catcher in launcher 2022-03-30 19:23:10 +02:00
Petr Mikheev
a453e5c198 Reuse the same code to load settings in apps/openmw, apps/launcher, apps/opencs 2022-02-02 23:47:11 +01:00
Bret Curtis
74e7cfc023 remove unused includes: part1 
remove unused imports: part2

revert one tidy we will keep for c++20
 2022-01-23 17:30:25 +01:00
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
 2022-01-23 17:04:48 +01:00
Cody Glassman
8ec0a52605 Toggable day night switch (#5928) 2022-01-11 09:34:19 +00:00
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
 2021-12-20 23:32:47 +01:00
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.
 2021-12-16 21:48:50 +01:00
elsid
9e0451c714
Support navmesh generation from launcher 2021-12-11 00:22:04 +01:00
Thomas Lowe
f50cbcad81 * AA combo box no longer disables the AA alpha test checkbox. 
* Updated AA alpha test description to be more accurate
 2021-11-30 20:07:29 -05:00
Thomas Lowe
4f77c18af4 Removed unneeded signal. 2021-11-29 20:44:47 -05:00
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.
 2021-11-29 07:18:49 -05:00
psi29a
5c5c71778a Merge branch 'circular' into 'master' 
Consistently sort content files

See merge request OpenMW/openmw!1350
 2021-11-14 20:24:18 +00:00
Alexei Kotov
5afd6b0e46 Merge branch 'adding_settingint_methods' into 'master' 
Adding saveSettingInt() and loadSettingInt()

See merge request OpenMW/openmw!1167
 2021-11-11 14:32:39 +00:00
psi29a
5836d0225f Merge branch 'leave_butter_to_soften' into 'master' 
Soft Particles (#6128)

See merge request OpenMW/openmw!980
 2021-11-09 14:16:47 +00:00
Evil Eye
a3e039d862 Explicitely sort by file name after adding all data dirs 2021-11-07 14:15:30 +01:00
glassmancody.info
4461366761 settings update and launcher option 2021-11-01 09:26:50 -07:00
Petr Mikheev
37386f417e Support *.omwscripts in openmw-launcher 2021-10-29 20:09:47 +02:00
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.
 2021-10-17 17:16:21 +02:00
pi03k
e4eeb9cce9 Remove 'no relevant classes' moc warning 2021-09-14 11:20:18 +02:00
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.
 2021-08-23 18:31:52 -05:00
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.
 2021-08-20 19:02:09 +02:00
glassmancody.info
166e23a6d9 fix CI artifacts, missing header 2021-07-25 20:49:17 -07:00
psi29a
b92c6985cd Merge branch 'auto_in_most_apps' into 'master' 
Using auto keyword in most apps

See merge request OpenMW/openmw!885
 2021-07-25 21:23:26 +00:00
psi29a
7d7427015e Merge branch 'removing_unused_launcher_imports' into 'master' 
Removing unused imports in the Launcher

See merge request OpenMW/openmw!884
 2021-07-25 21:18:25 +00:00
Cédric Mocquillon
1051745f29 [Launcher] Add new setting 'allow zooming' to advanced tab in the launcher 2021-07-25 14:17:10 +02:00
elsid
4259f7f230
Add setting to enable/disabled notification for saved screenshots 2021-07-08 21:14:01 +02:00
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
 2021-06-21 18:47:45 +00:00
Thunderforge
89950e5528 Preventing type conversion of double to float for objectPagingMinSize 2021-05-29 16:27:23 -05:00
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.
 2021-05-29 16:17:30 -05:00
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
 2021-05-18 19:42:24 -05:00
Thunderforge
ded7bd92e6 Using auto keyword in most apps 
Detected by clang-tidy's modernize-use-auto
 2021-05-18 19:20:59 -05:00
Thunderforge
6ba23a028c Removing unused imports in the Launcher 2021-05-18 18:23:16 -05:00
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.
 2021-05-18 18:05:54 -05:00
psi29a
4bc7012104 Merge branch 'pack-default-settings' into 'master' 
Pack default settings

Closes #5925

See merge request OpenMW/openmw!822
 2021-05-18 08:11:13 +00:00
AnyOldName3
09f39b29f0 Load defaults.bin instead of settings-default.cfg. Do not decode yet. 2021-05-09 21:14:06 +01:00
AnyOldName3
92325976e9 Update documentation to refer to defaults.bin 2021-05-09 21:13:34 +01:00
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.
 2021-05-08 23:28:29 -05:00
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
 2021-05-04 21:09:39 +00:00
Simon Meulenbeek
cd419256ad don't forget to close the audio device after you're done with it. 2021-04-22 18:42:56 +00:00
Andrei Kortunov
33b8233887 Validate GUI scaling and place it to the launcher 2021-04-15 15:18:32 +04:00
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
 2021-04-13 19:15:08 +00:00
glassmancody.info
582f7b52cf Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up 2021-04-13 11:09:52 -07:00
glassmancody.info
9e80091aff clear up force shaders and make it less convoluted 2021-04-13 11:09:49 -07:00
glassmancody.info
d4e7d25d14 Make life not suck for whoever wants to edit lighting shaders 2021-04-13 11:09:49 -07:00
glassmancody.info
4ba473b684 Finalize settings, torch fix 2021-04-13 11:09:49 -07:00
elsid
634556be9d
Add setting to allow following creatures to find path over water surface 2021-04-11 21:59:28 +02:00
Andrei Kortunov
b96929f3fc Avoid division by zero 2021-04-10 09:52:46 +04:00
Simon Meulenbeek
75b4871bab Add Audio settings to openmw-launcher 2021-04-09 19:28:08 +00:00
Alexei Dobrohotov
7be7af13d7 Downgrade FOV-dependent view distance factor to a recommendation 2021-01-11 06:53:23 +03:00
Andrei Kortunov
c5a36ad440 Do not cast enums to booleans 2021-01-09 13:19:41 +04:00
fredzio
dbdd397716 Remove deadcode. 2021-01-01 16:54:45 +01:00
Evil Eye
525292b184 Add graphic herbalism to the launcher 2020-12-10 19:02:38 +01:00
Andrei Kortunov
8084a336b5 Replace zeroes and nulls by nullptrs 2020-11-29 11:14:07 +04:00
Alexei Dobrohotov
f49bf028b9 Put a stretch menu background checkbox into the launcher (#5672) 2020-11-01 02:14:25 +03:00
Andrei Kortunov
46a1950b0e Do not use deprecated Qt functions 2020-10-22 15:50:47 +04:00
Bret Curtis
82431b752d removed unnessary bits that cmake should be doing for us; replace Misc::gcd with std::gcd 2020-10-20 23:38:05 +02:00
psi29a
9d350ec824 Merge branch 'head_bobbing' into 'master' 
Add head bobbing in first person mode

Closes #5043

See merge request OpenMW/openmw!320
 2020-10-17 19:54:34 +00:00
Andrei Kortunov
8ca3c3b123 Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
fredzio
ae3306c019 Document async physics settings 
Add an option to the launcher
Update changelog
 2020-10-15 06:41:41 +02:00
Petr Mikheev
be27b51279 Add head bobbing in first person mode 2020-10-08 00:22:01 +02:00
Petr Mikheev
a17fb14b8a Add "smooth movement" and "NPCs avoid collisions" settings to openmw-launcher and to the docs; update CHANGELOG.md. 2020-09-22 22:50:44 +02:00
AnyOldName3
a495888d3d Get per-monitor resolution list while SDL is alive 2020-08-26 16:58:51 +01:00
AnyOldName3
5538fea1d1 Display standard resolutions on single-monitor machines 2020-08-26 16:58:12 +01:00
AnyOldName3
b60d5904e2 Correct SDL_GetNumVideoDisplays error message 
It logged the wrong function
 2020-08-26 00:16:14 +01:00
Andrei Kortunov
7c9497c4de Use two columns when there is too many checkboxes in launcher's tab 2020-08-22 09:26:15 +04:00
Capostrophic
c436f29a1e Make Advanced tab of the launcher look okay for everyone again 2020-08-09 20:23:17 +03:00
Petr Mikheev
6a4fa8a8b5 Add more settings to openmw-launcher 2020-08-07 20:17:44 +00:00
Capostrophic
9c930e38fa Add option to always allow stealing from KO'd actors (feature #5545) 2020-07-26 13:10:44 +03:00
CedricMocquillon
1f4f10c723 Add a tab level in advanced settings 2020-07-25 17:42:31 +02:00
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 2020-07-25 13:58:42 +00:00
CedricMocquillon
998bf5da34 Add new checkbox for the new setting 'trainers training skills based on base skill' 2020-07-06 20:32:30 +02:00
Bret Curtis
355996c2ff supress -> suppress 2020-06-27 01:20:57 +02:00
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
 2020-06-24 11:26:22 +00:00
fredzio
6d4d53fc7c Add a setting to the launcher to enable/disable the dialogue topic 
formatting stuff.
 2020-06-22 23:21:03 +02:00
Bret Curtis
61a5c6125d #5480: Drop Qt4 support and require Qt 5.12 or later. 2020-06-22 12:17:06 +02:00
Bret Curtis
5f0f2f0f16 rename to better reflect what is going on per AnyOldName3 comment; added none option 2020-05-01 00:34:31 +02:00
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 2020-04-29 16:36:48 +02:00
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.
 2020-04-18 20:54:21 +00:00
James Moore
a37bdfd492 Implement a refresh button on data files page 2020-03-21 19:35:20 +00:00
Capostrophic
122dffe4c1 Make uncapped Damage Fatigue optional (bug #5264) 
Cap Absorb Fatigue
 2020-02-09 14:41:38 +03:00
Andrei Kortunov
d57253c5e2 Do not use the QStringList::fromSet, which is deprecated since Qt 5.14 2019-12-28 21:38:49 +04:00
Andrei Kortunov
47a13f1ed2 Do not use deprecated Qt API in the launcher 2019-12-20 12:59:56 +04:00
Capostrophic
0a96f065d7 Launcher: improve first run and missing game data dialogues (bug #4009) 2019-12-08 17:03:27 +03:00
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
 2019-11-30 22:41:00 +01:00
Alexei Dobrohotov
f332df8839
Fix terrain shadows checkbox loading 2019-11-14 19:50:59 +03:00
Capostrophic
5a5bc0bef8 Uncheck sheathing checkboxes automatically when appropriate 
Fix their order and bogus saveSettingBool calls
 2019-11-07 17:24:43 +03:00
Capostrophic
5eab913a9c Make additional anim sources dependency more obvious 2019-11-05 21:41:56 +03:00
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
 2019-11-04 20:34:06 +03:00
Capostrophic
208608cbd0 Fix a typo and a mistake 2019-11-02 18:06:39 +03:00
Capostrophic
0e2380d471 Add the most basic shadow settings into the launcher 2019-11-02 18:06:39 +03:00
Michael Stopa
e4bec88a68 Implement mouse wheel bindings (bug #2679) 2019-10-30 20:45:51 +04:00
elsid
045ceeac11
Replace foreach macro by for-loop 2019-10-20 20:08:16 +02:00
Capostrophic
9788a776b9 Avoid Qt "opening user openmw.cfg twice" warning 2019-09-10 22:56:04 +03:00
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
 2019-06-22 18:15:19 +03:00
Capostrophic
b87b29eeb0 Make framerate limit configurable in the launcher 2019-06-22 18:15:19 +03:00
Capostrophic
5cd781b3eb Experimental folder handling rewrite 2019-05-31 20:01:46 +03:00
Capostrophic
686049679c Launcher: Clone content list button (feature #4784) 2019-05-15 18:17:57 +03:00
Capostrophic
34ea9ea813 Add an option to restore MCP-like movement behavior 2019-04-24 16:21:12 +03:00
Capostrophic
c7ac06b960 Always account for every follower travelling 2019-04-24 16:21:12 +03:00
terrabyte25
61c3847a12 Add magic animation option to advanced page 2019-04-08 14:21:51 -05:00
Andrei Kortunov
bf5f68a4d8 Replace boost GCD to the homebrew implementation 2019-03-02 17:32:05 +04:00
Andrei Kortunov
a14c832f4f Fix Boost version check in the launcher 2019-02-28 15:11:30 +04:00
Bret Curtis
735bcf17c2 Merge branch 'boost-gcd-deprecation' into 'master' 
Fix boost deprecation warning

See merge request OpenMW/openmw!66
 2019-02-26 18:02:01 +00:00
AnyOldName3
cd4303da23 Add preprocessor check to determine which common_factor header to use. 2019-02-26 17:03:07 +00:00
Capostrophic
4138e29ca4 Add option to restore the previous ammo behavior 2019-02-22 17:18:23 +03:00
AnyOldName3
c68ccbc6b6 Use new common_factor header in the launcher, too 2019-02-13 18:37:01 +00:00
mp3butcher
9de6c630f2 fix moc achieving to reach unparsable boost code 2018-12-01 21:27:43 +01:00
Marc Zinnschlag
8b30f15df7 Merged pull request #1942 2018-09-27 11:05:22 +02:00
Capostrophic
ba2fd8b795 Rename reflected absorb spells setting and add it to Advanced tab 2018-09-26 21:21:03 +03:00
Andrei Kortunov
bce8de5fe9 Respect selected encoding in the content selector (bug #4467) 2018-09-25 21:39:18 +04:00
Capostrophic
37f9d45182 Remove an outdated checkbox from the advanced page 2018-08-15 16:04:29 +03:00
Yohaulticetl
640b32da56 Fixed merge conflicts 2018-08-14 19:57:48 +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
Andrei Kortunov
2b90504558 Init SDL2 before Qt4 to avoid crash on Linux (bug #4529) 2018-08-07 22:57:16 +04:00
Capostrophic
ab29f9e13f Add permanent barter disposition change option (feature #3103) 2018-08-01 17:31:35 +03:00
Capostrophic
4d48ede6f1 Add two missing gameplay settings to Advanced tab 2018-08-01 13:36:31 +03:00
Marc Zinnschlag
20d4e27f82 Merged pull request #1821 2018-07-31 10:51:32 +02:00
Andrei Kortunov
2d4ec86b8d Provide launcher icons 2018-07-28 13:18:38 +04:00
Andrei Kortunov
28a02ac93b Use file selection dialogue result (bug #4524) 2018-07-27 21:25:21 +04:00
Thunderforge
72f6b1a693 Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface" 2018-06-28 20:13:18 -05:00
Thunderforge
506d615acc Moving csignal import from main to graphicspage 2018-06-14 22:16:35 -05:00
Thunderforge
7615e78e52 Move SDL initialization from main.cpp to graphicspage.cpp 2018-06-14 19:39:24 -05:00
Marc Zinnschlag
efb4abbb7f Merged pull request #1623 2018-06-09 10:49:04 +02:00
Thunderforge
dfa9968565 Renaming Launcher::DataFilesPage::signalSelectedFilesChanged to signalLoadedCellsChanged 2018-06-08 19:18:23 -05:00
Thunderforge
62c4eb8d6a Explicitly flagging loaded cells changed as queued 2018-06-08 19:16:24 -05:00
Thunderforge
d46590934a Importing mutex 2018-06-03 16:59:27 -05:00
Thunderforge
e282ece3d1 Fixing bug with autocomplete not loading correctly during startup 2018-06-03 16:58:18 -05:00
Thunderforge
103a7ac628 Using a mutex lock to prevent race conditions 2018-06-03 16:32:12 -05:00
Thunderforge
e26c675829 Changing join to detach so that the thread will not block the UI 2018-06-02 17:29:35 -05:00
Thunderforge
26dfef7970 Changing where we are loading cells to prevent Qt access issue 2018-05-27 17:15:36 -05:00
Thunderforge
78234e9468 Moving autocomplete code to thread 2018-05-27 16:47:09 -05:00
Thunderforge
c2fff61ccd Changing so that data changes happen only after the addon is checked 2018-05-26 20:35:28 -05:00
Thunderforge
d58cce9c72 Adding WIP code to dynamically change the autocomplete fields 2018-05-22 20:50:31 -05:00
declan-millar
9ed4f33048 Replace spelling: soulgem -> soul gem 2018-05-21 19:10:24 +01:00
declan-millar
78e79d5775 Add advanced option to Rebalance soulgem values to the launcher 2018-05-21 13:33:42 +01:00
Andreas Sturmlechner
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) 2018-04-17 23:03:56 +02:00
Thunderforge
fb27f34a32 Add autocomplete to the "Start default character at" field 2018-04-07 21:27:36 -05:00
Thunderforge
d42791e260 Moving testing options to Advanced page 2018-03-15 22:11:54 -05:00
Thunderforge
dcc262ed91 Fixing Skip Menu checkbox not working correctly 2018-03-05 23:10:08 -06:00
Thunderforge
082e166fae Making "start default character at" field enabled or disabled by the previous checkbox 2018-03-05 21:41:29 -06:00
Thunderforge
da74ca5ce0 Add testing options to the Settings page 2018-03-05 21:26:59 -06:00
Thunderforge
6c3ac834c4 Preventing max quicksaves from being saved to settings.cfg if it is unchanged. 2018-03-05 19:57:19 -06:00
Thunderforge
b6d9b6f544 Formatting improvement for advanced page 2018-02-27 20:17:43 -06:00
Thunderforge
4292351993 Adding Max Quicksaves setting to Launcher 2018-02-27 20:17:21 -06:00
Thunderforge
a67373d116 Fixing "Show Enchant Chance" checkbox setting melee info instead 2018-02-19 18:28:04 -06:00
Thunderforge
8b17844781 Replacing Qt5-only method with Qt4-compatible code 2018-01-29 21:14:31 -06:00
Thunderforge
8837046d9c Adding panel for advanced settings.cfg options 2018-01-28 22:49:49 -06:00
AnyOldName3
a9b95596bc Add a missed trailing new line. 2017-09-08 22:21:00 +01:00
AnyOldName3
8c74f16247 Restore trailing new lines to shrink PR 2017-09-08 22:20:04 +01:00
AnyOldName3
5ce34f1cbf Move new behaviour into macro to reduce code duplication 2017-09-08 22:17:42 +01:00
AnyOldName3
3c0ec0d6d0 If CMake supports it, sets the debugger working directory for Visual Studio 2017-09-08 17:26:46 +01:00
Siimacore
c920d083e4 Correcting https://bugs.openmw.org/issues/3906. 2017-08-03 23:15:26 +02:00
scrawl
41fb17f39b Revert "Correcting https://bugs.openmw.org/issues/3906" 
This reverts commit b0abed00e5.
 2017-06-20 00:36:06 +02:00
scrawl
f7969fb178 Merge pull request #1317 from Siimacore/master 
Correcting https://bugs.openmw.org/issues/3906
 2017-06-12 23:47:07 +02:00
Siimacore
b0abed00e5 Correcting https://bugs.openmw.org/issues/3906 2017-06-10 21:36:35 +02:00
Bret Curtis
dbf149f9b2 gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now 2017-06-10 00:51:19 +02:00
Bret Curtis
d799954ca0 replace and purge boost::math::gcd and other non-used headers 2017-06-09 19:08:53 +02: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
scrawl
9d125bcaa2 Merge pull request #1129 from PhillipAnd/phillipand-cmake-fix 
Fix various build issues with Visual Studio environment
 2016-11-17 18:25:23 +01:00
Phillip Andrews
c18fc113e5 Changed missing library dependencies to simple fix 2016-11-14 00:01:22 -06:00
Phillip Andrews
aeaedbc57a Moved install commands to target-specific cmakelists so that all configurations work. 2016-11-13 22:49:01 -06:00
Phillip Andrews
59eba1dede Changed tabs to spaces, oops 2016-11-13 16:59:36 -06:00
Phillip Andrews
1861302dbd Include various libraries for Visual Studio environment 2016-11-13 14:27:59 -06:00
Allofich
3420121c3f Fix shadowing warnings 2016-11-13 23:20:51 +09:00
Nikolay Kasyanov
5d4734c02e Use local path from configuration manager to load openmw.cfg in launcher 2016-11-01 21:27:35 +01:00
Allofich
125e94ef0e Fix shadowing warnings 2016-10-31 00:39:31 +09:00
Alexander "Ace" Olofsson
338f0cf53d Merge branch 'appveyor' of github.com:ace13/openmw into appveyor 2016-01-19 22:11:46 +01:00
Rob Cutmore
21d13a48fa Make setup method of MainDialog class private 2016-01-16 06:43:45 -05:00
Rob Cutmore
a5411c1ec2 Remove unused code 2016-01-15 20:51:39 -05:00
Alexander "Ace" Olofsson
fe241be26c Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 2015-12-24 11:27:02 +01:00
Alexander "Ace" Olofsson
2142d0d2d6 Make Qt5 happy 2015-12-24 02:48:00 +01:00
scrawl
177a6f4a68 Launcher: ensure to clear previous settings when reloading settings 2015-11-27 20:52:29 +01:00
scrawl
ace4cfc0a8 Fix 'duplicate setting' errors when running installation wizard 2015-11-27 20:32:45 +01:00
scrawl
2ffcc2a2b4 Fix incorrect path encoding handling in debug message 2015-11-26 17:34:22 +01:00
scrawl
d894d54e41 Improve path conversions 2015-11-26 17:15:28 +01:00
scrawl
84aceedfa2 Add comment 2015-11-26 17:15:12 +01:00
scrawl
325d208b4a Fix incorrect error message 2015-11-26 17:13:13 +01:00
scrawl
3747843c92 Use QString::toInt instead of atoi 2015-11-26 17:07:20 +01:00
cfcohen
c26463fd91 Should have coded it the way scrawl said, since it's cleaner. 2015-11-26 10:52:20 -05:00
cfcohen
a9c9cc5508 Remove unnecessary copy of mEngineSettings in mInitialSettings. 2015-11-26 10:42:43 -05:00
cfcohen
046538984c Fix duplicate filename in what() message. Use newly create cfgError 
utility function consistently throughout code.
 2015-11-26 01:49:14 -05:00
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.
 2015-11-25 21:30:04 -05:00
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.
 2015-11-25 13:17:03 -05:00
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.
 2015-11-25 13:08:53 -05:00
Nikolay Kasyanov
014a2fc0e9 OS X: do not override Qt plugin path 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
4dcb1a1b17 OS X: remove QPlastiqueStyle usage 2015-11-14 13:50:01 +01:00
scrawl
5602cd9b7b Fix the launcher's version label for builds with no git commit info 2015-08-06 02:54:47 +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
scrawl
c783b50a83 Fix config file priority in the launcher to match OpenMW 2015-07-18 01:38:35 +02:00
scrawl
3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-16 19:53:41 +02:00
scrawl
609e146a22 Build fixes for windows 2015-06-15 16:48:18 +02:00
scrawl
cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aitravel.cpp
 2015-06-14 16:32:13 +02:00
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
 2015-06-14 14:51:01 +10:00
cc9cii
0efe8f5465 Fix broken launcher build for windows. 2015-06-14 14:42:08 +10:00
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
 2015-06-13 23:50:12 +02:00
scrawl
b7cd62e4de Revert "Remove user preference setting option." 
This reverts commit d3b7cf44d3.
 2015-06-13 23:49:27 +02:00
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
 2015-06-13 21:11:24 +02:00
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.
 2015-06-12 15:13:42 +02:00
scrawl
4b5c2398a1 Remove QTextCodec::setCodecForCStrings 
Not needed, we're using QString::fromUtf8/toUtf8 to handle encodings correctly.
 2015-06-12 02:00:06 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 2015-06-11 23:38:08 +02:00
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
 2015-06-07 15:23:54 +02:00
cc9cii
d3b7cf44d3 Remove user preference setting option. 2015-06-07 13:29:45 +10:00
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
 2015-06-06 20:35:55 +10: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
Marc Zinnschlag
913caf96bd Merge branch 'openmw-36' 2015-05-23 09:46:54 +02:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
Marc Zinnschlag
34f106749a removed a redundant typedef 2015-05-17 10:38:15 +02:00
Nikolay Kasyanov
7d321e0fb7 Fix #2557 
Don’t show main dialog right away if wizard is selected.
 2015-05-16 13:18:04 +03:00
scrawl
ccab8cc9a1 Register Player in the PhysicsSystem 2015-05-12 17:40:42 +02:00
scrawl
c1edc30ad7 Dead code removal 2015-05-04 03:29:12 +02:00
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
 2015-05-04 02:41:50 +02:00
scrawl
cac288d5be Remove OgreInit 2015-05-01 21:49:36 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
Marc Zinnschlag
093c577895 Merge remote-tracking branch 'dteviot/Bug2344' 2015-02-26 19:05:30 +01:00
dteviot
cc815c63f1 Fix: no longer loose changes when run install wizard or iniimport. 2015-02-24 20:14:18 +13:00
dteviot
84762c4eb8 Progress bar at 0% shows no text. 2015-02-23 19:30:46 +13:00
scrawl
5eadffd0c4 Make launcher's version label selectable so it can be copy-pasted into issue reports 2015-02-22 00:13:03 +01:00
dteviot
9708e8529f Removed unneeded include. 2015-02-22 08:58:17 +13: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
03257ecae5 QString encoding fix 2015-02-09 20:15:41 +01:00
Marc Zinnschlag
6c4920c58e Merge remote-tracking branch 'scrawl/master' 2015-02-06 09:23:45 +01:00
Marc Zinnschlag
ea21fbcbe6 Merge remote-tracking branch 'dteviot/master' 2015-02-06 09:22:57 +01:00
dteviot
cac250a90d Fixed typo in comment. 2015-02-06 12:45:15 +13:00
dteviot
9d9cabf40d Fix: Importer creates a single Content List (Fixes #2345) 2015-02-06 12:24:06 +13:00
scrawl
9825b68dfb Fix SDL eating SIGINT signals in the launcher (Fixes #2328) 2015-02-05 04:18:42 +01:00
scrawl
0c6e2170db Include cleanup 2015-02-05 04:18:42 +01:00
Marc Zinnschlag
82ff737c31 Merge remote-tracking branch 'scrawl/master' 2015-02-01 12:10:28 +01:00
scrawl
57a259c526 Remove references to no longer used font 2015-01-31 22:40:43 +01:00
scrawl
e0d0997409 Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter 2015-01-31 22:40:38 +01:00
dteviot
e298589e7f Reorganised DataFilesPage.cpp code. 
Removed some recursive calling of saveSettings() and loadSettings().
 2015-01-26 18:46:18 +13:00
Alexander "Ace" Olofsson
942cf26eee And the missing includes 2015-01-23 16:06:19 +01:00
Alexander "Ace" Olofsson
7a903b7100 Doing forward declaration instead 2015-01-23 16:05:36 +01:00
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
 2015-01-23 15:37:32 +01:00
dteviot
fcbf7d7deb Fixed string formatting minor error found by Mingun. 2015-01-11 08:33:33 +13:00
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.
 2015-01-10 18:46:47 +13:00
dteviot
063388e0eb Change "Profile" to "Content List" in user visible strings in Launcher. (Fixes #810) 2015-01-10 15:04:45 +13:00
dteviot
9d6efcecff Merge remote-tracking branch 'OpenMW/master' into FixLoadOrderReset 
Fixed Conflict:
	components/contentselector/model/contentmodel.cpp
 2015-01-08 12:15:48 +13:00
Marco Schulze
6cd5b78ca7 Fix missing include in apps/launcher/main.cpp 2015-01-01 14:15:05 -03:00
scrawl
363d1f9207 Merge remote-tracking branch 'upstream/master' 2014-12-30 23:01:45 +01:00
dteviot
a62e15d93d Read profile files from LauncherSettings in load order. 2014-12-30 17:25:19 +13:00
Marc Zinnschlag
2fa0764c89 Merge remote-tracking branch 'swick/master' 2014-12-26 16:08:07 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 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
MiroslavR
3cc32b641a Fix some memory leaks 2014-12-23 20:44:25 +01:00
Sebastian Wick
639fbfad0b make borderless setting available to the UI 2014-12-22 02:44:20 +01:00
scrawl
8ed376af5e Launcher: fix changing active profile through the Play page 2014-12-11 15:59:43 +01:00