9532 commits

Author	SHA1	Message	Date
Marc Zinnschlag	e439065897	Merge remote-tracking branch 'scrawl/master'	2015-01-10 11:33:04 +01:00
scrawl	66e7e04807	UnitTests: add another dialogue keyword test	2015-01-10 00:29:07 +01:00
scrawl	2ac23008f5	Remove an old workaround (Fixes #2263) ... The workaround was added when we were still using OIS for input. It doesn't seem to be needed with SDL.	2015-01-10 00:07:55 +01:00
scrawl	dfdf26e95e	Add assertion to Store	2015-01-09 20:58:53 +01:00
scrawl	1b302b750c	UnitTests: add tests for KeywordSearch conflict resolution	2015-01-09 20:53:49 +01:00
scrawl	9d07edda13	UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04	2015-01-09 20:53:43 +01:00
scrawl	ce2cbab402	Dialogue: improve conflict resolution for chains of overlapping keywords (unit test for such a case will follow)	2015-01-09 20:08:52 +01:00
Marc Zinnschlag	4e7f7baf8b	Merge remote-tracking branch 'dteviot/Bug2076'	2015-01-09 13:57:21 +01:00
dteviot	64cd1396ac	Fixed minor issues. ... 1. Renamed "hightRatio" to "heightRatio". 2. Replaced magic numbers with named constants.	2015-01-09 22:17:53 +13:00
dteviot	7fe2f86d06	Slaughter fish attacks when player only knee deep in water (Fixes #2076)	2015-01-09 21:40:53 +13:00
Marc Zinnschlag	d254bb0a34	Merge remote-tracking branch 'dteviot/FixLoadOrderReset'	2015-01-09 09:32:23 +01:00
scrawl	65ab31eae6	Remove now redundant Store::setUp implementation	2015-01-09 04:31:02 +01:00
scrawl	ddd6e682bc	Dialogue: add conflict resolution for overlapping keywords (Fixes #2245)	2015-01-09 04:19:38 +01:00
scrawl	c77660ba20	Remove some nonsense code	2015-01-09 01:59:38 +01:00
scrawl	2ddbe22da3	Fix for NPC store clearDynamic bug ... It was clearing the whole mShared vector, instead of only the dynamic part. Actually, that whole overload was pointless to begin with. All it does is making sure the Player record isn't cleared, but ESMStore::clearDynamic re-inserts the player record anyway after clearing.	2015-01-09 01:59:32 +01:00
Marc Zinnschlag	f8a3ec3ee3	Merge remote-tracking branch 'scrawl/cmdline-savegame'	2015-01-08 20:57:49 +01:00
scrawl	d31ae2b345	Fix mIds mapping for dynamic records being lost on save/reload	2015-01-08 16:27:13 +01:00
scrawl	928b9ee41b	Fix missing GUI mode update when showing soulgem dialog	2015-01-08 16:27:13 +01:00
scrawl	ef7e0070a6	Don't right-shift signed integers which is implementation-defined	2015-01-08 16:27:13 +01:00
dteviot	9d6efcecff	Merge remote-tracking branch 'OpenMW/master' into FixLoadOrderReset ... Fixed Conflict: components/contentselector/model/contentmodel.cpp	2015-01-08 12:15:48 +13:00
Marc Zinnschlag	38a413a483	Merge remote-tracking branch 'scrawl/master'	2015-01-07 20:22:15 +01:00
scrawl	4684014a83	Use .omwsave extension for save game files	2015-01-07 15:06:39 +01:00
scrawl	13c5bd5cc2	Enchanting: fix skill-based cast cost bonus being applied twice	2015-01-07 04:41:12 +01:00
scrawl	ef1b0a191b	Revert "Enchanting: fix inverted self-enchant success chance" ... It wasn't inverted to begin with. The author of this commit is an idiot.	2015-01-07 03:48:16 +01:00
scrawl	4e92f6ab48	Add commandline option to load a save game on startup	2015-01-07 03:27:24 +01:00
scrawl	157438460b	Fix being able to activate objects when paralyzed	2015-01-07 02:34:29 +01:00
scrawl	dc5ed5b861	Remove weather particles underwater (Fixes #2010)	2015-01-07 02:34:29 +01:00
scrawl	d02e075bab	Add setting for exterior cell grid size (Fixes #1537)	2015-01-07 02:34:29 +01:00
scrawl	a17252eab3	Remove unused checkWaypoint function ... It was an almost exact copy of the checkPathCompleted function anyway.	2015-01-07 02:34:28 +01:00
scrawl	4d9100091d	Reduce default pathing arrival tolerance to 32 units (Fixes #1605)	2015-01-07 02:34:28 +01:00
scrawl	e19ab77d00	Store camera first person state in savegame (Fixes #2255)	2015-01-07 02:34:24 +01:00
scrawl	992b87ea44	Reset existing summons when the spell is re-casted (Fixes #2135)	2015-01-06 16:11:10 +01:00
scrawl	f267497c03	Allow separate summoned creature instances for each spell ID (Fixes #2194)	2015-01-06 16:11:05 +01:00
Marc Zinnschlag	31f6ccdf4d	Merge remote-tracking branch 'internecine/bug2031'	2015-01-06 09:43:59 +01:00
Internecine	e1fdcb608e	Fixed incorrect index	2015-01-06 15:00:24 +13:00
scrawl	464f8abb3f	List exterior cell names in tab completion (Fixes #2252)	2015-01-06 01:10:09 +01:00
scrawl	708dbc2518	Crime fix	2015-01-05 20:31:50 +01:00
scrawl	c343a5c803	stopCombat fix	2015-01-05 20:31:50 +01:00
scrawl	c1955ef7fa	Fix enchanting dialog effect labels showing a duration for constant effects	2015-01-05 18:57:08 +01:00
scrawl	5e7e40aac9	Fix being able to switch weapons while knocked out	2015-01-04 19:54:49 +01:00
scrawl	de12c96a46	Fix crash on exit if the window wasn't created (Fixes #2249)	2015-01-04 19:23:31 +01:00
scrawl	bc686c93b5	Potential fix for thrown weapons being regarded as broken	2015-01-04 19:20:30 +01:00
scrawl	398fe6e780	Thrown weapon fix (Fixes #2248)	2015-01-04 19:20:24 +01:00
scrawl	d56906acf7	Fix the creature position glitch	2015-01-03 19:10:15 +01:00
scrawl	6f747df713	Remove an unused constructor	2015-01-03 19:10:15 +01:00
scrawl	593ca6bd48	Fix for framerate-dependent maximum stepping distance (Bug #1638)	2015-01-03 19:10:15 +01:00
Marc Zinnschlag	9f6a2d00e8	Merge remote-tracking branch 'thoronador/fix-uninitialized-members'	2015-01-02 18:17:25 +01:00
Marc Zinnschlag	bdc28c0523	Merge remote-tracking branch 'maqifrnswa/feature1325'	2015-01-02 18:14:42 +01:00
Marc Zinnschlag	ec1df719fe	Merge remote-tracking branch 'mrcheko/master'	2015-01-02 18:08:47 +01:00
Scott Howard	f24c1845b6	remove pop-up message on load failure	2015-01-02 10:42:09 -05:00