3671 commits

Author	SHA1	Message	Date
scrawl	d47090b312	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2013-02-09 16:40:10 +01:00
Marc Zinnschlag	f19fbaa293	Merge remote-tracking branch 'mark76/multiple_esm_esp' into next	2013-02-09 15:30:29 +01:00
Marc Zinnschlag	2d937cd9e2	Merge branch 'gmst' into next	2013-02-09 15:26:25 +01:00
Marc Zinnschlag	d40ee06897	fixed base/modified logic	2013-02-09 15:25:50 +01:00
Mark Siewert	55bd9eef66	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-02-09 13:03:35 +01:00
Mark Siewert	eefbdde6de	- For pull request: remove all instances of maps used to track refnumbers. ... - new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.	2013-02-09 13:00:57 +01:00
scrawl	6805c7bab4	Merge branch 'master' into graphics	2013-02-08 18:35:41 +01:00
Marc Zinnschlag	828695f295	added value column to gmst table	2013-02-08 14:48:38 +01:00
Marc Zinnschlag	cce2d63433	added type column to gmst table	2013-02-08 12:20:03 +01:00
Marc Zinnschlag	d5dd0640c7	basic gmst support	2013-02-08 09:58:19 +01:00
Marc Zinnschlag	dd2b7d5c63	handle deleted records	2013-02-07 13:26:00 +01:00
Marc Zinnschlag	c1cd8305bc	a bit of cleanup for the previous commit	2013-02-07 13:13:06 +01:00
Marc Zinnschlag	21733e8181	hide startup dialogue when opening open dialogue	2013-02-07 13:11:41 +01:00
Marc Zinnschlag	adcaea464b	basic globals record loading	2013-02-07 12:52:01 +01:00
Marc Zinnschlag	7d112e4d5c	rewrote logic of content file loading	2013-02-07 11:33:08 +01:00
Marc Zinnschlag	43912f927a	Merge remote-tracking branch 'potatoesmaster/importer' into next ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-02-06 10:12:40 +01:00
Emanuel Guevel	a4f051e85a	Fix game files import	2013-02-06 00:51:05 +01:00
Emanuel Guevel	6e3c016351	Add archives to settings imported by mwiniimporter ... Add Morrowind.bsa by default.	2013-02-06 00:51:05 +01:00
scrawl	86d65519e3	Settings window fix	2013-02-05 23:57:30 +01:00
Michal Sciubidlo	347a734364	Move OpenDialog to editor and use it in startup dialogue. ... Remove debug output from DataFilesList.	2013-02-05 22:06:36 +01:00
Michal Sciubidlo	f7e5ea24f4	Merge branch 'startup' into cs_load. ... Fix include in textinputdialog.cpp.	2013-02-05 21:23:49 +01:00
scrawl	608c112f34	Supply the new render window to mygui	2013-02-05 20:48:25 +01:00
scrawl	31f760ccce	Fixing issues from last commit: restored input and occlusion queries	2013-02-05 20:26:13 +01:00
scrawl	c4d518132f	With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.	2013-02-05 19:22:08 +01:00
scrawl	499f3ac0d1	Slightly better ripple normal blending. Not physically accurate at all, but looks good.	2013-02-05 16:40:41 +01:00
scrawl	3772cd9257	Refraction can be disabled separately now	2013-02-05 14:29:46 +01:00
Marc Zinnschlag	c409f1184e	cleaned up object movement and fixed a bug regarding local scripts	2013-02-05 12:19:06 +01:00
Marc Zinnschlag	86fb3574a0	Merge remote-tracking branch 'wheybags/master' into next	2013-02-05 11:55:47 +01:00
scrawl	a29919d02d	restored global map	2013-02-05 00:39:56 +01:00
scrawl	35b5fdab5d	Merge branch 'terrainfix' into graphics	2013-02-05 00:28:59 +01:00
scrawl	09180666b2	Merge branch 'master' of git://github.com/zinnschlag/openmw into terrainfix	2013-02-05 00:21:42 +01:00
scrawl	58cf182db2	better place for syncing	2013-02-05 00:21:29 +01:00
scrawl	bb1f23875d	Merge branch 'terrainfix' into graphics	2013-02-04 23:16:11 +01:00
scrawl	596628d339	Fix terrain derived data update (bug 534, bug 544)	2013-02-04 23:13:01 +01:00
Michal Sciubidlo	66ec4ca7d9	Split launcher specific code from DataFilesList back to DataFilesPage.	2013-02-04 22:14:14 +01:00
scrawl	0f37c24d5f	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-04 21:55:41 +01:00
scrawl	bf037b7d29	Removed problematic ModVertexAlpha method, now done in shader	2013-02-04 18:03:03 +01:00
Marc Zinnschlag	ba0d13fc12	moved code for creating new base content records into the Document class	2013-02-04 13:50:38 +01:00
Marc Zinnschlag	4c973a0f67	constructing documents from a file list instead of a single name	2013-02-04 13:46:54 +01:00
Marc Zinnschlag	3f0a49a2f6	Merge branch 'master' into startup ... Conflicts: apps/opencs/CMakeLists.txt	2013-02-04 10:22:37 +01:00
scrawl	fa07288b15	tweaked map light color	2013-02-03 20:29:50 +01:00
scrawl	5cc8af0f14	fix map positions	2013-02-03 20:06:03 +01:00
scrawl	a44dfcd2ac	Now that refraction is separated out, we don't have to worry about rendering order. Should fix transparency blending issues around water (eg waterfalls) for good.	2013-02-03 19:28:31 +01:00
scrawl	109d0a942f	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-03 19:02:57 +01:00
scrawl	979a874220	Fixed the custom near clip planes	2013-02-03 19:01:59 +01:00
scrawl	5334934612	Listen to render window updates and properly activate/deactivate occlusion queries pre/post update.	2013-02-03 18:03:09 +01:00
Mark Siewert	3e43db5f76	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-02-03 16:14:41 +01:00
scrawl	15e51b76de	Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth	2013-02-03 15:46:23 +01:00
Tom Mason	ac112ef972	refactored special variable code	2013-02-03 13:27:27 +00:00
Marc Zinnschlag	c97553703a	fixes for static build without cg	2013-02-03 13:47:55 +01:00