21889 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Bret Curtis	d727a2f25c	Merge pull request #2285 from Capostrophic/mainmenu ... Avoid menu button textures vertical cutoff	2019-03-25 13:33:03 +01:00
Bret Curtis	1e9eac568f	Merge pull request #2249 from akortunov/cache ... Implement generic caching system	2019-03-25 13:32:23 +01:00
Capostrophic	93f78aad60	Avoid menu button texture vertical cutoff	2019-03-24 22:55:27 +03:00
Bret Curtis	0a1af526d4	Merge pull request #2280 from akortunov/optimize ... Reduce default composite map distance to decrease GPU loading	2019-03-24 16:45:50 +01:00
Bret Curtis	354f904a24	Merge pull request #2279 from akortunov/map ... Optimize map window update	2019-03-24 16:45:16 +01:00
Bret Curtis	6cbf1288ff	Merge pull request #1929 from Capostrophic/elseif ... Ignore the rest of the line after else operator (bug #3006)	2019-03-24 16:35:49 +01:00
Capostrophic	cbce1a1b7c	Ignore the rest of the line after else (bug #3006)	2019-03-24 18:34:33 +03:00
Bret Curtis	8f8bba66d9	Merge pull request #2178 from Capostrophic/declaration ... Ignore extra text after a local variable declaration (bug #4867)	2019-03-24 16:33:21 +01:00
Bret Curtis	eefbda0ddf	Merge pull request #2283 from Capostrophic/input ... Disallow binding some reserved keys (bug #3282)	2019-03-24 16:30:28 +01:00
Capostrophic	6dbd875f75	Disallow binding some reserved keys (bug #3282)	2019-03-23 22:56:30 +03:00
bzzt	1143985bc7	Do not update map texture if it did not change	2019-03-23 16:22:57 +04:00
Andrei Kortunov	bbb1fdd92f	Reduce default composite map distance to decrease GPU loading	2019-03-23 14:25:44 +04:00
bzzt	231e629e66	Store map widgets and textures in one vector instead of 4 different ones	2019-03-23 07:46:41 +04:00
Bret Curtis	115f12823a	Merge pull request #2278 from Capostrophic/blendmap ... Remove unused and unfinished blendmap packing feature	2019-03-22 22:35:21 +01:00
Capostrophic	786f3e5fc3	Remove unused and unfinished blendmap packing feature	2019-03-22 22:15:28 +03:00
bzzt	c2176945bd	Do not use the delayed map cells update	2019-03-22 18:58:34 +04:00
Bret Curtis	bbbdefce5f	Merge pull request #2275 from elsid/fix_map_iteration ... Use auto for map value_type in range-based for loops	2019-03-22 11:13:58 +01:00
Bret Curtis	92bed66e5f	Merge pull request #2276 from elsid/aiwander ... Improve AiWander pathfinding for locations without pathgrid	2019-03-22 10:00:37 +01:00
elsid	5434e92437	Take in account actor half extents for obstacle check	2019-03-21 23:15:47 +03:00
elsid	1e8bf3846e	Remove unused argument	2019-03-21 23:15:47 +03:00
elsid	287433efa8	Stop walking for water and flying creatures after single stuck	2019-03-21 23:15:47 +03:00
elsid	a65f60e1f1	Build path only by navmesh for wandering near spawn	2019-03-21 23:15:47 +03:00
elsid	ff67a9e233	Build straight path for wandering flying and water creatures	2019-03-21 23:15:47 +03:00
elsid	ebdff5d96e	Check for height map when cast ray for AiWander path	2019-03-21 23:15:47 +03:00
elsid	e033b0c565	Avoid build path through the ground for flying wandering creatures	2019-03-21 23:15:46 +03:00
elsid	e82d65a2c7	Use if-continue to skip build path	2019-03-21 23:15:46 +03:00
elsid	fa7b304e78	Use auto for map value_type in range-based for loops ... To avoid implicit call of copy constructor for pair<const K, V> to pair<K, V> conversion.	2019-03-21 23:09:42 +03:00
Capostrophic	af47ec7756	Skip extra text after variable declaration (bug #4867)	2019-03-21 17:00:40 +03:00
Bret Curtis	5e12073b47	Merge pull request #2272 from akortunov/optimize_terrain ... Do not block loading while compiling composite maps	2019-03-21 09:17:02 +01:00
Bret Curtis	0c11f903ab	Merge pull request #2274 from akortunov/terrain ... Enable light sources directly to avoid virtual calls	2019-03-21 08:57:37 +01:00
Andrei Kortunov	b466bfee40	Enable light sources directly to avoid virtual calls	2019-03-21 10:27:50 +04:00
Andrei Kortunov	0e1f5f68b6	Do not allow different threads to compile the same composite map	2019-03-21 08:52:13 +04:00
Andrei Kortunov	cad45e96ac	Remove redundant mCompile set - we do not use data from it anyway	2019-03-21 08:42:48 +04:00
Chris Djali	e14682e353	Merge pull request #2273 from AnyOldName3/conformant-comparator ... Use irreflexive, asymmetric comparator as required by the spec.	2019-03-20 23:55:03 +00:00
AnyOldName3	32da9a8ab1	Use irreflexive, asymmetric comparator as required by the spec.	2019-03-20 23:32:01 +00:00
Bret Curtis	a38c5cd240	Merge pull request #2271 from Capostrophic/animation ... Minor NpcAnimation cleanup	2019-03-20 21:03:12 +01:00
bzzt	c2986b3bd7	Do not block the loading thread while compiling composite maps in the ... draw thread	2019-03-20 21:42:53 +04:00
Capostrophic	695cd5bb49	Minor NpcAnimation cleanup	2019-03-20 16:11:21 +03:00
Bret Curtis	7ccfec4d21	Merge pull request #2270 from akortunov/animfix ... Fixes for werewolf animations	2019-03-20 12:32:11 +01:00
Andrei Kortunov	be12d241da	Reset current attack during force update (bug #4922)	2019-03-20 12:28:29 +04:00
Andrei Kortunov	e171d34192	Init NPC type properly in the NpcAnimation	2019-03-20 12:28:03 +04:00
Bret Curtis	cc43315fad	Merge pull request #2269 from elsid/fix_warnings ... Add override to fix warnings	2019-03-20 07:59:47 +01:00
elsid	ccb325c663	Add override to fix warnings	2019-03-20 00:19:26 +03:00
Bret Curtis	fa8e7b8037	Merge pull request #2246 from Capostrophic/osgqt ... Merge upstream osgQt changes	2019-03-19 21:04:53 +01:00
Bret Curtis	26feedfcae	Merge pull request #2268 from akortunov/scanfix ... Fix some issues from the Coverity Scan report	2019-03-19 17:27:48 +01:00
Bret Curtis	19dcbf2b3d	Merge pull request #2266 from Capostrophic/vsync ... Vsync tweaks	2019-03-19 09:23:48 +01:00
Andrei Kortunov	7501f18d21	Avoid the 'structurally dead code' warning	2019-03-19 09:16:03 +04:00
Andrei Kortunov	b2fca46206	Fix a couple of minor issues in shadows	2019-03-19 09:14:07 +04:00
Andrei Kortunov	7995a92672	Initialize missing variables	2019-03-19 09:12:31 +04:00
Andrei Kortunov	fd5e9cf271	Catch possible boost::bad_any_cast exception	2019-03-19 09:11:14 +04:00