21536 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Miloslav Číž	319ed2f9b8	disable 360 screenshots in vanity/preview mode	2017-11-10 15:23:44 +01:00
Miloslav Číž	497b33e403	small corrections	2017-11-10 14:28:09 +01:00
rexelion	69a56eaea3	don't initialise rangeAttackOfTarget	2017-11-10 10:44:53 +00:00
Miloslav Číž	9ab3a0c44b	set cubemap width differently	2017-11-10 11:16:25 +01:00
Miloslav Číž	5baff05bac	add cubemap mapping	2017-11-10 10:50:28 +01:00
Miloslav Číž	5a07d135ae	add settings for cubemap size	2017-11-10 10:34:46 +01: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
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
Miloslav Číž	43c49e2f31	delete accidentally commited files	2017-11-09 23:12:23 +01:00
Miloslav Číž	1b184d8716	correct player mask	2017-11-09 23:09:13 +01:00
Miloslav Číž	e54c0a90fa	fix mirrored spherical screenshots	2017-11-09 21:14:02 +01:00
Miloslav Číž	d763e9fe46	add settings for spherical screenshots	2017-11-09 20:25:29 +01: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
Miloslav Číž	8f32114025	segfault fix	2017-11-09 18:26:27 +01:00
Miloslav Číž	d4fd08a63f	save 360 screenshots in the configured directory	2017-11-09 16:49:46 +01:00
Miloslav Číž	1b97a541f4	make a new action for 360 screenshot	2017-11-09 16:06:29 +01:00
rexelion	983c33c4c8	don't use a pointer for ActionWeapon	2017-11-09 14:23:26 +00:00
Miloslav Číž	f60840754f	disable water effects for spherical screenshots	2017-11-09 14:44:42 +01: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
Miloslav Číž	5698d70806	small planet mapping	2017-11-08 12:58:27 +01:00
Miloslav Číž	5f36518181	spherical mapping	2017-11-08 09:15:45 +01: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
scrawl	41ecbdbe6c	Add missing WaitDialog::clear() (Fixes #4196)	2017-11-08 00:56:05 +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
Miloslav Číž	4761a3d98b	dirty cylindrical projection	2017-11-07 22:13:05 +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
Miloslav Číž	3be9e2ee95	make spherical screenshot class	2017-11-07 19:47:36 +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
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
AnyOldName3	09b02c307a	Merge from base branch	2017-11-07 16:34:51 +00:00