mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-02 03:15:32 +00:00
Code Issues Releases Wiki Activity
26671 commits 38 branches 54 tags 122 MiB
Commit graph

639 commits

Author SHA1 Message Date
David Cernat
cc25612b8d Add OpenMW commits up to 18 Sep 2019 
# Conflicts:
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
#	apps/openmw/mwmechanics/security.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/miscextensions.cpp
 2019-09-18 23:46:08 +03:00
Capostrophic
9788a776b9 Avoid Qt "opening user openmw.cfg twice" warning 2019-09-10 22:56:04 +03:00
David Cernat
ed05125f6a Add OpenMW commits up to 2 Aug 2019 
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
 2019-08-22 15:38:15 +03:00
David Cernat
b57c0bcafe Add OpenMW commits up to 6 June 2019 
# Conflicts:
#	apps/openmw/mwgui/hud.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/waitdialog.cpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-22 11:42:02 +03:00
David Cernat
5181c601c0 Add OpenMW commits up to 2 May 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/statsextensions.cpp
 2019-08-22 08:40:32 +03:00
David Cernat
8729c3c5e3 Add OpenMW commits up to 9 Mar 2019 
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	README.md
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwscript/animationextensions.cpp
#	apps/openmw/mwscript/guiextensions.cpp
#	apps/openmw/mwscript/miscextensions.cpp
#	apps/openmw/mwscript/soundextensions.cpp
 2019-08-21 19:04:04 +03:00
David Cernat
6fdef4fd0a Add OpenMW commits up to 1 Jan 2019 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-21 14:37:54 +03:00
David Cernat
fba07194cf Add OpenMW commits up to 29 Oct 2018 
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-20 13:15:00 +03:00
David Cernat
84cab59057 Add OpenMW commits up to 19 Aug 2018 
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/main.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/containerextensions.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/misc/debugging.hpp
 2019-08-20 10:06:15 +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
David Cernat
a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts 
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2018-08-20 14:08:44 +03: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
David Cernat
a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
 2018-07-04 01:52:29 +03: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
David Cernat
296c69d788
Merge pull request #436 from OpenMW/master 
Add OpenMW commits up to 22 May 2018
 2018-05-23 00:40:51 +03: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
David Cernat
9e5ddeac50
Merge pull request #408 from OpenMW/master 
Add OpenMW commits up to 18 Apr 2018
 2018-04-18 18:05:09 +03: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
David Cernat
b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts 
# Conflicts:
#	README.md
 2018-03-09 21:07:46 +02: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
David Cernat
37b349c2f6
Merge pull request #390 from OpenMW/master 
Add OpenMW commits up to 28 Feb 2018
 2018-03-01 05:33:37 +02: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
David Cernat
9e10eb9c84
Merge pull request #389 from OpenMW/master 
Add OpenMW commits up to 24 Feb 2018
 2018-02-25 22:05:32 +02:00
Thunderforge
a67373d116 Fixing "Show Enchant Chance" checkbox setting melee info instead 2018-02-19 18:28:04 -06:00
David Cernat
a7e3261b0b
Merge pull request #383 from OpenMW/master 
Add OpenMW commits up to 11 Feb 2018
 2018-02-11 06:57:54 +02: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
David Cernat
bd541b1e5b Merge pull request #287 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
 2017-09-12 07:38:49 +03: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
David Cernat
4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.gitignore
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
 2017-08-31 15:14:13 +03:00
Siimacore
c920d083e4 Correcting https://bugs.openmw.org/issues/3906. 2017-08-03 23:15:26 +02:00
David Cernat
df67ae4689 Merge pull request #229 from OpenMW/master 
Add OpenMW commits up to 20 Jun 2017
 2017-06-20 04:16:51 +03:00
scrawl
41fb17f39b Revert "Correcting https://bugs.openmw.org/issues/3906" 
This reverts commit b0abed00e5.
 2017-06-20 00:36:06 +02:00
David Cernat
fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
 2017-06-18 18:16:10 +03: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
David Cernat
0fe2d743a7 Rename tes3mp-netlauncher into tes3mp-browser 2017-01-19 12:14:25 +02:00
Koncord
f7dc30387c Run tes3mp-netlauncher instead openmw in the OpenMW Launcher 2017-01-12 08:55:21 +08: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