20488 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
AnyOldName3	474770eca8	Switch shadow map rendering to a specialised, simplified shader.	2018-10-16 21:23:31 +01:00
AnyOldName3	ce15369bbd	Convert colorMode shader define to a uniform	2018-10-15 23:12:15 +01:00
AnyOldName3	0124be5713	Merge upstream/master	2018-10-10 21:23:19 +01:00
Bret Curtis	c45ec9171b	Merge pull request #1963 from Capostrophic/journal ... Disallow to open the journal while settings window is open (bug #4674)	2018-10-10 20:55:32 +02:00
Capostrophic	4ec727c50b	Disallow to open the journal while settings window is open (bug #4674)	2018-10-10 18:33:56 +03:00
Marc Zinnschlag	2d87d1d9d2	Merged pull request #1959	2018-10-10 15:05:29 +02:00
Marc Zinnschlag	d466785aa7	Merged pull request #1958	2018-10-10 15:04:32 +02:00
Marc Zinnschlag	38a3632be7	Merged pull request #1960	2018-10-10 14:56:51 +02:00
Bret Curtis	e2dbb115f0	Merge pull request #1961 from akortunov/crossbowfix ... Improve pitch factor handling for crossbow animations	2018-10-09 13:56:43 +02:00
Andrei Kortunov	5617bb3f0c	Improve pitch factor handling for crossbow animations (bug #4672)	2018-10-09 11:35:28 +04:00
Andrei Kortunov	e06f0b797a	Replace all NULLs to nullptr	2018-10-09 10:21:12 +04:00
Capostrophic	09aecb955c	getSkill usage cleanup (bug #4671)	2018-10-08 17:06:30 +03:00
Capostrophic	cae2e84ab4	Trace the player down after enabling collision with TCL (bug #4669)	2018-10-08 16:15:15 +03:00
Bret Curtis	6540ef68a7	Merge pull request #1957 from Capostrophic/appveyor ... Fix AppVeyor build	2018-10-07 20:41:26 +02:00
Bret Curtis	5b4a8237fb	Merge pull request #1956 from Capostrophic/lightcolor ... Editor: display light source color as a color (bug #4668)	2018-10-07 20:24:14 +02:00
Capostrophic	e627f49df4	Fix AppVeyor build	2018-10-07 20:22:52 +03:00
Capostrophic	768c532b8f	Editor: display light source color as a color (bug #4668)	2018-10-07 19:43:51 +03:00
Marc Zinnschlag	71f80db886	Merged pull request #1954	2018-10-07 11:25:32 +02:00
Bret Curtis	585313a71f	Merge pull request #1953 from Capostrophic/animation ... Fix first person swimming animations	2018-10-06 14:24:48 +02:00
Capostrophic	03788edd63	Fix redundant drag call in instance dragging (bug #4593)	2018-10-05 18:48:17 +03:00
Capostrophic	34e45efac3	Fix first person swimming animations	2018-10-05 17:29:49 +03:00
Marc Zinnschlag	503352e840	Merged pull request #1951	2018-10-03 13:23:56 +02:00
Marc Zinnschlag	b410d87aae	Merged pull request #1952	2018-10-03 13:19:28 +02:00
Andrei Kortunov	07ccc5abdb	Remove non-looping effects after rest	2018-10-01 21:57:13 +04:00
Andrei Kortunov	3896a2eba6	Do not use a PartHolder for spell effect node	2018-10-01 20:18:20 +04:00
Andrei Kortunov	632045e145	Improve the 'part has no parents' warning	2018-10-01 20:18:19 +04:00
Andrei Kortunov	4dc424036f	Cleanup magic effects, when create a new ActorAnimation	2018-10-01 20:17:58 +04:00
Capostrophic	674e33170b	Fix quick key system regressions (bug #4662)	2018-09-30 21:16:02 +03:00
Bret Curtis	c19905d0a8	Merge pull request #1949 from akortunov/revert ... Revert fix for skinning transformations	2018-09-30 19:42:01 +02:00
Andrei Kortunov	87394f2ebb	Revert "Take in account transformations of NiTriShape and NiSkinData in skinning (bug #4437)" ... This reverts commit 09427d3f5e since the fix is not entirely correct.	2018-09-29 16:21:40 +04:00
Marc Zinnschlag	38758a9555	Merged pull request #1944	2018-09-29 11:16:14 +02:00
Marc Zinnschlag	6a9618f0f5	Merged pull request #1948	2018-09-29 11:03:26 +02:00
Marc Zinnschlag	c702672eb3	Merged pull request #1947	2018-09-29 11:02:52 +02:00
Capostrophic	f20f49daa6	Content selector: allow to copy paths to clipboard (feature #2847)	2018-09-29 02:09:13 +03:00
elsid	2073218fc6	Use specific googletest version	2018-09-28 22:39:27 +03:00
Andrei Kortunov	43c7438e8e	Move WeakCache to components/misc	2018-09-28 16:47:47 +04:00
Marc Zinnschlag	33044add97	Merged pull request #1938	2018-09-28 11:31:45 +02:00
Marc Zinnschlag	3dc15d39e3	Merged pull request #1936	2018-09-28 11:30:13 +02:00
Capostrophic	2e98cad895	Fade out sun glare and specularity completely at night start, not sunset start	2018-09-27 17:34:46 +03:00
Andrei Kortunov	35abf7367c	Implement wearing priority for editor	2018-09-27 18:22:17 +04:00
Andrei Kortunov	ac848b0902	Use male bodyparts as fallback for females in the editor	2018-09-27 13:14:59 +04:00
Kyle Cooley	7eb1b14b21	Periodically prune empty elements in weak cache	2018-09-27 13:14:59 +04:00
Kyle Cooley	0096951f25	cleanup	2018-09-27 13:14:59 +04:00
Kyle Cooley	676fc48855	Re-add logic for empty model	2018-09-27 13:14:59 +04:00
Kyle Cooley	f43b70d77b	Centralize actor data, simplify logic	2018-09-27 13:14:59 +04:00
Kyle Cooley	c1ec926f43	Workaround inconsistencies with record status changes	2018-09-27 13:14:59 +04:00
Kyle Cooley	1518d630ca	Fix issue with body part events not propogating to actors	2018-09-27 13:14:59 +04:00
Kyle Cooley	031502b2ab	Reorganize ActorAdapter data, use weak cache for sharing	2018-09-27 13:14:59 +04:00
Kyle Cooley	2a9ebac572	Simplify update logic, update when race parts are changed.	2018-09-27 13:14:59 +04:00
Kyle Cooley	1276e0fa9b	Handle changes to race record when rendering actors	2018-09-27 13:14:59 +04:00