20754 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Cernat	926106cf8c	[General] Rework CharGen slightly for clarity purposes ... Previously, charGenStage.end was doing double duty as both the variable indicating the number of CharGen stages and – when set to 0 – the variable indicating that CharGen was over. The latter role is now filled by a new boolean.	2017-11-13 05:33:27 +02:00
David Cernat	ac7a588632	[General] Update config files	2017-11-13 02:18:58 +02:00
David Cernat	a21f5d18d6	Merge pull request #336 from TES3MP/master ... Add master commits up to 12 Nov 2017	2017-11-12 06:37:34 +02:00
David Cernat	2ba1c84cf7	Merge pull request #335 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwgui/container.cpp	2017-11-12 06:35:15 +02:00
David Cernat	a8261bb385	[General] Fix printing of packet identifiers after changes to logger	2017-11-12 02:36:18 +02: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
scrawl	a7fd27f413	Merge pull request #1544 from rexelion/archerrangefix ... use fProjectileMaxSpeed for ranged weapons distance (fixes #4192)	2017-11-11 22:30:59 +00:00
scrawl	98b4f9c596	Merge pull request #1549 from akortunov/itemmodels ... Item models reworking	2017-11-11 22:12:07 +00:00
scrawl	ae9f79c192	Merge pull request #1550 from akortunov/trackingfix ... Do not track a nearest actor during combat and pursue	2017-11-11 22:10:33 +00:00
scrawl	dc016059c3	Disable Activate key when textinput is active (Bug #4151)	2017-11-11 22:00:18 +00:00
scrawl	3b9e1e8c1b	Make movement keys not function in text input mode	2017-11-11 22:00:09 +00:00
scrawl	b7eda61f7a	Fix overlapping widgets in trade window layout (Fixes #4205)	2017-11-11 21:59:21 +00:00
Andrei Kortunov	8c0dcd8b2b	Do not track a nearest actor during combat and pursue (bug #4179)	2017-11-11 19:46:59 +04:00
rexelion	f0649849b8	changed variable name to be more descriptive	2017-11-11 12:00:23 +00:00
Andrei Kortunov	9943bd4d74	AiWander fast forwarding improvements (bug #3638)	2017-11-11 15:31:06 +04:00
Andrei Kortunov	03f129b53c	remove redundant allowedToInsertItems() function from ItemModel	2017-11-11 11:58:22 +04:00
Andrei Kortunov	99517d83ea	Bound items detection refactoring	2017-11-11 11:58:22 +04:00
Andrei Kortunov	a02124f884	Handle item owners during pickpocketing	2017-11-11 11:58:18 +04:00
David Cernat	700e4d032e	Merge pull request #334 from TES3MP/master ... Add master commits up to 11 Nov 2017	2017-11-11 03:47:22 +02: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	f1aeb416ec	Disable Activate key when textinput is active (Bug #4151)	2017-11-10 22:54:53 +00:00
scrawl	a5adc5b018	Add NPC base skeleton files to the optimizer blacklist (Fixes #4159)	2017-11-10 22:51:32 +00:00
scrawl	b06512a60d	Fix error message that referred to the wrong file (Bug #4159)	2017-11-10 22:51:32 +00:00
scrawl	1afbf99f74	Make movement keys not function in text input mode	2017-11-10 22:51:31 +00:00
scrawl	b9baee51d5	Fix overlapping widgets in trade window layout (Fixes #4205)	2017-11-10 22:51:29 +00:00
rexelion	69a56eaea3	don't initialise rangeAttackOfTarget	2017-11-10 10:44:53 +00:00
Kyle Cooley	1cd539bad2	Fix render order for markers	2017-11-10 02:06:06 -05:00
Andrei Kortunov	3694b6ec90	Move onClose() check to item models	2017-11-10 10:58:43 +04:00
Andrei Kortunov	ac33ff9482	Move onDropItem() check to item models	2017-11-10 10:58:43 +04:00
Andrei Kortunov	3604b73d60	Move onTakeItem() to item models	2017-11-10 10:58:40 +04:00
Kyle Cooley	556117f6e6	Update marker transparency when changed.	2017-11-10 01:56:06 -05:00
David Cernat	4dbada69bf	Merge pull request #332 from TES3MP/master while resolving conflicts	2017-11-10 08:50:28 +02:00
David Cernat	f2a6957e16	Merge pull request #331 from OpenMW/master while resolving conflicts	2017-11-10 08:43:50 +02:00
Kyle Cooley	de214db8d4	Use configured transparency.	2017-11-09 13:45:32 -05:00
Kyle Cooley	197ea95646	Prevent arrows for move/scale markers from intersecting.	2017-11-09 13:04:46 -05:00
rexelion	983c33c4c8	don't use a pointer for ActionWeapon	2017-11-09 14:23:26 +00:00
scrawl	41ecbdbe6c	Add missing WaitDialog::clear() (Fixes #4196)	2017-11-08 00:56:05 +00:00
scrawl	9ecdcc187f	Clarify a warning message refers to inventory objects	2017-11-08 00:26:09 +00:00
scrawl	95b3c1181a	Update shader with a non-color tracking material when equipment is changed during chameleon/invisibility effects (Fixes #4190)	2017-11-08 00:24:52 +00:00
scrawl	e42bd71081	Add missing WaitDialog::clear() (Fixes #4196)	2017-11-08 00:24:04 +00: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
rexelion	cab0002461	Backing up distance is now dependent on opponents's weapon range; don't back up from ranged oponents	2017-11-07 17:57:23 +00:00