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
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
gus
846276f747
clean up
2014-01-27 15:14:24 +01:00
Marc Zinnschlag
29c3a288e3
load and save of reference in cells (without CustomData state)
2014-01-27 13:27:42 +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
scrawl
a1fbd1fcc8
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit df7c139e2f614f8a951aae1b4889b920af0013fe, reversing
changes made to fec26342cd57269bc0801e5d901e00419fbc7cec.
2014-01-26 00:14:49 +01:00
scrawl
e0de76a6f7
Save/load global map
2014-01-25 19:06:14 +01:00
scrawl
e62bf8fca9
Remove some garbage
2014-01-25 16:41:26 +01:00
scrawl
79a9c4e048
Clear mShared before populating it. Fixes an issue with duplicate records (e.g. dialogue keywords) after loading a savegame.
2014-01-25 16:33:39 +01:00
scrawl
bdb03926c2
Fix crash when loading another game after dying
2014-01-25 16:13:45 +01:00
scrawl
28185e2017
Death/godmode fixes: Revive player *after* character update, since there might be fall damage.
2014-01-25 15:54:24 +01:00
scrawl
f09328ca84
Clear global map overlay when starting/loading a game
2014-01-25 13:34:56 +01:00
gus
707e579dfe
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
2014-01-24 19:16:50 +01:00
gus
5ca5946760
WIP
2014-01-24 19:13:23 +01:00
scrawl
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-24 18:28:35 +01:00
scrawl
295aed3533
Implement savegame screenshots
2014-01-24 17:49:16 +01:00
scrawl
786ed6ca5b
Include some required Ogre headers explicitely
2014-01-24 15:02:34 +01:00
scrawl
ac1859fb77
Merge branch 'savedgame' of https://github.com/zinnschlag/openmw into savedgame
2014-01-24 15:02:13 +01:00
scrawl
9b9c39af7a
Fix being able to activate magic bolts mid-flight
2014-01-24 13:22:39 +01:00
scrawl
ac4c904e62
Fix projectile bug
2014-01-24 13:22:30 +01:00
mrcheko
87e83a92f8
refactoring of setting an attack type
2014-01-23 23:14:20 +02:00
scrawl
70264eae3b
Feature #764 : Quest completetion status in quest book
2014-01-23 13:08:56 +01:00
scrawl
849ee54399
Feature #764 : Show quest names in quest book if present
2014-01-23 12:54:37 +01:00
Marc Zinnschlag
460089c0aa
ignore deleted references that did not came from a content file
2014-01-23 12:53:55 +01:00
Marc Zinnschlag
419e3a7d30
write references in cells to saved game file
2014-01-23 12:51:42 +01:00
scrawl
358cc3c62f
Closes #1060 : Fix incorrect message box size
2014-01-23 12:24:06 +01:00
Marc Zinnschlag
22cb4784b5
store cell state in saved game files (no references yet)
2014-01-23 11:29:40 +01:00
pvdk
c95b8bcb39
Moved the generated version header stuff into components
2014-01-22 17:33:55 +01:00
scrawl
cf378ec31e
Support optional volume and pitch arguments for soundgen events (e.g. moan 0.5 1.0) as required for some actors
2014-01-22 15:25:03 +01:00
scrawl
2e6e0fd0a0
Fix GetPcCell bug
2014-01-22 14:45:36 +01:00
scrawl
ea21d8fec3
Fix CreatureTargetted function
2014-01-22 13:30:45 +01:00
scrawl
4c94289b1f
Fix PC Health Percent function
2014-01-22 13:30:07 +01:00
scrawl
f27701cbe8
Detect selling stolen items or enchanting with stolen items
2014-01-22 13:04:55 +01:00
scrawl
264226dfe3
Handle iWereWolfBounty
2014-01-22 12:33:47 +01:00
scrawl
194413c955
Feature #1119 : Implement Resistance/Weakness to normal weapons magic effect. Handle fWereWolfSilverWeaponDamageMult.
2014-01-22 12:26:53 +01:00
scrawl
f89c400305
Don't complain about greetings with no sound
2014-01-22 00:02:43 +01:00
scrawl
16f5f5862d
Feature #956 : Implement blocking melee attacks
2014-01-21 23:25:24 +01:00
Marc Zinnschlag
9ebe66e693
improved cleanup; failed loads will now drop back into the main menu instead of crashing
2014-01-21 14:50:58 +01:00
Marc Zinnschlag
0f60898517
adding missing cleanup for SoundManager
2014-01-21 14:13:13 +01:00
scrawl
82a07af72c
Fix typo (should be Strength, not Luck). Use GMSTs for strength damage.
2014-01-21 12:30:23 +01:00
scrawl
1617a4f7d9
Use fCombatDistance
2014-01-21 12:30:23 +01:00
scrawl
a4404054bb
Feature #1130 : Add race power spells for NPCs as well, not just the player
2014-01-21 12:30:23 +01:00
scrawl
5de8c7fe29
Feature #1130 : Add auto-calculated NPC spells
2014-01-21 12:30:23 +01:00
