mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 12:35:46 +00:00
Code Issues Projects Releases Wiki Activity
9,316 Commits 18 Branches 66 Tags
Commit Graph

6867 Commits

Author SHA1 Message Date
scrawl
2b15b8b484 Fix gold bugs (Fixes #1145, Fixes #1146) 2014-01-29 15:37:27 +01:00
scrawl
305e78c981 Fix creature attack bug 2014-01-29 15:37:27 +01:00
scrawl
e717694b36 Reset Run stance in AiWander 2014-01-29 15:37:27 +01:00
scrawl
23ffb8a4dc Fixes #1143: Make getCurrentAiPackage return the package that was run last, not the package that will be run in the next frame. 
This makes the Mehra Milo script work properly.
 2014-01-29 15:37:27 +01:00
scrawl
434fd21584 Don't set journal index if a higher index is currently set 
This is vanilla behaviour, and required for the Mehra Milo vivec informants quest.
 2014-01-29 15:37:27 +01:00
scrawl
edff88542b Allow double click / Enter key for accepting race/class/birthsign 2014-01-29 15:37:27 +01:00
scrawl
a8a09762ce Don't crash when deleting or disabling a moving door 2014-01-29 15:37:26 +01:00
scrawl
190512156d Use some more GMSTs for enchanting 2014-01-29 15:37:26 +01:00
scrawl
ea7e0abdc2 Move WhenStrikes skill success to a more appropriate place 2014-01-29 15:37:26 +01:00
scrawl
b8db151da7 Add missing skill increases for armor hits 2014-01-29 15:37:26 +01:00
scrawl
82146e7f8d Use GMSTs for levelup 2014-01-29 15:37:26 +01:00
scrawl
cc40cec395 Move levelup to NpcStats 
The code came from back in the days where NpcStats did not derive from CreatureStats.
 2014-01-29 15:37:26 +01:00
scrawl
ba67bf45f8 Fix an issue with InventoryStore copy constructor. Don't copy the iterator directly - mContainer will be wrong and comparisons against end() will always fail. 
This caused an exception when looting a creature that had moved cells.
 2014-01-29 15:37:26 +01:00
scrawl
365ae15532 Drag&Drop: auto-hide windows that can't be drop targets on mouseover 2014-01-29 15:37:26 +01:00
mrcheko
3a5da7e6e8 merged with master 2014-01-29 00:03:00 +02:00
mrcheko
5ee1dc6be8 attacktypes error fix 2014-01-28 21:07:26 +02:00
Marc Zinnschlag
1d34f5e096 Merge remote-tracking branch 'sirherrbatka/cloning' 
Conflicts:
	apps/opencs/model/world/refiddata.cpp
 2014-01-28 12:40:14 +01:00
Marc Zinnschlag
a473c3f619 some cleanup 2014-01-28 12:36:10 +01:00
Marc Zinnschlag
fd5486864a Merge remote-tracking branch 'gus/AIFix2' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/actors.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
 2014-01-28 12:33:31 +01:00
Marek Kochanowicz
2bd98a69ab Corrections, according to the comments. Thanks for the review. :-) 2014-01-28 11:16:48 +01:00
mrcheko
e50e94af0b remove CreatureStats::mAttackType, set/getAttackType() 2014-01-27 23:05:17 +02:00
mrcheko
fe0268062d merge with master 2014-01-27 22:38:01 +02:00
Marek Kochanowicz
d3000ce099 whitespaces removed again. 2014-01-27 19:47:54 +01:00
Marek Kochanowicz
62ea0bb066 Cleared whitespaces. 2014-01-27 19:40:05 +01:00
Marek Kochanowicz
c82db915f1 Removed needless includes 2014-01-27 19:32:51 +01:00
Marek Kochanowicz
d0b07de7ef Corrected bug mentioned by zini. 2014-01-27 16:59:18 +01:00
gus
846276f747 clean up 2014-01-27 15:14:24 +01:00
Marek Kochanowicz
ed0ba906cf removed needless include 2014-01-27 15:05:29 +01:00
Marek Kochanowicz
9c579dbd6c ok, that should be enough 2014-01-27 15:03:29 +01:00
Marek Kochanowicz
84e07c95b1 formatting 2014-01-27 15:02:29 +01:00
Marek Kochanowicz
51115fa5be spaces around operators 2014-01-27 14:56:57 +01:00
Marek Kochanowicz
c91ae86084 is there something that can generate diff from two git branches? Using github for this is kinda annoying. 2014-01-27 14:53:39 +01:00
Marek Kochanowicz
52176d6435 reforfucking 2014-01-27 14:51:57 +01:00
Marek Kochanowicz
2b71568bb6 still reformating 2014-01-27 14:50:36 +01:00
Marek Kochanowicz
316debb827 reformating 2014-01-27 14:46:58 +01:00
Marek Kochanowicz
4d6fb31610 reformating 2014-01-27 14:45:07 +01:00
Marek Kochanowicz
2899f04a3f reformatting 2014-01-27 14:43:12 +01:00
Marek Kochanowicz
6a0b5defd7 removed needless member value. 2014-01-27 13:42:08 +01:00
Marek Kochanowicz
bb62efc3d8 Removed pointless includes. 2014-01-27 13:36:01 +01:00
Marc Zinnschlag
29c3a288e3 load and save of reference in cells (without CustomData state) 2014-01-27 13:27:42 +01:00
Marek Kochanowicz
71d6364754 Chaninging variables name to follow our policy. 2014-01-27 13:13:39 +01:00
Marek Kochanowicz
aa6d1ff4c3 removed needless argument for cloning 2014-01-27 13:08:14 +01:00
Marek Kochanowicz
be8b978a89 corrected mistake in data 2014-01-27 12:23:03 +01:00
Marek Kochanowicz
62c2259c87 removing coordinates handling 2014-01-27 10:10:23 +01:00
mrcheko
45b3aa3d93 corrected things connected to determining attack type 2014-01-26 23:32:57 +02:00
gus
f5d589388c bug fix 2014-01-26 22:06:54 +01:00
gus
764011dd1b clean up 2014-01-26 21:53:55 +01:00
gus
7cb47aa635 new implementation of pathfinding. Works, but need clean up 2014-01-26 21:26:19 +01:00
scrawl
eba6c9a8fd Fix massive console spam regarding the scrib's idle3 animation 2014-01-26 02:49:32 +01:00
scrawl
b1066de81d Revert "Merge remote-tracking branch 'mrcheko/master'" 
This reverts commit 4e360136b10061e29fd60492544aad59850513e7, reversing
changes made to 047bbe43b2ca08a63c8e18d2b4af52e0dbefb37b.

Conflicts:

	apps/openmw/mwmechanics/aicombat.cpp
 2014-01-26 00:31:44 +01:00