1372 commits

Author	SHA1	Message	Date
David Cernat	056591b957	Add OpenMW commits up to 14 Sep 2018 ... # Conflicts: # apps/openmw/mwgui/container.cpp # apps/openmw/mwworld/worldimp.hpp	2019-08-20 12:14:57 +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
Grim Kriegor	8f90f8a3b8	[General] Change the default plugins home location	2018-11-12 01:10:10 +00: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
David Cernat	be448e5b8e	[General] Use more appropriate update rate in server config	2018-08-23 00:06:28 +03:00
David Cernat	0658d39eaa	[General] Update ports used for master server in client & server config	2018-08-22 13:47:46 +03: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
Bret Curtis	4cb9b52b81	fix rebase issue	2018-08-14 23:15:30 +02: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
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)	2018-08-05 07:20:12 +03: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	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
David Cernat	21d5bb4d4e	Merge pull request #460 from OpenMW/master ... Add 0.7.0 commits up to 20 Jul 2018	2018-07-21 05:59:57 +03:00
Miloslav Číž	4e3bc3e403	Change wave parameters based on weather	2018-07-11 17:03:59 +02:00
David Cernat	7a646494ee	[General] Point to serverCore.lua instead of server.lua in server config	2018-07-11 02:53:40 +03:00
David Cernat	26ac29e8b1	[Client] Add disclaimer to save dialog about singleplayer-only saves	2018-07-09 22:55:11 +03:00
David Cernat	c0fde5ae97	[General] Add explanation about 0.0.0.0 to server config file	2018-07-07 19:33:54 +03: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
Koncord	685a80887b	Remove Pawn support	2018-07-02 23:00:35 +08:00
Thunderforge	72f6b1a693	Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface"	2018-06-28 20:13:18 -05: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
David Cernat	669d4d3d7e	Merge pull request #440 from OpenMW/master ... Add OpenMW commits up to 27 May 2018	2018-05-27 16:10:16 +03: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
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	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
declan-millar	78e79d5775	Add advanced option to Rebalance soulgem values to the launcher	2018-05-21 13:33:42 +01:00
David Cernat	5458e09c8a	Merge pull request #420 from OpenMW/master ... Add OpenMW commits up to 11 May 2018	2018-05-12 06:32:01 +03: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
David Cernat	7db74509e0	Merge pull request #412 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwscript/transformationextensions.cpp	2018-04-25 21:55:32 +03:00
Alexander Olofsson	f0288282be	Slight appdata cleanup and improvement	2018-04-22 12:40:22 +02:00
David Cernat	17678ee60f	Merge pull request #407 from OpenMW/master ... Add OpenMW commits up to 17 Apr 2018	2018-04-17 15:25:28 +03:00
Nelsson Huotari	af558e07a3	implement +6 icons	2018-04-15 12:47:52 +03:00