2882 commits

Author	SHA1	Message	Date
David Cernat	ac82124a5d	Merge pull request #395 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwmechanics/actors.cpp	2018-03-29 07:28:30 +03:00
RoadTrain	d626d89c49	OpenMW-CS: Fix a typo in startup warning.	2018-03-19 00:50:50 +03:00
David Cernat	ecb0ad0d77	Merge pull request #359 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml	2017-12-25 02:03:02 +02:00
Miloslav Číž	01f9d90315	CS: Reorder 3D input menu	2017-12-15 17:22:32 +01:00
Miloslav Číž	13dc1bd41e	CS: Add tooltip to camera-ortho-size preference	2017-12-15 14:56:03 +01:00
Miloslav Číž	1f5feeddb9	CS: Change camera parameter types to int	2017-12-15 14:46:23 +01:00
Miloslav Číž	f2777f7242	CS: Mover object-marker-alpha under Rendering	2017-12-15 14:36:12 +01:00
Miloslav Číž	79527b746a	Remove unused variable	2017-12-14 17:29:24 +01:00
Miloslav Číž	b246580c63	Fix orbit camera axis	2017-12-13 20:08:38 +01:00
Miloslav Číž	e309dfd234	CS: Rename variables (AppVeyor fix)	2017-12-08 22:06:03 +01:00
Miloslav Číž	199e41833f	Merge branch 'master' into cs-cam	2017-12-08 20:56:05 +01:00
Miloslav Číž	d85f8deaa3	CS: Add fixed roll setting, plus ortho fix	2017-12-08 20:51:40 +01:00
Miloslav Číž	1b77e3ed62	CS: Add ortho camera setting	2017-12-08 18:18:27 +01:00
Miloslav Číž	bfad5ebde4	CS: Fix camera orbit control with keys	2017-12-08 17:42:20 +01:00
Miloslav Číž	5e076ee015	CS: Fix camera orbit with arbitrary roll	2017-12-08 00:19:05 +01:00
Miloslav Číž	cfdc6c788e	CS: Make camera FOV change dynamically	2017-12-08 00:05:50 +01:00
Miloslav Číž	7d36dd68dc	CS: Make orbit camera not change roll	2017-12-07 23:52:05 +01:00
Miloslav Číž	360d786ff2	CS: Add rendering prefs and camera FOV	2017-12-07 23:48:34 +01:00
David Cernat	e7f20e7daf	Merge pull request #351 from OpenMW/master while resolving conflicts ... # Conflicts: # CMakeLists.txt # README.md	2017-11-30 10:06:38 +02:00
scrawl	a4d8aef40d	Merge branch openmw-43 into master ... Conflicts: CMakeLists.txt README.md files/mygui/openmw_trade_window.layout	2017-11-29 22:37:50 +00:00
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
Alexander "Ace" Olofsson	3e51c9e6b3	Missed the OpenCS config file	2017-10-24 23:23:55 +02: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