11849 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Marek Kochanowicz	9213067aee	created new branch as a simple solution to the /manual branch mess	2014-10-18 13:46:11 +02:00
scrawl	bf0669e18c	Ignore some extra string arguments to ShowMap (Fixes #2029) ... Required for a dialogue result script in Morrowind.esm ("ShowMap Dren Plantation"). This must do the same as "ShowMap Dren", which actually does work properly, since ShowMap supports partial string matching.	2014-10-18 00:56:41 +02:00
scrawl	841d52f1f7	Disable travis IRC spam until the OSX build is fixed	2014-10-18 00:02:12 +02:00
scrawl	deabc52c16	Treat "Root Bone" as the animation root if existing (Fixes #2019)	2014-10-17 23:29:59 +02:00
scrawl	5892fd9e65	Fix NpcAnimation non-existing skeleton crash (Fixes #2028)	2014-10-17 23:07:01 +02:00
scrawl	f117a75747	Force walk animation when flying (Fixes #2015)	2014-10-17 19:11:06 +02:00
scrawl	6d7f4085a5	Add shader implementation of alpha test	2014-10-17 19:11:06 +02:00
scrawl	5f11ccc298	Show tooltip for non-affordable list items (Fixes #2025)	2014-10-17 19:02:31 +02:00
Marc Zinnschlag	49938182e8	silenced a compiler warning regarding null pointer dereferencing	2014-10-17 15:46:07 +02:00
Marc Zinnschlag	a3c894c1e2	Merge branch 'cellmarker'	2014-10-17 14:26:16 +02:00
Marc Zinnschlag	994159fafd	fixed broken iterator	2014-10-17 14:23:37 +02:00
Marc Zinnschlag	8a05c0e5c0	fixed overlay singleton	2014-10-17 14:23:27 +02:00
Marc Zinnschlag	ba46bcad40	Revert "Don't allow viewing non-existent cells from the regionmap." ... This reverts commit 7cdab41501.	2014-10-17 13:52:21 +02:00
Marc Zinnschlag	c97845d35d	better script compiler diagnostics	2014-10-17 10:59:25 +02:00
scrawl	c3ef39eb6f	Fix ItemWidget text cleanup (Fixes #2022)	2014-10-17 02:41:43 +02:00
scrawl	86280df55a	DialInfo: Clear SelectStructs from previous loadings when a record is overwritten (Fixes #2017)	2014-10-16 19:35:20 +02:00
scrawl	c4e81adb83	Fix settings window being too small for all tabs on some localizations	2014-10-16 15:49:01 +02:00
scrawl	c3853b376d	Fix outdated core_layouteditor.xml	2014-10-15 22:48:15 +02:00
cc9cii	7cdab41501	Don't allow viewing non-existent cells from the regionmap.	2014-10-16 07:36:47 +11:00
cc9cii	094f046087	Convert OverlaySystem to a OpenCS style singleton.	2014-10-16 07:29:46 +11:00
scrawl	244db5cbfe	Merge branch 'openmw-33' of https://github.com/OpenMW/openmw into openmw-33	2014-10-15 17:22:53 +02:00
Marc Zinnschlag	984b586bb1	fix for implicit references	2014-10-15 16:27:03 +02:00
Marc Zinnschlag	8afdf0f46b	dagoth fix	2014-10-15 16:12:57 +02:00
scrawl	69bbbefc09	setDynamic workaround for broken endgame scripts (Fixes #2016)	2014-10-15 15:00:45 +02:00
cc9cii	aff6f6fdb2	Setup OverlaySystem after Ogre::Root but before initialisation as per the API documentation.	2014-10-15 18:48:01 +11:00
Marc Zinnschlag	86f5073293	increased version number	2014-10-15 09:12:34 +02:00
cc9cii	5889fd5bd9	Try hard coding OSX paths.	2014-10-15 16:42:05 +11:00
cc9cii	142a825ad6	For OSX support.	2014-10-15 09:51:20 +11:00
cc9cii	1d0ac3b4df	Delete Ogre::OverlaySystem before Ogre::Root	2014-10-15 07:02:19 +11:00
Alexander "Ace" Olofsson	dc788512e2	Fix LNK2019 link error on Visual Studio 2010 builds ... For some reason VS2010 (Haven't tested 2013) is REALLY pedantic about class/struct being two different things when it comes to function signatures	2014-10-14 16:10:19 +02:00
cc9cii	8cebfc411b	Minor visual improvements.	2014-10-14 17:34:10 +11:00
cc9cii	994420aa57	Singleton wrapper for Ogre OverlaySystem.	2014-10-14 13:21:43 +11:00
cc9cii	57b337d368	Fix corruption issue when the initial scenewidget is closed before subsequent ones. Also place the label closer to the terrain height at the center of the cell, should reduce the perception of the label jumping around too much.	2014-10-14 11:43:56 +11:00
Marc Zinnschlag	7d35199396	updated credits file	2014-10-13 19:19:21 +02:00
Marc Zinnschlag	6beee95151	Merge remote-tracking branch 'terrorfisch/aistate'	2014-10-13 19:14:15 +02:00
Marc Zinnschlag	6d37e3e2a8	updated credits file	2014-10-13 19:13:35 +02:00
Marc Zinnschlag	528dcf761d	Merge remote-tracking branch 'internecine/master'	2014-10-13 19:11:14 +02:00
Marc Zinnschlag	e23a32c44f	some cleanup	2014-10-13 15:26:47 +02:00
Marc Zinnschlag	8062faa51a	fixed member variable access in OpenCS script compiler (Fixes #2011)	2014-10-13 15:25:27 +02:00
Marc Zinnschlag	02acf60c0b	added tooltips for scopes in creator bar	2014-10-13 14:24:27 +02:00
cc9cii	961867e39f	Hide overlay if off screen.	2014-10-13 20:58:07 +11:00
cc9cii	313aed078e	Merge remote-tracking branch 'remotes/upstream/master' into QtOgre ... Conflicts: apps/opencs/CMakeLists.txt	2014-10-13 20:45:30 +11:00
Marc Zinnschlag	eb45793eab	Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage'	2014-10-13 11:03:03 +02:00
Marc Zinnschlag	61731d3277	Merge remote-tracking branch 'miroslavr/master'	2014-10-13 10:57:04 +02:00
Marc Zinnschlag	352cbf26c6	Merge remote-tracking branch 'scrawl/master'	2014-10-13 10:53:43 +02:00
cc9cii	6b9b02dc1a	Giving up, revert CMake changes.	2014-10-13 19:31:38 +11:00
cc9cii	0171bde363	Another variation.	2014-10-13 19:15:17 +11:00
cc9cii	c7e57e8d88	Another attempt for osx build.	2014-10-13 18:59:15 +11:00
cc9cii	f29227629a	Experimenting with FindOGRE for osx.	2014-10-13 18:55:30 +11:00
cc9cii	43838ccf01	Remove override (c++11)	2014-10-13 16:42:50 +11:00