18831 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
AnyOldName3	0f6f097cf2	Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm	2017-11-17 18:24:08 +00:00
AnyOldName3	3d18ddc8e4	Take into account previous #line directives when expanding @foreach shader macros	2017-11-17 17:18:33 +00:00
scrawl	36f4f0ef85	Don't increase simulationTime while the game is minimized (Fixes #4211)	2017-11-16 18:48:49 +00:00
scrawl	cf40d19d7d	Merge pull request #1551 from thegriglat/abs ... Change abs to std::abs	2017-11-15 17:34:59 +00:00
scrawl	60fba7acd8	Fix reorder warning	2017-11-15 17:20:08 +00:00
scrawl	c36d250044	Parse dialogue text for keywords after the resultscript runs (Fixes #4210)	2017-11-15 17:20:06 +00:00
scrawl	7c5d2a1ac4	Update dialogue topics list after result script is run ... Regression from 0.42.	2017-11-15 17:20:06 +00:00
scrawl	5a93b6a324	Enable word-wrapping for the console history	2017-11-15 17:20:05 +00:00
Grigorii Latyshev	6e4f6c4bd5	Change abs to std::abs	2017-11-13 21:36:55 +01: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
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	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
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
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
AnyOldName3	590531595b	Create @foreach shader preprocessor macro in preparation for moving shadow setup out of shadermanager.cpp	2017-11-10 02:02:27 +00:00
rexelion	983c33c4c8	don't use a pointer for ActionWeapon	2017-11-09 14:23:26 +00:00
AnyOldName3	548c42b5fd	Disable over-zealous shadows in the character preview.	2017-11-08 13:38:30 +00:00
AnyOldName3	64d5d0fd66	Prevent the local map from being considered to be shadowed.	2017-11-08 13:30:13 +00:00
AnyOldName3	6e0b61d084	Add missing libraries to components target	2017-11-08 04:09:14 +00:00
AnyOldName3	e201e359a9	Move Shadow to Components	2017-11-08 01:44:49 +00:00
AnyOldName3	1a30a917af	Merge upstream/master	2017-11-08 01:31:38 +00:00
AnyOldName3	2e7951c83f	Remove unused mask	2017-11-08 01:28:10 +00:00
AnyOldName3	aa31cbba4f	Attempt (and fail) to make the local map show without unwanted shadow	2017-11-08 01:20:52 +00:00
AnyOldName3	c3616ca78b	Merge branch 'osgshadow-test-vdsm-sky-method-two' into osgshadow-test-vdsm	2017-11-08 00:35:54 +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
AnyOldName3	25432146f7	Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm	2017-11-07 22:08:21 +00:00
Alexander Stillich	af3e1f92ec	Added StringUtil::replaceAll()	2017-11-07 23:06:23 +01:00
AnyOldName3	3403205231	Use three shadow maps per light	2017-11-07 20:34:48 +00:00
AnyOldName3	715f29165b	Dynamically adjust shaders to have the required number of shadow maps.	2017-11-07 20:22:45 +00: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
AnyOldName3	3106159721	Turn off all shadow texture units for the sky now it is possible for there to be more than one	2017-11-07 16:40:32 +00:00