17129 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
scrawl	9d125bcaa2	Merge pull request #1129 from PhillipAnd/phillipand-cmake-fix ... Fix various build issues with Visual Studio environment	2016-11-17 18:25:23 +01:00
scrawl	2368382ea5	Fix upside down rain particle texture	2016-11-17 17:52:20 +01:00
scrawl	2da4de85be	Merge pull request #1132 from MiroslavR/aiflee ... Implement fleeing AI	2016-11-17 15:48:57 +01:00
MiroslavR	5e46121046	Implement fleeing AI (Closes #1118)	2016-11-16 20:15:25 +01:00
Phillip Andrews	c18fc113e5	Changed missing library dependencies to simple fix	2016-11-14 00:01:22 -06:00
Phillip Andrews	aeaedbc57a	Moved install commands to target-specific cmakelists so that all configurations work.	2016-11-13 22:49:01 -06:00
Phillip Andrews	7383cc9de4	Forgot to undo my test edits because I am a big dum-dum	2016-11-13 17:06:00 -06:00
Phillip Andrews	59eba1dede	Changed tabs to spaces, oops	2016-11-13 16:59:36 -06:00
Phillip Andrews	86b4673539	Removed math constants in openmw-cs, which are apparently not going to be used	2016-11-13 16:43:07 -06:00
Phillip Andrews	a1225ff4ec	Additional MSVC library dependencies	2016-11-13 14:34:12 -06:00
Phillip Andrews	1861302dbd	Include various libraries for Visual Studio environment	2016-11-13 14:27:59 -06:00
scrawl	02b9e81f89	Merge pull request #1127 from Allofich/warnings ... Fix shadowing warnings	2016-11-13 20:49:26 +01:00
scrawl	233c9e37b0	Merge pull request #1128 from MiroslavR/Woverloaded-virtual ... Fix overloaded virtual function warning	2016-11-13 20:49:14 +01:00
Phillip Andrews	2efd38b1ab	Fix install procedure so it works with all MSVC build configurations, not just Release	2016-11-13 13:32:42 -06:00
MiroslavR	175cfd4dff	Fix overloaded virtual function warning	2016-11-13 17:22:50 +01:00
Allofich	3420121c3f	Fix shadowing warnings	2016-11-13 23:20:51 +09:00
scrawl	5658817581	Merge pull request #1126 from Allofich/waterwalking ... Don't allow resting on water with water walking	2016-11-13 13:58:26 +01:00
Allofich	fee39afe38	Don't allow resting on water with water walking	2016-11-13 19:50:33 +09:00
scrawl	f0d5cf7afb	Merge pull request #1112 from Assumeru/waterwalking ... Move actors out of the water if there's room for them. Fixes #1138	2016-11-10 19:02:51 +01:00
Assumeru	05cc258ed3	Start trace from collision object origin	2016-11-10 15:38:14 +01:00
Bret Curtis	02d859e298	minor fix to remove Index:, it isn't necessary	2016-11-10 10:50:43 +01:00
Bret Curtis	1ffdd2dd0f	Merge pull request #1125 from lysol90/master ... Further updating of normal map conversion documentation	2016-11-10 10:44:40 +01:00
Joakim Berg	303fe013ea	Update convert_bump_mapped_mods.rst	2016-11-09 22:51:27 +01:00
Joakim Berg	e957e2b3cc	Update convert_bump_mapped_mods.rst ... Ok, so another update then. Sorry for another one so soon after the first PR, but I think (or hope) that this will be the last edit for some time. It looks good to me now. ´ Mainly, I changed changed some "=" headers to "-", and while at it, I fixed some typing errors and just edited some text to read better.	2016-11-09 22:47:39 +01:00
Bret Curtis	a1c1db467e	Merge pull request #1124 from lysol90/master ... Create convert_bump_mapped_mods.rst	2016-11-09 21:32:45 +01:00
Assumeru	99bc4f733f	Trace up to waterlevel + halfextent	2016-11-09 18:03:10 +01:00
Joakim Berg	d7bf2b9e85	Update index.rst ... Added convert_bump_mapped_mods to the table of contents.	2016-11-09 15:56:07 +01:00
Joakim Berg	3ee28bfeac	Update convert_bump_mapped_mods.rst ... This should be correct according to the style-guide. Well, except for the British/American spelling. I need a Brit and/or an American to confirm that.	2016-11-09 15:47:50 +01:00
Joakim Berg	1b8cfee5eb	Update convert_bump_mapped_mods.rst	2016-11-09 15:38:49 +01:00
lysol90	2d48c38d0d	Create convert_bump_mapped_mods.rst ... A tutorial to how normal mapping works with different mods in Morrowind and how they work in OpenMW. It also covers how to convert the mods made for Morrowind to be used with OpenMW.	2016-11-09 13:14:50 +01:00
scrawl	92d42ef49b	Merge pull request #1123 from Allofich/warnings ... Fix dereference of null pointer warning	2016-11-07 22:22:32 +01:00
scrawl	4f8bfb7702	Merge pull request #1122 from MiroslavR/slow-repair ... Improve performance of repairing/recharging	2016-11-07 22:16:11 +01:00
Allofich	c7313606f5	Fix dereference of null pointer warning	2016-11-07 22:39:20 +09:00
MiroslavR	e80636f0ca	Improve performance of repairing/recharging (Fixes #2493)	2016-11-06 11:01:46 +01:00
scrawl	7af1e09151	Merge pull request #1120 from nikolaykasyanov/osx-link-libz ... Link OpenMW with libz on macOS explicitly	2016-11-05 15:43:23 +01:00
Nikolay Kasyanov	3adf4cb97f	Link OpenMW with libz on macOS	2016-11-05 12:18:22 +01:00
Nikolay Kasyanov	0115a3a874	Revert "Link OpenMW with libz on macOS" ... This reverts commit 0c4dd05118.	2016-11-05 12:11:04 +01:00
Nikolay Kasyanov	0c4dd05118	Link OpenMW with libz on macOS	2016-11-05 12:09:47 +01:00
scrawl	d8b506155e	Merge pull request #1118 from MiroslavR/resize-perf ... Fix horrible performance when resizing/moving the settings window	2016-11-04 20:24:27 +01:00
scrawl	681efdb6ca	Merge pull request #1119 from nikolaykasyanov/use-local-config-path-in-launcher ... Use local config path from configuration manager in the launcher	2016-11-01 21:48:28 +01:00
Nikolay Kasyanov	5d4734c02e	Use local path from configuration manager to load openmw.cfg in launcher	2016-11-01 21:27:35 +01:00
Nikolay Kasyanov	224d7f27b0	Revert "Use local path from configuration manager to load openmw.cfg in launcher" ... 89e85a6acf	2016-11-01 21:19:27 +01:00
Nikolay Kasyanov	89e85a6acf	Use local path from configuration manager to load openmw.cfg in launcher	2016-11-01 21:14:24 +01:00
MiroslavR	5cd04af3fa	Fix horrible performance when resizing/moving the settings window ... Resize widgets instead of reconstructing them.	2016-11-01 16:37:00 +01:00
scrawl	d073999340	Merge pull request #1117 from nikolaykasyanov/fix-osx-ci ... Fix & reenable OS X CI	2016-10-30 23:27:57 +01:00
Nikolay Kasyanov	cf2e59c983	[OS X] Use Qt 5.5 on CI ... Newer Qt versions require C++11.	2016-10-30 21:36:43 +01:00
Nikolay Kasyanov	c99d9a47e8	[OS X] Reenable CI	2016-10-30 21:36:43 +01:00
scrawl	e0f613661e	Fix char -> int, fix shadowing warning	2016-10-30 20:10:33 +01:00
scrawl	cac8de0b29	Merge pull request #1116 from Allofich/paused ... Don't update ripple simulation when paused	2016-10-30 19:26:56 +01:00
scrawl	e5cb7306c3	Merge pull request #1115 from Allofich/conversion ... Fix narrowing conversion warning	2016-10-30 19:26:51 +01:00