2804 commits

Author	SHA1	Message	Date
David Cernat	b64f379949	Merge pull request #286 from OpenMW/master while resolving conflicts ... # Conflicts: # CMakeLists.txt # apps/openmw/mwmechanics/actors.hpp	2017-09-04 18:05:24 +03:00
Thunderforge	e0ffc94f3e	Fix OpenMW-CS internal name	2017-09-02 18:07:12 -05:00
David Cernat	4468e6ec4a	Merge pull request #280 from OpenMW/master while resolving conflicts ... # Conflicts: # .gitignore # apps/openmw/mwmechanics/actors.hpp # apps/openmw/mwmechanics/mechanicsmanagerimp.cpp	2017-08-31 15:14:13 +03:00
scrawl	4fba157d3b	Implement releaseGLObjects for cached resources	2017-08-26 19:29:12 +00:00
Marc Zinnschlag	91f674bb6f	Merge remote-tracking branch 'aesylwinn/master'	2017-08-25 10:24:17 +02:00
Kyle Cooley	a8576d78ad	Change default topic info values	2017-08-24 13:51:53 -04:00
Kyle Cooley	42b948dffe	Fix pathgrid segfault	2017-08-23 11:35:26 -04:00
Kyle Cooley	157ecb166c	Fix wrong folder name	2017-08-23 00:02:02 -04:00
Kyle Cooley	d3d04171f9	Fix seg fault, undo changes BsaArchive	2017-08-22 15:06:56 -04:00
Kyle Cooley	8c4b12a603	VFS changes, one VFS and resource system per document. ... Added ability to reset a VFS::Manager. Removed ability to rebuild the index for a VFS::Manager. Moved VFS creation to CSM::Data.	2017-08-21 22:31:19 -04:00
Kyle Cooley	979b0d7211	Code cleanup and more cache clearing	2017-08-21 18:58:38 -04:00
Kyle Cooley	3b9326d238	Clear terrain cache and reload terrain	2017-08-20 22:34:41 -04:00
Kyle Cooley	d4a722067d	Reload water	2017-08-20 20:55:56 -04:00
Kyle Cooley	d7744e8b16	A bit of cleanup	2017-08-20 19:07:23 -04:00
Kyle Cooley	5950b26912	Update scene assets	2017-08-19 19:36:45 -04:00
Kyle Cooley	742bd00ec6	Clear cached resources	2017-08-19 15:26:46 -04:00
Kyle Cooley	d31ed83b54	Preliminary asset reloading	2017-08-19 03:43:31 -04:00
Kyle Cooley	249c1ae95a	Fix orbit camera jumping back to old position	2017-08-13 19:26:32 -04:00
David Cernat	690f7dc7df	Merge pull request #251 from OpenMW/master ... Add OpenMW commits up to 27 Jul 2017, part 2	2017-07-27 20:55:56 +03:00
Rob Cutmore	3f2cd9b669	Editor: Do color to int conversion in ColorEditor	2017-07-26 19:56:54 -04:00
Rob Cutmore	c7241c692f	Editor: Do int to color conversion in ColorEditor	2017-07-26 19:43:37 -04:00
Rob Cutmore	3fb7c42845	Editor: Use colour field for cell map colour	2017-07-25 19:11:47 -04:00
Rob Cutmore	0082f5a2dc	Editor: fix handling of colour columns ... Colours are stored as ints in the backend but the conversion from QColor to int was broken.	2017-07-25 19:11:47 -04:00
David Cernat	3d1458b5a2	Merge pull request #246 from OpenMW/master ... Add OpenMW commits up to 24 Jul 2017	2017-07-24 20:21:04 +03:00
PlutonicOverkill	16be1e1a84	Fix occurrence highlighting preferences panel	2017-07-23 20:29:42 +12:00
David Cernat	fa3baac0f3	Merge pull request #228 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/main.cpp	2017-06-18 18:16:10 +03:00
Bret Curtis	c781d1f8ed	purge unnecessary imports ... add fstream back add fstream back add fstream back add fstream back add fstream back add fstream back add fstream back	2017-06-09 19:08:53 +02:00
Bret Curtis	d48b829b45	replace and purge boost::lexical_cast	2017-06-09 19:08:53 +02:00
Bret Curtis	d97aa9152b	remove more unused imports, including boost headers	2017-06-09 19:08:53 +02:00
Bret Curtis	39185e6f8c	purge the rest of boost::shared and any other boost related things that no longer are required ... put boost system back in, clean others up revert Qt add back boost fstream	2017-06-09 19:08:53 +02:00
Ewan Higgs	38a2de3c51	convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis	2017-06-09 16:49:25 +02:00
David Cernat	da22639620	Merge pull request #216 from OpenMW/master ... Add OpenMW commits up to 12 May 2017	2017-05-14 05:26:22 +03:00
PlutonicOverkill	5ec97811d8	Don't switch pages when right-clicking on list	2017-05-12 20:22:18 +12:00
PlutonicOverkill	7281e8b888	Remove C++11 features	2017-05-12 12:48:25 +12:00
PlutonicOverkill	cd75c5618c	Move context menu code to PageBase	2017-05-11 19:46:51 +12:00
PlutonicOverkill	16f8341de3	Prevent context menu appearing for modifier settings	2017-05-10 21:24:12 +12:00
PlutonicOverkill	c2f427f48d	Prevent context menu appearing when right-clicking shortcut setting	2017-05-10 20:43:52 +12:00
PlutonicOverkill	646ff72cdc	Add a more elegant way of showing the context menu	2017-05-10 20:27:50 +12:00
PlutonicOverkill	bd9f657603	Show context menu when user clicks on empty space	2017-05-10 19:51:43 +12:00
PlutonicOverkill	30af92f575	Fix pointer initialisation bug	2017-05-09 20:58:32 +12:00
PlutonicOverkill	4879405097	Add reset context menu for key binding pages	2017-05-09 19:58:34 +12:00
PlutonicOverkill	3545cfa00a	Rewrite feature to reset options to default	2017-05-09 19:50:16 +12:00
PlutonicOverkill	f30d1a3075	Revert everything	2017-05-08 17:24:28 +12:00
PlutonicOverkill	a9760ec805	Fix indenting	2017-05-07 17:07:58 +12:00
PlutonicOverkill	d8a711f89f	Fix tabs	2017-05-07 17:05:50 +12:00
PlutonicOverkill	477af73ad6	Missed another one	2017-05-07 17:00:26 +12:00
PlutonicOverkill	418aeb65f1	Remove unneeded dependencies	2017-05-07 16:58:15 +12:00
PlutonicOverkill	5fca37d0c8	Forgot to remove debugging code	2017-05-07 16:54:38 +12:00
PlutonicOverkill	dff3828710	Keep the settings page in sync with the real settings	2017-05-07 16:51:11 +12:00
PlutonicOverkill	64879c03e4	Add option to reset settings to default	2017-05-06 20:18:31 +12:00