9442 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Marc Zinnschlag	d73097c2e4	Merge remote-tracking branch 'scrawl/master'	2014-02-13 13:13:37 +01:00
gus	7c6e27e4f9	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2 ... Conflicts: apps/openmw/mwmechanics/aitravel.cpp	2014-02-13 12:59:04 +01:00
scrawl	ea90035eca	Enable irc notification for travis	2014-02-13 12:35:33 +01:00
scrawl	1ed1b43296	Enable release branches in Travis CI	2014-02-13 12:30:53 +01:00
scrawl	0fcec24c9b	Remove some bogus dependencies for travis build	2014-02-13 12:24:15 +01:00
scrawl	4e6507248b	Fix travis build	2014-02-13 12:19:21 +01:00
scrawl	d4a755d1aa	Fix some hardcoded literals	2014-02-13 11:15:55 +01:00
Marek Kochanowicz	71b2fc1c70	Introduced method to access display type.	2014-02-13 10:55:31 +01:00
Marc Zinnschlag	9c52820754	Merge remote-tracking branch 'scrawl/master'	2014-02-13 10:54:51 +01:00
Marek Kochanowicz	5f3f867a10	Implemented convertEnums function	2014-02-13 10:21:49 +01:00
scrawl	c6fb0f2d9b	Removed terrain component's dependency on ESM	2014-02-13 10:13:53 +01:00
scrawl	fb0c5be536	Don't suppress git error output	2014-02-13 10:13:03 +01:00
Marc Zinnschlag	ac8290c4d3	fixed problem with line endings in case of a local variable redeclaration	2014-02-13 09:59:22 +01:00
Marc Zinnschlag	dde4fbd818	allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away	2014-02-13 09:52:44 +01:00
Marc Zinnschlag	87b51e47a9	fixed another case issue in remote member access	2014-02-13 09:40:07 +01:00
Marc Zinnschlag	c03bd8ebb6	allow [] as aliases for ()	2014-02-13 08:59:33 +01:00
Marc Zinnschlag	0313876d88	allow leaving out if in a top-level if-statement	2014-02-13 08:49:40 +01:00
Marc Zinnschlag	2eeb0eb4f3	allow lines to continue with other instructions after an legit else	2014-02-13 08:38:26 +01:00
Marc Zinnschlag	749136bf33	ignore attempts to set non-existing variables	2014-02-12 20:23:47 +01:00
Marc Zinnschlag	b3412b7eec	another case fix (remote member access again)	2014-02-12 15:22:17 +01:00
Marc Zinnschlag	a85d3c7dcb	ignore unused explicit references for functions	2014-02-12 13:53:59 +01:00
Marc Zinnschlag	6e2e4d1adf	ignore stray begin	2014-02-12 13:45:01 +01:00
Marc Zinnschlag	dc433a3c09	fixed case handling problem for local variable access	2014-02-12 13:38:16 +01:00
Marc Zinnschlag	388735046f	fixed broken remote member variable access	2014-02-12 13:35:24 +01:00
Marek Kochanowicz	c142089bfe	Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop	2014-02-12 13:13:32 +01:00
Marek Kochanowicz	c00834a8de	added some iostream garbage.	2014-02-12 13:12:58 +01:00
Marek Kochanowicz	8dfdd87a07	Merge branch 'DnD' of https://github.com/gugus/openmw into DragDrop ... Conflicts: apps/opencs/view/world/table.cpp	2014-02-12 12:12:53 +01:00
Marek Kochanowicz	62c9c77ddf	Compiles now.	2014-02-12 11:42:19 +01:00
gus	6cf561f713	get index to where we are dropping	2014-02-12 11:32:01 +01:00
gus	2e33ab3a13	droping somewhat works	2014-02-12 11:16:12 +01:00
Marc Zinnschlag	93d4743012	interpret instruction keywords as names within expressions	2014-02-12 09:56:25 +01:00
Marek Kochanowicz	e1a39b8388	Replaced some display_string with specific type. Damn, i wish this is correct ;-)	2014-02-12 09:24:08 +01:00
Marc Zinnschlag	c0a6acfe6c	allow the use of keywords as variable names in more places	2014-02-12 09:23:23 +01:00
Marc Zinnschlag	b1b0877122	allow additional numeric argument for AiFollow and ignore it	2014-02-12 09:14:32 +01:00
Marc Zinnschlag	bfb0e62c4a	ignore additional string argument after enable/disable	2014-02-12 09:10:05 +01:00
Marek Kochanowicz	fc135fbfee	Added new Display types	2014-02-12 09:04:52 +01:00
Marc Zinnschlag	61626e90da	allow additional string argument for stopcombat and addspell (ignored)	2014-02-12 08:53:37 +01:00
Marc Zinnschlag	6a5d88b640	ignore stray else and endif in scripts	2014-02-12 08:42:42 +01:00
Emanuel Guevel	8824af30b4	Allow to display message box outside of dialogue window	2014-02-11 18:26:57 +01:00
Marc Zinnschlag	ffd1783690	Merge remote-tracking branch 'mrcheko/master'	2014-02-11 17:03:50 +01:00
Marc Zinnschlag	e44a7268fc	Merge remote-tracking branch 'potatoesmaster/selected-spell'	2014-02-11 17:00:41 +01:00
Emanuel Guevel	a3eea4f6b6	Do not allow spellcasting stance without spell selected	2014-02-11 16:34:51 +01:00
Emanuel Guevel	70d35da116	Unset selected spell when removed	2014-02-11 16:34:23 +01:00
Marc Zinnschlag	697bda6371	allow (and discard) explicit reference on instructions that do not accept explicit references	2014-02-11 14:55:31 +01:00
Emanuel Guevel	6a4820c0f7	Show a message when the player attempts to cast a disabled spell	2014-02-11 14:52:58 +01:00
Marc Zinnschlag	9de2922d22	fixed case problem in remote member variable access	2014-02-11 13:56:56 +01:00
Marc Zinnschlag	f26aa4f645	fixed while loop implementation	2014-02-11 13:31:04 +01:00
Marek Kochanowicz	53e2e8415d	replaced start with exec	2014-02-11 12:25:21 +01:00
Emanuel Guevel	8c8f4cd420	Fix typo	2014-02-10 22:53:16 +01:00
gus	df46218acc	try droping	2014-02-10 16:48:04 +01:00