9442 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Marek Kochanowicz	56be62b956	small reformatting	2014-02-15 13:23:51 +01:00
Marek Kochanowicz	4ee90c24e5	more readable code.	2014-02-15 13:22:14 +01:00
Marc Zinnschlag	4e04131957	fixing case broke sorting in script context	2014-02-15 13:09:43 +01:00
Marc Zinnschlag	2130ec39d6	disable warnings by default in script verifier	2014-02-15 12:58:34 +01: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
Marek Kochanowicz	b1f63947e8	Checking if the drop comes from same document.	2014-02-15 12:40:07 +01:00
Marek Kochanowicz	d6820b977e	store const ref to the document in the table.	2014-02-15 12:22:32 +01:00
Marek Kochanowicz	f3dc45f1ec	long line split.	2014-02-14 15:29:10 +01:00
Marek Kochanowicz	37d262b147	Splited very long line.	2014-02-14 15:12:34 +01:00
Marc Zinnschlag	7b8802588e	Merge remote-tracking branch 'sirherrbatka/DragDrop'	2014-02-14 14:28:30 +01:00
Marek Kochanowicz	aafde926d3	Documentation, corrections.	2014-02-14 14:04:36 +01:00
Marc Zinnschlag	e17af4231a	added script verifier	2014-02-14 13:38:30 +01:00
Marc Zinnschlag	0ff744c2ff	fixed CSMWorld::ScriptContext::isJournalId	2014-02-14 12:56:05 +01:00
gus	a315d5cc2b	aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp	2014-02-14 12:55:14 +01:00
Marek Kochanowicz	13c4c71995	reformating	2014-02-14 12:54:51 +01:00
Marek Kochanowicz	ae418f2538	nicer formatting	2014-02-14 12:51:50 +01:00
Marc Zinnschlag	0a8ffbfb1d	added missing implementation for CSMWorld::ScriptContext::getMemberType	2014-02-14 12:46:54 +01:00
Marek Kochanowicz	ace4252013	nicer formatting	2014-02-14 12:46:15 +01:00
Marc Zinnschlag	d213c6c36a	fixed a constness-issue	2014-02-14 12:23:00 +01:00
Marc Zinnschlag	910d62e4b8	added missing implementation for CSMWorld::ScriptContext::getGlobalType	2014-02-14 11:59:33 +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
Emanuel Guevel	7c981587fc	When searching object by id, search in active cells before searching in the player's inventory	2014-02-13 22:58:12 +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
Emanuel Guevel	e597328b6b	Make enable/disable a no-op for items in containers	2014-02-13 20:24:27 +01:00
Marek Kochanowicz	40cc108e54	drag and drop works.	2014-02-13 20:19:51 +01:00
Marek Kochanowicz	1bcc6d6918	using new icon.	2014-02-13 19:14:17 +01:00
Marek Kochanowicz	2afe3f3e57	Introduced multitype icon.	2014-02-13 19:00:35 +01:00
Nikolay Kasyanov	58add97676	Merge branch 'master' into osx-ogre-19 ... Conflicts: CMakeLists.txt	2014-02-13 20:34:06 +04:00
Marek Kochanowicz	6662560cbc	new displays for referencable table columns	2014-02-13 15:43:19 +01: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
Marc Zinnschlag	e9238b456d	use case-insensitive sorting in columns	2014-02-13 15:01:10 +01:00
Marc Zinnschlag	309573a3ac	allow the use of the keyword end as a variable name in an expression	2014-02-13 14:15:48 +01:00
Marek Kochanowicz	09d3c7a446	Attempt to match types. Does not work at the moment.	2014-02-13 13:54:09 +01:00