scrawl
|
1deb0a7cdf
|
Savegame dialog: Set key focus to editbox
|
2014-02-01 18:42:01 +01:00 |
|
scrawl
|
ec46575671
|
Overwriting saves fixes - copy description of overwritten slot, ask for confirmation
|
2014-02-01 18:42:01 +01:00 |
|
scrawl
|
6d37cd7e86
|
Savegame dialog: Don't allow empty save names
|
2014-02-01 18:42:01 +01:00 |
|
scrawl
|
63284d21a0
|
Savegame dialog: 'Enter' while editing a name is equivalent to pressing the ok button
|
2014-02-01 18:42:01 +01:00 |
|
scrawl
|
dea9d21db6
|
Some additional safety checks for global map loading
|
2014-02-01 18:42:01 +01:00 |
|
scrawl
|
f89b3cac02
|
Feature #764: Store the actor that gave the dialog response
|
2014-02-01 18:42:01 +01:00 |
|
scrawl
|
a988a0d6dc
|
Don't add duplicate topic responses to the journal
|
2014-02-01 18:42:00 +01:00 |
|
scrawl
|
37ef8ec908
|
Savegame dialog: support loading saves using Enter key or double-click
|
2014-02-01 18:42:00 +01:00 |
|
scrawl
|
49e26415be
|
Don't call loadGame() from within the MWMechanics::Actors update sequence
|
2014-02-01 18:42:00 +01:00 |
|
Marc Zinnschlag
|
1b5301eec0
|
Merge branch 'savedgame'
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
|
2014-02-01 18:16:32 +01:00 |
|
Marc Zinnschlag
|
5b04c10e1d
|
added creature/NPC state to saved games (only container/inventory for now)
|
2014-02-01 17:36:23 +01:00 |
|
Marc Zinnschlag
|
d2ec3ffdc8
|
handle equipped items when serialising inventory state
|
2014-02-01 17:31:05 +01:00 |
|
Marc Zinnschlag
|
bcc5894e2d
|
changed implementation functions for container serialisation from free functions to member functions (will need some polymorphism later)
|
2014-02-01 15:24:01 +01:00 |
|
Marc Zinnschlag
|
dd674566a2
|
store content of containers in saved game files
|
2014-01-31 13:25:32 +01:00 |
|
scrawl
|
4ec86d1c68
|
Bug #1147: Fix the inventory preview pose used for ranged weapons
|
2014-01-31 05:06:35 +01:00 |
|
scrawl
|
60bbab52fe
|
Support keyframe controllers for bones that aren't in the skeleton base
|
2014-01-31 05:06:34 +01:00 |
|
scrawl
|
da34f8bda1
|
Fix LastHitObject
|
2014-01-31 04:43:35 +01:00 |
|
scrawl
|
067c2bc2ec
|
Disable combat movements for creatures without weapons
|
2014-01-31 04:43:35 +01:00 |
|
scrawl
|
7820ea5806
|
"Always best attack" should only affect the player
|
2014-01-31 04:43:35 +01:00 |
|
scrawl
|
d0c6ecd03a
|
Bug #1148: Workaround for broken images in some MW versions
|
2014-01-31 04:43:35 +01:00 |
|
scrawl
|
52f89e9a17
|
Don't play "idle" voice entries for NPCs with Hello 0
Not entirely sure if this is correct, but it prevents the NPCs in the starting boat from incorrectly playing them.
|
2014-01-31 04:43:35 +01:00 |
|
scrawl
|
39d86a9468
|
Improvements to smooth NPC steering
|
2014-01-31 04:43:29 +01:00 |
|
mrcheko
|
80d8aa4030
|
bug with sequence of knockouts; giving sense to some hit state code
|
2014-01-30 23:54:26 +02:00 |
|
Marc Zinnschlag
|
900532a6ca
|
store additional state of lights in saved game files
|
2014-01-30 12:37:33 +01:00 |
|
Marc Zinnschlag
|
ec7cb90ca4
|
added support for serialisation of CustomData state
|
2014-01-30 11:50:13 +01:00 |
|
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
|
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 4e360136b1, reversing
changes made to 047bbe43b2.
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 df7c139e2f, reversing
changes made to fec26342cd.
|
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 |
|
scrawl
|
851a7d5014
|
Feature #957: Handle area effects for "on touch" range
|
2014-01-21 12:30:15 +01:00 |
|
scrawl
|
c8a9e9f7fa
|
Stop AiCombat when the target is dead
|
2014-01-20 13:54:10 +01:00 |
|
scrawl
|
42284603f7
|
Properly handle on target effects with mArea=0
|
2014-01-20 13:44:38 +01:00 |
|
scrawl
|
9cedd3bb2e
|
Fix spell area not displaying in tooltip
|
2014-01-20 13:11:34 +01:00 |
|
scrawl
|
205e8aa4e9
|
Feature #957: Implement area magic
|
2014-01-20 13:11:29 +01:00 |
|
scrawl
|
ba5300b071
|
Update the Ptr in SoundManager for references moved to a different cell. Fixes looping sounds not stopping after a moved object was already deleted.
|
2014-01-20 12:05:13 +01:00 |
|
scrawl
|
5dd3cfa09a
|
Loop projectile sounds
|
2014-01-20 11:50:52 +01:00 |
|
scrawl
|
df7c139e2f
|
Merge remote-tracking branch 'mrcheko/master'
|
2014-01-19 21:23:04 +01:00 |
|
scrawl
|
fec26342cd
|
Query the number of animation groups for death/hit animations, since they can vary a lot (argonian/khajiit, creatures, first person..)
|
2014-01-19 21:11:48 +01:00 |
|
mrcheko
|
339399f8b1
|
bug fix/logic fix/future suggestion
|
2014-01-19 22:09:51 +02:00 |
|
scrawl
|
05e75e1214
|
Closes #1127: Fix for subtitles for idle dialogue appearing outside of hearing range
|
2014-01-19 20:54:05 +01:00 |
|
scrawl
|
bea161331c
|
Play 'hello' voiced dialogue entries in AIWander
|
2014-01-19 20:53:58 +01:00 |
|
scrawl
|
0adc0f56ed
|
Issue #777: Consider weapons in Creature::hit
|
2014-01-19 16:13:16 +01:00 |
|
scrawl
|
9723263730
|
Bug #1126: Tweak creature attack distance a bit (still no idea where this should come from)
|
2014-01-19 14:47:58 +01:00 |
|
scrawl
|
1a00f26390
|
Bug #1126: Golden saints and many other creatures only have "Bip01 Head"
|
2014-01-19 14:33:41 +01:00 |
|
scrawl
|
4e360136b1
|
Merge remote-tracking branch 'mrcheko/master'
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/character.cpp
apps/openmw/mwmechanics/character.hpp
|
2014-01-19 14:01:39 +01:00 |
|
scrawl
|
047bbe43b2
|
Don't complain about missing jump animations
|
2014-01-19 13:46:40 +01:00 |
|
scrawl
|
13646a651b
|
Issue #777: Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats.
|
2014-01-19 13:32:58 +01:00 |
|
scrawl
|
198bb0de60
|
Issue #777: Add CreatureAnimation variant for creatures with weapons/shields
|
2014-01-19 13:05:26 +01:00 |
|
scrawl
|
589fbbd871
|
Issue #777: Create InventoryStore for creatures with weapons/shields
|
2014-01-19 11:43:23 +01:00 |
|
scrawl
|
69ca03c308
|
Issue #777: Move DrawState to CreatureStats. All creatures can cast spells, and some creatures have weapons.
|
2014-01-19 09:43:41 +01:00 |
|
scrawl
|
947b6c9645
|
kOgrePi unused
|
2014-01-18 22:16:31 +01:00 |
|
scrawl
|
4c0045b418
|
Bug #1109: Do not reset water level when loading a plugin with no water level record (for real this time)
|
2014-01-18 21:11:12 +01:00 |
|
Marc Zinnschlag
|
14e64c180f
|
on load check player record for dangling ID references
|
2014-01-18 15:06:58 +01:00 |
|
Marc Zinnschlag
|
6584a01d01
|
reset reference to player NPC record during cleanup
|
2014-01-18 14:53:25 +01:00 |
|
mrcheko
|
969340d61b
|
fixed StartCombat script
|
2014-01-18 12:55:17 +02:00 |
|
scrawl
|
525ce2f042
|
Some cleanup - move definitions to implementation file
|
2014-01-18 10:52:16 +01:00 |
|
scrawl
|
c04a8afc8b
|
Make sure onPcEquip is also set for Equip script instruction
|
2014-01-18 10:51:52 +01:00 |
|
scrawl
|
9653355cf1
|
Feature #701: Spawn levelled creatures in cells
|
2014-01-18 07:26:27 +01:00 |
|
mrcheko
|
df4df5b094
|
fixed weapRange for creatures/startcombat script(?)
|
2014-01-17 23:30:28 +02:00 |
|
scrawl
|
5049f3b134
|
Fix the group for creature attack animations
|
2014-01-17 20:18:35 +01:00 |
|
mrcheko
|
a11a6b616b
|
Merge remote-tracking branch 'upstream/master'
|
2014-01-17 21:00:55 +02:00 |
|
mrcheko
|
435bbdd530
|
one more mismatch fixed
|
2014-01-17 20:55:21 +02:00 |
|
mrcheko
|
46a4790cb1
|
final warnings removal
|
2014-01-17 20:33:49 +02:00 |
|
mrcheko
|
7df8273d71
|
fix for everybody
|
2014-01-17 20:01:15 +02:00 |
|
scrawl
|
3dcb292bc1
|
Do not soul trap creatures without a soul (which apparently exist)
|
2014-01-17 18:43:45 +01:00 |
|
mrcheko
|
5357f569e6
|
fix for scrawl
|
2014-01-17 19:36:22 +02:00 |
|
scrawl
|
149d77dedf
|
Feature #960: Add knockdown and hit recovery for creatures
|
2014-01-17 17:41:16 +01:00 |
|
scrawl
|
9b32b1403b
|
Feature #960: Implement Creature::hit
|
2014-01-17 17:19:08 +01:00 |
|
scrawl
|
228254c890
|
Handle creature attack animations in character controller
|
2014-01-17 16:31:27 +01:00 |
|
scrawl
|
c76a0448a3
|
Closes #1123: Implement SlowFall magic effect
|
2014-01-17 15:47:34 +01:00 |
|
scrawl
|
27d0d9c592
|
Fix exception when clicking on statics when in the inventory window
|
2014-01-17 15:27:59 +01:00 |
|
scrawl
|
5fc38e7ac4
|
Don't use blood effects for fatigue damage
|
2014-01-17 15:20:28 +01:00 |
|
scrawl
|
c548dcee13
|
Quick keys menu: make sure selected spell still exists
|
2014-01-17 15:20:22 +01:00 |
|
Marc Zinnschlag
|
1b7697a4b2
|
handle missing player specific state during load/save
|
2014-01-17 13:07:57 +01:00 |
|
scrawl
|
805843d7ff
|
Closes #1086: Implement blood effects
|
2014-01-17 11:27:13 +01:00 |
|
scrawl
|
240d96a0f1
|
Renamed AnimationValue to AnimationTime
|
2014-01-17 10:55:46 +01:00 |
|
scrawl
|
ddc432c7ef
|
Fix stealing bug
|
2014-01-17 10:55:46 +01:00 |
|
scrawl
|
e410eb5273
|
Play 'Idle' voiced dialogue entries in AIWander. Tweak voice max distance.
|
2014-01-17 10:55:46 +01:00 |
|
scrawl
|
2836c7c927
|
Do not set owner when adding items to a container, as opposed to NPC/creatures
|
2014-01-17 10:55:46 +01:00 |
|
scrawl
|
fe66012bcd
|
Closes #1115: Fix a bug causing number of AI packages to grow exponentially when adding an AI package. Not sure if adding the same package twice should even be allowed.
|
2014-01-17 10:55:46 +01:00 |
|
scrawl
|
f070d9966d
|
Implement movement speed formula for creatures. Still moving a bit too slow.
|
2014-01-17 10:55:46 +01:00 |
|
mrcheko
|
f2ad1c18f2
|
fix merging problem/some logic fixes
|
2014-01-16 22:24:05 +02:00 |
|
Alexander "Ace" Olofsson
|
ddf72c06de
|
Update statswindow.cpp
Fixes a build issue on MSVC ('floor' : ambiguous call to overloaded function)
|
2014-01-16 12:09:50 +01:00 |
|
Marc Zinnschlag
|
c300cd9375
|
loading/saving of some player state (cell/coordinates and some other bits)
|
2014-01-16 12:03:23 +01:00 |
|
mrcheko
|
d5f794d4fb
|
update to combat ai behaviour
|
2014-01-15 22:56:55 +02:00 |
|
scrawl
|
ea8f60eddf
|
Implement movement speed formula for creatures. Still moving a bit too slow.
|
2014-01-15 16:30:16 +01:00 |
|
scrawl
|
d544551f61
|
Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
Information provided by Hrnchamd.
|
2014-01-15 15:50:45 +01:00 |
|
scrawl
|
7534fc968d
|
Minor acrobatics fixes
|
2014-01-15 14:53:30 +01:00 |
|