Commit Graph

1363 Commits (ffi-server-rewrite)

Author SHA1 Message Date
Grim Kriegor 8f90f8a3b8 [General] Change the default plugins home location 6 years ago
David Cernat be448e5b8e [General] Use more appropriate update rate in server config 6 years ago
David Cernat 0658d39eaa [General] Update ports used for master server in client & server config 6 years ago
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
6 years ago
Koncord d03722b3f4 [Browser] Rework browser for improved stability & clarity
(cherry picked from commits 5c79e7106f, 57353cdfff, 15723adb9a, 01a5196a92, ed75563a94, 3839a2dcfd, 1fd16ba69c, 66283943c5, ba8613a179, 5b8f4f3e92, 35b771b19e, 043eb224e2, 05fac2f67d)
6 years ago
Capostrophic ab29f9e13f Add permanent barter disposition change option (feature #3103) 7 years ago
Marc Zinnschlag e8139a5cc7 Merged pull request #1835 7 years ago
AnyOldName3 f717c9e56d
Sort out some tabs which snuck into the water shader 7 years ago
Capostrophic 4d48ede6f1 Add two missing gameplay settings to Advanced tab 7 years ago
Andrei Kortunov 2d4ec86b8d Provide launcher icons 7 years ago
David Cernat 21d5bb4d4e
Merge pull request #460 from OpenMW/master
Add 0.7.0 commits up to 20 Jul 2018
7 years ago
Miloslav Číž 4e3bc3e403 Change wave parameters based on weather 7 years ago
David Cernat 7a646494ee [General] Point to serverCore.lua instead of server.lua in server config 7 years ago
David Cernat 26ac29e8b1 [Client] Add disclaimer to save dialog about singleplayer-only saves 7 years ago
David Cernat c0fde5ae97 [General] Add explanation about 0.0.0.0 to server config file 7 years ago
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
7 years ago
Koncord 685a80887b Remove Pawn support 7 years ago
Thunderforge 72f6b1a693 Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface" 7 years ago
Miloslav Číž d629c30fdb
Merge branch 'master' into screenshot360 7 years ago
Thunderforge 058cfb553c Adding CFBundleIdentifier to OpenMW's Info.plist file for Macs 7 years ago
Thunderforge a9ca528fb8 Adding version number of macOS build of OpenMW 7 years ago
Marc Zinnschlag efb4abbb7f Merged pull request #1623 7 years ago
Andrei Kortunov fea34bd73f Added support for per-group animation files 7 years ago
David Cernat 669d4d3d7e
Merge pull request #440 from OpenMW/master
Add OpenMW commits up to 27 May 2018
7 years ago
scrawl 31ea7c8edd
Revert "set rebalance soul gem values to true by default"
This reverts commit 2963524a01.
7 years ago
Marc Zinnschlag b151a89528 Merged pull request #1568 7 years ago
Marc Zinnschlag e30ade81be Merged pull request #1680 7 years ago
Andrei Kortunov 9ac752ea70 Implement filtering in the spells window 7 years ago
David Cernat 296c69d788
Merge pull request #436 from OpenMW/master
Add OpenMW commits up to 22 May 2018
7 years ago
declan-millar 2963524a01 set rebalance soul gem values to true by default 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
David Cernat 5458e09c8a
Merge pull request #420 from OpenMW/master
Add OpenMW commits up to 11 May 2018
7 years ago
Nelsson Huotari 4ae75d1d20 Terrain texture brush frame 7 years ago
Marc Zinnschlag e661e3cf74 Merged pull request #1677 7 years ago
Nelsson Huotari a2745683e6 new run icon 7 years ago
Nelsson Huotari e4e225f4e7 Add topic, journal and related -info icons. 7 years ago
David Cernat 7db74509e0 Merge pull request #412 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwscript/transformationextensions.cpp
7 years ago
Alexander Olofsson f0288282be Slight appdata cleanup and improvement 7 years ago
David Cernat 17678ee60f
Merge pull request #407 from OpenMW/master
Add OpenMW commits up to 17 Apr 2018
7 years ago
Nelsson Huotari af558e07a3 implement +6 icons 7 years ago
Nelsson Huotari 69aacdff17 Lamoot's new icon set 7 years ago
scrawl fc72483ddf
Merge pull request #1673 7 years ago
Capostrophic b08d7b4a3b Use centroid interpolation for shader lighting (fixes #4143) 7 years ago
David Cernat fa652964fd
Merge pull request #403 from OpenMW/master
Add OpenMW commits up to 9 Apr 2018
7 years ago
scrawl 0982d2175a
Merge pull request #1473 7 years ago
scrawl 35300c04cd
Merge pull request #1671 7 years ago
Capostrophic cddc0914c8 Option to charge for all companions travelling (fixes #4064) 7 years ago
David Cernat e3c43c6af7 Merge pull request #400 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
7 years ago
scrawl c610b8acc8
Merge pull request #1649 7 years ago