3819 commits

Author	SHA1	Message	Date
David Cernat	28f47c4f81	[General] Update version to 0.6.2-hotfixed	2018-01-17 08:10:49 +02:00
David Cernat	9935f56d46	[General] Use doubles instead of ints for enchantmentCharge ... Additionally, include enchantmentCharges for items in PlayerEquipment packets.	2018-01-17 08:10:49 +02:00
David Cernat	a818140c14	Merge pull request #365 from OpenMW/master ... Add OpenMW commits up to 2 Jan 2017	2018-01-04 12:12:18 +02:00
David Cernat	65d978a3cb	Merge pull request #364 from OpenMW/master ... Add OpenMW commits up to 1 Jan 2017	2018-01-02 07:50:37 +02:00
Bret Curtis	93f14c219c	camelCase	2018-01-01 16:32:20 +01:00
Bret Curtis	7a7b040216	fix building on mips machines	2018-01-01 14:10:23 +01:00
scrawl	c920f95d1e	Don't incorrectly discard root node transformation (Fixes #4272)	2017-12-31 23:49:43 +00:00
David Cernat	cac2c6c1e8	Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts	2017-12-25 02:25:01 +02:00
David Cernat	993081ba1e	[General] Add enchantmentCharge to worldObjects and items	2017-12-23 13:16:38 +02:00
David Cernat	c9c363ebef	[General] Allow GameSettings to set bed & wilderness resting separately	2017-11-30 12:18:15 +02:00
David Cernat	e7f20e7daf	Merge pull request #351 from OpenMW/master while resolving conflicts ... # Conflicts: # CMakeLists.txt # README.md	2017-11-30 10:06:38 +02:00
scrawl	a4d8aef40d	Merge branch openmw-43 into master ... Conflicts: CMakeLists.txt README.md files/mygui/openmw_trade_window.layout	2017-11-29 22:37:50 +00:00
David Cernat	3508a16836	[General] Use GameSettings packet to set ability to rest and wait	2017-11-27 07:39:02 +02:00
David Cernat	d06817a356	Merge pull request #347 from OpenMW/master ... Add OpenMW commits up to 25 Nov 2017	2017-11-25 08:54:22 +02:00
Andrei Kortunov	94c0e3ed10	Move toUpper() from StringUtils to the JournalViewModel	2017-11-23 19:37:45 +04:00
David Cernat	656453725b	Merge pull request #343 from OpenMW/master ... Add OpenMW commits up to 23 Nov 2017	2017-11-23 04:51:13 +02:00
David Cernat	6668b9ab42	[General] Implement ConsoleCommand packet	2017-11-23 00:21:47 +02:00
Andrei Kortunov	67acb83b62	Add missing include	2017-11-21 13:27:33 +04:00
Andrei Kortunov	5f41f7c48d	Clean code up a bit	2017-11-21 13:03:38 +04:00
Andrei Kortunov	ba91cd658b	Convert topic name to Unicode	2017-11-21 12:31:23 +04:00
Andrei Kortunov	f0ca3eabd3	Merge from upstream master	2017-11-21 09:39:54 +04:00
scrawl	9fda3b6db4	Fix NumericEditBox behavior broken by switch to std::stoi ... For some reason stoi doesn't throw an error for '1foo' while 'foo1' does. Now the edit box flat out rejects any non-digit key events.	2017-11-20 23:20:03 +00:00
Andrei Kortunov	a391990f2a	Provide multibyte toLower() and single chars comparator	2017-11-20 21:30:46 +04:00
Alexander Stillich	93e9df15c9	Fixed parameter naming	2017-11-11 22:58:02 +00:00
Alexander Stillich	52b3507a2b	Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all	2017-11-11 22:58:02 +00:00
Alexander Stillich	09aac22782	Added StringUtil::replaceAll()	2017-11-11 22:58:01 +00:00
Alexander Stillich	92aaff3b78	Fixed escaping @ in boost program options filter	2017-11-11 22:57:59 +00:00
David Cernat	01db219de4	Merge pull request #333 from OpenMW/master ... Add OpenMW commits up to 11 Nov 2017	2017-11-11 03:46:21 +02:00
scrawl	a5ba1caed1	Merge pull request #1541 from astillich/4189 ... Fixed escaping @ in boost program options filter	2017-11-10 23:08:54 +00:00
scrawl	a5adc5b018	Add NPC base skeleton files to the optimizer blacklist (Fixes #4159)	2017-11-10 22:51:32 +00:00
David Cernat	f2a6957e16	Merge pull request #331 from OpenMW/master while resolving conflicts	2017-11-10 08:43:50 +02:00
scrawl	244cc5b861	Reduce error spam	2017-11-08 00:24:03 +00:00
scrawl	7b4add2ae4	Fall back to non-shader material if creating the shader fails ... Also fixes an uncaught exception that will break the whole game.	2017-11-08 00:24:03 +00:00
Alexander Stillich	43b5c2e36b	Fixed parameter naming	2017-11-07 23:20:10 +01:00
Alexander Stillich	70d578d050	Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all	2017-11-07 23:10:58 +01:00
Alexander Stillich	af3e1f92ec	Added StringUtil::replaceAll()	2017-11-07 23:06:23 +01:00
Alexander Stillich	7d39c5450c	Fixed escaping @ in boost program options filter	2017-11-05 22:14:16 +01:00
David Cernat	2ca4017371	[Client] Force position updates for players in animations	2017-11-01 22:00:54 +02:00
David Cernat	be25decee2	[General] Implement PlayerSpeech packet	2017-10-31 15:19:14 +02:00
David Cernat	605b06c303	[General] Find actor speech captions instead of sending them in packets	2017-10-30 11:06:09 +02:00
David Walley	41dc82abad	Update Links to Documentation in settings.cfg files (#1523) ... * Update settings-default.cfg * Update settings.cpp	2017-10-28 16:05:30 +00:00
David Cernat	413893aa51	[General] Implement PlayerAnimPlay packet	2017-10-27 09:10:29 +03:00
David Cernat	37304655da	Merge pull request #326 from OpenMW/master ... Add OpenMW commits up to 25 Oct 2017	2017-10-26 17:28:56 +03:00
David Cernat	50d5fffb7f	[General] Add and implement PlayerQuickKeys packet	2017-10-25 07:21:00 +03:00
AnyOldName3	c1a871ff1f	Make indentation consistent.	2017-10-24 23:31:40 +01:00
AnyOldName3	daf7d8451c	Switch to a more reliable method of passing the git-version targt the data it needs	2017-10-24 23:29:18 +01:00
AnyOldName3	e3142b9643	Add missing variables to those forwarded to the git-version target	2017-10-24 23:10:50 +01:00
David Cernat	dd25c7db4e	Merge pull request #324 from OpenMW/master ... Add OpenMW commits up to 24 Oct 2017	2017-10-24 19:36:14 +03:00
scrawl	0c6ef17fb5	Add explicit variant of 'OnActivate'	2017-10-23 23:33:06 +00:00
David Cernat	8c47d63b08	[General] Update version to 0.6.2	2017-10-23 20:22:29 +03:00