9731 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
pvdk	56d537e23d	Added some sanity checking: compare git version with manual version	2014-02-19 14:37:27 +01:00
pvdk	b43325119a	Some changes to the version retrieval: ignore shallow clones	2014-02-19 14:19:08 +01:00
pvdk	85b7240948	Made the git version retrieval more reliable	2014-02-19 13:43:14 +01:00
Marek Kochanowicz	d7a1abb30b	emit signal with types (will be connected to the tablesubview)	2014-02-19 12:55:39 +01:00
Marek Kochanowicz	dd95ed8e4c	Accept drops on the filterbox	2014-02-19 12:32:48 +01:00
Marek Kochanowicz	569533eeae	Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop	2014-02-19 11:23:53 +01:00
scrawl	d25b3ad9cb	Fix AiCombat for creatures with weapons	2014-02-19 11:23:03 +01:00
scrawl	ebc67a82cf	Don't list unnamed quests in the quest book	2014-02-19 11:23:03 +01:00
scrawl	1fba5d1bb9	Terrain: change world bounds from AABB to 4 floats	2014-02-19 11:23:03 +01:00
scrawl	bc376e6649	Closes #888: Treat "Bip 01" as animation root if existing	2014-02-19 11:23:03 +01:00
scrawl	439018e706	Get rid of useless return values	2014-02-19 11:23:03 +01:00
scrawl	90f6cda4cc	Moved includes to appropriate place	2014-02-19 11:23:03 +01:00
scrawl	ae5d25ac58	FindSDL.cmake is unused	2014-02-19 11:23:03 +01:00
Marek Kochanowicz	e9664d80bd	make convert enumns public static	2014-02-19 11:22:47 +01:00
Marc Zinnschlag	550e5eb686	Merge remote-tracking branch 'corristo/osx-music-fix'	2014-02-18 09:12:02 +01:00
gus	d8f24ac499	bug fix	2014-02-17 15:49:49 +01:00
Marc Zinnschlag	ea16f79d77	Merge remote-tracking branch 'gus/AIFix2'	2014-02-17 10:54:07 +01:00
gus	84959eea28	woops, thanks scrawl	2014-02-17 10:50:10 +01:00
gus	6e1425321b	remove cout spam	2014-02-17 10:43:09 +01:00
gus	e5b19cf3c6	clean up	2014-02-17 10:37:11 +01:00
Marc Zinnschlag	02c6c65705	Merge remote-tracking branch 'sirherrbatka/DragDrop'	2014-02-17 09:55:50 +01:00
Marek Kochanowicz	2bb9e47507	Improvements.	2014-02-17 08:58:55 +01:00
Nikolay Kasyanov	51fb9f65ea	#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()	2014-02-17 02:59:23 +04:00
Nikolay Kasyanov	5e8cb2e466	Another attempt to fix #1041. This time I'm sending real data from decoder ... once after playback started.	2014-02-17 02:35:13 +04:00
Marek Kochanowicz	e1a0f60041	allow _foo ids without qoute	2014-02-16 20:26:22 +01:00
Marek Kochanowicz	b83817e05e	May only include alphanumeric characters and underscores and may not start with a number.	2014-02-16 20:18:28 +01:00
Marek Kochanowicz	3cc23a9cb3	very basic, but safe putting down " "	2014-02-16 18:41:42 +01:00
Nikolay Kasyanov	4e28fd85a3	Fixed build on OS X	2014-02-16 20:22:46 +04:00
Marc Zinnschlag	44f6f79bf5	Merge remote-tracking branch 'corristo/osx-ogre-19'	2014-02-16 17:12:52 +01:00
Marc Zinnschlag	c18c3e51ee	handle IDs that don't exist anymore after loading	2014-02-16 16:23:05 +01:00
Nikolay Kasyanov	4a61868521	OS X: fixed Ogre plugin packaging	2014-02-16 19:01:28 +04: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	e4017b8bfe	It seems that OctreeSceneManager is not required anymore	2014-02-16 14:16:45 +04:00
Nikolay Kasyanov	8f99da084b	OS X: plugins are now in Frameworks dir, not in Plugins	2014-02-16 14:13:12 +04:00
Nikolay Kasyanov	3c281c6a62	OS X: specify path to framework binary, not to framework directory	2014-02-16 14:12:45 +04:00
Marek Kochanowicz	17af865a9f	checking for the source of the drop, reject those from other files for now	2014-02-16 09:51:33 +01:00
Marc Zinnschlag	9cdfca6c26	Merge remote-tracking branch 'potatoesmaster/disable-crash'	2014-02-15 22:55:00 +01:00
Marek Kochanowicz	cbe1fe2f95	removed misplaced bracket	2014-02-15 22:38:59 +01:00
Marek Kochanowicz	45d9364195	Put the id in the quote.	2014-02-15 22:14:27 +01:00
Marek Kochanowicz	ec8c8a9d88	-journalinfo +topic	2014-02-15 22:05:42 +01:00
Marek Kochanowicz	41606a67e4	implemented whitelist of allowed types in the scripts	2014-02-15 20:49:09 +01:00
Marek Kochanowicz	930b77e60a	allow drag and drop into the script edit window.	2014-02-15 19:52:40 +01:00
Marc Zinnschlag	01a7918124	Merge remote-tracking branch 'potatoesmaster/selected-spell'	2014-02-15 18:38:10 +01:00
Marek Kochanowicz	97fe5465bf	created new files	2014-02-15 17:55:18 +01:00
Emanuel Guevel	3d8ca02479	Fix breaking of enchanted items casting	2014-02-15 17:39:57 +01:00
Marc Zinnschlag	0afa61eed5	fixed referenceable-loading in case of more than one content file	2014-02-15 15:50:17 +01:00
Marc Zinnschlag	2007a3e902	improved script check error messages	2014-02-15 13:25:38 +01:00