2861 commits

Author	SHA1	Message	Date
David Cernat	22521578eb	Merge pull request #349 from OpenMW/master ... Add OpenMW commits up to 28 Nov 2017	2017-11-29 03:52:15 +02:00
Kyle Cooley	eb23367175	Fix rendering depth/order issues	2017-11-26 17:39:57 -05:00
Kyle Cooley	c8f79ea838	Adjust rotation markers	2017-11-25 20:46:14 -05:00
Kyle Cooley	1cd539bad2	Fix render order for markers	2017-11-10 02:06:06 -05:00
Kyle Cooley	556117f6e6	Update marker transparency when changed.	2017-11-10 01:56:06 -05: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
Kyle Cooley	492b99b008	Transparent object markers	2017-11-07 00:41:27 -05:00
David Cernat	3a9e5e3a7b	Merge pull request #319 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwworld/worldimp.hpp	2017-10-22 20:27:44 +03:00
Marc Zinnschlag	0b163f0a50	Merge remote-tracking branch 'aesylwinn/forceNewProject'	2017-10-19 14:44:30 +02:00
Marc Zinnschlag	bdabace7e2	Merge remote-tracking branch 'aesylwinn/LLmerge'	2017-10-19 14:24:58 +02:00
Kyle Cooley	6d8666d80d	Force new project file when creating new project	2017-10-18 20:21:44 -04:00
David Cernat	260b3411c3	Merge pull request #317 from OpenMW/master ... Add OpenMW commits up to 18 Oct 2017	2017-10-18 15:13:48 +03:00
AnyOldName3	43e9e955c8	Do the same for the CS	2017-10-18 02:04:48 +01:00
David Cernat	184c5f2b29	Merge pull request #315 from OpenMW/master ... Add OpenMW commits up to 17 Oct 2017	2017-10-17 04:34:46 +03:00
Kyle Cooley	6d7a24224b	Add documentation.	2017-10-16 12:52:13 -04:00
AnyOldName3	654bd401fb	Switch openmw-cs to the escape versions of option types	2017-10-16 15:38:17 +01:00
Kyle Cooley	11eae16645	Get rid of duplicate function, fix flag checking	2017-10-14 15:09:12 -04:00
Kyle Cooley	d27071f06a	Fix LTEX import bug.	2017-10-14 13:18:54 -04:00
Kyle Cooley	98c38ad7d1	Merge cleanup.	2017-10-14 13:18:31 -04:00
Kyle Cooley	6d9d98c02c	Merge Land/LandTextures	2017-10-14 11:32:42 -04:00
David Cernat	3e8d7c8416	Merge pull request #306 from OpenMW/master ... Add OpenMW commits up to 7 Oct 2017	2017-10-07 21:54:21 +03:00
Kyle Cooley	b14404e9cc	Fix region colors	2017-10-06 20:05:06 -04:00
David Cernat	38247ff086	Merge pull request #303 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwbase/dialoguemanager.hpp # apps/openmw/mwdialogue/dialoguemanagerimp.hpp # apps/openmw/mwgui/container.cpp # apps/openmw/mwgui/windowmanagerimp.cpp # apps/openmw/mwscript/dialogueextensions.cpp	2017-10-06 04:10:04 +03:00
Marc Zinnschlag	dd17f70068	Merge remote-tracking branch 'aesylwinn/landrecords'	2017-10-03 13:32:02 +02:00
Kyle Cooley	2f5449a68c	Remove now unnecessary overrides.	2017-10-02 16:13:40 -04:00
Kyle Cooley	137ea872d3	Hide base land textures.	2017-10-02 15:56:22 -04:00
Kyle Cooley	dfcbee3ab1	Ignore case when comparing textures, also add new textures to lookup map.	2017-09-30 00:04:52 -04:00
Kyle Cooley	1fe1ec63c4	Fix Qt4 build	2017-09-22 23:33:50 -04:00
Kyle Cooley	3981f79d38	Change flag for base land textures	2017-09-22 22:59:50 -04:00
Kyle Cooley	054e6a780e	Use map for texture lookup.	2017-09-22 22:43:45 -04:00
Kyle Cooley	4921e7f5c1	Get rid of reinterpret cast.	2017-09-22 22:42:09 -04:00
David Cernat	4d4eb1bb9f	Merge pull request #292 from OpenMW/master ... Add OpenMW commits up to 18 Sep 2017	2017-09-19 09:40:45 +03:00
Marc Zinnschlag	e6caacec04	Merge remote-tracking branch 'plutonicoverkill/pref-pane-width'	2017-09-18 10:19:21 +02:00
Kyle Cooley	50d9d9f78f	Get rid of some templates, exceptions instead of assert, and other small changes.	2017-09-17 20:29:51 -04:00
PlutonicOverkill	5e60fb7c10	Fix preferences pane width	2017-09-17 21:09:28 +12:00
David Cernat	bd541b1e5b	Merge pull request #287 from OpenMW/master while resolving conflicts ... # Conflicts: # CMakeLists.txt # apps/openmw/CMakeLists.txt	2017-09-12 07:38:49 +03:00
scrawl	bd667c3847	Merge pull request #1435 from AnyOldName3/cmake-vs-debugging-dir ... If CMake supports it, sets the debugger working directory for Visual …	2017-09-11 10:30:50 +00:00
Marc Zinnschlag	9a8a4c744f	Merge remote-tracking branch 'capostrophic/controlplus'	2017-09-11 10:46:34 +02:00
Capostrophic	97ff24b8d6	Change ctl to ctrl in OpenMW-CS shortcut manager	2017-09-10 20:48:09 +03:00
Kyle Cooley	25d4a0370f	Changes to land data access in tables, also update Land once per frame in scene view.	2017-09-09 15:37:52 -04:00
Kyle Cooley	d030b595f8	Fix potential segfault, cleanup, get rid of warnings.	2017-09-09 11:48:13 -04:00
Kyle Cooley	72cb405de2	Some bug fixes, changes to land load code.	2017-09-08 21:03:52 -04:00
AnyOldName3	5ce34f1cbf	Move new behaviour into macro to reduce code duplication	2017-09-08 22:17:42 +01:00
Kyle Cooley	2eacc2f093	Changes to land creation, add ability to specifically clear terrain cache	2017-09-08 14:37:03 -04:00
AnyOldName3	3c0ec0d6d0	If CMake supports it, sets the debugger working directory for Visual Studio	2017-09-08 17:26:46 +01:00
Kyle Cooley	ab607f3028	Tweaks to land loading, land cloning, terrain signals, placeholder land update handling	2017-09-08 00:51:46 -04:00
Kyle Cooley	99e90ef808	Cleanup. Also modify ltex index generation.	2017-09-05 19:29:07 -04:00
Kyle Cooley	97d0fd756a	LTEX importing	2017-09-04 19:31:09 -04:00
Kyle Cooley	5c3e90da88	Fix includes	2017-09-04 15:14:42 -04:00