1574 commits

Author	SHA1	Message	Date
scrawl	c8c0e5de38	Fixed code issues found with unity build. Missing include guards, duplicated functions, ...	2014-03-16 23:49:06 +01:00
scrawl	b0a1e1198a	Yet another terrain fix	2014-03-16 16:30:17 +01:00
scrawl	a9dcc90970	Another terrain fix	2014-03-09 11:59:23 +01:00
scrawl	b8ca067730	Small fix for terrain	2014-03-09 03:21:34 +01:00
Marc Zinnschlag	f1353dc84f	Merge branch 'scene'	2014-03-06 16:46:44 +01:00
scrawl	d0f98103e4	Terrain: re-added "distant land=off" path ... Still a hack, but the overhead of building and traversing the quad tree appears negligible.	2014-03-06 03:04:23 +01:00
scrawl	1d926816b5	Terrain: background load blendmaps & layer textures. Refactor QuadTree update.	2014-03-05 21:46:37 +01:00
scrawl	4328e08162	Terrain: get rid of unneeded members	2014-03-05 21:46:37 +01:00
scrawl	6a002d19b3	Terrain: destroy no longer used materials	2014-03-05 21:46:37 +01:00
scrawl	97c3efb3ba	Terrain: decoupled Chunk from QuadTreeNode.	2014-03-05 21:46:37 +01:00
scrawl	edb5a54092	Include some more required Ogre headers explicitely.	2014-03-05 21:46:37 +01:00
scrawl	195071efc7	Terrain: geometry is now loaded in background threads. ... TODO: background load layer textures and blendmaps. "Distant land" setting has been removed for now (i.e. always enabled).	2014-03-05 21:46:37 +01:00
scrawl	b3fed853ae	Terrain: take cell world size into account for LOD selection	2014-03-05 21:46:37 +01:00
scrawl	6c863486e1	Terrain: fix an embarrassing copy&paste mistake.	2014-03-05 21:46:36 +01:00
scrawl	64c9932597	Terrain: remove hard dependency on shiny - can now be compiled without it (fixed function)	2014-03-05 21:46:36 +01:00
scrawl	c9e349f60f	Terrain: support alternate coordinate systems. Get rid of LoadingListener for now	2014-03-05 21:46:36 +01:00
Bret Curtis	ab224f93c9	remove our stdint.h version that uses boost and force usage of system stdint.h	2014-03-05 17:08:58 +01:00
Marc Zinnschlag	f9d2fde783	Merge branch 'openmw-29' ... Conflicts: apps/openmw/mwmechanics/aicombat.cpp	2014-03-04 09:34:38 +01:00
Marc Zinnschlag	6e8b9c88b2	changed name of default worldspace (should reduce chance of a name conflict)	2014-03-02 22:43:15 +01:00
cc9cii	46867ec0cf	Fix file handles being left open on windows builds	2014-03-01 07:24:20 +11:00
cc9cii	2421f23c2f	cleanup the mess...	2014-02-27 23:59:23 +11:00
Marc Zinnschlag	bfcd768078	various bits of cleanup	2014-02-23 21:39:18 +01:00
cc9cii	1ab5948f19	merge upstream changes	2014-02-23 19:11:37 +11:00
Marc Zinnschlag	d780364842	fixed record size type	2014-02-22 17:31:44 +01:00
Marc Zinnschlag	b0ae5b8ab7	Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29	2014-02-22 17:16:55 +01:00
cc9cii	fcfc8fcccb	Revert "Allow MinGW64 compilation in Windows/msys" ... This reverts commit c3f350e3fb. Conflicts: libs/platform/string.h	2014-02-22 23:45:13 +11:00
cc9cii	c241405d91	Fix Windows save & load.	2014-02-22 12:15:20 +11:00
cc9cii	c3f350e3fb	Allow MinGW64 compilation in Windows/msys	2014-02-22 12:06:50 +11:00
Marc Zinnschlag	c5b2c154f8	another esm writer fix	2014-02-20 12:49:56 +01:00
Marc Zinnschlag	72b29ddb79	fix broken esm writer header code	2014-02-20 12:35:57 +01:00
scrawl	1fba5d1bb9	Terrain: change world bounds from AABB to 4 floats	2014-02-19 11:23:03 +01:00
scrawl	90f6cda4cc	Moved includes to appropriate place	2014-02-19 11:23:03 +01:00
Marc Zinnschlag	44f6f79bf5	Merge remote-tracking branch 'corristo/osx-ogre-19'	2014-02-16 17:12:52 +01:00
Marc Zinnschlag	9788bbcab9	partially store creature state in saved game files (only attributes and dynamics for now)	2014-02-16 15:56:36 +01:00
Marc Zinnschlag	b0532e0c85	store NPC state in saved game files	2014-02-16 15:51:45 +01:00
Marc Zinnschlag	9f721fd144	store list of known topics in saved game files	2014-02-16 12:54:27 +01:00
Marc Zinnschlag	6ac64bbe15	Merge branch 'script' ... Conflicts: readme.txt	2014-02-16 12:12:56 +01:00
Nikolay Kasyanov	8f99da084b	OS X: plugins are now in Frameworks dir, not in Plugins	2014-02-16 14:13:12 +04:00
Marc Zinnschlag	0d84adb2c6	allow x->(y) instead of (x->y)	2014-02-15 12:50:40 +01:00
Marc Zinnschlag	fd665a1994	ignore conditions after an else (only works if condition is put in parentheses)	2014-02-15 12:45:50 +01:00
Marc Zinnschlag	d213c6c36a	fixed a constness-issue	2014-02-14 12:23:00 +01:00
Marc Zinnschlag	451e1f413b	instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly	2014-02-14 11:15:16 +01:00
Marc Zinnschlag	e76ef92669	also allow the use of keywords as remote local variables in set statements	2014-02-14 09:06:06 +01:00
Marc Zinnschlag	2086ebe410	fix for inappropriate disable (2nd attempt)	2014-02-14 08:48:26 +01:00
Marc Zinnschlag	b01c6dad37	Revert "allow disable as an alias for getDisabled (in most cases)" ... This reverts commit f7ff4fbd51.	2014-02-14 08:29:18 +01:00
Nikolay Kasyanov	c2fe0d480a	Merge remote-tracking branch 'upstream/master' into osx-ogre-19 ... Conflicts: CMakeLists.txt	2014-02-14 00:04:16 +04:00
Marc Zinnschlag	053b3dc371	Merge branch 'openmw-28' ... Conflicts: CMakeLists.txt	2014-02-13 20:57:28 +01:00
Nikolay Kasyanov	58add97676	Merge branch 'master' into osx-ogre-19 ... Conflicts: CMakeLists.txt	2014-02-13 20:34:06 +04:00
Marc Zinnschlag	f7ff4fbd51	allow disable as an alias for getDisabled (in most cases)	2014-02-13 15:31:07 +01:00
Marc Zinnschlag	d6e212a02b	Merge branch 'master' into script	2014-02-13 15:02:02 +01:00