terrorfisch
db1b93498d
Added comment.
2014-10-10 00:17:50 +02:00
terrorfisch
730abf6841
Moved all variables in temporary storage for AiCombat and some more for AiWander.
...
+Buxfix for previous AiWander changes
2014-10-10 00:16:17 +02:00
MiroslavR
29f5cb46ac
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-09 19:17:39 +02:00
Internecine
782e851eb1
Better fix, now allows for teleporting to change weather while still paused.
2014-10-09 19:41:51 +13:00
terrorfisch
cae948df96
removed unecessary PathFinders
2014-10-08 23:09:50 +02:00
terrorfisch
4c36c67fb8
Updated AiCombat:
...
-moved everything except target to temporary storage
-removed the Pathfinder since present in baseclass
-cleaned some trigonometric mess
2014-10-08 23:00:36 +02:00
terrorfisch
4391c1fd00
Addded the parts of AiWander that I fully understand to the temporary storage.
...
The rest should be done by someone who has a clearer overview over the class.
2014-10-08 22:11:45 +02:00
terrorfisch
0871d45790
Draft how to move temporary package state to CharacterController.
...
Example for a few values shown in AiWander.
2014-10-08 10:58:52 +02:00
sylar
70fd531722
None texturing filtering enable for android by default
2014-10-08 00:15:22 +04:00
sylar
f75721a217
Add none texture filtering .It is fixes a bug with black objects in shaders glsles
2014-10-07 23:30:31 +04:00
Marc Zinnschlag
744c56943a
Merge remote-tracking branch 'jordan-ayers/topic/misc-cleanup'
2014-10-07 18:03:25 +02:00
Jordan Ayers
56db525a93
Document the return value of getEffectMultiplier.
2014-10-06 21:56:41 -05:00
MiroslavR
d1dc9951d4
Do not display werewolf overlay in third person
2014-10-06 20:24:53 +02:00
MiroslavR
0e19c3fdeb
Silence werewolves' footstep sounds when they are running with their claws sheathed
2014-10-06 18:48:22 +02:00
MiroslavR
4086bc4848
Do not spawn blood vfx on player if hit fader is enabled
2014-10-06 18:33:41 +02:00
MiroslavR
b6abfb0145
Do not display hit fader if the player wasn't damaged
2014-10-06 18:31:02 +02:00
MiroslavR
ff74d54e98
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-06 18:24:41 +02:00
scrawl
9ab8d0a8e6
Hotfix for crash when deleting an actor
2014-10-06 14:56:49 +02:00
scrawl
8097d9801d
Fix HasSoulgem function to return number of soulgems
2014-10-06 14:56:49 +02:00
Internecine
3dee4c2b0e
Fixes #1706
2014-10-06 16:10:58 +13:00
Jordan Ayers
aac2de270e
Cleanup: Don't call <environment obj>.get().
...
mEnvironment.get() is redundant. Switch the call to resemble the
surrounding environment get() calls, instead.
2014-10-05 18:12:55 -05:00
Jordan Ayers
2f5721bf61
Fix typo in comments.
2014-10-05 18:12:33 -05:00
scrawl
9cce3bc31b
Implement fDispositionMod according to research wiki
2014-10-05 23:03:30 +02:00
scrawl
39bc11681e
Fix broken onGround status when levitating
2014-10-05 22:59:24 +02:00
scrawl
829a7bfd1b
Fix being able to rest while water-walking ( Fixes #1712 )
2014-10-05 22:35:53 +02:00
scrawl
d9165593d9
Fix footstep sounds played during water-walking
2014-10-05 22:27:25 +02:00
scrawl
064f1964ba
More efficient water walking
2014-10-05 22:27:20 +02:00
MiroslavR
e1799cbcf4
Fix a typo in condition
2014-10-05 19:53:36 +02:00
scrawl
04614651fa
Fix recharging items not being updated for actor's initial inventory
2014-10-05 18:27:26 +02:00
MiroslavR
de2cb8926a
Feature #1697 : Queue fade operations, implement hit fader & werewolf overlay
2014-10-05 17:53:50 +02:00
scrawl
d790506525
Fix projectiles colliding with dead actors ( Fixes #1971 )
2014-10-05 17:41:56 +02:00
scrawl
c4fa671381
Don't allow raising faction rank if the next rank has no name ( Fixes #1975 )
2014-10-05 16:47:55 +02:00
scrawl
fe4d74a6cb
Fix not being able to move with 0/0 encumbrance ( Fixes #1979 )
2014-10-05 15:52:33 +02:00
scrawl
5c3bc6563b
Fix divisions by zero in normalizedEncumbrance
2014-10-05 15:50:01 +02:00
scrawl
8dd410fe96
Teleport indirect followers as well when using a door ( Fixes #1974 )
2014-10-05 15:18:32 +02:00
scrawl
ff11745429
Fix magic projectile sound disappearing after multiple save/load cycles
2014-10-05 14:47:23 +02:00
Jordan Ayers
663647bee8
Simplify getEffectMultiplier.
...
Both return cases were same, except for some overflow conditions.
2014-10-04 15:28:58 -05:00
Lukasz Gromanowski
bcb38c3eba
Issue #1887 : Equipped items do not emit sounds
...
Added handling of autoEquip and unequipAll cases.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-04 22:27:23 +02:00
scrawl
20777c1b2e
Optimize physics shape scaling on cell load
2014-10-04 20:37:35 +02:00
scrawl
db6b04d127
Use the footstep volume slider for jump landing sounds ( Fixes #1968 )
2014-10-04 19:50:38 +02:00
scrawl
95378aa6ac
Fix crash when a magic projectile has no sound defined ( Fixes #1967 )
2014-10-04 18:37:35 +02:00
Lukasz Gromanowski
e566e4abf2
Issue #1887 : Equipped items do not emit sounds
...
Added playing of sounds for equipped items (at this moment only for lights).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-04 16:47:29 +02:00
Lukasz Gromanowski
6a89b67cb1
Revert "Issue #1887 : Equipped items do not emit sounds"
...
This reverts commit 566211e753
2014-10-04 13:34:36 +02:00
Marc Zinnschlag
cd7cc4bec9
Merge remote-tracking branch 'miroslavr/master'
2014-10-04 09:46:29 +02:00
Lukasz Gromanowski
566211e753
Issue #1887 : Equipped items do not emit sounds
...
Added playing of sounds for equipped items (at this moment only for lights).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-03 22:39:05 +02:00
MiroslavR
95be7ea738
Revert spelling change to preserve consistency, fix a typo
2014-10-03 22:38:06 +02:00
MiroslavR
4829b1f9cc
Support "right" alignment in books
2014-10-03 22:30:46 +02:00
MiroslavR
a13039ad1f
Allow alignment for images in books
2014-10-03 21:36:45 +02:00
MiroslavR
3287d0b6ef
Fix line breaks around IMG tags.
2014-10-03 21:08:52 +02:00
MiroslavR
c5e85ebddc
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-03 21:02:15 +02:00
scrawl
cecc64752e
Increase maximum height for finding spawn points ( Fixes #1633 , Fixes #1881 )
2014-10-03 18:51:18 +02:00
scrawl
d4ac5c0b57
Use a raycast to find spawn point if convexSweepTest doesn't find one ( Fixes #1623 , Fixes #1679 )
2014-10-03 18:49:41 +02:00
scrawl
6fc53e73ad
Don't run AI for knocked-out actors ( Fixes #1854 )
2014-10-03 15:58:14 +02:00
scrawl
81a9dc0655
Hotfix for not being able to scroll the world map
2014-10-02 22:44:06 +02:00
scrawl
083bcaf483
Fix journal quest logs not being marked finished when there are multiple quest IDs in the log
2014-10-02 19:26:37 +02:00
scrawl
8dc20712de
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-10-02 18:22:39 +02:00
scrawl
58672c6bb5
Fix for crash in main menu when reflections are enabled
2014-10-02 18:12:49 +02:00
Marc Zinnschlag
a166034e12
Merge remote-tracking branch 'jordan-ayers/topic/disease-cleanup'
2014-10-02 17:19:32 +02:00
scrawl
7d36a202a8
Implement cell loading threshold ( Fixes #1874 )
...
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.
Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
2014-10-02 16:50:10 +02:00
scrawl
861cc26aa6
Don't sell racial spells ( Fixes #1961 )
2014-10-02 16:50:05 +02:00
scrawl
cc63f7f051
Fix broken idle camera
2014-10-02 14:23:13 +02:00
scrawl
afbd2de511
Fix broken alchemy magnitude/duration
2014-10-02 13:55:42 +02:00
scrawl
7e10818bdf
Fix uninitialized flags for custom-made spells
2014-10-02 13:55:42 +02:00
scrawl
0bd9f30c67
Remove comment for old MyGUI version
2014-10-02 13:55:42 +02:00
Jordan Ayers
3bc91c66e6
Disease Check: Shorten the resistance calculations.
2014-10-01 19:29:03 -05:00
Jordan Ayers
a9a0930b85
Disease check: Reuse corprus check from spells.hpp.
2014-10-01 19:26:25 -05:00
scrawl
1c51694aa9
Don't update physics and animation for actors outside the AI processing distance
2014-10-02 00:27:04 +02:00
scrawl
88da7f5157
Adjust border skin for loading bar and message boxes to match vanilla MW
2014-10-02 00:27:03 +02:00
scrawl
85f5754bb6
Apply third person camera distance to the camera node instead of only the camera itself ( Fixes #1705 )
2014-10-02 00:26:57 +02:00
scrawl
f9b6cc468d
Don't reset an unbound input action to its default binding if the key/mouse button for that default binding is already used by another action ( Fixes #1960 )
2014-10-01 17:54:18 +02:00
scrawl
46adf6344a
Adjust third person camera height and default distance to match vanilla MW
2014-10-01 17:45:20 +02:00
scrawl
ee8b85aa2c
Fix priority bug in AiSequence::stack ( Fixes #1959 )
2014-09-30 22:57:38 +02:00
scrawl
795dfdb557
Fix size_t underflow for journals with 1 page ( Fixes #1958 )
2014-09-30 18:14:25 +02:00
scrawl
c010c28337
Implement ToggleWorld instruction
2014-09-30 15:54:09 +02:00
Jordan Ayers
da9d858201
Add 'const' to a spell helper function.
2014-09-29 20:59:10 -05:00
scrawl
3e153d0a9b
Optimize actor physics: Use only one convexSweepTest for stepping down and checking onGround status, instead of 2
2014-09-29 22:30:21 +02:00
scrawl
b345c50a86
Run stepSimulation before moving actors
...
Shouldn't make too much of a difference, but a nice side effect is seeing the convexSweepTest calls for actor movements in the profiler results.
2014-09-29 14:55:31 +02:00
scrawl
7f18f85a1d
Forgot const
2014-09-29 12:04:19 +02:00
scrawl
bdab3fa321
Bullet optimization: Don't update AABBs of static objects every frame
2014-09-28 18:02:57 +02:00
scrawl
ff0b4e0583
Add debug window (F10), displays Bullet's profiler output
2014-09-28 18:02:49 +02:00
scrawl
7c52d05f85
Disable topics list visually when in a choice
2014-09-28 14:00:15 +02:00
scrawl
e9ed0211c9
Attempt to fix Clang warnings
2014-09-28 12:44:47 +02:00
scrawl
58571f7ac2
Revert "Transfer item ownership to the buyer if item wasn't stolen"
...
Fixes #1953 .
This reverts commit 5d77c5e8ca
2014-09-28 12:18:46 +02:00
scrawl
02dec787fd
Cache GMSTs in getDerivedDisposition
2014-09-27 22:44:20 +02:00
scrawl
ea956b537c
Don't search for fFatigueReturnBase and fFatigueReturnMult every frame
2014-09-27 22:37:53 +02:00
MiroslavR
508113f271
Resolve merge conflict
2014-09-27 17:50:17 +02:00
MiroslavR
1c4e52a0e5
Book formatter: Fix an excessive line break case
2014-09-27 17:35:57 +02:00
MiroslavR
cb5f661596
Book formatter: Support FONT closing tag, minor code cleanup
2014-09-27 13:31:59 +02:00
scrawl
e868a48a63
Don't trigger OnPcHitMe for friendly hits ( Fixes #1950 )
...
Don't consider actors as followers if they are also in combat with the follow target
2014-09-26 22:08:07 +02:00
scrawl
7252cb63a6
Fix cppcheck issues
2014-09-26 17:48:14 +02:00
scrawl
790e0150b1
Fix global map markers being duplicated when cell is visited again
2014-09-26 16:51:48 +02:00
scrawl
18be152ab1
Allow dragging map even when a marker is hovered
2014-09-26 14:27:52 +02:00
scrawl
603e558fb7
Fix broken getCollidingPc / getCollidingActor (cppcheck)
2014-09-26 14:16:46 +02:00
scrawl
97df7c9b22
Get rid of markers.png and use original MW texture, cleanup
2014-09-26 13:40:10 +02:00
scrawl
4f0fc79ea4
Change global map cell size from 24 to 18 and make it configurable
2014-09-26 12:47:33 +02:00
scrawl
0bc840aadd
Add NumericEditBox widget
2014-09-25 21:04:51 +02:00
scrawl
f56711f443
Fix crash caused by teleportation spells ( Fixes #1904 )
2014-09-25 18:14:04 +02:00
scrawl
8ad2b95208
Revert "AiFollow: return from execute() if target is not player"
...
This reverts commit 061c7813f6Fixes #1898 .
2014-09-25 17:57:10 +02:00
scrawl
40ce5add59
Don't report crime for attacking an NPC that is already in combat with another NPC ( Fixes #1908 , Fixes #1821 )
2014-09-25 17:33:26 +02:00
scrawl
6b65502557
Add properties for new widget classes to MyGUI plugin
2014-09-25 16:25:08 +02:00
scrawl
2066097202
Fix incorrect reading of global map state in some cases when the map size changed ( Fixes #1946 )
2014-09-25 15:28:02 +02:00
scrawl
40587f984d
Implement price-based mercantile skill progress ( Fixes #1947 ), thanks Hrnchamd
...
Correct barter formula (removed erroneous clamping)
2014-09-25 13:02:42 +02:00
scrawl
1afcc7adb5
Add imported font colors from openmw.cfg to MyGUI plugin
2014-09-25 00:04:38 +02:00
scrawl
62ab35881e
Don't advance skills in werewolf mode (thanks Hrnchamd)
2014-09-25 00:03:55 +02:00
scrawl
088d01d727
Minor cleanup
2014-09-24 23:50:28 +02:00
scrawl
0f99a959eb
Update barter offer for all items when another item is added ( Fixes #1935 )
2014-09-24 12:21:19 +02:00
scrawl
a7c0e07d78
Add missing World cleanup for mLevitationEnabled
2014-09-24 12:21:19 +02:00
scrawl
5d77c5e8ca
Transfer item ownership to the buyer if item wasn't stolen ( Fixes #1933 )
2014-09-24 12:21:19 +02:00
scrawl
45b4304237
Store levitation/teleport enabled state in savegames ( Fixes #1923 )
2014-09-24 12:21:19 +02:00
Marc Zinnschlag
175d4f3d44
Merge remote-tracking branch 'ragora/playdeathlevelupmusic'
2014-09-23 13:30:50 +02:00
Marc Zinnschlag
56858c98b1
Merge remote-tracking branch 'miroslavr/master'
2014-09-23 13:23:00 +02:00
Ragora
06e683d378
Added code to play music on level up and on death
2014-09-23 04:58:19 -04:00
MiroslavR
22c71cec18
Check for text size
2014-09-22 23:17:44 +02:00
MiroslavR
608e1518a5
Hack to prevent newlines at the end of books possibly creating unnecessary pages for mygui versions lower than 3.2.2
2014-09-22 21:47:21 +02:00
MiroslavR
f87d7c3fce
Book formatter: Do not insert last page if it's empty, code cleanup
2014-09-22 21:25:41 +02:00
MiroslavR
4b1df64fba
Book parser: Fix comparison between signed and unsigned integer expressions
2014-09-22 16:28:17 +02:00
Marc Zinnschlag
aa7fc8ee47
fix for potential script problem during saved game loading
2014-09-22 10:12:07 +02:00
MiroslavR
51cd2678ae
Book formatter: Fix last block of text not displaying
2014-09-21 22:25:54 +02:00
Lukasz Gromanowski
c72369fafe
Simplified casting when comparing to AV_NOPTS_VALUE.
...
AV_NOPTS_VALUE is casted to int64_t when compared with pts,
so with libavc >= 56.1 it should be no-op because in that version
it's already signed int.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 20:11:03 +02:00
MiroslavR
c362ec0f95
Book formatting: Handle line endings as per vanilla, fix tall images causing infinite loop, cleanup
2014-09-21 19:47:52 +02:00
Marc Zinnschlag
3cd717cd47
Merge remote-tracking branch 'lgro/videoplayer'
2014-09-21 19:04:15 +02:00
Lukasz Gromanowski
b40c1ff26c
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Corrected ifdef from previous commit around codecCtx->refcounted_frames = 1;
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:23:05 +02:00
Lukasz Gromanowski
7ad6a94523
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian)
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:13:54 +02:00
Lukasz Gromanowski
f5589b42ea
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:09:16 +02:00
Lukasz Gromanowski
d77546b7dc
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Deprecated functions were:
- AVCodecContext::get_buffer
- AVCodecContext::release_buffer
Changed to:
AVCodecContext::get_buffer2 and setting AVCodecContext::refcounted_frames to 1
before call to avcodec_open2().
release_buffer usage was removed.
Also changed places when some fileds were compared to AV_NOPTS_VALUE
- it's signed, so removed unsigned int casting, or changed casting
to signed int.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 12:58:11 +02:00
Marc Zinnschlag
e4b6f135b6
catch exceptions from adding local scripts
2014-09-21 12:43:19 +02:00
scrawl
fb26c2c2de
Fix autocalculated NPCs not having health/magicka/fatigue set correctly ( Fixes #1943 )
2014-09-21 11:39:17 +02:00
scrawl
b1e74e2a85
Remove support for Ogre 1.8 versions
2014-09-21 10:41:13 +02:00
Lukasz Gromanowski
6987dd768a
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 09:52:31 +02:00
scrawl
3ac04060c1
Fix NPCs being able to practice Block skill
2014-09-20 16:17:09 +02:00
scrawl
023d7072f9
Don't play battle music for enemies out of AI processing range
2014-09-20 13:55:57 +02:00
scrawl
d3554084ad
Fix weird behaviour of options menu sliders when value was changed out of bounds via cfg file
2014-09-20 13:50:23 +02:00
scrawl
f5868f7ae1
Fix layout problems in generate class result dialog
2014-09-20 13:07:38 +02:00
scrawl
e42cb8020e
Change all skins to get font colors from fallback settings ( Fixes #704 )
2014-09-20 10:40:09 +02:00
scrawl
25e96b8c7b
InteractiveMessageBox: Define a maximum width for the message text
2014-09-20 08:57:16 +02:00
MiroslavR
84d27d55e2
Remove redundant includes
2014-09-20 00:51:46 +02:00
MiroslavR
4f89c3e77a
Rework book formatter ( Fixes #1148 )
2014-09-20 00:11:04 +02:00
Marc Zinnschlag
65ddf7acfe
Merge remote-tracking branch 'scrawl/master'
2014-09-19 15:59:59 +02:00
Marc Zinnschlag
bc1eaa035d
Merge remote-tracking branch 'scrawl/fontcolors'
2014-09-19 15:59:10 +02:00
Marc Zinnschlag
2a48c377a8
Merge remote-tracking branch 'miroslavr/master'
2014-09-19 15:55:24 +02:00
scrawl
9c0649c11d
Add basic framework to retrieve font colors from fallback settings (Feature #704 )
2014-09-19 11:53:35 +02:00
scrawl
cbc242d857
Move item count text to ItemWidget
2014-09-19 09:29:00 +02:00
scrawl
b145d183ae
Fix incorrect alchemy failure handling when an effect has a zero magnitude/duration ( Fixes #1922 )
2014-09-19 09:11:21 +02:00
scrawl
8a3a3baed4
Tweak AiEscort maximum distances
2014-09-19 05:47:45 +02:00
scrawl
b6c6bfe943
Merge cell names when merging cells ( Fixes #1929 )
2014-09-19 05:02:54 +02:00
scrawl
b39fe85a51
Implement fPCbaseMagickaMult and fNPCbaseMagickaMult
2014-09-18 14:56:43 +02:00
scrawl
c05874e1ff
Reset CreatureLevList spawning flag if levelled list returned no creature
2014-09-18 06:06:20 +02:00
scrawl
c19f89976e
Add missing Hit voice dialogue for friendly hits
2014-09-18 05:13:17 +02:00
scrawl
54dac1460c
Run global scripts after running local scripts
...
Turns out to be a compatibility problem with Calvus Horatius contract scripts. The local script needs to be run first, otherwise the cleanup when he quits as result of negative profit does not work properly.
2014-09-18 04:33:49 +02:00
scrawl
08499ea51f
Fix Calvus Horatius AiFollow package not being removed after he quits as result of negative profit
2014-09-18 04:26:12 +02:00
scrawl
ac97a0f99d
Fix dialogue choices being displayed in incorrect order
2014-09-18 04:10:17 +02:00
scrawl
be7839873a
Don't trigger dynamic stats recalculation when setting up actor initial stats ( Fixes #1927 )
...
This caused the magicka value set in the CS to be ignored completely, so flame atronachs were spawning with 50 magicka instead of 105.
2014-09-18 03:47:45 +02:00
scrawl
447e93bdb4
Use SpellCast animation for creatures that have it (flame atronach)
2014-09-18 03:24:47 +02:00
scrawl
07cd647e75
Fix broken AI for creatures with OnTarget spells (Bug #1927 )
2014-09-18 03:19:13 +02:00
scrawl
09042ba6d9
Use object name instead of ID when available for tooltips
2014-09-17 13:03:12 +02:00
scrawl
2eaceb71ba
Reject AiTravel destinations further than 7168 units away, as in vanilla MW ( Fixes #1911 )
2014-09-17 12:39:10 +02:00
scrawl
441073b475
Remove ancient comment
2014-09-17 07:02:19 +02:00
scrawl
3ce3f31452
Adjust turning animation speed multiplier based on turning speed
2014-09-17 07:02:19 +02:00
scrawl
6debd21ec6
Make sure the Jump control is always handled by the PhysicsSystem even if game runs faster than the minimum physics timestep
2014-09-17 07:02:19 +02:00
scrawl
269c200c8f
Fix jump velocity mechanics ( Fixes #1708 )
2014-09-17 07:02:19 +02:00
scrawl
b6a89c7845
Fix idlestorm animation conflict with torch animation
2014-09-17 07:02:19 +02:00
scrawl
4c285151a3
Fix incorrect movement animation for some creatures ( Fixes #1924 )
2014-09-17 07:02:10 +02:00
Marc Zinnschlag
71c868aa94
Merge remote-tracking branch 'scrawl/master'
2014-09-15 12:45:00 +02:00
Marc Zinnschlag
3f671c86a8
Merge remote-tracking branch 'cc9cii/ffmpeg-swresample'
2014-09-15 12:44:38 +02:00
scrawl
0c75c6bf1b
Improve spellcasting AI for Drain/Damage effects
2014-09-15 10:42:51 +02:00
scrawl
157c53bed4
Handle spellcasting for creatures with no casting animation ( Fixes #1856 )
2014-09-15 10:42:44 +02:00
Marc Zinnschlag
19f469c7db
Merge remote-tracking branch 'scrawl/master'
2014-09-14 12:00:14 +02:00
Marc Zinnschlag
d1d861e1be
Merge branch 'run'
...
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/CMakeLists.txt
2014-09-14 11:59:54 +02:00
Marc Zinnschlag
89000f6196
removed unused OmwLoader
2014-09-14 11:28:28 +02:00
Marc Zinnschlag
ea60c665dd
Merge remote-tracking branch 'ragora/bounditemflag'
2014-09-14 10:54:07 +02:00
scrawl
233e221de2
Terminate AI packages when target is disabled or deleted ( Fixes #1910 )
2014-09-14 10:49:33 +02:00
Marc Zinnschlag
9b7f61b4ba
Merge remote-tracking branch 'scrawl/myguiplugin'
2014-09-14 10:45:26 +02:00
scrawl
1270dada34
Don't set Attacked flag when the actor is already in combat with the attacker ( Fixes #1909 )
2014-09-14 10:35:57 +02:00
scrawl
002b41ba51
Make changeWeather work when the player isn't in a cell yet (workaround for modTESTchargen_v2_5)
2014-09-14 08:38:54 +02:00
scrawl
4b27950879
Don't apply race height to NPC collision shape ( Fixes #1487 )
2014-09-14 07:04:02 +02:00
scrawl
bd96764229
Mark code that will be obsolete when upgrading to MyGUI 3.2.2
2014-09-14 03:54:50 +02:00
Ragora
b8851790a6
Covered forgotten old bound item checks
2014-09-13 18:59:13 -04:00
Ragora
f250e3df4b
Replaced old bound item checks that I knew of to use the new ItemStack::Flag_Bound bit
2014-09-13 18:48:41 -04:00
scrawl
4426b03fa4
Remove some garbage
2014-09-13 22:21:37 +02:00
scrawl
0c273568f2
Increment version number for input configuration
...
Old files are broken by keycode->scancode switch (319f4e0547
2014-09-13 21:45:03 +02:00
scrawl
99c276baa9
Set weapon Magical flag when enchanting a weapon
2014-09-13 21:23:44 +02:00
scrawl
a42e60970b
Revert "delete death events on adding an actor to the scene"
...
If we go to a different cell in the exact frame of an actor's death, the death event would be lost permanently.
This reverts commit fd2c07a6f4
2014-09-13 20:57:25 +02:00
scrawl
8625764143
Give 100% of health back when Resurrecting an actor ( Fixes #1877 )
2014-09-13 20:50:49 +02:00
Marc Zinnschlag
081588f484
add project file to content file list when running OpenMW from OpenCS
2014-09-13 20:48:24 +02:00
Marc Zinnschlag
10fa205ced
fixed --data switch (was missing composing option)
2014-09-13 20:41:57 +02:00
scrawl
319f4e0547
Bind to scancodes instead of keycodes
2014-09-13 20:39:59 +02:00
scrawl
dc1e8d4e22
Don't trigger any mouse button bindings while in the settings menu
2014-09-13 20:39:59 +02:00
scrawl
04c79d5f1e
Fix case issue when setting companion's profit on the script
2014-09-13 20:39:59 +02:00
scrawl
e54ba2c5d1
Fix broken dialogue Function_HealthPercent
2014-09-13 20:39:58 +02:00
Marc Zinnschlag
882ef37ae3
Merge remote-tracking branch 'ragora/conjureditemsgmstcheck'
2014-09-13 15:58:02 +02:00
Marc Zinnschlag
94a7e38194
Merge remote-tracking branch 'ragora/fixglobalcompassorient'
2014-09-13 15:55:06 +02:00
Marc Zinnschlag
690273d5b3
Merge remote-tracking branch 'ragora/fixmapresize'
2014-09-13 15:52:36 +02:00
scrawl
f82224497a
Compatibility fix for MyGUI git
2014-09-13 08:00:24 +02:00
scrawl
2c58a879ec
Fix minor exploit when map window is shown with transparency
2014-09-13 07:59:29 +02:00
scrawl
2b5adb325b
Remove a useless method
2014-09-13 07:57:15 +02:00
scrawl
cfc57d0fe0
Use MyGUI's castType for widget casts
2014-09-13 04:07:40 +02:00
MiroslavR
4fdef94034
Use player's base name for profiles
2014-09-13 02:58:01 +02:00
MiroslavR
23e6d52844
Fix UI not updating initially for zero stats
2014-09-13 02:56:06 +02:00
Ragora
282e7abd16
Map Arrow Correction; now rotate global map arrow to whatever the local map arrow orientation is
2014-09-12 18:26:38 -04:00
Ragora
35571bb108
Global compass arrow rotates regardless of indoor or outdoor presence
2014-09-12 17:31:37 -04:00
Ragora
25f99c5d5a
Discarded use of a static variable and renamed event function to be less ambiguous
2014-09-12 15:06:37 -04:00
Marc Zinnschlag
560eae3f4d
Merge remote-tracking branch 'ragora/conjuredequipmentrmvalfix'
2014-09-12 14:22:24 +02:00
cc9cii
1107156334
Workaround incorrectly reported channel_layout
2014-09-12 21:18:54 +10:00
Ragora
58d70c2895
Removed Unused includes from experimentation
2014-09-12 05:20:03 -04:00
Ragora
4ecac31752
Map keeps focus on wherever it was last moved when resizing map window
2014-09-12 05:16:33 -04:00
scrawl
c6bcd75058
Add various custom widgets used in OpenMW to the MyGUI plugin
2014-09-12 05:14:21 +02:00
Ragora
e105202ee2
Use std::set instead of std::map
2014-09-11 22:45:30 -04:00
scrawl
ee3b1e800c
Add FontLoader and transparent BG texture to the MyGUI plugin
2014-09-12 04:27:23 +02:00
cc9cii
675d11c0e5
Mental note: need to get a linux box
2014-09-12 11:25:11 +10:00
cc9cii
8fe6877cb2
More include madness b/w different systems & compilers
2014-09-12 11:05:02 +10:00
cc9cii
de41dfc314
Add includes.
2014-09-12 10:52:10 +10:00
Ragora
f9e2fd0f3d
Also forgot to remove a now unused variable I introduced
2014-09-11 20:47:14 -04:00
Ragora
efaa820ee2
Managed to forget the itemmodel.cpp code
2014-09-11 20:46:21 -04:00
Ragora
ea43a23505
All GMST logic is done in itemmodel.cpp now with usage of a static cache std::map
2014-09-11 20:45:22 -04:00
cc9cii
0121fdca2c
Don't use C99 in printf.
2014-09-12 10:31:49 +10:00
cc9cii
be74db8b24
Don't use to_string()
2014-09-12 10:04:46 +10:00
Ragora
83868bca23
Removed unused include left over from experimentation
2014-09-11 19:37:00 -04:00
Ragora
ee6298f520
Added Flag_Bound flag for ItemStack to check against but the system behind it is probably not the best
2014-09-11 19:33:45 -04:00
cc9cii
ecd9dd81ea
Moved debug statements before exception..
2014-09-12 08:41:33 +10:00
cc9cii
ce3077c970
Test version with debug statements. Also moved some common code out to a separate file.
2014-09-12 08:27:25 +10:00
Marc Zinnschlag
5dd424b6c6
Merge remote-tracking branch 'cc9cii/Bug-No-1655'
2014-09-11 14:14:02 +02:00
cc9cii
48a36442c6
Add libswresample and libavresample support for sounds.
2014-09-11 21:15:18 +10:00
Marc Zinnschlag
b5d5eadf79
Merge remote-tracking branch 'scrawl/master'
2014-09-11 09:01:21 +02:00
cc9cii
862c5fc8f6
Add libavresample support. Tested on windows x64 only.
2014-09-11 16:47:00 +10:00
Ragora
74e1db3ac8
Minor Correction to existing conjured item logic
2014-09-11 01:00:39 -04:00
scrawl
f3d4b63aaf
Fix AI moving load doors and throw an exception when trying to do this ( Fixes #1907 )
2014-09-11 05:53:56 +02:00
Ragora
69dbd6b30f
Added checks for different bound item situations
2014-09-10 23:38:38 -04:00
scrawl
36a90198e2
Add option to change screenshot image format
2014-09-11 04:32:31 +02:00
Ragora
141755b473
Appears to have resolved the issue with unequipping conjured items and all possible error conditions deriving from being able to unequip them
2014-09-10 21:34:17 -04:00
scrawl
7fa3100993
Refactor TradeWindow balance buttons to use ControllerRepeatClick
2014-09-11 00:25:09 +02:00
scrawl
ebab911e44
Add a hack to support binding the console to a printable key ( Fixes #371 ) and change default console key to morrowind default (GRAVE)
2014-09-10 18:13:39 +02:00
scrawl
cf355d0fcb
Change Always Run key default to Caps Lock, as in vanilla
...
A poor choice, but it's still what players coming from vanilla MW will expect.
2014-09-10 18:09:05 +02:00
MiroslavR
d64be1c092
Use CellId::mWorldspace to find out whether objects are in the same worldspace
2014-09-10 02:49:57 +02:00
MiroslavR
621e81fa7d
Make getdistance return maximum value only if the given objects are in different worldspaces ( Fixes #1895 )
2014-09-10 01:40:33 +02:00
scrawl
616148e168
Fix "failed to open file" error when no startup script is given
2014-09-09 18:28:49 +02:00
MiroslavR
45c90bdcb5
Call getPtrViaHandle instead of searchPtrViaHandle for faced handle
2014-09-09 18:10:34 +02:00
MiroslavR
7e6e248511
Don't cache faced handle, as its context may have been changed during the frame by input events
2014-09-09 17:50:56 +02:00
MiroslavR
86c286c24e
Fix werewolf globals
2014-09-09 15:12:42 +02:00
scrawl
dd5f4947d7
Add a TODO comment
2014-09-09 05:05:20 +02:00
scrawl
56cd0da522
Fix potential infinite recursion when an area effect spell is reflected ( Fixes #1896 )
2014-09-09 04:44:14 +02:00
MiroslavR
5ac2788a15
Feature #1545 : Allow to select the player in the console
2014-09-09 04:36:17 +02:00
MiroslavR
21eb25706c
Don't pursue the player for their crimes when they are a werewolf
2014-09-09 04:15:54 +02:00
scrawl
cb916594d9
Always show tooltips for dead actors
2014-09-09 02:12:44 +02:00
scrawl
d2ef0d362c
Implement vanilla distance threshold for AI processing (Bug #1876 )
2014-09-09 01:52:48 +02:00
scrawl
f18d4b4ac4
Don't show crosshair tooltips for actors in combat
2014-09-09 00:47:26 +02:00
scrawl
780a48cd1e
Don't greet dead actors in AiWander
2014-09-09 00:43:12 +02:00
scrawl
c54ab2e846
Don't allow talking to creatures that are in combat
2014-09-09 00:39:38 +02:00
scrawl
a9847c9453
Fix creature attacking flag not being reset after the attack starts ( Fixes #1889 )
2014-09-09 00:27:25 +02:00
scrawl
457b96a8af
Reset bounty and crime immediately when going to jail ( Fixes #1892 )
2014-09-09 00:00:55 +02:00
scrawl
628600a0a5
Make PlaceItem place the item in the player's current worldspace
2014-09-08 23:57:16 +02:00
scrawl
3007af44ea
Revert "Don't trigger CellChanged events when crossing exterior cell borders ( Fixes #1874 )"
...
This reverts commit 0c67ff9ed0
2014-09-08 20:52:15 +02:00
scrawl
6b06ab23aa
Don't play sound for torches with OffDefault flag ( Fixes #1884 )
2014-09-08 15:31:47 +02:00
scrawl
8b0cb239a9
Ignore text keys for zero-length animations ( Fixes #1876 )
...
This fixes an issue where the Riekling's attack animation would trigger *two* hits on each swing. It has the "min hit" and "hit" keys at the same time, so the MinHitToHit segment a zero-length animation. This caused problems as the "hit" text key will be encountered twice; once when playing the "max attack to min hit" segment and once when playing the "min hit to hit" segment.
2014-09-08 15:23:35 +02:00
scrawl
07d827c907
Ignore invalid input in numeric EditBox ( Fixes #1885 )
2014-09-08 15:22:33 +02:00
cc9cii
785d2c7cc9
Remove incomplete implementation to support planar formats. Make libswresample a prerequisite.
2014-09-08 15:24:39 +10:00
scrawl
fe0c9ec9b7
Change priorities in World::searchPtr
...
Fixes performance bottleneck of scripts searching through all Containers in all active cells every frame. Can be observed near cell (2,-6)
2014-09-07 19:09:23 +02:00
scrawl
adbc50366b
Use random attack strength for creatures (Bug #1876 )
...
Determining the attack strength from the time the wind-up animation was held will not work properly, as most creatures don't have this animation.
This fixes another balancing issue with Rieklings (they were previously using an attack strength of 1 every time).
2014-09-07 18:55:59 +02:00
scrawl
b6635c7964
Move eventDone out of WindowBase
2014-09-07 18:55:59 +02:00
scrawl
271c921cf8
Add missing confirmation dialog for deleting map notes
2014-09-07 18:55:59 +02:00
scrawl
6e2673daf3
Remove an unneeded include
2014-09-07 18:55:59 +02:00
scrawl
d6bc50c492
Remove an unused member variable
2014-09-07 18:55:59 +02:00
scrawl
31b31115af
Fix AI not using Restore Health effect when it is complemented by unnecessary restore magicka/fatigue effects (e.g. in sc_purityofbody)
2014-09-07 18:55:59 +02:00
scrawl
0c67ff9ed0
Don't trigger CellChanged events when crossing exterior cell borders ( Fixes #1874 )
2014-09-07 18:55:59 +02:00
cc9cii
f616000afb
More fix based on code review.
2014-09-07 21:17:34 +10:00
MiroslavR
b574131b06
Unset selected spell after selecting enchanted item in the spell window ( Fixes #1878 )
2014-09-07 12:42:11 +02:00
cc9cii
c396149f23
Code review fix.
2014-09-07 20:35:32 +10:00
Marc Zinnschlag
16aa55dcde
Merge remote-tracking branch 'miroslavr/master'
2014-09-07 10:22:07 +02:00
MiroslavR
931e778b4d
Initialize mHasMovedInXY in CharacterController
2014-09-06 21:31:48 +02:00
Rohit Nirmal
e315a72582
Remove extra semicolons at the end of some lines.
2014-09-06 13:04:52 -05:00
MiroslavR
007404e17f
Merge branch 'master' of github.com:OpenMW/openmw
2014-09-06 14:54:59 +02:00
MiroslavR
b1a449a0b9
Fix wolfrun sound playing all the time when running is default
2014-09-06 05:52:47 +02:00
MiroslavR
57f7ef1db4
GUI: update/clear force-hidden window status
2014-09-06 03:13:35 +02:00
MiroslavR
c1cc66985d
Werewolf: only NPCs should have modified fight and react to your transformation
2014-09-06 03:09:11 +02:00
scrawl
f274d5a627
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-09-05 17:18:36 +02:00
scrawl
282c93ccc5
Handle death in actor update rather than instantly ( Fixes #1866 )
2014-09-05 17:17:45 +02:00
cc9cii
6d12374ace
Move windows platform specific files into a common directory.
2014-09-05 22:36:33 +10:00
Marc Zinnschlag
86995adc4a
Merge remote-tracking branch 'cc9cii/Bug-No-1655'
2014-09-05 09:00:12 +02:00
MiroslavR
9e0d5dc28a
Werewolf: can't sleep in beds anymore, actors will attack you on sight, and if you are seen transforming, you will be marked for death
2014-09-05 01:58:57 +02:00
cc9cii
e0e561a105
Add icon to windows exe
2014-09-05 07:17:31 +10:00
cc9cii
7ae8d04c47
Arrgh... silly typo
2014-09-04 19:07:19 +10:00
cc9cii
c6cad5adc5
Make cmake more reliably detect libswresample
2014-09-04 18:55:10 +10:00
cc9cii
801b9446b7
Support for ubuntu/debian. Can easily be reverted if not required.
2014-09-04 07:58:46 +10:00
Marc Zinnschlag
71a2424500
Merge remote-tracking branch 'miroslavr/master'
2014-09-03 17:58:54 +02:00
cc9cii
093c7f8882
Moved format conversion to audio_decode_frame()
2014-09-03 22:52:03 +10:00
cc9cii
1e72cf4cdc
More refactoring, remove more #ifdef guards and fix repeat samples for planar formats.
2014-09-03 18:13:43 +10:00
scrawl
628d57f18c
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-09-03 04:55:24 +02:00
scrawl
2379c0ada7
Pause frame updates when the window is minimized ( Fixes #1868 )
2014-09-03 04:54:07 +02:00
MiroslavR
386bb98fd2
Do not attach coin widgets to a box
2014-09-03 03:03:03 +02:00
MiroslavR
5977860e09
Fix broken coin placement in levelup dialog + possible memleak
2014-09-02 22:06:02 +02:00
scrawl
84a0d064cd
Fall back to regular death animation if deathknockdown/deathknockout don't exist ( Fixes #1870 )
2014-09-02 15:14:23 +02:00
cc9cii
5095f729b0
Make travis happy again.
2014-09-02 22:05:54 +10:00
cc9cii
2d6b532ea5
Minimize the use of #ifdef guards for better code legibility.
2014-09-02 21:52:19 +10:00
Marc Zinnschlag
4894699eba
Merge remote-tracking branch 'scrawl/master'
2014-09-02 09:04:19 +02:00
scrawl
0eb949c8a7
Don't update ripples when they are not used
2014-09-02 04:29:37 +02:00
cc9cii
f4dd281393
Simplify the use of swr_convert and add #ifdef guards around code that require libswresample.
2014-09-01 21:49:37 +10:00
Marc Zinnschlag
a9df3b53fd
restored --new-game switch
2014-09-01 11:55:12 +02:00
MiroslavR
7dfba0ae30
Followers with high fight should not engage in combat with the player
2014-09-01 03:43:53 +02:00
MiroslavR
41c6045986
Realign all parent boxes when autosizedwidgets change size
2014-09-01 03:38:05 +02:00
scrawl
9caff1d800
Don't say Idle voices when player is not in LOS ( Fixes #1436 )
2014-09-01 02:21:54 +02:00
scrawl
59720b7dc6
Implement MagicItems flag for vendors ( Fixes #1861 )
2014-09-01 02:10:36 +02:00
scrawl
0da4757ee6
Merge branch 'master' of github.com:scrawl/openmw
2014-09-01 02:04:18 +02:00
cc9cii
0b9d17a81d
More cleanup.
2014-09-01 08:04:28 +10:00
cc9cii
fdee660ffb
Implemented feedback review comments, removing hard coded values and adding error handling.
2014-09-01 08:02:25 +10:00
cc9cii
68cbb8989e
Cleanup comments.
2014-08-31 23:39:17 +10:00
cc9cii
a7371eda4d
Now works for both FLT and S16 formats. The output format is hard coded in the MovieAudioDecoder constructor (default S16).
2014-08-31 23:35:05 +10:00
cc9cii
8429dab271
Working version - converts FLTP to FLT. Does not work when converting to S16.
2014-08-31 22:01:08 +10:00
cc9cii
16c165185b
Minor cleanup. Tested successfully on windows x64 using ffmpeg-20140823-git-7444cf9-win64-dev which is on libavcodec version 56.0.101.
2014-08-31 13:40:29 +10:00
cc9cii
944f99b23a
Initial commit of FLTP format binkaudio support. Converts to FLT format by manually interleaving decoded samples. swresample library is included with a view to use swr_convert() in future versions, but not used in this commit.
2014-08-31 13:20:33 +10:00
Corporama
ccca6db865
Compile fixes for Linux
2014-08-30 23:11:09 +02:00
scrawl
9d6ca9066f
Fix summoned creatures not following for non-player summoners
2014-08-30 18:48:28 +02:00
scrawl
180a831e96
Fix typo in combat distance
2014-08-30 18:38:24 +02:00
scrawl
fde6cad24b
Reset RefNum when copying a reference to a new cell
2014-08-30 18:27:59 +02:00
scrawl
267cf4e140
Implement ResetActors script instruction ( Fixes #1859 )
2014-08-30 18:27:32 +02:00
scrawl
58945c557a
Add sound for casting enchanted item with insufficent charge ( Fixes #1857 )
2014-08-30 02:47:35 +02:00
scrawl
a62e40f4ed
Add situational AI use of Feather, Dispel and Cure effects
2014-08-29 17:58:32 +02:00
Marc Zinnschlag
2eadff54d4
Merge remote-tracking branch 'rohitnirmal/scan-build-fixes'
2014-08-29 13:40:37 +02:00
Rohit Nirmal
b5eb16b663
Silence some scan-build warnings.
2014-08-28 20:55:32 -05:00
cc9cii
fa0352cd75
fix typo
2014-08-29 10:47:44 +10:00
cc9cii
961b4f0142
Suppress a warning.
2014-08-29 07:48:52 +10:00
scrawl
0be1ac1343
Enable casting of NoMagnitude effects in AI (e.g. summoned creatures)
2014-08-28 21:37:18 +02:00
scrawl
feeb740497
Fix bone not found exception for golden saint spellcasting
2014-08-28 17:02:11 +02:00
scrawl
0f43592237
Another invalid iterator fix
2014-08-28 16:47:54 +02:00
scrawl
1c222a0154
Fix mSelectedEnchantItem cleanup not working for non-player actors
2014-08-28 16:31:06 +02:00
scrawl
f91d639782
Add missing soul trap sound ( Fixes #1855 )
2014-08-28 16:30:42 +02:00
Marc Zinnschlag
ce3d75bba2
Merge remote-tracking branch 'scrawl/master'
2014-08-28 12:34:08 +02:00
scrawl
253036abee
Play VFX_Soul_Trap on successful soul trap
2014-08-28 02:55:36 +02:00
scrawl
f8f4d2dfdb
Another invalid iterator fix
2014-08-28 02:14:30 +02:00
scrawl
1a98f8ca93
Invalid iterator fix
2014-08-28 02:09:00 +02:00
scrawl
2e623bac5a
Don't attempt to use broken weapons in AI
2014-08-28 02:01:41 +02:00
scrawl
0bdc1b243a
Consider weapon ammunition in combat AI ( Fixes #1576 )
2014-08-28 01:54:32 +02:00
scrawl
f1d72419de
Don't equip weapons in autoEquip, AiCombat does that now ( Fixes #1451 )
2014-08-28 00:59:54 +02:00
scrawl
0fe9612afb
Implement basic spellcasting AI ( Fixes #961 )
...
Select a weapon to attack with in AiCombat and equip it (Fixes #1609 , Fixes #1772 )
2014-08-28 00:55:37 +02:00
scrawl
1a96dd0bd5
Remove more MyGUI 3.2.0 specific code
2014-08-27 16:39:13 +02:00
scrawl
c5fa7bf7c2
Minor cleanup
2014-08-26 17:45:28 +02:00
scrawl
4f92044d71
Allow user-created markers on local map ( Fixes #1571 )
2014-08-26 17:45:23 +02:00
scrawl
17dc01ec44
Require MyGUI version 3.2.1 and remove legacy code ( Fixes #1528 )
2014-08-26 17:01:35 +02:00
scrawl
dd77954512
Don't pass key to input binder if it was consumed by text editor ( Fixes #1845 )
2014-08-26 03:06:30 +02:00
scrawl
dcddd9a07c
Use MyGUI clipboard events for MyGUI 3.2.1+ ( Fixes #1846 )
...
Note that only <= 3.2.0 and >= 3.2.1 are supported, any SVN version between them might still exhibit duplicate text pasting.
2014-08-26 03:06:30 +02:00
scrawl
10a0e2434e
Open inventory when activating an unconscious actor ( Fixes #1848 )
2014-08-26 03:06:23 +02:00
scrawl
fc7ed05da8
Knock out actors when fatigue base is 0 ( Fixes #1847 )
2014-08-26 03:02:06 +02:00
scrawl
b4fbaf1169
Fix potential infinite recursion in ActionTeleport ( Fixes #1840 )
2014-08-26 02:09:23 +02:00
scrawl
854491ac15
Don't treat actors as following if another non-combat AiPackage precedes ( Fixes #1843 )
2014-08-26 02:09:23 +02:00
scrawl
7714192e28
Remove wrong comment
2014-08-26 02:09:23 +02:00
scrawl
9f13315d1c
Remove unused numUnload
2014-08-26 02:09:23 +02:00
scrawl
c775e05d7a
Show encumbrance preview when trading ( Fixes #1793 )
2014-08-26 02:09:22 +02:00
MiroslavR
fc21d898f2
Add hand-to-hand tooltip
2014-08-25 03:15:28 +02:00
MiroslavR
3823e36f05
Merge branch 'master' of github.com:OpenMW/openmw
2014-08-25 00:56:35 +02:00
MiroslavR
d16e0c063c
Enchanting, spellmaking dialog: check for flags when listing known effects
2014-08-24 21:59:52 +02:00
MiroslavR
df262e53ae
Display school in the spell tooltip
2014-08-24 20:51:41 +02:00
MiroslavR
fc789265e2
Spells that always succeed should not increase your skill when you cast them
2014-08-24 20:36:31 +02:00
Marc Zinnschlag
111b55f48e
Merge remote-tracking branch 'scrawl/script'
2014-08-24 17:58:05 +02:00
MiroslavR
e8a245bea3
Enchanting dialog: follow vanilla behavior more closely
2014-08-24 16:41:17 +02:00
Marc Zinnschlag
52f6a2ec7b
remote local variable access was always using variable with index 1 instead of the index specified by the access request ( Fixes #1739 )
2014-08-24 11:58:08 +02:00
Marc Zinnschlag
d024c1a93f
Merge remote-tracking branch 'scrawl/master'
2014-08-24 09:14:17 +02:00
Marc Zinnschlag
79e1786ff9
Merge remote-tracking branch 'rohitnirmal/quick-draw'
2014-08-24 09:11:58 +02:00
scrawl
c5c822ecba
Use Chop attack when walking diagonally ( Fixes #1729 )
2014-08-24 02:38:00 +02:00
scrawl
e0e4cbbb41
Implement Light magic effect ( Fixes #1122 )
2014-08-24 02:37:59 +02:00
scrawl
714c927fda
Fix being able to change camera during death via mouse wheel
2014-08-24 02:37:59 +02:00
scrawl
3dbe17b6ed
Terminate AiPursue when target dies ( Fixes #1836 )
2014-08-24 02:37:59 +02:00
scrawl
2b407a9995
Refactor NIF cache
...
- Remove broken cache locking mechanism
This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now.
- Decouple cache from NIFFile (now a new nifcache component)
- Add API for future background loading
- Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck.
2014-08-24 02:37:50 +02:00
Marc Zinnschlag
80d39780ae
same fix for a couple of additional instructions
2014-08-23 18:50:53 +02:00
Marc Zinnschlag
7de49a66e2
fix for PCJoinFaction and for getPcRank without explicit reference
2014-08-23 18:45:06 +02:00
Marc Zinnschlag
0d8bfbfa9b
getpcrank did not read the explicit reference in some cases ( Fixed #1767 )
2014-08-23 18:23:14 +02:00
Rohit Nirmal
6ed4f530df
Forgot to update comment.
2014-08-23 10:35:55 -05:00
Rohit Nirmal
bf97fe7b35
Need to change draw state if use'd item is in player's right hand.
2014-08-23 10:31:10 -05:00
scrawl
e9e7e96c5f
SaveGameDialog: use ComboBox accept event, not changePosition (improves keyboard navigation)
2014-08-23 16:18:46 +02:00
Marc Zinnschlag
7c1b32ae62
Merge remote-tracking branch 'miroslavr/corprus'
2014-08-23 09:15:27 +02:00
Rohit Nirmal
234903d93c
Change player draw state when quick-selecting weapon or spell.
...
(Fixes #1828 )
2014-08-22 21:36:39 -05:00
MiroslavR
85aa237baf
Implement removal of corprus spells
2014-08-22 03:34:31 +02:00
MiroslavR
2cbe17ca0a
Make Spells::mCorprusSpells private
2014-08-20 12:40:38 +02:00
MiroslavR
26732bc228
Purge blight should not remove corprus
2014-08-19 22:13:37 +02:00
MiroslavR
96e7ff666d
Implement saving/loading of corprus stats, remove redundant code
2014-08-19 03:17:31 +02:00
Bret Curtis
feb0ef8390
fixes building on systems with kFreeBSD kernel
2014-08-18 17:19:54 +02:00
scrawl
83037a1a91
Move fast-forward of particle systems outside of OgreNifLoader ( Fixes #1830 )
...
Particle systems were being fast-forwarded before the skeleton base was attached, so particles without the LocalSpace flag would spawn at an incorrect position.
2014-08-18 16:37:47 +02:00
MiroslavR
3722c7adc3
Initial work on implementing corprus worsening effect
2014-08-18 15:33:12 +02:00
scrawl
03cb66c342
Set render queue group for projectiles ( Fixes #1829 )
2014-08-18 15:32:52 +02:00
Bret Curtis
bb1fe23f9c
fix building on GNU Hurd
2014-08-18 14:41:46 +02:00
scrawl
888a53af04
SaveGameDialog: Allow deleting saves with keyboard (Delete key)
2014-08-17 20:41:23 +02:00
scrawl
9b38888ac9
Add missing AiFollow ActorId initialization ( Fixes #1818 )
2014-08-17 17:01:04 +02:00
Marc Zinnschlag
02b7712d7c
Merge remote-tracking branch 'scrawl/master'
2014-08-17 12:07:44 +02:00
scrawl
bcc79919a7
Fix fortified skill not immediately updating on changing equipment
2014-08-17 05:42:52 +02:00
scrawl
360c7f863c
Store magic effect Base values in savegame ( Fixes #1489 )
2014-08-17 05:38:48 +02:00
scrawl
2db50da8dd
Implement magic effect script instructions (Feature #1489 )
2014-08-17 05:09:14 +02:00
scrawl
d8943aef2f
Encapsulate magic effect magnitude (Feature #1489 )
2014-08-17 03:58:04 +02:00
scrawl
e508450c1c
Add persuasion GMST to ensureNeededRecords ( Fixes #1817 )
2014-08-17 03:58:03 +02:00
scrawl
322480862b
InteractiveMessageBox: lay out buttons horizontally if button width does not exceed message width ( Fixes #1812 )
...
Also fix some layout bugs.
2014-08-16 18:53:13 +02:00
MiroslavR
195f044f3b
Replace more .tga->.dds hacks with ResourceHelpers
2014-08-16 18:12:18 +02:00
scrawl
bb33b4e005
Revert "Remove horizontal messagebox layout, not used in vanilla ( Fixes #1402 )"
...
This reverts commit 40d6c8abf7
2014-08-16 17:24:18 +02:00
scrawl
ddf8c5023e
InventoryWindow: don't unnecessarily update preview on opening count dialog
2014-08-16 17:18:13 +02:00
scrawl
6ddd9cc5a2
Don't show weight or value for keys ( Fixes #1815 )
2014-08-16 16:51:56 +02:00
Marc Zinnschlag
47619d957a
Merge remote-tracking branch 'miroslavr/master'
2014-08-16 15:25:13 +02:00
Marc Zinnschlag
e893d0d7d3
Merge remote-tracking branch 'scrawl/master'
2014-08-16 15:10:03 +02:00
MiroslavR
063b40a0ee
Correct tooltip for maxed out skills
2014-08-16 13:30:49 +02:00
MiroslavR
236eec3d89
Allow widgets with layout-type tooltip to change user data of widgets from tooltip layout
2014-08-16 13:24:44 +02:00
MiroslavR
a9f7a30d90
HBox, VBox: call parent setPropertyOverride
2014-08-16 13:12:02 +02:00
scrawl
c4ae07f48a
Remove partially broken sound pausing in main menu ( Fixes #1707 )
2014-08-16 02:01:39 +02:00
scrawl
7432771ac7
For non-active torches set the particle system speed factor to zero instead of destroying it ( Fixes #1811 )
2014-08-16 00:51:02 +02:00
scrawl
ddba9e5854
Improve performance of ItemView resize (reposition widgets instead of recreate)
2014-08-15 18:42:33 +02:00
scrawl
084cc857d4
Update magic effects when changing equipment ( Fixes #1646 )
2014-08-15 01:13:38 +02:00
MiroslavR
1385a86bd4
Spell creation: do not add skill/attribute effects before selecting the skill or attribute
2014-08-15 00:30:24 +02:00
scrawl
7f807f31d0
Remove comment
...
Doing some testing with extended journals, doesn't appear to be a performance issue.
2014-08-14 19:49:03 +02:00
scrawl
c62d53ae84
Remove no longer needed comments about coordinate system
2014-08-14 19:09:33 +02:00
scrawl
c065a4b203
Add ManualResourceLoader for global map overlay ( Fixes #1736 )
2014-08-14 19:01:03 +02:00
scrawl
1bb82c710c
Fix use of uninitialized memory in AiWander::init
2014-08-14 18:55:54 +02:00
scrawl
061c7813f6
AiFollow: return from execute() if target is not player ( Fixes #1637 )
2014-08-14 02:14:13 +02:00
scrawl
f8010c09fe
Adjust combat engagement of following actors ( Fixes #1810 )
2014-08-14 02:13:55 +02:00
scrawl
94c2517d67
Fix race preview crash ( Fixes #1808 )
2014-08-13 19:30:46 +02:00
scrawl
28e61c9834
Add default values for fDifficultyMult and sDifficulty ( Fixes #1742 )
...
Also added values for some other GMSTs added in a Morrowind patch or Tribunal/BM
2014-08-13 17:32:52 +02:00
scrawl
09f27d142a
Clear movement queue when changing to a new cell ( Fixes #1802 )
2014-08-13 16:25:27 +02:00
scrawl
d649c19790
Cache ActorId in AiFollow::getTarget ( Fixes #1804 )
2014-08-13 16:00:32 +02:00
Marc Zinnschlag
93ed019ca3
Merge remote-tracking branch 'scrawl/master'
2014-08-13 09:04:35 +02:00
scrawl
8ae6796b2f
Play creature movement animation without scaling if a fallback is used ( Fixes #1797 )
2014-08-13 01:53:56 +02:00
scrawl
e2ee3b2497
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwrender/terrainstorage.cpp
2014-08-12 19:53:37 +02:00
MiroslavR
4f67f5d26f
Spellcreation window: set captions to "0" if no effects are added ( Fixes #1778 )
2014-08-12 18:53:03 +02:00
scrawl
b374255447
Improve performance of moving spell window (don't recreate widgets unnecessarily)
2014-08-12 17:07:15 +02:00
scrawl
025f50a2df
Improve performance of inventory window resize (don't update selection buffer unnecessarily)
2014-08-12 17:07:06 +02:00
MiroslavR
baa14511cf
Use ResourceHelpers to replace DDS hacks scattered throughout the code, fix prefix comparision
2014-08-12 12:18:38 +02:00
scrawl
177de58884
Use fWereWolfRunMult only when no weapon is drawn
2014-08-12 01:10:18 +02:00
scrawl
63cb91db2e
Add --export-fonts command line option
2014-08-11 20:40:02 +02:00
scrawl
cf22d2fa36
Make Potions reveal two effects for every fWortChanceValue of alchemy skill ( Fixes #1792 )
2014-08-11 20:40:02 +02:00
scrawl
5335f00958
Don't show Until Healed button when only fatigue is not full ( Fixes #1798 )
2014-08-11 20:40:02 +02:00
scrawl
28fe81df90
Make Lights with OffDefault flag not emit light nor particles when placed in a cell ( Fixes #1796 )
2014-08-11 20:39:56 +02:00
MiroslavR
4d403ed747
Rename and move functions for texture path correction
2014-08-11 20:04:44 +02:00
scrawl
8866b5f860
Fix maximum magicka calculation ( Fixes #1795 )
2014-08-11 19:07:14 +02:00
scrawl
fc1687906b
Use the last Loop Stop key for calculating animation velocity ( Fixes #1776 )
2014-08-11 05:29:36 +02:00
scrawl
34847baa54
Disable head animations for dead actors ( Fixes #1781 )
2014-08-11 05:00:13 +02:00
scrawl
f8040da694
Make doors move through dead actors ( Fixes #1608 )
2014-08-11 04:43:06 +02:00
scrawl
98bc4618cb
AiAvoidDoor: turn and walk forward instead of backwards or sideways ( Fixes #1788 )
2014-08-11 04:21:04 +02:00
scrawl
36ba56d037
Make Position instruction move non-player actors within their cell only ( Fixes #1791 )
2014-08-11 02:01:20 +02:00
scrawl
f724732290
Implement mouse wheel journal navigation ( Fixes #1790 )
2014-08-11 00:51:54 +02:00
scrawl
fcd2a9e4d5
Don't set magic effects for dead actors ( Fixes #1783 )
2014-08-10 23:52:32 +02:00
scrawl
4138c3e966
Reuse health of previous level rather than recalculating initial health ( Fixes #1787 )
2014-08-10 17:09:14 +02:00
scrawl
399fa90ef1
Add missing include guard
2014-08-10 16:56:54 +02:00
MiroslavR
4873c4bd31
Generalize function for texture path correction ( Fixes #1779 )
2014-08-09 18:59:57 +02:00
scrawl
4a26dcb2ad
Avoid calling RenderTarget::update from within loadResource
2014-08-08 15:46:33 +02:00
scrawl
8c26f802e6
Move terrain grid implementation to a component so the editor can use it (Feature #1597 )
2014-08-08 15:46:33 +02:00
scrawl
982453d4f6
Move ESM terrain data handler to esmterrain component so it can be used by the editor (Feature #1597 )
2014-08-08 15:46:33 +02:00
scrawl
accab47724
Don't knock down from fall damage in onHit (CharacterController is doing that already)
2014-08-08 15:46:32 +02:00
scrawl
a731ec3587
Remove summoned creature and its effect when it is killed ( Fixes #1341 )
2014-08-08 15:46:32 +02:00
scrawl
8a4e0a2ce8
Don't fade out screen if teleport target cell is not found
2014-08-08 15:46:32 +02:00
scrawl
143609be59
Set glyph width/height separately from texture coordinates (Bug #1096 )
...
Requires MyGUI SVN
2014-08-08 15:46:13 +02:00
scrawl
22d7d8a466
Implement Command creature/humanoid magic effects ( Fixes #1120 )
2014-08-07 17:21:07 +02:00
scrawl
0f8a10f468
Savegame: Set equipment slot for lights ( Fixes #1761 )
2014-08-06 20:13:58 +02:00
scrawl
2bfcec53bf
Don't show sMagicInvalidTarget for soultrap on NPCs ( Fixes #1762 )
...
Note the message was accurate, since NPCs can't be soultrapped. Maybe vanilla doesn't show it to not spam the screen with message boxes when attacking with a "soultrap on strike" weapon...
2014-08-06 20:13:58 +02:00
scrawl
a9a7a7ec73
Use Modified attribute values to derive magicka and fatigue ( Fixes #1760 )
2014-08-06 20:13:58 +02:00
scrawl
44b517f66d
Implement hiding inventory windows by double click on caption ( Fixes #1690 )
2014-08-06 20:13:58 +02:00
scrawl
c6bf9dfbfb
Add ManualResourceLoader for character previews ( Fixes #1752 )
2014-08-06 20:13:57 +02:00
scrawl
0b1e997bdd
Make sure dialogue is ended properly when closing it by using a service ( Fixes #1755 )
2014-08-06 20:13:57 +02:00
scrawl
1fc424ce30
Make sure player doesn't get any AI packages (Bug #1749 )
2014-08-06 20:13:57 +02:00
MiroslavR
42dceb641e
Readd Azura's Star after recharging ( Fixes #1765 )
2014-08-06 19:50:10 +02:00
MiroslavR
8707f7b116
Fix spell creation magicka cost ( Fixes #1763 )
2014-08-06 13:19:40 +02:00
Marc Zinnschlag
f4ddf2a7b9
Merge remote-tracking branch 'sandstranger/android'
2014-08-06 08:04:11 +02:00
root
c15902487d
fix indent in cmake
2014-08-06 07:59:39 +04:00
root
32ebc90ba4
fix v9
2014-08-06 07:52:36 +04:00
root
713787d92f
fix v7
2014-08-06 07:48:16 +04:00
root
3cd98e5259
fix code v5
2014-09-06 02:02:39 +04:00
root
d8772156a7
fixe all code v 2
2014-08-06 00:46:21 +04:00
root
8a8b91dfe1
fixed all code for building on all platforms inlcudng ANDROID
2014-09-04 22:47:03 +04:00
root
57a8b9cdb5
abdroid-build
2014-08-04 19:52:01 +04:00
root
16aafc26bc
fixed cmake for build on all plaforms include android
2014-08-04 19:49:54 +04:00
Marc Zinnschlag
33c36bf0df
Merge remote-tracking branch 'scrawl/master'
2014-08-03 22:23:48 +02:00
scrawl
45f0f0e4c3
Use sky_night_02.nif if available ( Fixes #1744 )
2014-08-03 17:40:29 +02:00
scrawl
639ae7e06c
Implement friendly hits on followers ( Fixes #1139 )
2014-08-03 16:24:16 +02:00
scrawl
2d74388a76
Don't report crime if we are in combat with the victim
2014-08-03 16:24:16 +02:00
scrawl
216ebac2e9
Implement weapon condition damage for ranged weapons ( Fixes #1746 )
2014-08-03 16:24:11 +02:00
Marc Zinnschlag
dbf5613d8c
cleanup
2014-08-03 09:28:44 +02:00
Digmaster
a32ab842ae
Added ForceJump/ForceMoveJump commands
2014-08-02 22:42:40 -07:00
scrawl
eb1888a540
Fix GetPcRank and PcExpelled not accepting Faction IDs properly ( Fixes #1709 )
2014-08-03 00:31:25 +02:00
scrawl
ef78ae22f6
Loosen mode restrictions on opening Journal window ( Fixes #1570 )
2014-08-03 00:31:18 +02:00
scrawl
cd8287da16
Make sure fog texture is loaded before trying to convertToImage
2014-08-01 18:42:51 +02:00
scrawl
6cb9382bf0
Adjust screen-sized widgets automatically using Stretch align
2014-08-01 17:15:28 +02:00
scrawl
715d357f24
Use a controller to move Drag&Drop widget with the mouse cursor
2014-08-01 17:14:35 +02:00
scrawl
a18cec7c8e
Use a MyGUI widget to render the screen fader ( Fixes #1741 , Fixes #1719 )
2014-08-01 16:25:41 +02:00
scrawl
b58b8c6f8f
Adjust player position to ground when using a door marker, even if the player is levitating ( Fixes #1737 )
2014-07-31 04:28:02 +02:00
scrawl
89af49f669
Make sure fog of war texture is loaded before accessing its buffer
2014-07-31 01:58:33 +02:00
scrawl
175cc98e64
Make magic effects with no corresponding resistance attribute unresistable ( Fixes #1727 )
2014-07-31 01:14:44 +02:00
scrawl
0f1451babd
Add epsilon to armor class calculation
2014-07-30 20:26:47 +02:00
scrawl
261e755e73
Font hacking again ( Fixes #1506 )
2014-07-30 15:26:10 +02:00
scrawl
d1feb9ef02
Fix # in book text being interpreted as MyGUI color code
2014-07-30 15:26:10 +02:00
scrawl
78bd516ab4
Show sMagicInvalidTarget for an invalid soultrap target ( Fixes #1728 )
2014-07-30 15:26:10 +02:00
Michał Ściubidło
f754e06be9
Fix for bug 1685
2014-07-30 07:47:09 +01:00
scrawl
45af34d189
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-07-29 19:35:44 +02:00
scrawl
543bb22e8f
Implement collision script instructions ( Fixes #1111 )
2014-07-29 19:01:40 +02:00
scrawl
9e48d56244
Reset RefNum when copying an object ( Fixes #1723 )
2014-07-29 15:55:58 +02:00
scrawl
1a6db097ed
Fix dangling MWWorld::Ptrs in enchanting dialog after loading save game ( Fixes #1722 )
2014-07-29 15:32:22 +02:00
scrawl
a59620f643
Cache loudness vector in the buffer cache
2014-07-29 14:32:44 +02:00
scrawl
0943ff0886
Fix normalizing sample values
2014-07-29 14:19:12 +02:00
scrawl
625f9a35e6
Implement NPC eye blinking ( Fixes #1721 )
2014-07-29 01:16:08 +02:00
scrawl
598c0c4ae7
Implement mouth animation for NPCs based on say sound ( Fixes #642 )
2014-07-29 01:15:22 +02:00
Michał Ściubidło
bd3729a6cb
Add grace periods for player greeting.
...
Add delay for NPC greating. NPC ignores greeted player after some time.
Fixes bug 1503.
2014-07-28 23:45:26 +01:00
Michał Ściubidło
d47bfbe69c
Implement AI greeting states.
...
Greeting consist of 3 phases:
- none - default one, greeting state can only change to "in progress"
when near enough and some time passes
- in progress - NPC says his greating and rotates toward player,
state can only change to "done" after some time
- done - rotation is stoped, after idling can go away from player,
state can only change to "none" when player and NPC are faraway
2014-07-28 23:45:26 +01:00
Michał Ściubidło
20efeea5d9
AI tell their greatings even when player is moving (like morrowind).
...
Greating reset distance was greatly inflated comparing with morrowind.
2014-07-28 23:45:26 +01:00
scrawl
8455ed6279
Cancel upper body animations when knocked down
2014-07-28 19:51:29 +02:00
scrawl
5349699172
Only show "target resists magic" message for spells cast by player
2014-07-28 17:54:48 +02:00
bogglez
b56cb7e5ee
Remove defunct option for building without FFmpeg
...
- Added REQUIRED to find_package(FFmpeg)
- Removed USE_FFMPEG option from CMakeLists.txt
- Always use FFmpeg for sound input
- Removed SOUND_DEFINE from CMakeLists.txt
- Removed #else branch from videoplayer.cpp with dummy VideoState code
(FFmpeg is now guaranteed to exist and the code was incomplete)
- Remove #ifdef OPENMW_USE_FFMPEG in ffmpeg_decoder.cpp, it is guaranteed to be used
- Remove #ifdef OPENMW_USE_FFMPEG from soundmanagerimp.cpp, it is guaranteed to be used
2014-07-28 17:46:41 +02:00
scrawl
f67b7dae91
Sheath weapon in all Ai packages except for AiCombat
2014-07-28 17:32:14 +02:00
scrawl
d956df83e4
Don't make guards fight non-aggressive creatures that are in combat
...
Ex. summoned creature that is helping in a fight.
2014-07-28 17:19:20 +02:00
scrawl
d9a6515fe3
Adjust AiFollow running threshold to more closely match vanilla MW
2014-07-28 17:11:46 +02:00
scrawl
18b3e71be5
Reset player position when spawning in fallback cell
2014-07-28 16:59:46 +02:00
scrawl
4773d754c6
Remove redundant isHostile flag ( Fixes #1652 )
2014-07-28 16:41:12 +02:00
scrawl
0077296c91
Take actor's speed into account in stuck check
...
The Winged Twilight's walking animation was so slow that it incorrectly detects being stuck.
2014-07-28 15:57:16 +02:00
scrawl
d69ed78ccd
Don't add combat AI to player
2014-07-28 15:40:52 +02:00
scrawl
3067082534
Make base_anim.nif take priority for biped creatures
...
Fixes the skeletal minion's WalkForward1h animation.
2014-07-28 14:53:53 +02:00
Marc Zinnschlag
4791098e11
Merge remote-tracking branch 'miroslavr/master'
2014-07-28 10:06:22 +02:00
Marc Zinnschlag
7991dfb907
Merge remote-tracking branch 'scrawl/master'
2014-07-28 09:03:17 +02:00
Marc Zinnschlag
c9cd7fb6b7
Merge branch 'scripts'
2014-07-28 09:02:24 +02:00
scrawl
c6d3b0b70b
Moved merchant restock from trade start to dialogue start, since other services also interact with it.
2014-07-28 02:27:48 +02:00
scrawl
315b022d2d
Add transfer gold from all services to NPC trade gold pool
2014-07-28 00:55:57 +02:00
scrawl
45206bc3f6
Savegame: write and read dynamic Store before Cells
2014-07-28 00:32:59 +02:00
MiroslavR
b4ba18afe7
Include revision number in the "version" command line option ( Closes #1711 )
2014-07-27 23:36:40 +02:00
scrawl
6262d6c964
Don't leave stale player CharacterController in Actors when loading game ( Fixes #1713 )
2014-07-27 23:10:58 +02:00
scrawl
d81e9cfefd
Implement actors fighting for the actor they are following ( Fixes #1141 )
2014-07-27 20:33:45 +02:00
scrawl
47e42d4fda
Destroy Engine after exception is logged
...
In cases where OpenMW throws an exception, then crashes in the Engine destructor (ideally should not happen, but keeps happening), we will at least see what the exception was about.
2014-07-27 20:33:45 +02:00
scrawl
8c81e22f3e
Determine target for On Touch effects for non-player actors
2014-07-27 20:33:44 +02:00
scrawl
31d058b98c
Add workaround for ScrollView messing up canvas size ( Fixes #1700 )
...
TODO: Create fixed ScrollView widget?
2014-07-27 20:33:44 +02:00
scrawl
16b089cdc8
Fix invisible enchanting price when self-enchanting was previously used.
2014-07-27 20:33:44 +02:00
scrawl
9c60e4d826
Change button caption from "Buy" to "Create" when self-enchanting
2014-07-27 20:33:44 +02:00
scrawl
09607f992e
Enchanting: fix inverted self-enchant success chance ( Fixes #1701 )
2014-07-27 20:33:44 +02:00
scrawl
b370c0f7b5
Enchanting: Don't check price on self-enchanting (Bug #1701 )
2014-07-27 20:33:43 +02:00
scrawl
4a1e561015
Properly assign effect attribute/skill in potion creation ( Fixes #1704 )
2014-07-27 20:33:02 +02:00
scrawl
90b2709d6c
Allow absorption of non-harmful spells ( Fixes #1693 )
...
Also fix absorption being calculated for each effect rather than the whole spell.
2014-07-25 19:56:06 +02:00
scrawl
60499eff83
Hotfix for message boxes locking up the game
2014-07-25 19:48:37 +02:00
Marc Zinnschlag
af54bb9623
removed some redundancies; some more general cleanup
2014-07-25 12:23:18 +02:00
Marc Zinnschlag
d0654f3ade
move starting of startup scripts from engine startup to new game start; also restart all startup scripts on saved game load
2014-07-25 12:17:15 +02:00
Marc Zinnschlag
1ca0cc4988
rewrote MWScript::Locals::configure to be independent of precompiled script data
2014-07-25 09:37:21 +02:00
Marc Zinnschlag
a3c4000198
moved call to Globalscripts::addStartup out of the constructor because at the time of construction the environment may not be set up yet to perform this operation
2014-07-25 09:36:02 +02:00
Marc Zinnschlag
87c54adb24
some cleanup
2014-07-25 09:26:30 +02:00
Marc Zinnschlag
f6b502b195
rewrote dialgoue filter access to local variables
2014-07-25 09:08:59 +02:00
Marc Zinnschlag
9f69db0d69
added missing const to ScriptManager::getLocals
2014-07-25 08:12:53 +02:00
Marc Zinnschlag
2e355df8b3
removed function ScriptManager::getLocalIndex (was redundant and was also depending on precompiled scripts)
2014-07-25 07:59:50 +02:00
scrawl
4ec51b386a
Add ManualResourceLoader for fog of war textures ( Fixes #1675 )
2014-07-24 19:00:57 +02:00
scrawl
4b3e12bfb4
Fix pinned widgets receiving mouse clicks in gamemode ( Fixes #1686 )
2014-07-24 18:04:44 +02:00
scrawl
469d2afffa
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwgui/levelupdialog.cpp
2014-07-24 02:33:46 +02:00
scrawl
d4ff17f1c5
Remove unused FLTV and NAM0 from CellRef
2014-07-24 02:20:16 +02:00
scrawl
7ae9bbb1a5
Implement iCrimeThresholdMultiplier
2014-07-24 02:17:44 +02:00
scrawl
fc618cb3ea
Use separate function for fatigue restoration during resting/waiting
2014-07-24 02:17:44 +02:00
scrawl
103325bfb8
Change HUD enemy health bar to use actorId
2014-07-24 02:17:44 +02:00
scrawl
75366b2e37
Implement CellRef's faction rank (rank requirement to use item)
2014-07-24 02:17:38 +02:00
scrawl
ca45a63cf7
Close doors instantly when using Lock instruction
2014-07-22 17:55:54 +02:00
scrawl
2b57c7fa67
Use CellRef's global variable to disable owner ( Fixes #1677 )
2014-07-22 17:06:40 +02:00
Marc Zinnschlag
91afc2ebe7
Merge remote-tracking branch 'mikesc/bug1482'
2014-07-22 08:13:35 +02:00
Marc Zinnschlag
6b5f79a9ca
Merge remote-tracking branch 'miroslavr/master'
2014-07-22 08:11:11 +02:00
Marc Zinnschlag
ccf672630f
Merge remote-tracking branch 'lgro/aicombat'
2014-07-22 08:06:24 +02:00
Michał Ściubidło
e24173f94a
Fix bug 1482:
...
- put powers on cooldown only when they are used succedsfully
2014-07-21 23:56:38 +01:00
Lukasz Gromanowski
171c61022d
Added initialization of weapRange in AiCombat::execute().
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-07-21 21:17:12 +02:00
MiroslavR
3b67e9b329
Rework level up dialog to behave more like vanilla
2014-07-21 20:56:02 +02:00
scrawl
c0645d4978
Increase death count immediately on death (Bug #1588 )
...
This is required for scripts using getDeadCount as reaction to onDeath that rely on the increased value.
2014-07-21 20:37:14 +02:00
scrawl
d43c21a9fc
Make NPCs react to being attacked by other actors ( Fixes #1588 )
2014-07-21 20:36:26 +02:00
scrawl
127add7623
Don't allow dialogue with werewolf NPCs
2014-07-21 18:19:45 +02:00
Marc Zinnschlag
d87630b41a
blacklisting for scripts in OpenMW
2014-07-21 09:34:10 +02:00
scrawl
10d4da7994
Fix date time in journal entries being off by one day ( Fixes #1668 )
2014-07-21 01:17:01 +02:00
scrawl
5629803a08
Implement correct armor mitigation mechanics
2014-07-20 23:45:31 +02:00
scrawl
804f1a5e59
Adjust combat mechanics
...
- Projectiles can not trigger critical hits
- Critical hits are only possible if the target is not in combat (Fixes #1669 )
- Hand-to-hand deals damage to health during entire duration of knockdown animation (including standing up)
2014-07-20 23:17:55 +02:00
scrawl
90a96cd7d8
Fix bug where actors in combat with multiple other actors where not regarded as in combat with a specific actor
2014-07-20 22:34:20 +02:00
scrawl
1636fd66db
Don't add creature base damage to weapon damage (UESP was wrong)
2014-07-20 22:26:26 +02:00
scrawl
6d794dac69
Add missing messagebox for spell lock and unlock success
2014-07-20 17:09:55 +02:00
scrawl
9897f14c3c
Don't block when actor is paralyzed
2014-07-20 16:52:57 +02:00
scrawl
28a0899d2b
Implement difficulty scaling ( Fixes #1505 )
2014-07-20 16:38:20 +02:00
scrawl
5bbf07976f
Consider Shield spell effect for creature armor rating
2014-07-20 14:41:39 +02:00
scrawl
691ba02115
Reduce wepaon condition even if attack misses
2014-07-20 14:12:27 +02:00
MiroslavR
0f2305ae43
Clear selected spell when window manager is cleared
2014-07-20 13:07:47 +02:00
scrawl
63fd04882a
Make sure crime gold discounts don't reduce price to zero
2014-07-19 23:49:54 +02:00
MiroslavR
d5381e1bc4
Dynamically resize skill widgets to fit their contents ( Fixes #1610 )
2014-07-19 14:04:38 +02:00
Marc Zinnschlag
6a3ff211b1
automatically get target ID at InterpreterContext construction, if a reference is available
2014-07-18 09:57:47 +02:00
Marc Zinnschlag
4fb897f2f8
added missing getId functions to classes derived from MWWorld::Class
2014-07-18 09:56:58 +02:00
scrawl
d4ffd30f98
Implement Rank filter with no faction given ( Fixes #1660 )
2014-07-17 20:57:37 +02:00
scrawl
f9a39138cc
Add missing endline
2014-07-17 16:16:14 +02:00
scrawl
08ce6ed7fb
Attempt to restack item after repair or recharge ( Fixes #1656 )
2014-07-17 16:16:06 +02:00
Marc Zinnschlag
27c84d6cb7
the reference for a targeted script is now determined when needed instead of at the start of the script execution
2014-07-17 13:36:55 +02:00
Marc Zinnschlag
dba6a9ebff
run targeted scripts with an implicit reference based on the ID given
2014-07-17 09:15:41 +02:00
scrawl
20a0040bdb
Apply elemental shield magnitude to element resistance ( Closes #1121 )
2014-07-16 10:58:28 +02:00
scrawl
123157b216
Implement elemental shield damage to attacker (Feature #1121 )
2014-07-16 10:58:28 +02:00
scrawl
f43a10b7b9
Adjust disease contraction according to Hrnchamd's research
2014-07-16 10:58:21 +02:00
Marc Zinnschlag
75ab8de3d2
added opcode for running scripts with explicit references (targeted scripts)
2014-07-15 13:26:04 +02:00
Marc Zinnschlag
e9377ad5c4
include targeted script data in saved games
2014-07-15 13:05:38 +02:00
Marc Zinnschlag
8241ee59c3
modified GlobalScripts data structures to accommodate targeted script data
2014-07-15 12:59:02 +02:00
scrawl
5839691530
Check for container organic flag before checking weight ( Fixes #1654 )
2014-07-14 17:27:36 +02:00
scrawl
6cd739678a
Fix dangling model pointer after reference cleanup ( Fixes #1653 )
2014-07-14 16:53:58 +02:00
scrawl
7c7c71428a
Don't crash if certain class doesn't exist
2014-07-13 14:26:59 +02:00
scrawl
c9150c9680
Initialize character skeleton to a suitable pose ( Fixes #1473 )
2014-07-13 10:40:48 +02:00
slothlife
d0e1210dd7
Fix for Bullet debug assert
...
After changing the vector comparison to squaredDistance, the threshold
for rejecting similar vectors needed to be readjusted.
2014-07-13 01:39:42 -05:00
scrawl
8b404ee255
Fix not being able to exit dialogue using Escape when a Goodbye link appears
2014-07-13 06:42:24 +02:00
scrawl
f2799ea1d9
Reset item model when reference is reset ( Fixes #1628 )
...
This caused crashes when the window was resized after the reference no longer exists (e.g. when a savegame is loaded)
2014-07-12 18:53:22 +02:00
scrawl
d63dd88113
Apply autocalc corrections to player starting spells
2014-07-12 18:53:16 +02:00
scrawl
fd3f109362
Fix underflow for NPCs with level 0
2014-07-12 18:53:16 +02:00
scrawl
a1639371d3
Fix rounding for skill/attribute autocalc
2014-07-12 18:53:16 +02:00
scrawl
83819b2894
Traverse spells in record order from content files. bronrod_the_roarer is perfect now. Other NPCs have some differences.
2014-07-12 18:53:15 +02:00
scrawl
479f248c1d
Use spell effect range type, not base effect (applied to spellcasting code)
2014-07-12 18:53:15 +02:00
scrawl
b4f8edc186
Use spell effect range type, not base effect
2014-07-12 18:53:15 +02:00
scrawl
1c41ce9b9d
Implement Hrnchamd's player and NPC autocalc spells (Some unclarities remaining, XXX)
2014-07-12 18:53:15 +02:00
scrawl
d91d599269
Disable quickload when in modal dialog ( Fixes #1641 )
2014-07-12 06:43:04 +02:00
scrawl
048d07b299
Show owner of doors in tooltip
2014-07-11 11:57:21 +02:00
scrawl
5fbce67b9d
Don't redraw ItemView if the size did not change
2014-07-11 04:30:44 +02:00
scrawl
53c70dbdaa
Exit dialogue when going to jail ( Fixes #1635 )
2014-07-11 04:25:56 +02:00
scrawl
0704fa2b3d
Reset local rotation axis in SetAngle ( Fixes #1630 )
2014-07-09 10:23:01 +02:00
scrawl
df80c436fb
Fix compile error for OPENMW_USE_FFMPEG=0
2014-07-08 10:30:46 +02:00
scrawl
742d008765
Fix initializing CharacterController with fists or spell equipped
2014-07-08 10:30:46 +02:00
scrawl
a3a8f4da70
More font hackery. Will it ever end?
...
Fixes #1606
2014-07-08 10:30:45 +02:00
scrawl
0a2d5d34bc
Cancel queued view mode switch when switching view mode ( Fixes #1618 )
2014-07-08 10:30:45 +02:00
scrawl
ee81698089
Always control movement by animation except for first person or in-air
2014-07-08 10:30:45 +02:00
scrawl
6cd6578a88
Handle Deleted moved references (Bug #1613 )
2014-07-01 21:47:27 +02:00
scrawl
e666ddfe18
Fix list of moved references being discarded ( Fixes #1613 )
2014-07-01 21:42:11 +02:00
scrawl
df62c06acf
Print exterior grid position in betaComment
2014-07-01 21:41:23 +02:00
scrawl
205e039a39
Allow modCurrent instructions to decrease below zero (Bug #1589 )
2014-06-30 17:58:08 +02:00
scrawl
2506c16bf5
Add a dummy GetStat function returning 0 ( Fixes #1589 )
2014-06-30 17:49:01 +02:00
scrawl
85a1f9d37b
Fall back to resolution selected from list when switching to fullscreen ( Fixes #1599 )
2014-06-30 00:08:39 +02:00
scrawl
082b6125a9
Fix crash during spell creation when an effect targeting a skill/attribute doesn't have one assigned yet ( Fixes #1598 )
2014-06-29 17:02:29 +02:00
scrawl
5ec96c5394
Add missing visibility flags
2014-06-29 16:02:43 +02:00
scrawl
1de406cb6d
Catch exception from invalid scripts during save&load ( Fixes #1590 )
2014-06-29 16:02:43 +02:00
Marc Zinnschlag
604509ac7e
Merge remote-tracking branch 'scrawl/master'
2014-06-29 10:34:48 +02:00
scrawl
e25fa6c157
Refactor non-distant land terrain path to a grid based implementation ( Fixes #1562 )
2014-06-29 02:42:36 +02:00
scrawl
4949aa1fbb
Add hack required for unnamed animated collision shapes (in_dagoth_bridge00.nif)
2014-06-28 18:21:56 +02:00
scrawl
10ef0a34d9
Update effects even when main animation is paused ( Fixes #1585 )
2014-06-28 17:54:14 +02:00
scrawl
f929004635
Search exterior cells in reverse (workaround for duplicate chargen_plank reference in Morrowind.esm and Bloodmoon.esm)
2014-06-28 17:44:52 +02:00
scrawl
65e36793fc
Fix messagebox on crash showing wrong path
2014-06-28 15:31:55 +02:00
scrawl
3b2358888b
Attempt to fix player position after using coc/coe
2014-06-28 15:19:32 +02:00
scrawl
8e361bb879
Make targeted spells collide with water ( Fixes #1500 )
2014-06-28 14:49:07 +02:00
scrawl
92f5898b32
AiWander: Make sure we have 8 idle values ( Fixes #1583 )
...
The AiWander instruction may specify more (or less) than 8.
2014-06-28 14:22:27 +02:00
scrawl
523c2715e3
AiCombat: Handle Start to Min and Min to Max durations of 0 (found in Riekling animation)
2014-06-28 01:31:34 +02:00
scrawl
516014c071
Trigger hit on start key if there's no hit key ( Fixes #1574 )
2014-06-28 01:06:53 +02:00
scrawl
911bd0e340
Use walk animation as fallback if there's no run animation ( Fixes #1578 )
2014-06-28 00:07:13 +02:00
scrawl
78d02d97da
Find text keys in reverse (Bug #1578 )
2014-06-28 00:06:08 +02:00
scrawl
2451eead8a
Some additional wrapping for faction rank instructions
2014-06-27 20:07:19 +02:00
scrawl
7f26843dc3
Reset key focus when the key focus widget is hidden ( Fixes #1568 )
2014-06-27 19:35:41 +02:00
scrawl
37c85f0af4
Don't update object root controllers with no time source ( Fixes #1564 )
2014-06-27 19:35:41 +02:00
scrawl
6a900e0aad
Update weapon and shield controllers for creatures
2014-06-27 19:35:41 +02:00
Marc Zinnschlag
3100206b28
replaced an assert with an exception
2014-06-27 08:37:41 +02:00
scrawl
8b340ddd5e
Implement slower movement against storms ( Closes #41 )
2014-06-27 03:22:00 +02:00
scrawl
07d0f4458d
Rotate clouds/particles to come from red mountain ( Fixes #245 )
2014-06-27 03:22:00 +02:00
scrawl
9eb8addc70
Make flying creatures fall when paralyzed ( Fixes #1494 )
2014-06-27 03:21:50 +02:00
scrawl
865f4648b0
Fix flying creatures not falling on death
2014-06-26 17:15:07 +02:00
scrawl
44fd526c98
Don't show disposition bar for creatures
2014-06-26 15:36:19 +02:00
scrawl
4aab4e1c26
Ignore item condition when determining value, except in trade ( Fixes #1557 )
2014-06-26 14:59:33 +02:00
scrawl
869fa08a32
Fix disarming a trap when key is used ( Fixes #1556 )
2014-06-26 14:30:19 +02:00
scrawl
e5254ff8ef
Set render queue for rain
2014-06-26 14:26:53 +02:00
scrawl
7b1e1d03d8
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwrender/sky.hpp
2014-06-26 04:29:03 +02:00
scrawl
697329f128
Fix crash for in_dagoth_bridge00.nif ( Fixes #1561 )
...
This one is causing trouble by using an unnamed node, will need some more work.
2014-06-26 03:33:09 +02:00
scrawl
15b486e149
Don't trigger changed flag if a script with no locals is configured
2014-06-26 01:21:15 +02:00
scrawl
2d17d8f61a
Savegame: start in (0,0) cell if player's cell no longer exists
...
This happens frequently when saves are loaded that were created in a different MW language.
2014-06-26 01:19:03 +02:00
scrawl
5bd2f30a99
CellRef uninitialized fixes
2014-06-25 19:52:14 +02:00
scrawl
f6a568c995
Implement rain (Feature #41 )
2014-06-25 18:20:21 +02:00
scrawl
09926a86cb
Fix comparing outdated listener position with up-to-date cell ( Fixes #1499 )
2014-06-25 18:10:26 +02:00
scrawl
2bcbc6ab7d
Potential crash fix, either way should have a better error message now
2014-06-25 14:52:12 +02:00
Marc Zinnschlag
85965bfd47
Merge remote-tracking branch 'scrawl/master'
2014-06-25 09:58:00 +02:00
scrawl
ec64f1a53a
Reset accumulation root when its animation finishes
...
Fixes a position flicker after standing up from knockdown.
2014-06-25 02:46:39 +02:00
scrawl
ee098de0a6
Don't ignore lighting values of particles not attached to a character
2014-06-25 01:14:21 +02:00
scrawl
b259c5def2
Make GetFactionReaction garbage argument optional
2014-06-25 01:12:57 +02:00
scrawl
3d9bdad8ba
Correct run speed for creatures (by Hrnchamd - Fixes #1136 )
2014-06-25 00:51:02 +02:00
scrawl
7f1d0fc2a2
Fix disposition for npcs in same faction, by Hrnchamd
2014-06-25 00:12:51 +02:00
scrawl
8a8ecce1e5
Fix some uninitialized data written to savegames
2014-06-25 00:11:25 +02:00
scrawl
693a097b21
Implement idlestorm animation (Feature #41 )
2014-06-24 18:37:38 +02:00
scrawl
36135293e8
Fix moving object from an inactive to another inactive cell
2014-06-24 15:29:36 +02:00
scrawl
b52977e44c
Add dummy Face implementation for now (Bug #1541 )
2014-06-24 15:09:13 +02:00
scrawl
36132e054a
Implement ashstorm, blightstorm, snow and blizzard effects (Feature #41 )
2014-06-24 15:00:15 +02:00
scrawl
1d46ac19ff
Fix being able to activate through terrain
2014-06-24 02:24:32 +02:00
scrawl
320ab1b2c1
Don't say voice when using startcombat for a dead actor ( Fixes #1542 )
2014-06-23 22:00:17 +02:00
scrawl
0b34d8d2fd
Add support for animated collision shapes ( Fixes #1549 )
2014-06-23 20:43:24 +02:00
slothlife
9ea22324f7
Fix some MSVC warnings.
...
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
2014-06-23 01:13:30 -05:00
scrawl
64a4c2785e
Fix water walking
2014-06-22 22:30:30 +02:00
scrawl
d296c6e9b7
Handle fog density values of 0 (Bug #1549 )
2014-06-22 22:30:29 +02:00
scrawl
cbec0ffaee
Exception fix
2014-06-22 22:30:29 +02:00
slothlife
ead801f2d0
Fix for compiling Win32 debug.
2014-06-21 21:15:41 -05:00
scrawl
e23a7694f3
Don't throw exception when using ModDisposition on creatures ( Fixes #1548 )
2014-06-22 00:34:32 +02:00
scrawl
e002acdeae
Physics: Create actor shapes outside of BulletNifLoader
...
This will allow to create a specialised shape instead, such as a capsule, which tends to work better for character controllers.
2014-06-21 23:37:16 +02:00
scrawl
98329a94b4
Add case sensitivity workaround for spine bones ( Fixes #1547 )
2014-06-21 19:54:12 +02:00
scrawl
a4ce9d6a7f
Always show the script name when a script fails to compile
2014-06-20 23:56:21 +02:00
scrawl
9a26cf22e6
Implement toggleMenus
2014-06-20 18:51:00 +02:00
scrawl
ad0a182b7e
Improve error message for unknown cells
2014-06-19 20:08:53 +02:00
scrawl
091f9a8fdc
Optimize global map render slightly
2014-06-19 19:14:59 +02:00
scrawl
8eab3abb15
Fix initial view offset for large world maps ( Fixes #1523 )
2014-06-19 19:03:12 +02:00
scrawl
11b05c352f
Fix exception when casting Bound Gloves spell
2014-06-19 16:00:27 +02:00
Marc Zinnschlag
30f8e279ed
Merge remote-tracking branch 'scrawl/master'
2014-06-19 10:35:28 +02:00
scrawl
4648524df4
Improve getLOS (use eye level). Also, don't crash when used with non-actors.
2014-06-19 04:53:25 +02:00
scrawl
185ff279a3
Add missing sound effect for mages guild transport
2014-06-19 03:29:36 +02:00
scrawl
cc3c6ae7b8
Fix very slow movement on some creatures, e.g. rats (Bug #1136 )
...
Neither fAthleticsRunBonus, fBaseRunMultiplier or the creature's athletics skill (i.e. Combat stat) have any effect on the run speed (tested by setting those to absurd values). The new formula is just a guess and doesn't seem to be completely accurate.
2014-06-19 02:36:10 +02:00
scrawl
6760f4c897
Make cached GMSTs in MWClass::Npc/Creature safer
2014-06-19 02:09:46 +02:00
scrawl
4234c70232
Savegame: Disable CustomData load optimization for npcs and creatures for now to preserve compatibility (still enabled for containers)
2014-06-19 02:00:40 +02:00
scrawl
d878456d0f
Don't add an extra path separator
2014-06-19 01:10:33 +02:00
scrawl
c3e4160a0a
Don't crash in StatsWindow for invalid faction rank values
...
PcRaiseRank: don't allow to raise rank beyond max rank
2014-06-18 23:50:55 +02:00
scrawl
2193977eec
Savegame: Don't fill CustomData from ESM records if the savegame overwrites it anyway
...
This gets rid of some junk in ContainerStores (since clear() only sets count to 0 and doesn't really delete references), and significantly speeds up loading savegames (by about 80% in my test)
2014-06-18 22:59:18 +02:00
scrawl
4e71db7081
Savegame: Don't load/save deleted container items. This is currently pointless, and also causes new garbage being added on each load/save cycle: Container stores are first filled from ESM records, then cleared and filled from the savegame. The items from ESM records remain as deleted refs.
2014-06-18 21:39:17 +02:00
scrawl
8a4227ec38
Heal player while in jail
2014-06-18 16:57:54 +02:00
scrawl
9a6737073f
Fix broken swimdeath in first person
2014-06-18 16:57:54 +02:00
scrawl
e95483c40f
Fix crash for on target spells cast by non-actors ( Fixes #1529 )
2014-06-18 16:57:53 +02:00
scrawl
fe1e6a2719
Make Weakness effects apply to all subsequent effects within the same spell ( Fixes #1150 )
2014-06-18 16:57:53 +02:00
scrawl
56bc5a9d39
Fix being able to steal undetected just after invisibility breaks
2014-06-18 16:57:53 +02:00
scrawl
80f66e2157
Fix crash when avformat_open_input fails ( Fixes #1522 )
2014-06-18 16:57:53 +02:00
scrawl
d4678a8d55
Fix level up dialogue layout ( Fixes #1393 )
2014-06-18 16:57:53 +02:00
scrawl
666dbc6ddc
Disable QuickKeysMenu in werewolf form
2014-06-18 16:57:53 +02:00
scrawl
a3ea7cb956
Ignore distance when considering aggression due to crime (seems to work better, all balmora mages guild members now come to help when one is attacked)
2014-06-18 16:57:53 +02:00
scrawl
1dc9e151cb
Count werewolf kills ( Fixes #1525 )
2014-06-18 16:56:36 +02:00
scrawl
1244da85df
Make Detect Life spell detect NPCs when in werewolf form ( Fixes #1527 )
2014-06-17 16:27:33 +02:00
scrawl
4f9ebd148c
Fix broken AI movement on Z axis
2014-06-17 15:25:54 +02:00
Marc Zinnschlag
2683aa9503
Merge remote-tracking branch 'filkry/bug640_luminescent_water'
2014-06-17 13:08:06 +02:00
scrawl
2477456f99
Implement Murder crimes and OnMurder instruction ( Fixes #1315 )
2014-06-17 04:05:27 +02:00
scrawl
3801dfb4ba
Add delay to sneak icon update and skill progress ( Fixes #1321 )
2014-06-17 04:05:27 +02:00
scrawl
ffb6f5d555
Use fFight<Crime> GMSTs to control attacks in response to crimes
2014-06-17 04:05:27 +02:00
scrawl
8ac019611d
Fix Potion use action removing the potion even when the action is not executed ( Fixes #1521 )
2014-06-17 04:05:20 +02:00
Fil Krynicki
c36fc48c47
Fixed underwater issue
...
I had accidentally deleted some interpolation parameters.
2014-06-16 17:15:49 -04:00
Fil Krynicki
cfea7736d9
WIP fix
...
Bug is fixed, but appears to have broken vision underwater. Notes:
+ basically fixed by darkening the colour of water such that it is
darker than refracted terrain
+ also disabled sunlight scattering at night. This may actually be
desirable, but given there is no visible moon it seems unlikely to make
much sense, and blends a lot of green into the water colour appearing
luminescent at night
2014-06-16 17:08:02 -04:00
scrawl
28feb260eb
Implement disposition/distance based aggression ( Fixes #1520 )
2014-06-16 20:05:53 +02:00
scrawl
d11a5e19f7
Fix positionCell not properly teleporting actors from inactive to active cells ( Fixes #1516 )
2014-06-16 20:05:53 +02:00
scrawl
2ce8323a42
Fix getDistance not detecting references in inactive cells properly
2014-06-16 20:05:47 +02:00
scrawl
47bd170d7e
Crashcatcher: create temp file in /tmp, not working directory (which may not have write access)
2014-06-16 04:13:36 +02:00
scrawl
f935cfc6c9
Fix crash when stealing items with the owner not around ( Fixes #1512 )
2014-06-16 04:03:53 +02:00
scrawl
1b610cdbd0
Allow following NPCs to fast-travel ( Fixes #1501 )
2014-06-16 03:17:31 +02:00
scrawl
78f30e2970
Fix a journal layout bug
2014-06-16 02:52:25 +02:00
scrawl
345ba99c17
Fix WeaponAnimationTime not working after restoring draw state (when loading save or re-entering a cell - Fixes #1497 )
2014-06-16 02:52:25 +02:00
scrawl
9ea071c1e8
Fix weapon incorrectly showing when saving and loading with spell equipped
2014-06-16 02:52:25 +02:00
scrawl
edccb62c1f
Clear MyGUI's clipboard, since we don't want to use it ( Fixes #1277 )
...
This would cause pasted text to appear twice, but only when using an SVN version of MyGUI, since 3.2 had a bug where it wouldn't recognize the Ctrl C/V/X keys when using separated key/textinput events.
2014-06-16 02:52:25 +02:00
scrawl
4f73e8bb71
Add items to player inventory upon drag start ( Fixes #1507 )
2014-06-16 02:52:25 +02:00
scrawl
0aba1088a1
Attempt to open companion window if no greetings are found (Bug #1507 )
2014-06-16 02:52:25 +02:00
scrawl
3b7119ba0d
Make Bipedal creatures always able to walk and swim ( Fixes #1509 )
...
This is necessary since the vanilla CS greys out the walk/swim checkboxes when Bipedal is checked.
2014-06-16 02:52:24 +02:00
scrawl
d5b97005ab
Make ESM::Faction skills optional ( Fixes #1508 )
...
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
2014-06-16 02:52:16 +02:00
scrawl
ee2b81763e
Savegame: Store AiSettings and summoned creatures
...
CreatureStats state is now completely stored (Closes #1174 )
Also play VFX_Summon_Start and VFX_Summon_End visual effects.
2014-06-15 21:19:37 +02:00
scrawl
a0f9a6718f
Disable fProjectileThrownStoreChance when shooting at player ( Fixes #1490 )
2014-06-15 16:11:22 +02:00
scrawl
fd59a4a79e
Fix some doxygen typos
2014-06-15 16:11:22 +02:00
scrawl
77388fe2ce
Implement BetaComment instruction (dumps reference info)
2014-06-15 16:11:16 +02:00
scrawl
326c747508
Don't run scripts when in pause menu ( Fixes #1495 )
2014-06-15 14:18:16 +02:00
scrawl
9e6d21d95b
Clear message boxes in windowmanager cleanup ( Fixes #1496 )
2014-06-15 14:18:16 +02:00
scrawl
e288437885
Disable all other animations on death ( Fixes #1483 )
2014-06-15 14:18:16 +02:00
scrawl
1adb81abd0
Sort using ciLess, not ciEqual
2014-06-15 14:18:16 +02:00
scrawl
88f8f25ffa
Don't allow scripted dialogue with dead actors ( Fixes #1493 )
2014-06-15 14:18:16 +02:00
scrawl
8d8015ce18
Remove a squareroot in pathfinding
2014-06-15 14:18:16 +02:00
scrawl
afbd5162ee
Move AiWander arrival check to time-critical section
2014-06-15 14:18:16 +02:00
scrawl
7afd2ca614
Consider moved references in CellStore::listRefs
2014-06-15 14:18:16 +02:00
scrawl
31a4e10c6f
Fix incorrect trigger of change flag for static doors
2014-06-15 14:18:16 +02:00
scrawl
395f98e476
Fix triggering changed flag for all references when cell is visited
...
The InsertFunctor for cells was calling localRotateObject() for all references which set the mChanged flag in RefData to true.
Also clean up RefData interface slightly.
2014-06-15 14:18:16 +02:00
scrawl
b20f8cc04f
Don't clear AiSequence if there are no saved packages (eg for old savegames)
2014-06-15 14:18:16 +02:00
Marc Zinnschlag
01c90a3434
Merge remote-tracking branch 'mrcheko/master'
2014-06-15 14:12:38 +02:00
mrcheko
a6ee4272aa
fix bug when you were able to kill somebody from large distance without
...
being spotted
2014-06-15 00:14:18 +04:00
mrcheko
6da061fd96
fix http://bugs.openmw.org/issues/1340
...
Did I understand right that guards trigger combat after refusing pay
gold/go to jail via script?
2014-06-14 23:36:57 +04:00
Alexander "Ace" Olofsson
c24e08dff6
Use Ogre::Math::PI
2014-06-14 14:43:24 +02:00
Alexander "Ace" Olofsson
6ea29812ac
Another way of getting M_PI
2014-06-14 13:54:01 +02:00
Alexander "Ace" Olofsson
dc2fefffc7
Fix missing M_PI define on Windows
2014-06-14 13:29:55 +02:00
scrawl
832f1a4857
Fix merge mistake
2014-06-14 02:31:01 +02:00
scrawl
0637cde267
Bug #1417 : Make sure to reset all position/rotation fields when placing items
2014-06-13 23:40:49 +02:00
scrawl
ad3a78706e
Bug #1417 : Use fmod to wrap local rotations (more efficient and robust)
2014-06-13 23:40:35 +02:00
scrawl
54d8606b78
Fix logging fatal exceptions to cerr, and log them to openmw.log
2014-06-13 22:04:20 +02:00
mrcheko
9d40f2e196
Merge remote-tracking branch 'origin/master'
2014-06-13 23:23:25 +04:00
mrcheko
c4e5872620
fix bug http://bugs.openmw.org/issues/1470
2014-06-13 23:22:00 +04:00
scrawl
3334078d4d
Add first person meshes to refraction render ( Fixes #1481 )
2014-06-13 21:14:17 +02:00
scrawl
fe5bbfce3c
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-06-13 19:31:33 +02:00
scrawl
8114f48469
Workaround per-frame resources leak in MyGUI. New vertex buffers were being created every frame.
2014-06-13 19:06:09 +02:00
mrcheko
fc6366fb27
Merge remote-tracking branch 'upstream/master'
...
Equipping_Weapon check isn't needed cause there won't be WeapType_None in
that case
Conflicts:
apps/openmw/mwmechanics/character.cpp
2014-06-13 14:12:41 +04:00
scrawl
e458cf1df2
Savegame: Store death counter ( Fixes #1477 )
2014-06-13 02:26:53 +02:00
scrawl
797134aa51
Handle activation scripts in AiActivate ( Fixes #1478 )
2014-06-13 02:26:52 +02:00
scrawl
a54ac579a5
Savegame: Store AiSequence
2014-06-13 02:26:52 +02:00
scrawl
be6f1fe4fe
Fix a sign error
2014-06-13 02:26:52 +02:00
scrawl
91ed5183c8
Show base item value in tooltip, not real value ( Fixes #1469 )
2014-06-13 02:26:52 +02:00
scrawl
604d5ac000
Fix console reference label not resetting when loading save
2014-06-13 02:26:52 +02:00
mrcheko
df7213185f
warning fixes
2014-06-12 23:42:33 +04:00
Marc Zinnschlag
2eebb0bf73
Merge remote-tracking branch 'scrawl/master'
2014-06-12 12:54:39 +02:00
Marc Zinnschlag
82eb13c070
Merge remote-tracking branch 'cc9cii/master'
2014-06-12 12:46:04 +02:00
cc9cii
37f0c253f6
For compiling with MSVC 2012
2014-06-12 07:04:57 +10:00
scrawl
68d6b6b2f3
Cell merge fix (reference context position was not saved correctly)
2014-06-11 21:56:10 +02:00
scrawl
41ab7329a8
Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202
...
Note: breaks compatibility with input.xml, so the filename was changed.
2014-06-11 19:47:42 +02:00
scrawl
013916fca3
Fix for broken physics in exteriors ( Fixes #1446 )
...
The wrong function was being used to check the distance between old and new positions. It took the length of the vectors into account, which makes no sense for positions. The issue was only observed in exteriors, since most interiors are relatively close to the origin.
2014-06-11 19:01:23 +02:00
scrawl
d970cc06d7
Don't play the same music track twice in a row ( Fixes #746 )
2014-06-11 18:11:16 +02:00
scrawl
d60df66811
Change openmw.log to boost ofstream to fix unicode path on windows (see https://github.com/OpenMW/openmw/pull/108 )
2014-06-11 16:56:41 +02:00
scrawl
73be457805
Merge ESM::Cell fields by subrecord
...
Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord.
Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (*oldcell = *cell;)
2014-06-11 16:13:33 +02:00
Marc Zinnschlag
2faeceacfa
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/openmw/main.cpp
2014-06-11 08:51:18 +02:00
scrawl
0f31e31088
Allow opening journal during dialogue ( Fixes #1460 )
2014-06-11 03:08:22 +02:00
scrawl
14a9f0ebf8
Handle Quadratic and Linear attenuation independently ( Fixes #1456 )
2014-06-11 02:24:17 +02:00
Emanuel Guevel
a41339da1e
Write logs in log directory
...
The crash.log file was created in the working directory, requiring users
that had installed the game to run it with augmented privileges to be
able to create the file.
2014-06-10 23:46:49 +02:00
mrcheko
d6d9df6cec
split getStartTime
2014-06-11 00:20:46 +04:00
scrawl
07d20c212b
Fix crash activating quick key 1
2014-06-10 21:34:47 +02:00
scrawl
10758d6297
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2014-06-10 19:32:49 +02:00
scrawl
7b5482f25b
Fix character selection caption when there is no character in settings.cfg
2014-06-10 19:01:18 +02:00
scrawl
5a955279bb
Fix main menu background showing when resizing window during load
2014-06-10 18:49:42 +02:00
scrawl
3788fb042e
Implement MenuTest script instruction ( Fixes #1454 )
2014-06-10 18:49:42 +02:00
scrawl
6ba112619a
Fix dropped items ending up inaccessible when standing in objects with no collision ( Fixes #1441 )
2014-06-10 18:49:42 +02:00
scrawl
2dd54dbcfc
Implement ClearInfoActor script instruction ( Fixes #1422 )
2014-06-10 18:49:41 +02:00
scrawl
a90245147b
Don't reset history when ForceGreeting is used and a dialogue window was already open for the same actor ( Fixes #1423 )
2014-06-10 18:46:16 +02:00
scrawl
1ed3f092c1
Implement text replacement for journal topic responses ( Fixes #1429 )
2014-06-10 15:42:50 +02:00
scrawl
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
2014-06-10 15:03:27 +02:00
scrawl
4119038f1d
Remove an old workaround ( Fixes #1458 )
2014-06-10 14:46:44 +02:00
mrcheko
979128b2c5
Combat music; some minor combat fixes
2014-06-10 14:20:29 +04:00
scrawl
65d5311037
Revert "Don't try to show exceptions in a message box if SDL was not initialized"
...
According to SDL docs, "This function may be called at any time, even before SDL_Init()".
Also fixes an issue where message boxes weren't working due to SDL_Quit already having been called by ~Engine.
This reverts commit 39eea24dc3
2014-06-10 04:10:34 +02:00
scrawl
c0c1db4490
Don't list non-usable items in QuickKeysMenu selection ( Fixes #1427 )
2014-06-10 03:28:21 +02:00
scrawl
271aac3fcc
Savegame dialog: Grey out buttons if no save is selected
2014-06-10 02:47:02 +02:00
scrawl
311acfa8ff
Add delete button to save load menu ( Fixes #1453 )
2014-06-10 02:27:38 +02:00
scrawl
881ae33b74
Don't allow Creatures with no movement abilities to move ( Fixes #1457 )
2014-06-10 02:15:09 +02:00
scrawl
e0d6670ac4
Move video skip detection to WindowManager
...
Fixes a bug where skipping using Esc would not work if a mouse button had been pressed previously
2014-06-10 01:57:54 +02:00
scrawl
7721e54191
Use descriptive names for save files and character folders ( Fixes #1449 )
2014-06-10 00:22:00 +02:00
scrawl
e796fa2313
Add another french morrowind font workaround ( Fixes #1447 )
2014-06-09 22:18:53 +02:00
mrcheko
698cbba6ef
old bug + comment fix
2014-06-09 23:02:06 +04:00
mrcheko
08e8dab067
merge openmw master
2014-06-09 22:37:49 +04:00
scrawl
1bab74a98d
Fix punishment for stealing 0 value items ( Fixes #1435 )
2014-06-09 03:42:29 +02:00
scrawl
5488fe1ab3
Change npc training skills to prefer skills with lowest ID if skill values are the same ( Fixes #1445 )
2014-06-09 03:40:14 +02:00
scrawl
a3752da79f
Store Always Run control state in settings
2014-06-08 19:50:39 +02:00
mrcheko
67abc60264
aiming to moving target in ranged combat ai
...
1) Taking into account target move vector and speed. However aiming is not
ideal, since attack strength can't be controlled directly. I did achieve
almost 100% accuracy updating it everyframe but then thought it would be
unfair, cause AI should mimic human targetting.
2) Also added in this commit func to measure real attack durations for
weapon.
2014-06-08 20:59:26 +04:00
Marc Zinnschlag
b717e3fcb8
Merge remote-tracking branch 'filkry/bug1196jumpdialog'
2014-06-08 11:25:34 +02:00
scrawl
d2dca27067
Correct wrong assertions ( Fixes #1425 )
2014-06-08 11:25:10 +02:00
scrawl
b9dadff5a3
Recognize DELE subrecords at the end of the record ( Fixes #1414 )
2014-06-08 11:22:37 +02:00
scrawl
823ccb1b3d
Don't batch statics that have "references persist" set (temporary fix for Arkngthand door - Fixes #1386 )
2014-06-08 11:22:37 +02:00
scrawl
69855097ca
Fix an always true condition (Bug #1355 )
2014-06-08 11:22:37 +02:00
scrawl
b470596206
Handle failed savegame file operations ( Fixes #1413 )
2014-06-08 11:22:37 +02:00
scrawl
2ec324c80b
Consider all splash screens in the Splash folder ( Fixes #1416 )
2014-06-08 11:22:37 +02:00
scrawl
927ae00454
Fix code that stopped animation immediately after starting it, due to thinking it has completed ( Fixes #1370 )
2014-06-08 11:22:37 +02:00
slothlife
51c45796b1
Fix physics to not trigger Bullet assert in Debug
...
When physics attempts to move by a very small amount, precision losses
caused Bullet to trigger an assert in debug from normalizing a zero
length vector.
2014-06-07 19:26:12 -05:00
Fil Krynicki
cd693b6d37
Fixed mouse closing containers, and injection/gui test order
...
Called setEnabled on channels now effects whether those channels
notify listeners, rather than whether they register changes to
their controls. This was making channels get stuck on "1" when the
GUI was activated.
Also ensured GUI activity can invalidate player controls even if
that activity is closing the GUI, by re-ordering a check.
And fixed a comment.
2014-06-07 20:08:29 -04:00
Fil Krynicki
1d3a220d94
Added A_Use command to player controls.
2014-06-06 22:35:16 -04:00
Fil Krynicki
97caa1f8a4
Alternative fix strategy by checking for binding state
2014-06-06 22:25:23 -04:00
Marc Zinnschlag
0668019c86
Merge remote-tracking branch 'scrawl/master'
2014-06-06 19:09:24 +02:00
scrawl
58d963d6e6
Fix warning
2014-06-06 18:43:30 +02:00
scrawl
b68a8e38cd
Remove unused map
2014-06-06 15:24:06 +02:00
scrawl
54a5dba3f5
Don't reserve Pauldron parts for robes ( Fixes #1396 )
2014-06-06 15:20:56 +02:00
Hallfaer Tuilinn
01283f531e
Fix for Bug #1409
2014-06-06 15:13:25 +02:00
scrawl
9627146bf4
Another fix for trade exploit (hopefully the last: Fixes #1408 )
2014-06-06 15:08:44 +02:00
scrawl
f3cece8dec
Fix alchemy allowing same item ID in different slots ( Fixes #1407 )
2014-06-06 14:12:50 +02:00
scrawl
40d6c8abf7
Remove horizontal messagebox layout, not used in vanilla ( Fixes #1402 )
2014-06-06 02:24:51 +02:00
scrawl
d442853b3e
Allow opposite gender's parts as fallback ( Fixes #1404 )
2014-06-06 01:30:23 +02:00
scrawl
c36decb855
Fix being able to place items on top of actors ( Fixes #1403 )
2014-06-06 00:43:24 +02:00
scrawl
3d103f3785
Don't block hits when in hand-to-hand combat (shield not visible)
2014-06-05 22:27:46 +02:00
scrawl
0063b63ae4
Don't use armor mitigation for fall damage
2014-06-05 22:23:57 +02:00
scrawl
6db936bb3a
Refactor item icon code into ItemWidget ( Fixes #1391 )
...
- Removed duplicate code
- Fixed missing magic backgrounds during item drag&drop
- Change background texture used for HUD icons
2014-06-05 22:13:18 +02:00
scrawl
f53e86cad9
Fix AiCombat being incorrectly added to player ( Fixes #1356 )
2014-06-05 21:51:57 +02:00
scrawl
1173957e56
Fix item weight displaying as 1e+3 for Stendarr's Hammer
2014-06-05 18:15:48 +02:00
scrawl
17f8b49db6
Add missing padding for item tooltip magic effects
2014-06-05 17:51:15 +02:00
scrawl
d2e98c4de1
Fix forced switch to third person on death not always working
...
For instance, when dying from fall damage
2014-06-05 17:21:02 +02:00
scrawl
b6e52ae8ab
Fix crash when loading a savegame after dying ( Fixes #1389 )
2014-06-05 17:01:22 +02:00
scrawl
4e235516c3
Work around missing character in french morrowind font (Bug #1390 )
2014-06-05 16:16:16 +02:00
scrawl
85c9871178
Use question mark for not found glyphs in the font
2014-06-05 16:15:47 +02:00
scrawl
cefa20bfb9
Fix not reacting to quit request while video is playing
2014-06-05 15:52:02 +02:00
scrawl
c0f1449004
Cycle with equipped items if all slots are occupied ( Fixes #1395 )
2014-06-05 14:54:07 +02:00
Marc Zinnschlag
5313862a46
Merge remote-tracking branch 'scrawl/master'
2014-06-04 15:14:29 +02:00
scrawl
00775035af
Add missing hasItemHealth for lockpicks/probes ( Fixes #1385 )
2014-06-04 01:03:12 +02:00
scrawl
d7f3cd75ac
Rewrite journal GUI topic list to use MWList
2014-06-03 16:04:18 +02:00
scrawl
17b15a6f4f
Fix overlapping text in SpellWindow when the window is too small
2014-06-03 01:12:31 +02:00
scrawl
d777739425
Fix a crash on exit when projectiles were active
2014-06-03 00:44:32 +02:00
scrawl
bbc5b125ab
Rewrite journal GUI quest index
...
- Use quest names as identifiers, not quest IDs. This ensures that quests with different IDs, but the same name (e.g. A2_4_MiloCaiusGone and A2_4_MiloGone) are merged properly, as they should.
- Switch display from BookPage to MWList. Handles word-wrapping and scrolling properly.
- Fixes a bug where the quest index would not be updated when opened.
2014-06-03 00:28:33 +02:00
slothlife
281d3b4c95
Fix for dereferencing past end of mGuiModes.
2014-06-02 17:21:13 -05:00
scrawl
577ed3943b
Show wallpaper when loading a savegame
2014-06-02 23:26:43 +02:00
scrawl
d2ad2e0f31
Re-enable collision when an actor is resurrected
2014-06-02 20:45:25 +02:00
scrawl
996e49c534
Change CharacterManager to use list instead of vector
...
Solves a crash when deleting all savegames of a character due to mCurrent being invalidated
2014-06-02 20:24:35 +02:00
scrawl
68afac6a19
Fix large size_t being truncated to int
2014-06-02 19:47:39 +02:00
Marc Zinnschlag
f130f8535c
Merge remote-tracking branch 'slothlife/cmake-fixes'
2014-06-02 19:08:15 +02:00
scrawl
8b33c087e0
Properly handle exceptions when saving the game
...
Add message boxes when an exception occurs while loading or saving the game
2014-06-02 14:46:41 +02:00
Emanuel Guevel
929aae6869
Silence a clang warning
...
warning: pointer is initialized by a temporary array, which will be destroyed at the end of the full-expression [-Waddress-of-array-temporary]
2014-06-02 10:30:44 +02:00
slothlife
20dabaead9
Fix CMake scripts to link static dependencies
...
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.
Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.
Modified launcher, openmw, and opencs to link the static Ogre plugins.
Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.
Fixed FindMyGUI.cmake to correctly look for static variants.
Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
2014-06-02 02:51:04 -05:00
scrawl
f6f6b5604a
Fix loading a savegame when some of its content files were disabled
...
Fixes #1380
2014-06-01 23:11:38 +02:00
Marc Zinnschlag
538aa6607e
Merge remote-tracking branch 'scrawl/master'
2014-06-01 10:25:53 +02:00
Fil Krynicki
bbb7ceab43
Merge branch 'master' into bug1196jumpdialog
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2014-05-31 19:58:21 -04:00
Fil Krynicki
cd131e7f86
1196/1217 fix
...
Fixes an issue where inputs could be processed by both GUI and
gameplay systems. An enabled/disable has been added to OIS
channels, and OpenMW now disables player gameplay hotkeys when
a GUI element has focus. GUI hotkeys are left enabled.
2014-05-31 19:51:21 -04:00
scrawl
dcc0e2d105
When dialogue goodbye is forced, allow using either the red link or the goodbye button
...
Fixes #1373
2014-06-01 00:21:55 +02:00
scrawl
0f1b39bca4
Fix trade exploit
...
Using the Max Sale button it was possible to "invert" the buying/selling state.
2014-05-31 18:28:00 +02:00
scrawl
865486604f
Make trade disposition changes temporary again, as in vanilla
2014-05-31 13:57:07 +02:00
scrawl
a1bdf20958
Make trade balance label editable
2014-05-31 13:53:36 +02:00
scrawl
de7fcf0beb
Fix unhandled edge case in TradeItemModel with items that are able to stack, but are not currently stacked (e.g. after repairing a damaged item)
...
Fixes #1368
2014-05-31 13:45:47 +02:00
scrawl
16ac6e7aac
Merge DialInfo objects by subrecord instead of overwriting the object
...
Fixes #1360
2014-05-31 13:01:11 +02:00
Rohit Nirmal
4f4a37896e
Check if player's CellStore is non-NULL before configuring fog.
...
This prevents an assertion fail in getCell() when changing the
view distance while in the main menu.
2014-05-30 22:37:13 -05:00
Fil Krynicki
6cc6172779
Update in response to comments.
...
It turns out I was erroneous about problem (1) in my original commit
message. I thought that in an edge case the OpenMWGUI could both handle
the same event on the frame the GUI was closed. My test for
this was broken. So after brainstorming many possible unsatisfactory
solutions to this event handling, it's luckily not necessary!
2014-05-30 15:12:57 -04:00
scrawl
8761aa5795
Loop main menu video when it's finished playing
2014-05-30 14:28:04 +02:00
scrawl
ac77b07e29
Small fix for menu background
2014-05-30 14:28:04 +02:00
Marc Zinnschlag
f5e587f566
Merge remote-tracking branch 'puppykevin/master'
2014-05-30 11:42:19 +02:00
Marc Zinnschlag
be88168e91
Merge remote-tracking branch 'scrawl/master'
2014-05-30 10:07:18 +02:00
scrawl
b81c7d05c6
Remove CG shaders from settings window (not fully supported on non-nvidia cards, amd profiles have an instruction limit making them useless)
...
Can still be used by editing the config file, however.
2014-05-29 23:16:36 +02:00
Marc Zinnschlag
2f56b11530
Merge remote-tracking branch 'digmaster/master'
2014-05-29 18:57:16 +02:00
scrawl
6a882e1e8d
Don't show hidden factions in StatsWindow (e.g. Nerevarine)
2014-05-29 18:09:04 +02:00
scrawl
3b3b53d665
Support animated main menus (menu_background.bik)
...
Closes #1362
2014-05-29 17:24:25 +02:00
scrawl
a6788cfb0e
Support lights that do not have a model ( Fixes #1361 )
2014-05-29 16:44:50 +02:00
scrawl
95b3026c7e
Fix cells being listed twice in console autocompletion when using --skip-menu=0 and loading a game
2014-05-29 16:34:05 +02:00
Digmaster
03d7137655
Fixes issue with pressing f1 in QuickKey menu, removed transparency in GoodBye button
2014-05-29 06:19:25 -04:00
Digmaster
a5cfa8a049
Removes add behavior when pressing escape while waiting.
2014-05-29 01:52:41 -04:00
scrawl
c6a4506ac2
Make console error prefix slightly less technical (see https://bugs.openmw.org/issues/1194#note-2 )
2014-05-28 22:35:36 +02:00
Kevin Poitra
8516b837ff
Revert "Started implementing sound time tracking so we can have NPCs' mouths move as they talk."
...
This reverts commit b897080156
2014-05-28 15:04:35 -05:00
scrawl
41a04b9c65
Slightly adjust menu button position
2014-05-28 21:50:08 +02:00
scrawl
e9ab7c85c6
Fix exception when there are spaces in INI-imported color settings
2014-05-28 21:29:09 +02:00
Kevin Poitra
3f00f00426
Remove some debug code.
2014-05-28 14:20:04 -05:00
scrawl
18e24a2007
Fix old savegames causing the save list to not fill properly (Error in framelistener: Object '$dynamic0' not found)
...
Fixes #1357
2014-05-28 21:08:20 +02:00
Kevin Poitra
16a6edbd0e
Fix a possible crash due to a null pointer.
2014-05-28 12:58:45 -05:00
Marc Zinnschlag
f112c78858
Merge remote-tracking branch 'scrawl/master'
2014-05-28 19:47:36 +02:00
Kevin Poitra
251df73407
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-05-28 12:29:40 -05:00
Kevin Poitra
b897080156
Started implementing sound time tracking so we can have NPCs' mouths move as they talk.
2014-05-28 12:26:35 -05:00
scrawl
e68600eda2
Make Activate instruction work properly even when onActivate was not called in the same frame.
...
There are two major differences to the old implementation:
- Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low.
- The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action.
Fixes #1166 and #1346 .
2014-05-28 19:23:50 +02:00
scrawl
42ea43c3d1
Fix container scripts not getting removed properly on cell change
...
Broken by f99eda1a54
2014-05-28 18:45:07 +02:00
scrawl
56ff399f30
Say attack voiced dialogue *after* the target is set up
...
Required for the CreatureTargetted filter to function properly
2014-05-28 13:59:31 +02:00
Arthur Moore
9be219beba
Fixes Bug #1348 "Evidence Chest unlocking when arrested."
2014-05-27 22:09:37 -04:00
Marc Zinnschlag
be39395ce7
Merge remote-tracking branch 'scrawl/master'
2014-05-27 21:09:24 +02:00
Digmaster
033f1850f9
Fixed crass on character creation, allowed some character creation windows to be Esc-able
2014-05-27 14:30:26 -04:00
Digmaster
060a50f94a
Fixed issue with QuickKeyMenu and ItemSelectionDialog
2014-05-27 13:50:24 -04:00
Fil Krynicki
91f4967614
Fix for bug 1196.
...
This bug would cause the player to jump when jump was assigned to
Space and they closed a dialog with Space. I tested vanilla
MW for behaviour and found that Jump was the only basic input which
MW does not allow when closing dialogs (i.e. if Space is assigned to
move forward, MW will move you forward after closing the dialog).
There were two reasons for the bug:
1) OpenMW GUI does not consume UI events
2) Jump occurs so long as key is down (not only on first key down)
To minimally fix the bug, I made it so that keypress events can be
consumed by the GUI and not passed along to the player control
input manager (1). However, if the player holds space, they will still
jump (as the subsequent key held events will be captured and cause
a jump).
Unfortunately, there is no idiomatic way that I could find in the
OpenMW input manager to perform events only on key down. Instead,
I introduced a variable which tracks whether the jump key has been
pressed for the first time within the current frame (2).
Note: I was initially concerned that limiting the jump event to
KeyDown and not Key Hold would cause issues with swimming,
levitating, or variable height jumping. However, after a bunch
of testing in vanilla MW and exploration of the OpenMW codebase
I could find nothing suggesting the need to capture the jump
key being held.
2014-05-27 13:12:27 -04:00
scrawl
0b45a9e6b2
Fix case folding for faction reaction from ESX records
2014-05-27 19:02:48 +02:00
scrawl
2b15b85af1
Fix position adjustment not working properly for rotated objects
2014-05-27 17:58:18 +02:00
scrawl
2fe86f2b85
Consider hit normal for item drop test ( Fixes #995 )
2014-05-27 17:39:04 +02:00
scrawl
f476aa4ade
Remove MyGUI color codes when copying to system clipboard
2014-05-27 17:07:14 +02:00
scrawl
3e2eed9269
Implement getFactionReaction function
...
Strange bug when using value != 0 for the garbage argument?
2014-05-27 15:23:22 +02:00
scrawl
e266c39c5d
Implement modFactionReaction instruction ( Closes #1347 )
2014-05-27 14:54:29 +02:00
Marc Zinnschlag
27c795483b
Merge remote-tracking branch 'ace/win-build-fix'
2014-05-27 14:32:20 +02:00
scrawl
578adb4ef6
PcJoinFaction and friends: make sure the given faction exists
2014-05-27 13:54:25 +02:00
Alexander "Ace" Olofsson
d3357cc279
The MSVC linker is really pedantic with this.
...
Functions compiled as taking a class can't be linked with functions giving a struct, because of the name mangling I'm guessing...
unresolved external symbol "protected: void __thiscall MWWorld::LiveCellRefBase::loadImp(class ESM::ObjectState const &)" (?loadImp@LiveCellRefBase@MWWorld@@IAEXABVObjectState@ESM@@@Z)
2014-05-27 13:27:18 +02:00
Digmaster
2b3b11d848
Give access to the main menu when at a choice in dialogue
2014-05-27 05:33:25 -04:00
Digmaster
ee7b5fa5c2
Fixed crash when Esc-ing out of Save "are you sure" dialog.
2014-05-27 04:38:13 -04:00
Digmaster
e0356cf89d
Added support to close modal windows with Esc
2014-05-27 03:00:31 -04:00
Marc Zinnschlag
9e21da9636
Merge remote-tracking branch 'scrawl/master'
2014-05-27 08:34:54 +02:00
Digmaster
e0d55116a4
Dims and disabled Goodbye button in dialogs when unavailable.
2014-05-27 00:30:37 -04:00
Digmaster
79d0ed64d9
Undo some changes I made in the past that shouldn't exist
2014-05-26 23:31:40 -04:00
Digmaster
1ca921d6e2
Merge remote-tracking branch 'upstream/master'
2014-05-26 23:26:23 -04:00
Digmaster
e3e51324a4
Esc button exits all non-modal GUI windows
2014-05-26 23:13:37 -04:00
scrawl
cf68f6da96
Fix ESX dependencies not being checked except for the first one
2014-05-27 00:06:34 +02:00
scrawl
4caa8c5cca
Fix offset to accumulation root not being cleared when adding an animation state with startpoint=1.f (observed with death animations)
2014-05-26 20:52:38 +02:00
scrawl
5660f283dd
Fix actor models incorrectly being rotated on X/Y axes
2014-05-26 20:52:38 +02:00
scrawl
0966755a0c
Store death animation index in CreatureStats
2014-05-26 20:52:32 +02:00
Marc Zinnschlag
3937cfcd8b
Merge remote-tracking branch 'scrawl/master'
2014-05-26 19:02:13 +02:00
scrawl
3cd835e61a
Fix bsa file loading not being case insensitive ( Fixes #1178 )
2014-05-26 17:34:36 +02:00
scrawl
f629307f60
Fix frame delay for sound listener position ( Fixes #1180 )
2014-05-26 16:43:19 +02:00
scrawl
bfd91c0681
Fix potential NpcStats overwriting issue
2014-05-26 12:31:08 +02:00
Marc Zinnschlag
4aab4bae65
minor cleanup and silenced a warning
2014-05-26 10:14:24 +02:00
Marc Zinnschlag
f0d0a31a19
Merge remote-tracking branch 'mrcheko/master'
2014-05-26 10:08:40 +02:00
Thomas
7697b9e868
Ensures nothing bad will happen if we try to lock a door that never had a lock level
2014-05-26 01:48:24 -04:00
Thomas
b3ffd5b868
Fix for bug Bug #1098
2014-05-26 01:42:11 -04:00
mrcheko
8fa7fcdbee
fix bug http://bugs.openmw.org/issues/1335 (1304 as well)
...
though fish detects if actor is swimming, but in MW it attacks even if
the player is knee-deep in water
2014-05-25 21:03:37 +04:00
scrawl
10d835a55c
Some more missing isInCell checks
2014-05-25 15:07:35 +02:00
scrawl
f3ba31de2d
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwscript/cellextensions.cpp
2014-05-25 14:58:47 +02:00
scrawl
039398c8ae
Basic RefData and CellRef change tracking
...
Wrapped item charge handling in getItemHealth function
2014-05-25 14:30:07 +02:00
Marc Zinnschlag
130af28fa5
Merge remote-tracking branch 'cc9cii/master'
...
Conflicts:
apps/openmw/mwrender/videoplayer.cpp
2014-05-25 12:07:09 +02:00
Marc Zinnschlag
ff15601a4c
Merge branch 'openmw-30'
2014-05-25 11:55:25 +02:00
mrcheko
c62187bd55
fix bug at http://bugs.openmw.org/issues/1155
...
Though it still can happen sometimes but not in such stupid manner.
2014-05-25 13:31:46 +04:00
cc9cii
d2794165ba
Disable binkaudio sound for FFmpeg libavocdec versions below 54.55.xxx (Windows x64) and 54.10.xxx (Windows 32bit). Later versions are all allowed, but due to sample formats there will be no sound and this message will be shown on the console "Sound Error: Unsupported sample format: fltp"
2014-05-25 18:56:50 +10:00
mrcheko
559c772906
Merge remote-tracking branch 'upstream/master'
2014-05-25 10:21:54 +04:00
cc9cii
4f94a31b54
Fix crash starting a new game.
2014-05-25 07:50:19 +10:00
mrcheko
56881cb7c9
fix bugs in aisequence::execute
2014-05-24 23:05:30 +04:00
scrawl
a05c8fd3ce
Make applyEnchantment return the record ID instead of modifying Ptr
2014-05-24 14:58:48 +02:00
scrawl
1d8da95756
Warning fix
2014-05-24 14:47:51 +02:00
scrawl
08cf58204f
Merge branch 'master' of github.com:scrawl/openmw
2014-05-23 16:45:28 +02:00
scrawl
f09c8ddc9e
Remove a pointless assert
2014-05-23 16:44:51 +02:00
scrawl
a7d525245c
Fix missing include
2014-05-23 16:07:02 +02:00
cc9cii
367acd9676
Enable video but without sound.
2014-05-23 21:55:47 +10:00
cc9cii
3718847ffc
Disable video for Windows until the crash issues are fixed.
2014-05-23 21:07:01 +10:00
scrawl
b47b2b84f3
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwdialogue/filter.cpp
apps/openmw/mwgui/waitdialog.cpp
2014-05-23 08:39:48 +02:00
Marc Zinnschlag
6ac700a501
Merge remote-tracking branch 'potatoesmaster/getClass'
2014-05-23 08:00:52 +02:00
Marc Zinnschlag
244eb11651
Merge remote-tracking branch 'greye/widechar'
2014-05-23 07:48:26 +02:00
scrawl
a2f156be8e
Prevent magic bolts from colliding with their caster
2014-05-22 23:34:32 +02:00
scrawl
df8e095c83
Small cleanup
2014-05-22 23:27:54 +02:00
Emanuel Guevel
1e4a854433
Remove static method MWWorld::Class::get(&Ptr)
...
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
2014-05-22 20:50:00 +02:00
Emanuel Guevel
20cfdd4b43
Move LiveCellRefBase ctor where it belongs to
2014-05-22 20:50:00 +02:00
scrawl
cba50c7338
Optimize ManualRef: look up correct Store instead of searching
2014-05-22 15:46:35 +02:00
scrawl
4b5f02f644
Remove useless throwing of exception
2014-05-22 15:29:36 +02:00
greye
8f9091550e
require boost::locale only on Windows
2014-05-22 15:42:47 +04:00
scrawl
3380e1e1c5
Fix ShouldAttack filter
...
This makes NPCs exit dialogue properly when they should attack as a result of taunting actions.
2014-05-22 12:20:25 +02:00
scrawl
c6c254d279
Do not trigger levelup if rest was interrupted
2014-05-22 11:08:36 +02:00
scrawl
18bba6bcec
Fix layout glitch when autosaving
2014-05-22 11:03:45 +02:00
scrawl
cf07d2ab93
Fix swapped position of Save and Load menu buttons
2014-05-21 16:38:50 +02:00
scrawl
f812746010
Auto-select first save in load dialog
2014-05-21 16:36:55 +02:00
scrawl
3a7e2f8bb5
Allow invoking Journal instruction with non-existing index
...
This is used by the MG_EscortScholar1 quest.
2014-05-21 14:18:14 +02:00
greye
8b94e31062
try to set relative path to resources
2014-05-21 15:39:58 +04:00
scrawl
2f6d400c62
Merge branch 'master' of https://github.com/OpenMW/openmw into newgame
2014-05-21 10:41:03 +02:00
scrawl
b39b572c5a
Moved mStartupScript to World, so that it is executed for a New game
2014-05-21 09:25:45 +02:00
scrawl
9fe505c8fa
Only run --script-run commands when bypassing the menu
...
Running them while no game is started yet is dangerous, and also leaves bits and pieces of state (e.g. in LocalScripts for scripted items added to inventory) that will not get cleaned up properly when a game is loaded (since when no game was previously running, no cleanup is performed). As a result, dangling MWWorld::Ptrs were left in LocalScripts.
2014-05-20 18:35:17 +02:00
scrawl
abd6b6ab33
Fix not returning to main menu on failed loads when using quickload
2014-05-20 17:11:26 +02:00
scrawl
7ab98f0c6f
Clear choices when dialogue starts
...
This is usually not needed, because it is not possible to exit dialogue while in a choice. However you can still exit dialogue by loading a different savegame.
2014-05-20 16:57:38 +02:00
greye
b728a919a2
write dependency on boost::locale to CMake files
2014-05-20 12:59:58 +04:00
scrawl
220ab86eca
Simplify new game movie player
2014-05-20 10:07:08 +02:00
Marc Zinnschlag
58afa58549
Merge remote-tracking branch 'mrcheko/master'
2014-05-19 22:07:32 +02:00
mrcheko
638df221a6
memory leak fix
2014-05-19 23:29:35 +04:00
scrawl
6bd0bbb8df
Do not load (0,0) on new game
2014-05-19 14:09:16 +02:00
greye
9c6224c74d
fix saving to Unicode path destination
2014-05-19 15:43:25 +04:00
scrawl
6f03694d50
Fixes #1334 : Only unequip item if the sell/drag action is actually successful
2014-05-19 08:03:55 +02:00
Marc Zinnschlag
37f1a49352
Merge remote-tracking branch 'mrcheko/master'
2014-05-18 22:36:40 +02:00
mrcheko
fa14df62b7
fix crash on disappeared target
2014-05-18 23:15:22 +04:00
Marc Zinnschlag
aa05acd26e
Merge remote-tracking branch 'scrawl/master'
2014-05-18 18:50:18 +02:00
Marc Zinnschlag
56c4367c1a
Merge remote-tracking branch 'mrcheko/master'
2014-05-18 18:42:23 +02:00
mrcheko
e1249f6a31
actor handle and id confusing fix
2014-05-18 20:13:46 +04:00
scrawl
a87b64d2da
Fix some ancient code
2014-05-18 16:34:58 +02:00
scrawl
1677fcf324
Dialogue merging
2014-05-18 15:25:16 +02:00
mrcheko
66307dd889
travis fix #3 :(
2014-05-18 16:10:14 +04:00
mrcheko
74697f8116
travis fix #2
2014-05-18 15:41:15 +04:00
scrawl
5b76c0893a
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
components/esm/inventorystate.hpp
2014-05-18 12:55:43 +02:00
greye
e02b04536f
fix most vexing parse issue
2014-05-18 14:55:05 +04:00
greye
a22ec223d8
open fstreams from boost::filesystem::path, vol.1
2014-05-18 14:55:05 +04:00
scrawl
a872c9f83a
Feature #1323 : handle restocking levelled items
2014-05-18 12:53:21 +02:00
mrcheko
69c1eb28c5
travis compile fix
2014-05-18 14:39:04 +04:00
scrawl
90ec19c3ac
Remove unneeded MWScrollView
2014-05-18 10:30:03 +02:00
scrawl
150b920ef1
Fix long journal entries not being displayed
2014-05-18 10:14:03 +02:00
scrawl
5fc2b1a41b
Allow setting a journal index even if there's no related journal entry
...
This is used by the MV_SlaveMule quest.
2014-05-18 07:39:16 +02:00
scrawl
e1458453f3
Fix "unknown info ID" exceptions when a dialogue response is from the Info Refusal group
...
Could be observed in TG_OverduePayments quest when talking to Trasteve about Dwemer Artifacts.
Info Refusal responses are not specific to any particular topic, so they should not be added to the journal. Trying to do so anyway will cause "unknown id" exceptions because MWDialogue::Entry expects the infoId to be from the Dialogue for the supplied topic.
2014-05-18 06:52:15 +02:00
cc9cii
12dc5cf4ea
Bug #1303 - resolves the bug by tweaking the slope constant (the value 49 was selected to mimic vanilla behaviour for a low level character exploring Seyda Neen). The feature to vary the climbable angle based on acrobatics is still to be implemented.
2014-05-18 12:05:08 +10:00
mrcheko
aa5647b45e
merge master, resolve conflicts
2014-05-17 19:20:57 +04:00
scrawl
b4ed828e21
Feature #1323 : Implement restocking items (does not handle levelled lists yet)
2014-05-17 14:30:31 +02:00
Marc Zinnschlag
f7c89015f9
Merge remote-tracking branch 'scrawl/master'
2014-05-17 11:50:31 +02:00
scrawl
ae66d28c87
Feature #32 : Implement respawn for containers, creatures and NPCs
2014-05-17 09:09:00 +02:00
scrawl
92c5bb56e0
Un-reverted actorId for AiPursue
2014-05-17 05:34:54 +02:00
scrawl
e266aff561
Savegame: store projectiles
2014-05-17 05:24:32 +02:00
scrawl
9adb990143
Fix potentially unsafe use of MWWorld::Ptr
2014-05-17 02:52:24 +02:00
scrawl
e5a21aca53
Refactor projectiles to no longer use MW-objects
2014-05-16 13:33:30 +02:00
scrawl
18852c09d0
Manually re-added AiCombat portion of actorid changes. This is the only one that really matters, and will not suffer from the infinite recursion because it's not included in AiSequence::fill.
2014-05-16 12:28:23 +02:00
scrawl
36d9ae17cc
Revert "Change all AI packages (except AiActivate) to use ActorIds"
...
Causes potential infinite loops (AiSequence::fill -> AiPackage() -> getCreatureStats -> ensureCustomData -> ..)
This reverts commit 2e9985c1a3
2014-05-16 12:11:34 +02:00
scrawl
028e00c98f
Add missing status report for some toggle commands
2014-05-16 09:21:28 +02:00
scrawl
868e38a07c
Fix Assault crimes being reported when striking in self-defense
...
Last missing fix for Bug #1134 .
2014-05-16 08:32:00 +02:00
scrawl
940a434479
Use ItemModel for moving items from a container to the world
...
Fixes owner not resetting when moving an item from a corpse to the world.
2014-05-16 03:19:38 +02:00
scrawl
d70306382e
Don't create the player object until the game starts
...
Fixes a crash introduced in e591d23
2014-05-16 00:58:12 +02:00
mrcheko
5be37f04ef
Feature 1314: make npc fight creatures
2014-05-16 00:03:48 +04:00
Marc Zinnschlag
3b2ba4f6cd
Merge remote-tracking branch 'scrawl/master'
2014-05-15 14:25:36 +02:00
scrawl
0bc33fa86a
Revert "AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)"
...
Apparently not working for AiCombat due to its higher getPriority(). What should we do here?
This reverts commit a6e1d7ffd6
2014-05-15 10:14:47 +02:00
scrawl
b16d444f0f
Fix never clearing graveyard. Oops
2014-05-15 10:05:35 +02:00
scrawl
6de7e16550
Fix searchPtrViaActorId not skipping over deleted references
...
Fixes an issue when an actor has moved cell: searchPtrViaActorId would randomly return the deleted Ptr from the old cell.
2014-05-15 09:57:09 +02:00
scrawl
b6a7aee42e
Fix player not being allowed to use his own items
2014-05-15 09:54:10 +02:00
scrawl
eb40032bde
Fix item owner not resetting when dragging an item from a corpse to the player avatar
2014-05-15 09:54:10 +02:00
scrawl
bac4d875df
Fix a potential exploit that made it possible to reset the owner of any item
2014-05-15 09:54:10 +02:00
scrawl
a6e1d7ffd6
AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)
2014-05-15 09:54:10 +02:00
scrawl
2e9985c1a3
Change all AI packages (except AiActivate) to use ActorIds
...
More robust in case the target changes cell or there are multiple targets with the same RefId
2014-05-15 09:54:10 +02:00
scrawl
2f13a17a39
Add some more safety checks to spellcasting
2014-05-15 09:54:10 +02:00
scrawl
f2c193ce3d
Fix searching the player's actorId
2014-05-15 09:54:10 +02:00
scrawl
a609dc5674
Fix exception when getting hit by a trap
2014-05-15 09:54:10 +02:00
scrawl
a76e391ad0
Savegame: store door movement state ( Closes #747 )
2014-05-15 09:54:10 +02:00
scrawl
37b9d2fb0c
Fix a wrong use of reference that causes potential crash
2014-05-15 09:54:10 +02:00
scrawl
471bbd0021
Savegame: store levelled creature state and move to actorIds
...
(Closes #1332 )
2014-05-15 09:54:04 +02:00
Marc Zinnschlag
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
2014-05-15 08:13:15 +02:00
slothlife
f33559fead
Fixes for MSVC warnings, less overall changes
...
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
2014-05-14 20:12:52 -05:00
scrawl
9b67fcc4d7
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-05-14 23:54:25 +02:00
scrawl
9052cc4a57
Savegame: store ActiveSpells
2014-05-14 23:54:15 +02:00
Thomas
d2aada95b4
Fixed AiPursue by fixing underlying issue is Pathto()
2014-05-14 14:11:34 -04:00
Thomas
2425d2c2ab
Added stuck mitigation for AiAvoidDoor
2014-05-14 13:38:10 -04:00
Thomas
993ef1be43
Actor avoiding door asks all surrounding actors to do the same.
2014-05-14 04:05:18 -04:00
scrawl
1141c1f3f2
Change projectiles to use actorIds
2014-05-14 09:48:16 +02:00
scrawl
61187c2fef
Savegame: store actorIds
2014-05-14 09:47:49 +02:00
Thomas
cbcf0f6039
Changed AiEScort to use new PathTo function
2014-05-14 01:44:11 -04:00
scrawl
dfacf8c044
Change ActiveSpells to use ActorId
2014-05-14 07:14:08 +02:00
scrawl
67e942e733
Bug #869 : Some fixes to the previous fix
2014-05-14 07:13:12 +02:00
slothlife
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
2014-05-14 00:03:30 -05:00
scrawl
7697ab37e0
Fixes #1129 : Change summoned creatures to use ActorId
...
Gracefully handles summoned creatures that are left behind in inactive cells.
2014-05-14 06:37:31 +02:00
Thomas
7cd4c93fa4
Changed getNearbyDoor to use MWWorld::Ptr
2014-05-13 23:46:00 -04:00
scrawl
99b4bc721b
Don't attempt to inflict spells on dead actors
2014-05-14 05:37:53 +02:00
scrawl
6c7b3074f5
Fix self-defense for creatures when attacked with a spell
2014-05-14 05:31:19 +02:00
Thomas
58bf7624be
Made code a bit more efficient
2014-05-13 21:52:05 -04:00
scrawl
3cdbcf3c28
Merge branch 'actorid' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwmechanics/creaturestats.cpp
2014-05-14 02:35:05 +02:00
Thomas
203ef580cf
Fixed moving activatable object being incorrectly activated.
2014-05-13 20:32:29 -04:00
scrawl
365ca6c7e1
Fixes #1331 : Manually disable movement state for dead actors.
...
For dead actors, refreshCurrentAnims is no longer called, so we need to disable the movement state manually.
2014-05-13 21:47:45 +02:00
Thomas
6d540c4e07
Removed merging error
2014-05-13 14:24:48 -04:00
Thomas
680890c846
Clarification on some documentation points
2014-05-13 14:21:59 -04:00
Thomas
d6d4d9f75d
Removed destructor documentation
2014-05-13 14:08:08 -04:00
Thomas
ee36ace00b
Undid some code clean up changes, and changed how some includes work
2014-05-13 13:43:50 -04:00
Thomas
598221a8e7
Forgot some files
2014-05-13 13:07:27 -04:00
scrawl
e591d23880
Fixes #894 : Make sure the player's CharacterController is updated when the player is rebuilt. Necessary if the race is changed while we are still in a GUI (e.g. in the review dialog), and an update normally wouldn't occur.
2014-05-13 19:01:02 +02:00
Thomas
9dbe53c722
Merge remote-tracking branch 'upstream/master'
2014-05-13 04:11:07 -04:00
Thomas
2db3c89a9e
Ensures destination is far enough to care about getting stuck
2014-05-13 04:09:21 -04:00
Thomas
cbfa282f8d
Changed implementations of aifollow/pursue/activate slightly, added ability for NPCs to go through unlocked doors (They even try locked ones), and step back from opening doors (Although it still needs some work)
...
Notes - When the door hits them while it's about to finish closing they will try to walk through the door.
- Considerably more works is needed in making the NPC work out troublesome areas where they get stuck
2014-05-13 03:58:32 -04:00
Thomas
2c74ea381e
Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue
2014-05-12 21:05:32 -04:00
scrawl
386604bc9d
Fixes #869 : Added methods to control external and internal collision modes separately
...
When an actor dies, we should only disable external collisions, i.e. prevent other actors from colliding with the dead body. The dead actor, however, should still have gravity and collision applied.
Also moved disableCollision to when the death animation finishes, not as soon as the actor's health is 0.
2014-05-13 01:43:52 +02:00
mrcheko
725f6cac5e
AiPursue infinite package updating bug resolved
2014-05-13 00:05:30 +04:00
scrawl
6cc691115b
Savegame: store most of CreatureStats
2014-05-12 21:37:36 +02:00
Thomas
645d174a96
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aisequence.hpp
2014-05-12 14:49:08 -04:00
mrcheko
e4fe78937a
Merge remote-tracking branch 'upstream/master'
2014-05-12 22:06:26 +04:00
scrawl
117b812fb1
Fix invisibility not breaking on certain actions
2014-05-12 02:20:56 +02:00
scrawl
b0fbea9d57
Removed a wrong assertion. Max drowning time is defined by GMST.
2014-05-11 21:03:27 +02:00
scrawl
2bc2684a66
Fixes #275 : force updating exterior cell maps even if already in cache
2014-05-11 18:01:47 +02:00
scrawl
54a893994a
Also update local map when paused, to make it update properly when teleporting via GUI/console
2014-05-11 18:01:47 +02:00
scrawl
7428511ea0
Bug #772 : Do not show door markers for disabled doors
2014-05-11 18:01:47 +02:00
scrawl
961c4d4dc4
Fixes #772 : Give scripts a chance to run before updating map, so that disabled objects are not visible
2014-05-11 18:01:47 +02:00
scrawl
ac8abd3398
assert -> exception to gracefully handle corrupted savegames
2014-05-11 18:01:47 +02:00
Marc Zinnschlag
368c868623
Merge remote-tracking branch 'scrawl/master'
2014-05-11 11:10:51 +02:00
Marc Zinnschlag
a85c73cf35
Merge remote-tracking branch 'filkry/bug1047dialoglinks'
2014-05-11 11:07:23 +02:00
scrawl
c39a0368cf
Bug #618 : Make local map textures static in an attempt to fix the disappearing maps with D3D.
...
Also removed problematic DISCARDABLE flag for fog of war textures.
2014-05-11 02:40:15 +02:00
scrawl
c98bea2a88
Moved local map update to LocalMap::updatePlayer to fix a brief desync on cell transitions due to sFogOfWarSkip
2014-05-11 02:27:43 +02:00
scrawl
a4a9794417
Savegame: store fog of war ( Closes #1177 )
2014-05-11 02:07:58 +02:00
scrawl
7b46e9f914
Get rid of no longer needed widget names
2014-05-11 01:05:49 +02:00
scrawl
041319c43e
Fixes #1234 : Store dynamic record counter in savegame to prevent name clashes
2014-05-11 00:32:22 +02:00
scrawl
07d9845aa0
Fix a bug in ESMStore code that checks for duplicate record insertions
2014-05-11 00:10:28 +02:00
Fil Krynicki
eb5ef270ba
Bug 1047 update - defaults and edge case
...
Handles edge case where it was possible to highlight adjacent
sub-terms without whitespace between them.
Also makes ignoring words not prefixed by whitespace the
assumed behaviour.
2014-05-10 17:47:21 -04:00
scrawl
dab4db87ff
Fix a bug in marker placement for interior maps
2014-05-10 23:47:00 +02:00
Fil Krynicki
9095a45ba7
Bug 1047 Fix
...
Dialog links can no longer be highlighted if they appear in the
middle of the word. This is achieved by confirming that the
character before a match is not alphabetic, so that words
following hyphens can still potentially match.
2014-05-10 17:05:15 -04:00
scrawl
b358cf2423
Fix a potential crash when loading script locals from savegame
2014-05-10 21:31:49 +02:00
scrawl
9fb5cef287
Oops, committed debug code
2014-05-10 21:31:49 +02:00
Marc Zinnschlag
2009cf9ad7
Merge remote-tracking branch 'scrawl/master' into openmw-30
2014-05-10 10:48:40 +02:00
scrawl
242e19a136
Fix crash when exiting OpenMW while dialogue/journal is opened and mouse cursor on a topic
...
(Fixes #1300 )
2014-05-10 01:37:34 +02:00
scrawl
5163358478
Fix a crash when exiting OpenMW while the mouse cursor is over a local map marker
2014-05-10 01:14:12 +02:00
scrawl
d86585b153
Fix clearing of local map markers
...
destroyWidget changes the child count, so the for loop is flawed.
2014-05-10 01:07:40 +02:00
scrawl
1444cd9051
Fix AiCombat exception when actor has a lockpick/probe equipped.
...
Don't make NPCs autoEquip lockpicks/probes, since they can't use them.
2014-05-10 00:37:36 +02:00
scrawl
136813a882
Bug #1319 : Fix references not coming from a content file incorrectly overwriting each other
2014-05-10 00:01:30 +02:00
scrawl
e7a004824c
Fix a search that should have been find
2014-05-09 23:58:24 +02:00
scrawl
872d9be1b4
Fix potential issue with dialogue globals
...
Make sure they are updated throughout the conversation
2014-05-09 19:19:21 +02:00
scrawl
731bc9c275
Fix broken isClass check and renamed variable for clarity
2014-05-09 18:45:49 +02:00
slothlife
46eb20b98c
Fixes for warnings when building with MSVC
...
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
2014-05-09 08:32:52 -05:00
cc9cii
cf23721f1b
Windows debug build crash fix.
2014-05-09 20:43:24 +10:00
scrawl
312dc84fa4
Fix a bug where the player's inventory could be opened as a container
...
If an NPC uses AiActivate on the player (i.e. to activate dialogue) precisely in the frame where the player just died, the player's inventory would be opened as a container instead.
2014-05-08 20:40:45 +02:00
mrcheko
01810f24b0
A* misses 1st closest node fix
2014-05-06 23:29:39 +04:00
Marc Zinnschlag
729e079b0b
Merge remote-tracking branch 'scrawl/master'
2014-05-06 20:18:19 +02:00
scrawl
1c8c26072d
Crime and self defense fixes
...
- NPCs should still shout messages such as "thief" even if they did not report the crime
- Fixed self defense for NPCs (they no longer attack the player when they were attacked by a non-player actor)
- Fixed self defense for creatures (Fixes #1203 )
2014-05-06 19:15:43 +02:00
scrawl
d2beb814e7
Remove superfluous attack phrases (already done by startCombat)
2014-05-06 18:05:53 +02:00
scrawl
dd9117809d
Say an attack phrase when combat starts
...
Move combat start to a helper method
Added some todo comments
2014-05-06 00:13:31 +02:00
scrawl
d4492b56db
Added header file missing from CMakeLists
2014-05-05 23:52:09 +02:00
scrawl
536fc5e192
Fix autosaves
2014-05-05 22:38:08 +02:00
Jeffrey Haines
d4812c3af9
fixed placement of else statement
2014-05-04 17:54:33 -04:00
Jeffrey Haines
78f76842a6
Added else statement
...
Its still dodgy though
2014-05-04 16:56:30 -04:00
Jeffrey Haines
7d5dab214c
#58 - Sneak Skill: functional sneaking
...
Removed sneak checking from individual actor update.
Added sneak checking to Actors::update()
2014-05-04 16:20:09 -04:00
Jeffrey Haines
a65e8393bb
Merged files
2014-05-04 11:33:27 -04:00
mrcheko
f596b698d9
fixes to slow-down at jump startup and infinite air intertia growth
2014-05-04 18:15:07 +04:00
Jeffrey Haines
a469444e53
Player can't detect self
2014-05-04 08:05:32 -04:00
Thomas
dbf06d8c8b
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aipursue.hpp
apps/openmw/mwmechanics/aisequence.hpp
2014-05-04 02:06:43 -04:00
Thoronador
be89654eef
remove audiere_decoder + mpgsnd_decoder from CMake file for openmw
2014-05-03 22:05:21 +02:00
Thoronador
620a8ccaf3
remove Audiere and MPG123+Sndfile decoder sources
2014-05-03 21:49:57 +02:00
Jeffrey Haines
e1e23447f2
Removed initial check form setSneak
...
It wasn’t needed.
2014-05-03 13:16:07 -04:00
Jeffrey Haines
05e326bdc3
Added update sneak to actors
...
Intends to check the state of a players sneak by asking the question if
each npc can see the player.
2014-05-03 12:48:07 -04:00
scrawl
658c37a299
AiPursue: If we reached the path end, that does not mean we reached the target. Rebuild the path if the target has moved in the meantime.
...
Fixes guards in pursuit activating the dialogue too early.
Also tweaked the activation distance.
2014-05-03 17:17:00 +02:00
scrawl
7bddfc0025
Fix some spelling mistakes.
2014-05-03 12:23:22 +02:00
scrawl
122e606e30
Crime: improvement to arrest on sight for large bounties
...
iCrimeThreshold controls the needed bounty to have guards run to the player and force dialogue. In vanilla, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or present a death sentence and attack (>= 5000 bounty).
2014-05-03 12:17:44 +02:00
scrawl
7331a64e34
Restore fix for Bug #875 (commit 602be9bbe7, was broken by 43757efdc4)
2014-05-03 11:33:20 +02:00
scrawl
1b074e5524
Call setAttacked even if the attack missed. Unsuccessful hits should also evoke a response.
2014-05-02 22:38:39 +02:00
scrawl
df1694c27b
Console autocompletion: List candidates when repeatedly pressing tab (bash-style)
2014-05-02 22:19:02 +02:00
scrawl
92467ba6bc
Fix sunlight for interiors
2014-05-02 21:20:27 +02:00
scrawl
8560b43464
Move to esm component
2014-05-02 12:48:07 +02:00
scrawl
f8cc328b5e
Slightly prettier backdrop when loading game from main menu.
2014-05-02 12:48:01 +02:00
scrawl
6381b1e938
Fixes #1309 : Do not allow saving while dialogs are opened, just like vanilla
...
This limitation could be removed post-1.0 by serializing the state of open windows.
2014-05-02 11:20:43 +02:00
scrawl
17bb8d7f9a
Fixes #1252 : Add item/magic keybindings to savegame
2014-05-01 21:16:32 +02:00
scrawl
fc7e79027a
Fixes #1144 : Don't refreshCurrentAnims when adding already dead actors
2014-05-01 16:55:16 +02:00
scrawl
64a30ad182
Fix another leak
2014-05-01 16:55:16 +02:00
scrawl
6f7fbc867f
Fix several leaks
2014-05-01 16:55:15 +02:00
scrawl
f99eda1a54
Fixes #1302 : Do not attempt to set OnPcAdd before the script has been added
2014-05-01 16:55:15 +02:00
scrawl
5415ca6a63
Fix exception when shift+click on empty space in save dialog
2014-05-01 16:55:15 +02:00
mrcheko
9e79fb5b87
fix to broken aiwander logic
2014-05-01 11:41:25 +04:00
mrcheko
e8f7d12c01
uninit bool and invalid iterator bugs fixes
2014-04-30 23:57:19 +04:00
Jeffrey Haines
5c9c467b26
Improved sneak.
2014-04-30 08:06:36 -04:00
Jeffrey Haines
14ebd8b110
Fixed logic in commit crime
2014-04-30 07:44:29 -04:00
Thomas
10a5bb9464
Made code a bit more standardized and added a good bit of documentation.
2014-04-29 23:40:59 -04:00
Marc Zinnschlag
0c2843b0f7
some missing cleanup
2014-04-29 19:56:33 +02:00
Marc Zinnschlag
9a1b5dc1c6
a bit of cleanup
2014-04-29 15:32:00 +02:00
Marc Zinnschlag
f6a876bc3d
added actor ID
2014-04-29 15:27:49 +02:00
Marc Zinnschlag
4eeed4e2c7
Merge remote-tracking branch 'scrawl/return'
2014-04-29 12:27:27 +02:00
scrawl
28ef236f0e
Don't allow setting a new return position if there already is one and we haven't reached it yet
2014-04-29 11:17:07 +02:00
Marc Zinnschlag
8fea2cfa2a
Merge remote-tracking branch 'mrcheko/master'
2014-04-29 10:03:29 +02:00
scrawl
1fd7a07b5e
Merge branch 'master' of https://github.com/OpenMW/openmw into return
...
Conflicts:
apps/openmw/mwmechanics/aisequence.cpp
apps/openmw/mwmechanics/aiwander.cpp
2014-04-29 09:14:13 +02:00
scrawl
9b36a13821
Feature #1289 : NPCs return to default position
...
Make stationary NPCs return to their previous position once combat/crime AI finishes.
2014-04-29 09:09:51 +02:00
scrawl
3780503275
Removed quicksave/quickload message boxes, now that the same text is shown in the progress bar
2014-04-29 07:07:03 +02:00
Marc Zinnschlag
3013c34d9b
Merge remote-tracking branch 'scrawl/master'
2014-04-28 21:46:05 +02:00
scrawl
7a0aeeaa38
Allow to delete savegames (shift + click)
2014-04-28 20:57:45 +02:00
scrawl
7f37f2c2be
Fixes #1187 : Make GetDistance handle actors in remote cells gracefully
2014-04-28 19:23:25 +02:00
Marc Zinnschlag
2e7b4e798e
Merge remote-tracking branch 'digmaster/master'
2014-04-28 19:22:54 +02:00
scrawl
a35f7c73ae
Fixes #1286 (Dialogue topic list clips with window frame)
...
The first problem was with the ScrollView skin, which had a full-sized client area. Since the scrollbar starts out visible, MyGUI expects the client area to be smaller to accomodate for the scrollbar width. As a result, the starting canvas size becomes bigger than the view size.
Another bug was with the MWList code: reducing the canvas size for the scrollbar is not needed, since MyGUI is already doing that, and attempting to do it manually interferes with the view offset.
2014-04-28 18:40:29 +02:00
scrawl
518a32c19d
Fixes #1195 : Make NPCs equip torches in interiors under certain conditions
2014-04-28 18:33:42 +02:00
Thomas
885228ec02
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
2014-04-28 12:27:57 -04:00
Lars Söderberg
04e5b9c72c
Right aligned version/revision
...
I've always felt that having the version/revision text at the bottom
center in the main menu was a bit out of place. A more common place for
this kind of thing is in one of the corners. I chose bottom right.
Aditionally I right aligned it and changed the v and r in version and
revision to capital letters.
Comments?
2014-04-28 16:23:07 +02:00
scrawl
84961d7843
Fixes #1254 : PcRank should return first rank if not in the faction
2014-04-28 15:31:18 +02:00
scrawl
b2119441b9
Fix bug in PcRank / PcNextRank
...
It was using the first faction instead of the actor's faction.
2014-04-28 15:26:40 +02:00
Marc Zinnschlag
421679b319
Merge remote-tracking branch 'scrawl/master'
2014-04-28 15:13:09 +02:00
scrawl
7e4a0c2478
Removed asserts
2014-04-28 15:00:52 +02:00
mrcheko
35c1724d39
unblock vertical aiming for combatants
2014-04-28 16:34:49 +04:00
scrawl
0796815da0
Ignore dead actors in getActorsFollowing/Fighting
...
Prevents dead enemies from disallowing resting near them
2014-04-28 11:44:56 +02:00
scrawl
27a05027f4
Fixes #1172 : Added basic loading/saving progress bar
...
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
2014-04-28 11:29:57 +02:00
Marc Zinnschlag
0b2371a05d
Merge remote-tracking branch 'thoronador/fix-minor-stuff'
2014-04-28 10:59:34 +02:00
Marc Zinnschlag
af322a9f77
Merge remote-tracking branch 'scrawl/master'
2014-04-28 10:48:57 +02:00
scrawl
1da99d9fc7
Remove unused variable
2014-04-28 10:26:24 +02:00
scrawl
b89463db09
Fix #1207 : Remember previous choice in class creation dialog
2014-04-28 09:12:03 +02:00
scrawl
1da19585dc
Remove some unneeded includes
2014-04-28 07:49:08 +02:00
Thomas
dc54bd5a5f
Merge remote-tracking branch 'upstream/master'
2014-04-27 20:56:45 -04:00
Thomas
c2127845af
Added onKnockdown command
2014-04-27 20:54:22 -04:00
mrcheko
22cdb166f2
warning fix, vars renaming
2014-04-27 22:38:04 +04:00
Thoronador
1b8c975d5b
minor performance improvements in apps/openmw
...
Checking for emptiness using size() might be inefficient, because
it can take linear time, while empty() is guaranteed to take only
constant time.
For non-primitive types, postfix ++ operators are inefficient
compared to prefix ++ operators, because post-increment usually
involves keeping a copy of the previous value around.
2014-04-27 19:10:23 +02:00
Marc Zinnschlag
ca097e146b
Merge remote-tracking branch 'jeffreyhaines/master'
2014-04-27 17:35:10 +02:00
Jeffrey Haines
edbc319c42
fixed logic. ||
2014-04-27 10:05:34 -04:00
Jeffrey Haines
52bb7c3f69
fixed logic. !
2014-04-27 09:55:38 -04:00
Jeffrey Haines
7599b26d30
Fixed: creatures won't witness crimes
...
and potential crash.
2014-04-27 09:37:43 -04:00
Jeffrey Haines
0409e18a0e
revert
2014-04-27 09:35:49 -04:00
Jeffrey Haines
b9bd4bc126
broken
2014-04-27 09:34:59 -04:00
Jeffrey Haines
ce106d3bec
Revert "NPCs detect crime exclusively"
...
This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72.
Conflicts:
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
2014-04-27 09:34:33 -04:00
mrcheko
82121e0401
some checks reworked
2014-04-27 16:59:21 +04:00
scrawl
e42855d522
Minor fix for spell icon
2014-04-27 12:54:18 +02:00
mrcheko
6a3dddfb9a
merge master
2014-04-27 13:49:31 +04:00
scrawl
3eb1e4e117
Fixes #1241 : Removed disposition-based combat conditions
...
The information for this code came from UESP, which in turn cites a (extremely vague) section from the TES-CS help text, so no surprise that it wasn't accurate.
The guard on the boat has a fight rating of 70, so with the old code it would attack on sight if the disposition is low enough. BTB-Character.esp includes something (not sure what) that drops his disposition to 35 when playing as a Khajiit, making him attack.
Testing in Vanilla it appears that disposition has no effect on combat engagement at all. Even with disposition 0 and fight 70 the NPCs don't attack.
Setting an NPCs fight rating to 70 or less still has a meaning, because the higher it is, the easier it becomes to raise the fight rating to 80 (by taunting, for example).
2014-04-27 09:43:54 +02:00
scrawl
dac0b7090a
Get rid of bigbars.png and smallbars.png
...
Changed loading bar colour to match vanilla
2014-04-27 09:43:48 +02:00
scrawl
3161647809
Fix for not being able to pick up scrolls during combat
...
This is the behaviour I observed in vanilla morrowind.
2014-04-27 09:15:37 +02:00
scrawl
d92f95f5bf
Fix a stacking issue
2014-04-27 06:08:15 +02:00
scrawl
93b76a603b
Fixes #1100 : Looting a corpse is no longer considered stealing
2014-04-27 06:08:08 +02:00
scrawl
e8210c92c6
Fixes #1240 : Don't hardcode drowning time
2014-04-27 04:27:26 +02:00
cc9cii
1fb2c8d87b
NPC turning is less hacky but still not perfect. NPC's should walk away after a period of non-action by the player (vanilla behaviour) - not yet implemented.
2014-04-27 07:38:31 +10:00
Thomas
c2b692e124
getActorsFollowing/Fighting no longer returns dead actors
2014-04-26 17:21:53 -04:00
mrcheko
dbe1307de0
code refining + minor fixes
2014-04-26 22:21:20 +04:00
Marc Zinnschlag
5e7cd806c4
Merge remote-tracking branch 'scrawl/master'
2014-04-26 18:05:04 +02:00
scrawl
04964595ef
Fixes #1270 , Fixes #1201 : Update active weapon/spell icons every frame
2014-04-26 16:44:20 +02:00
scrawl
d5dd864404
Fixes #1236 : Disable all controls while playing movie
2014-04-26 14:33:45 +02:00
scrawl
30666f2cce
Fixes #1297 : Store global map markers in savegame
2014-04-26 13:42:32 +02:00
scrawl
f921f2e7db
Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last.
...
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
2014-04-26 12:04:37 +02:00
scrawl
ef39b0f6ab
Fixes #1291 : Faction rank saving issue
...
A value of 0 is the first rank, -1 means not a member
2014-04-26 11:41:44 +02:00
scrawl
45d2a00717
Fixes #1293 : Allow interpolation type 0 in case of 0 keys
2014-04-26 11:36:27 +02:00
scrawl
b13b25dd1b
Fixes #1295 : Support partial matches in Cell filter
2014-04-26 11:03:17 +02:00
scrawl
6eca5ac4bb
Fixes #1296 : Streamlined cellChanged detection
2014-04-26 07:46:19 +02:00
scrawl
cd1b4218e7
Fix dynamically placed objects being discarded when loading game
2014-04-26 05:01:26 +02:00
scrawl
f05606657c
Correctly insert pasted text at cursor position
2014-04-26 05:01:26 +02:00
scrawl
91e50585ff
AiWander: make sure to walk, not run
2014-04-26 05:01:26 +02:00
scrawl
5b011e43a7
Fix a crash after loading game
2014-04-26 05:01:26 +02:00
mrcheko
f3626adc86
remake of z-moving in combat for flying/swimming enemies
2014-04-26 00:20:55 +04:00
Marc Zinnschlag
c63d6437c0
Merge remote-tracking branch 'jeffreyhaines/master'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
2014-04-25 15:29:23 +02:00
Marc Zinnschlag
1f6ed584c2
Merge remote-tracking branch 'digmaster/master'
...
Conflicts:
apps/openmw/mwstate/statemanagerimp.cpp
2014-04-25 08:39:40 +02:00
Jeffrey Haines
4a4c08946c
Checks the state of the passed sneak variable
2014-04-24 23:02:11 -04:00
Thomas
f3272c941f
Fix for bug #1080 , can't read/repair/make potions/use soul gems/rest/sleep while in combat.
...
The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.
2014-04-24 22:47:45 -04:00
Jeffrey Haines
42b879a9a5
Reworked the accusation of actors
2014-04-24 22:41:05 -04:00
Jeffrey Haines
c3e08916da
Sneak: Added support for state checking
...
I need advice one what I should do in order to pass mActors over to the
player. Particularly line 139 in player.cpp
2014-04-24 20:40:17 -04:00
Marc Zinnschlag
9db9ad410d
fixed checks for allowing load/save and some general cleanup
2014-04-24 10:14:17 +02:00
Marc Zinnschlag
760c8c7214
removed a redundant include
2014-04-24 09:56:51 +02:00
Marc Zinnschlag
42b3233bda
removed a redundant check
2014-04-24 09:54:47 +02:00
Thomas
5b681e2199
Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait.
2014-04-24 03:14:47 -04:00
Thomas
05b21c92af
Moved quick save into statemanager class. Kept loader as is as it's rather specalized.
2014-04-24 03:06:36 -04:00
Thomas
6a8bf71c4c
Moved autosave to before you rest, not after it.
2014-04-23 23:33:57 -04:00
Thomas
a598060071
Added autosave on rest, as well as an option in the settings menu
2014-04-23 23:12:30 -04:00
Thomas
682c395488
Apparently a normal save must exist for some reason, calling for a character to be made doesn't cause the signature to be created, and I don't know how to force create the signature (It's kinda driving me nuts)
2014-04-23 21:39:25 -04:00
Thomas
49620968b9
Disallowed quicksave/load in character creation
2014-04-23 21:21:11 -04:00
Thomas
e873135da7
Missed a debug message
2014-04-23 21:04:52 -04:00
Thomas
f90810223a
Added quicksave and quickload
2014-04-23 21:02:09 -04:00
Thomas
ee581f593b
Fixed issue which may occur if there's no evidence chest nearby
2014-04-23 13:20:43 -04:00
Thomas
f6deca7c80
Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors
2014-04-23 13:02:51 -04:00
Thomas
61341d4206
Removed mLocked, kept it as "Negative lock level means unlocked"
2014-04-23 10:00:18 -04:00
Thomas
6022ffbd1f
Evidence chest now locks when new evidence is added to it
2014-04-23 05:54:18 -04:00
Thomas
420163d35f
Small changes to lock command (If no valid lockLevel exists, defaults to 100)
2014-04-23 05:19:34 -04:00
Thomas
cac8e52154
Seperated locked and lock level, to allow for relocking doors to previous lock level.
...
The data is stored in the esm as -lockLevel if unlocked; lockLevel if locked. While not tested, it should not present any problems.
2014-04-23 05:12:07 -04:00
Thomas
e71a119c23
Made aifollowers run when long distances (800 or 10000, depending) from what they're following.
2014-04-23 02:57:48 -04:00
mrcheko
fbd0ffe86f
enable z-moving for flying/water combatants
2014-04-22 22:59:39 +04:00
mrcheko
f811abb752
pathgrid shortcutting extended
2014-04-20 20:35:07 +04:00
Marc Zinnschlag
0eed697f9a
Merge remote-tracking branch 'digmaster/master'
2014-04-20 13:36:39 +02:00
Marc Zinnschlag
a91b386381
Merge remote-tracking branch 'jeffreyhaines/master'
2014-04-20 13:34:58 +02:00
cc9cii
6a1435c49e
Remove rotation check that was freezing NPC's.
2014-04-20 17:59:08 +10:00
cc9cii
e17fab891d
Suppress travis warning and one more tweak.
2014-04-20 16:49:57 +10:00
Thomas Luppi
d6f1f129eb
Forgot to capitalize something. whooooops
...
dat y do
2014-04-20 00:39:50 -04:00
Thomas Luppi
95ef874205
Gets default keybindings from scancode, not keyvalue.
...
Gives keyboard set-up independant default keybindings; useful for
international keyboards or dvorak users
2014-04-20 00:34:58 -04:00
cc9cii
2b544d550b
Fixed the rotation animation glitch.
2014-04-20 14:27:18 +10:00
cc9cii
000afa48b7
An attempt at making turning animation smoother. Copied some code from AiCombat for rotation.
2014-04-20 11:59:47 +10:00
cc9cii
3d26702f5e
Make idle actors face the player. Turning animation is not smooth.
2014-04-20 10:36:01 +10:00
cc9cii
9bd31b6236
Added reaction time and moved game setting variables init to the constructor.
2014-04-20 10:06:03 +10:00
Jeffrey Haines
3484df0743
Fixed garage value found in beta's static analysis
...
Source: https://forum.openmw.org/viewtopic.php?f=6&t=2059#p23844
2014-04-19 19:42:49 -04:00
Jeffrey Haines
6733a1541e
Fixes to Crime System
...
Victimless crimes were removed because victims may not exist in the
case of stealing items.
Is class now uses case insensitive comparison.
Fixed issue with confiscation of stolen items.
2014-04-19 19:03:31 -04:00
cc9cii
3dfd08cf2d
Cleanup and little tweaking.
2014-04-20 08:31:02 +10:00
cc9cii
479a94b35d
Backing off closed doors working, needs cleanup and tweaking.
2014-04-20 08:14:54 +10:00
Marc Zinnschlag
7eb6a2e52d
Merge remote-tracking branch 'scrawl/alarm'
2014-04-18 16:19:28 +02:00
Marc Zinnschlag
34092f9f5d
Merge remote-tracking branch 'scrawl/master'
2014-04-18 15:08:30 +02:00
scrawl
b3916e7744
Crime: mark witnesses as alarmed.
...
Fixes guard dialogue to properly detect if the player turned himself in.
2014-04-18 13:44:09 +02:00
scrawl
4625adfb7f
Fix typo in a condition.
2014-04-18 11:43:37 +02:00
cc9cii
7437647f70
Forgot to add a guard :-(
2014-04-18 16:45:31 +10:00
cc9cii
a0fc514df7
Suppress compiler warning.
2014-04-18 15:45:39 +10:00
cc9cii
c652cb1568
More cleaning up.
2014-04-18 15:19:22 +10:00
cc9cii
2447f0f4aa
Cleaned up logging statements.
2014-04-18 14:41:44 +10:00
cc9cii
aad13d315c
Fixed issue where allowed nodes were being erased. PathFinder was returning an empty path if the closest pathgrid point to the start was also the closest pathgrid point to the goal. Still need to clean up and remove logging statements.
2014-04-18 14:41:44 +10:00
cc9cii
d3be725ee7
Actors are moved on if idling near a closed interior door. Unreachable pathgrid points due to a closed door are removed from the allowed set of points.
2014-04-18 14:41:43 +10:00
cc9cii
1ceeeb4a22
Fix movement glitches for actors with low speeds (e.g. a rat). Was caused by false detection of being stuck.
2014-04-18 14:41:43 +10:00
Marc Zinnschlag
30d5040f2f
Merge remote-tracking branch 'cc9cii/Bug-No-1260'
2014-04-15 15:26:58 +02:00
cc9cii
1fc030653f
Avoid hard coding "thief.dds" string.
2014-04-15 22:30:41 +10:00
Marc Zinnschlag
86e65944b8
Merge remote-tracking branch 'jeffreyhaines/master'
...
Conflicts:
apps/openmw/CMakeLists.txt
2014-04-15 11:31:48 +02:00
Jeffrey Haines
e2fab228f9
Save state is handled correctly now.
2014-04-14 18:11:04 -04:00
mrcheko
4e7ee97050
fix for windows builds
2014-04-14 17:18:29 +04:00
cc9cii
89be1069a7
Bug #1260 : show thief.dds image for a custom class level up menu
2014-04-14 18:31:46 +10:00
cc9cii
966ed46870
Better performance but less tolerant of collision induced glitches. Also had to use const_cast to cache on ground status.
2014-04-13 18:34:08 +10:00
cc9cii
3e6e325e5b
Instead of hacking character.cpp, provide a more reliable check for world->isOnGround(mPtr).
2014-04-13 14:53:36 +10:00
cc9cii
e9be6d3f42
Fix falling animation where vec.z is set to zero.
2014-04-13 11:34:59 +10:00
cc9cii
0bef754873
Fix jumping animation glitches caused by minor vertical movements. Should resolve Bug #1271 .
2014-04-13 08:46:02 +10:00
cc9cii
d2a41167d0
Allow flying and swimming creatures to step inclines. Should have listen to Chris in the first place, see https://forum.openmw.org/viewtopic.php?f=6&t=2075
2014-04-11 21:24:00 +10:00
Emanuel Guevel
09bd0324c9
Fail properly when a content file is not found
2014-04-08 20:19:09 +02:00
Marc Zinnschlag
03b3487f1b
minor cleanup
2014-04-07 09:56:36 +02:00
Marc Zinnschlag
fafb7501e3
Merge remote-tracking branch 'cc9cii/PathFinder-split'
2014-04-07 09:48:15 +02:00
Emanuel Guevel
ce7aa96371
Fix visual glitch happening when closing inventory while sneaking
...
(bug #1255 )
2014-04-06 22:21:28 +02:00
Marc Zinnschlag
c7f2cfeca0
Merge remote-tracking branch 'gus/AIFix2'
2014-04-06 15:13:30 +02:00
Jeffrey Haines
a274b48f2f
States are saved. Crime is reacted to.
...
Issues where some crime is ignored. Needs a lot more work
2014-04-05 22:45:40 -04:00
Jeffrey Haines
940c88d2ec
Cleaned up code, implemented crime ids
...
There is a problem with my game freezing. ToggleAi stops my character
2014-04-05 10:26:14 -04:00
Jeffrey Haines
df5cbe5dec
Minor changes
2014-04-04 08:10:35 -04:00
cc9cii
28f7c42fb7
One more comment fix.
2014-04-04 18:17:42 +11:00
cc9cii
f59226265a
Remove redundant parameter from aStarSearch. Also update some comments.
2014-04-04 18:10:06 +11:00
Jeffrey Haines
70919ba60a
Removed witnesses and minor changes
2014-04-03 16:13:14 -04:00
cc9cii
5cf8e7e933
Remove logging.
2014-04-04 06:16:26 +11:00
cc9cii
040d4f8fc4
Move PathgridGraph into separate files.
2014-04-04 06:13:47 +11:00
Jeffrey Haines
0c957a3cde
Added witnesses to the mix
2014-04-03 14:53:31 -04:00
cc9cii
a8b2eb1fe9
Make Travis happy.
2014-04-03 22:49:22 +11:00
cc9cii
325d0616bb
Cleanup debug statements.
2014-04-03 22:17:45 +11:00
cc9cii
98f77714ce
Per-cell pathgrid data and calculation moved off PathFinder. Now the edge cost calculations and strongly connected component searches are done only once per cell. Per-actor data and methods still remain with PathFinder.
...
This version still has debugging statements and needs cleaning up.
2014-04-03 21:43:44 +11:00
Jeffrey Haines
b1abef7a38
Cleaned up code
2014-04-03 01:07:56 -04:00
Jeffrey Haines
58b135a2be
Crime is now checked every frame call
2014-04-03 00:50:09 -04:00
cc9cii
f597d3e88b
Use duration rather than frame counts. Stops false detection of being "stuck" with high frame rates (e.g. indoors).
2014-04-03 07:46:26 +11:00
Jeffrey Haines
510f2d10ac
Replaces broken code with todo
2014-04-02 14:20:33 -04:00
Jeffrey Haines
6f1211dd8d
Moved mWitnesses into Player. resetCrime for paying fine.
2014-04-02 12:23:38 -04:00
Jeffrey Haines
7c0b51fb7e
Ai pursue now controls guards pursuit of crimes
...
Should extend AiActivate in the future
2014-04-02 00:18:22 -04:00
Jeffrey Haines
50dac98a2b
Feature 1154 & 73: Crime and NPC reactions
2014-04-01 20:24:25 -04:00
Jeffrey Haines
4037f3705e
Feature 1154 & 73: NPCs react to crime
2014-04-01 14:15:55 -04:00
Marc Zinnschlag
12e46c5dc7
Merge remote-tracking branch 'megaton/master'
2014-03-31 10:24:12 +02:00
Marc Zinnschlag
4ee1069baa
Merge remote-tracking branch 'scrawl/master'
2014-03-31 10:11:54 +02:00
scrawl
f5810b8e1c
Consider aspect ratio for loading screen background
...
More consistent with the main menu.
2014-03-30 23:07:49 +02:00
scrawl
1265131203
Set the selected index after all items are added (workaround for MyGUI bug)
2014-03-30 20:07:43 +02:00
megaton
50af9bc0d3
General perfomance optimizations.
2014-03-30 19:45:27 +04:00
cc9cii
d04bb3befb
MSVC uses C version of locale.
2014-03-30 17:23:22 +11:00
Jeffrey Haines
8ce938c6f1
Revert 6b28c06..98fd381
...
This rolls back to commit 6b28c06b2c
2014-03-29 22:26:53 -04:00
Jeffrey Haines
98fd381564
Feature #1154 Not all NPCs get aggressive when one is attacked
...
Compiling fix
2014-03-29 21:25:20 -04:00
Jeffrey Haines
6c866deb1b
Feature #1154 Not all NPCs get aggressive when one is attacked
...
Partially implemented
2014-03-29 21:23:34 -04:00
scrawl
5eeed03f5b
Only exchange bribe gold if the bribe was accepted
2014-03-30 00:12:31 +01:00
scrawl
72df9e77c6
Don't show version text in the pause menu
2014-03-30 00:07:32 +01:00
gus
d9ea7107b7
compile fix.
2014-03-29 18:36:32 +01:00
gus
bee057346b
Merge branch 'master' of https://github.com/OpenMW/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
2014-03-29 18:05:56 +01:00
Marc Zinnschlag
adab85eeb7
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-29 13:29:06 +01:00
Jeffrey Haines
6b28c06b2c
Feature #1233 Bribe gold in inventory - Corrected 1000 drake bribe
2014-03-29 07:47:41 -04:00
Jeffrey Haines
ad9286a30f
Revert "Revert "made mReceiver private""
...
This reverts commit 33aecc5218
2014-03-29 07:45:56 -04:00
Jeffrey Haines
33aecc5218
Revert "made mReceiver private"
...
This reverts commit 3e8f7b3bae
2014-03-29 07:45:36 -04:00
Marc Zinnschlag
c7b969821f
silenced a warning
2014-03-29 11:11:43 +01:00
Marc Zinnschlag
27095f3edb
Merge remote-tracking branch 'cc9cii/AiWander-improvements'
2014-03-29 11:08:51 +01:00
cc9cii
ebb1813b9b
Minor comment clarification.
2014-03-29 20:17:04 +11:00
cc9cii
07fd801d94
My previous analysis of the pathfinding issue was incorrect. It was in fact caused due to some of the pathgrid points being unreachable. Instead of returning an empty path in such a scenario, incorrect path + requested destination were being returned. There was also a defect where past cost was being used for selecting open points.
...
There is still an unresolved issue where mGraph and mSCComp are being rebuilt unnecessarily. The check mCell != cell in buildPath() is being triggered frequently. Not sure why.
2014-03-29 19:35:52 +11:00
cc9cii
267855c44e
Prevent NPC suicides off silt the strider platform in Seyda Neen. Added some comments as well. There may be opportunities for some optimization but left that out for now.
2014-03-29 19:35:52 +11:00
cc9cii
90a813ad2c
Allow interrupting a walking NPC to trigger a greeting.
2014-03-29 19:35:52 +11:00
Marc Zinnschlag
04baa4a573
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-29 08:14:04 +01:00
Jeffrey Haines
3e8f7b3bae
made mReceiver private
2014-03-29 02:59:47 -04:00
Jeffrey Haines
13d330e427
Feature #1233 Bribe gold not in inventory
...
Gold is now put into inventory receivers when bribing.
2014-03-28 21:16:42 -04:00
Marc Zinnschlag
86e5179fd8
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-28 22:40:12 +01:00
Jeffrey Haines
9efef31bb8
Feature #953 Trader Gold - Unused code/warning resolved
...
Removed unused code
getBaseGold throws proper error
2014-03-28 17:27:23 -04:00
Marc Zinnschlag
c38812d026
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-28 19:34:40 +01:00
Jeffrey Haines
401d21b4ee
getBaseGold implemented in MWWorld::Class for NPC and Creature
...
Implemented a getBaseGold() to get the vendor gold base
NPC gold base now can come from mNpdt12 and mNpdt52
2014-03-28 14:21:38 -04:00
Jeffrey Haines
895748f18d
Gold Pool implemented for Vendors
...
It appears that my solution breaks persuasion gold for some reason. I
may be wrong. I can’t see where this could be happening as the files
I’ve changes should not affect persuasion at all.
2014-03-28 12:01:56 -04:00
Marc Zinnschlag
2c2106205d
Merge remote-tracking branch 'scrawl/master'
2014-03-28 09:56:35 +01:00
scrawl
d7df9cae21
Bug #1224 : Changed fix to potentially allow for language independent saves
2014-03-27 22:32:42 +01:00
scrawl
4f852daf45
Don't play company logo when using --skip-menu
2014-03-27 19:59:33 +01:00
scrawl
f2cd37edd0
Play company logo movie
2014-03-27 19:51:48 +01:00
scrawl
5906d795c0
Refactored video player (now a MyGUI widget)
2014-03-27 19:10:15 +01:00
scrawl
2e4ef93b28
Add proper main menu (background image, logo animation, title music)
2014-03-27 15:25:01 +01:00
Marc Zinnschlag
5c81f20f46
Merge remote-tracking branch 'rohitnirmal/load-weap-icon'
2014-03-27 14:57:55 +01:00
Jeffrey Haines
6896142db1
Trader Gold Reset Delay
...
Trade Time initialized to 0
Gold pot set correctly for npc’s and creatures
2014-03-27 07:30:24 -04:00
Jeffrey Haines
2a8bf46607
Trader Gold Reset Delay
...
Implemented traded gold reset delay.
Note:
Traders gold pool is still in inventory.
2014-03-27 01:23:56 -04:00
Rohit Nirmal
e695890e01
Only update the icon if player is NOT unarmed, to avoid bad dereference.
2014-03-26 21:53:35 -05:00
Rohit Nirmal
bcacdc49af
Update weapon icon in HUD when save is loaded.
2014-03-26 21:08:31 -05:00
scrawl
27956f3624
Savegame dialog: Hide main menu after successful load
2014-03-27 02:36:21 +01:00
scrawl
e5e1e84c52
Ask for confirmation to exit OpenMW
2014-03-26 22:05:21 +01:00
scrawl
a5598e9c2e
Add Credits button to main menu (plays mw_credits.bik)
2014-03-26 21:38:57 +01:00
scrawl
23f4bbc5b0
Videoplayer: only pause previous sounds if there is an audio stream
2014-03-26 21:36:57 +01:00
scrawl
5562c78ac4
Ask for confirmation when selecting 'New Game'
2014-03-26 21:11:39 +01:00
scrawl
ecfaa41e93
Savegame dialog: use locale-aware datetime format
2014-03-26 20:56:39 +01:00
scrawl
53ba23e303
Fixes #1224 : Store class name instead of id in savegame header
2014-03-26 19:56:12 +01:00
scrawl
793649c854
ToggleAI: Report current status on toggle
2014-03-26 19:55:52 +01:00
scrawl
688415ce54
Play deathknockout/deathknockdown animations when appropriate
2014-03-26 18:55:16 +01:00
Marc Zinnschlag
1b6b4e3442
Merge remote-tracking branch 'slothlife/weather_save'
2014-03-23 08:36:45 +01:00
cc9cii
772a49b2a6
Just some notes for future maintenance.
2014-03-23 13:38:11 +11:00
scrawl
0a17245633
Refactored settings window
2014-03-22 19:02:14 +01:00
Marc Zinnschlag
87ae03b5d4
fix for previous commit
2014-03-22 16:39:24 +01:00
Marc Zinnschlag
6bd3b3ee78
include local variable state in saved games
2014-03-22 15:00:49 +01:00
Marc Zinnschlag
4d80bc009a
Merge remote-tracking branch 'scrawl/master'
2014-03-22 09:54:42 +01:00
scrawl
394284d0f8
Fixes #1209 : Tarhiel never falls
...
There are a few pitfalls with this code:
- Gravity is only considered when applying queued movement. Therefore, make sure to queue some movement every frame. (Could be refactored in the future?)
- The character controller never detects being in free fall (!World::isOnGround) unless movement has been applied.
2014-03-22 02:08:04 +01:00
slothlife
6dce3e5186
Fixed include to use C99 header, not C++11 header
2014-03-21 01:33:11 -05:00
slothlife
6eab9c5179
Move weather state save/load to a new class
2014-03-21 01:19:40 -05:00
Rohit Nirmal
e3a9daf921
Play item sound when trying to sell a bound item, too.
2014-03-20 22:22:31 -05:00
Marc Zinnschlag
688e03a9d2
Merge remote-tracking branch 'sirherrbatka/Editor-Dialog'
2014-03-20 22:27:28 +01:00
slothlife
1acd1bd913
Feature #1173 : Saved Game: include weather state
...
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
2014-03-20 01:25:52 -05:00
Rohit Nirmal
e4c4747a27
Play item sound even if merchant doesn't purchase it.
2014-03-19 20:08:01 -05:00
Marek Kochanowicz
6416ae90d2
Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/view/world/subviews.cpp
2014-03-19 10:23:15 +01:00
scrawl
128a47570e
One more fix
2014-03-17 14:15:52 +01:00
scrawl
4443e22387
Build fix
2014-03-17 13:32:13 +01:00
scrawl
c8c0e5de38
Fixed code issues found with unity build. Missing include guards, duplicated functions, ...
2014-03-16 23:49:06 +01:00
scrawl
81dfc26d26
mwscript/locals was added twice
2014-03-16 21:39:46 +01:00
Marc Zinnschlag
8b36de6c67
Merge remote-tracking branch 'cc9cii/Slaughterfish-fix'
2014-03-16 12:57:38 +01:00
Marc Zinnschlag
afbdd84467
Merge remote-tracking branch 'cc9cii/AiWander-fix'
2014-03-16 12:47:30 +01:00
cc9cii
f71fb83bfc
Cleaned up more inaccurate comments.
2014-03-16 20:56:11 +11:00
cc9cii
f57c11254f
Revert to original variable names.
2014-03-16 20:09:18 +11:00
cc9cii
22c544d9d7
Remove unnecessary comment.
2014-03-16 12:51:12 +11:00
cc9cii
fdbd564700
Apparently fall trace needs to be done with the middle of the object.
2014-03-16 08:57:55 +11:00
cc9cii
43757efdc4
Feature #1030 - partial fix to stop creatures unable to walk/fly to come out of water. Does not necessarily handle situations where they are already out of water, however.
2014-03-16 08:09:14 +11:00
scrawl
d08394bf78
Fixes #1205 : apparently creature and hand-to-hand (health) attacks should also level up armor skill (tested in vanilla)
2014-03-15 21:00:25 +01:00
scrawl
61955111f1
Fixes #1204 : Any health value < 1 should show as empty life bar.
2014-03-15 20:48:54 +01:00
scrawl
93c21b5ef2
Fixes #1197 : incorrect mouse wheel step
2014-03-15 20:34:12 +01:00
scrawl
3880247017
Fixes #1206 : effect texture override was not accounted for
2014-03-15 20:28:48 +01:00
Marc Zinnschlag
2fdf80bcbf
Merge remote-tracking branch 'gsedej/master'
2014-03-15 13:53:05 +01:00
cc9cii
e6977d00e8
Oops. Fix typo picked up by Zini.
2014-03-15 08:16:35 +11:00
cc9cii
b2e3fa70c2
Fix spelling errors in comments.
2014-03-14 07:04:39 +11:00
cc9cii
d54ae58ec9
Bug #900 fix - minor update to comments
2014-03-14 00:09:03 +11:00
cc9cii
d92740efc9
Bug #900 fix - only fixed AiWonder, AiCombat, AiTravel and others may need a different strategy to this.
2014-03-13 23:44:52 +11:00
Marc Zinnschlag
7bc97fb8b8
reworked code for player positioning on startup and new game
2014-03-13 13:19:32 +01:00
Gašper Sedej
43a12fffd5
indentation issue...
2014-03-12 14:37:44 +01:00
Gašper Sedej
d72a2f1ffb
Added code to test if git hash is availible
2014-03-12 12:33:42 +01:00
scrawl
0cd40294a2
Fixed ranged combat for creatures
2014-03-12 11:30:44 +01:00
Gašper Sedej
06e02ed77f
Added version and revision number to mainmenu
2014-03-12 10:53:56 +01:00
Marc Zinnschlag
2de862126a
moved resources group creation from Engine to bsa component
2014-03-09 11:42:39 +01:00
scrawl
6eaa7553f8
Fixes #1181 : Enable controls when loading a savegame
2014-03-09 03:34:49 +01:00
Sandy Carter
72a3c50eb8
( #1191 ) Disallow picking up if inventory disabled
...
Check if window manager has allowed the inventory window
if not, then items should not be possible to pick up
2014-03-08 13:45:54 -05:00
scrawl
072dc6d438
Feature #50 : Implement marksman mechanics.
2014-03-08 06:03:45 +01:00
scrawl
12de0afb03
Feature #50 : Spawn projectiles
...
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
2014-03-08 01:31:27 +01:00
cc9cii
f36bea03ab
Bug #1189 fix by scrawl
2014-03-07 19:36:44 +11:00
scrawl
e08f6c9ce3
Bug #416 : Copy framebuffer to a texture instead of not clearing
...
Potentially faster than the previous workaround, and should work for triple buffering too.
2014-03-06 04:01:25 +01:00
scrawl
83b6fcf22e
Bug #416 : Workaround for page flipping problem
2014-03-05 22:24:05 +01:00
scrawl
1d926816b5
Terrain: background load blendmaps & layer textures. Refactor QuadTree update.
2014-03-05 21:46:37 +01:00
scrawl
2a4e99c069
Set StaticGeometry origin
...
Fixes an exception for coordinates far away from (0,0,0).
2014-03-05 21:46:37 +01:00
scrawl
edb5a54092
Include some more required Ogre headers explicitely.
2014-03-05 21:46:37 +01:00
scrawl
195071efc7
Terrain: geometry is now loaded in background threads.
...
TODO: background load layer textures and blendmaps.
"Distant land" setting has been removed for now (i.e. always enabled).
2014-03-05 21:46:37 +01:00
scrawl
065b6d3331
Terrain: moved ESM::Land load to earlier in the startup procedure
...
Required for background loading as we cannot load ESM::Land data from background threads.
2014-03-05 21:46:36 +01:00
scrawl
8730b61362
Render maps after *all* cells have finished loading
...
Still not fixing Bug #772 , but at least this will allow for background loading of terrain.
2014-03-05 21:46:36 +01:00
scrawl
c9e349f60f
Terrain: support alternate coordinate systems. Get rid of LoadingListener for now
2014-03-05 21:46:36 +01:00
Bret Curtis
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
2014-03-05 17:08:58 +01:00
cc9cii
ce8d327e8e
Debug MSVC build of openmw needs number of sections beyond 2^16
2014-03-05 22:11:10 +11:00
gus
d84319300a
fix
2014-03-05 11:27:16 +01:00
gus
f4879dacd5
add AIfollow to summoned creatures
2014-03-05 11:24:39 +01:00
Marc Zinnschlag
f9d2fde783
Merge branch 'openmw-29'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-03-04 09:34:38 +01:00
Marc Zinnschlag
0ae9cc0106
removed unused function
2014-03-03 08:21:16 +01:00
Marc Zinnschlag
ca30f2af3d
minor fix
2014-03-02 11:03:37 +01:00
scrawl
a99aa15d14
Fix a copy&paste mistake leaving start rotation uninitialized
2014-02-28 17:23:58 +01:00
Marc Zinnschlag
0926501717
Merge remote-tracking branch 'cc9cii/branch_0_29_fixes' into openmw-29
2014-02-27 15:45:45 +01:00
cc9cii
56ae85df0c
Fix 32bit Windows crash while taking the save screenshot.
2014-02-28 00:28:02 +11:00
cc9cii
8fa88f4480
sync with upstream
2014-02-28 00:13:57 +11:00
cc9cii
2421f23c2f
cleanup the mess...
2014-02-27 23:59:23 +11:00
cc9cii
5b48ca114f
aicombat pathfinding fix - check the correct list
2014-02-25 08:31:14 +01:00
cc9cii
85c467f00f
Minor cleanup for aicombat pathfinding workaround.
2014-02-25 08:30:52 +01:00
Marc Zinnschlag
9b18e01507
keep track of which cells have state that needs to be saved
2014-02-24 10:03:04 +01:00
Marc Zinnschlag
bfcd768078
various bits of cleanup
2014-02-23 21:39:18 +01:00
Marc Zinnschlag
83ded18af0
encapsulated reference collections
2014-02-23 21:21:27 +01:00
Marc Zinnschlag
367919200f
moved CellRefList into a separate file
2014-02-23 20:11:05 +01:00
Marc Zinnschlag
f220867144
make Ptr a bit more pointer-like
2014-02-23 18:17:41 +01:00
Marc Zinnschlag
b72c1c2c58
encapsulated water level
2014-02-23 17:34:18 +01:00
gus
95ff869163
Merge branch 'openmw-29' of https://github.com/zinnschlag/openmw.git into AIFix2
2014-02-23 17:07:49 +01:00
Marc Zinnschlag
79e723ad06
encapsulated mIds
2014-02-23 16:46:07 +01:00
Marc Zinnschlag
8ea686c6c8
encapsulated mState
2014-02-23 14:26:36 +01:00
cc9cii
1bd2664cb0
aicombat pathfinding workaround
2014-02-23 11:47:25 +01:00
cc9cii
1ab5948f19
merge upstream changes
2014-02-23 19:11:37 +11:00
Marc Zinnschlag
b0ae5b8ab7
Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29
2014-02-22 17:16:55 +01:00
cc9cii
fcfc8fcccb
Revert "Allow MinGW64 compilation in Windows/msys"
...
This reverts commit c3f350e3fb
2014-02-22 23:45:13 +11:00
cc9cii
ac606a865c
Back out unnecessary change.
2014-02-22 23:22:23 +11:00
cc9cii
c241405d91
Fix Windows save & load.
2014-02-22 12:15:20 +11:00
cc9cii
c3f350e3fb
Allow MinGW64 compilation in Windows/msys
2014-02-22 12:06:50 +11:00
Marc Zinnschlag
7693f712bc
started making CellStore into a proper class; encapsulated mCell member
2014-02-21 11:35:46 +01:00
Marc Zinnschlag
736644de05
Revert " #1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()"
...
This reverts commit 51fb9f65ea
2014-02-20 12:31:40 +01:00
scrawl
d25b3ad9cb
Fix AiCombat for creatures with weapons
2014-02-19 11:23:03 +01:00
scrawl
ebc67a82cf
Don't list unnamed quests in the quest book
2014-02-19 11:23:03 +01:00
scrawl
1fba5d1bb9
Terrain: change world bounds from AABB to 4 floats
2014-02-19 11:23:03 +01:00
scrawl
bc376e6649
Closes #888 : Treat "Bip 01" as animation root if existing
2014-02-19 11:23:03 +01:00
scrawl
439018e706
Get rid of useless return values
2014-02-19 11:23:03 +01:00
scrawl
90f6cda4cc
Moved includes to appropriate place
2014-02-19 11:23:03 +01:00
Marc Zinnschlag
550e5eb686
Merge remote-tracking branch 'corristo/osx-music-fix'
2014-02-18 09:12:02 +01:00
gus
d8f24ac499
bug fix
2014-02-17 15:49:49 +01:00
Marc Zinnschlag
ea16f79d77
Merge remote-tracking branch 'gus/AIFix2'
2014-02-17 10:54:07 +01:00
gus
84959eea28
woops, thanks scrawl
2014-02-17 10:50:10 +01:00
gus
6e1425321b
remove cout spam
2014-02-17 10:43:09 +01:00
gus
e5b19cf3c6
clean up
2014-02-17 10:37:11 +01:00
Nikolay Kasyanov
51fb9f65ea
#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()
2014-02-17 02:59:23 +04:00
Nikolay Kasyanov
5e8cb2e466
Another attempt to fix #1041 . This time I'm sending real data from decoder
...
once after playback started.
2014-02-17 02:35:13 +04:00
Marc Zinnschlag
c18c3e51ee
handle IDs that don't exist anymore after loading
2014-02-16 16:23:05 +01:00
Marc Zinnschlag
9788bbcab9
partially store creature state in saved game files (only attributes and dynamics for now)
2014-02-16 15:56:36 +01:00
Marc Zinnschlag
b0532e0c85
store NPC state in saved game files
2014-02-16 15:51:45 +01:00
Marc Zinnschlag
9f721fd144
store list of known topics in saved game files
2014-02-16 12:54:27 +01:00
Marc Zinnschlag
6ac64bbe15
Merge branch 'script'
...
Conflicts:
readme.txt
2014-02-16 12:12:56 +01:00
Marc Zinnschlag
9cdfca6c26
Merge remote-tracking branch 'potatoesmaster/disable-crash'
2014-02-15 22:55:00 +01:00
Emanuel Guevel
3d8ca02479
Fix breaking of enchanted items casting
2014-02-15 17:39:57 +01:00
gus
a315d5cc2b
aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp
2014-02-14 12:55:14 +01:00
Marc Zinnschlag
451e1f413b
instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly
2014-02-14 11:15:16 +01:00
Emanuel Guevel
7c981587fc
When searching object by id, search in active cells before searching in the player's inventory
2014-02-13 22:58:12 +01:00
Emanuel Guevel
e597328b6b
Make enable/disable a no-op for items in containers
2014-02-13 20:24:27 +01:00
Marc Zinnschlag
d6e212a02b
Merge branch 'master' into script
2014-02-13 15:02:02 +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
Marc Zinnschlag
9c52820754
Merge remote-tracking branch 'scrawl/master'
2014-02-13 10:54:51 +01:00
scrawl
c6fb0f2d9b
Removed terrain component's dependency on ESM
2014-02-13 10:13:53 +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
b3412b7eec
another case fix (remote member access again)
2014-02-12 15:22:17 +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
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
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
3b990795c4
added access to remote access of local variables of global scripts
2014-02-10 14:45:55 +01:00
mrcheko
a6be72673c
improves animation-controlled velocity check
2014-02-08 16:59:15 +02:00
scrawl
8f949c6ae2
Fix lockpicks
2014-02-08 07:35:34 +01:00
scrawl
6ce499f0e6
Fixes #848 : Use hardcoded animation velocity for first person movement
2014-02-06 04:05:22 +01:00
scrawl
ff11d85a62
Fix wrong assertion
2014-02-06 03:15:01 +01:00
gus
632834ce10
WIP
2014-02-05 16:12:50 +01:00
scrawl
4a26909172
Fixes #1159 : Don't allow quick keys menu in chargen
2014-02-05 12:15:49 +01:00
scrawl
677fc84223
Refactor actors update
2014-02-05 09:50:21 +01:00
scrawl
0cc1cd8f7e
Fix message box formatting bug
2014-02-05 05:18:11 +01:00
scrawl
7907181c0c
Fix uninitialized member
2014-02-05 05:18:11 +01:00
scrawl
ffe19e7a52
Feature #50 : Handle attach & release of projectiles
2014-02-05 05:18:11 +01:00
scrawl
8b8fb931a0
Feature #50 : Don't allow ranged weapon attack when ammunition is empty
2014-02-05 05:18:10 +01:00
scrawl
a07eaa0c0d
Feature #50 : Allow body pitch in third person for ranged weapon aiming
2014-02-05 05:18:10 +01:00
scrawl
5ee105c812
Fix typo
2014-02-05 05:18:10 +01:00
scrawl
7cf22391a5
Feature #50 : Handle weapon controllers (i.e. bowstring animations, etc)
2014-02-05 05:18:10 +01:00
scrawl
e1e7a492e2
Fix movement speed formula for flying creatures
2014-02-05 05:18:10 +01:00
scrawl
f608ceeffc
Fixes #1158 (Armor rating label issues)
2014-02-05 05:18:10 +01:00
scrawl
8aed4fcfa4
Correction for marksman weapon inventory preview
2014-02-05 05:18:10 +01:00
scrawl
5b076aa570
Revert "Bug #1074 : Inventory paperdoll obscures armour rating"
...
This reverts commit b017a3be3e
2014-02-05 05:18:10 +01:00
scrawl
df78357e05
Handle knockout separately ( Closes #1151 )
2014-02-05 05:18:09 +01:00
mrcheko
688f359a33
discard creatures speed and negative fatique changes
2014-02-03 23:09:26 +02:00
Marc Zinnschlag
c5b92ed6c8
Merge remote-tracking branch 'pvdk/versioninfo'
2014-02-03 11:21:11 +01:00
Marc Zinnschlag
21f502df34
compatibility fix
2014-02-03 11:20:55 +01:00
pvdk
f263acdac6
Merge remote-tracking branch 'upstream/master' into versioninfo
2014-02-03 02:27:24 +01:00
Alexander "Ace" Olofsson
e50a393de4
Fix linking issues on Windows using MSVC.
2014-02-02 23:59:57 +01:00
Marc Zinnschlag
32860a05e3
added dummy implementations for getPcInJail and getPcTraveling
2014-02-02 15:35:18 +01:00
mrcheko
761f13d3ce
activate whole-body attack animations
2014-02-02 16:29:51 +02:00
Marc Zinnschlag
914ab1b8ab
allow 'x' instead of 'getjournalindex x'
2014-02-02 15:08:27 +01:00
Marc Zinnschlag
4ee43612f6
added new switch: --script-warn
2014-02-02 14:09:59 +01:00
mrcheko
b85a4dd35e
pos accum without conformity with animation bug/creature speed
2014-02-02 15:01:49 +02:00
Alexander "Ace" Olofsson
e3d85af70a
Fix an issue with int32_t being unknown on windows.
2014-02-02 13:57:19 +01:00
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 4e360136b1047bbe43b2
2014-01-26 00:31:44 +01:00
scrawl
a1fbd1fcc8
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit df7c139e2ffec26342cd
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
scrawl
28a2585106
Unsheath weapon in AiWander
2014-01-15 14:53:29 +01:00
scrawl
dff67bb0b6
StopCombat: mark as non-hostile
2014-01-15 14:53:29 +01:00
scrawl
da3295d69c
Closes #1106 : Move stance to CreatureStats, since creatures also have separate run/walk animations.
2014-01-15 14:53:29 +01:00
scrawl
03b2e99802
Remove unused Combat stance
2014-01-15 14:53:29 +01:00
scrawl
d0500e8124
Some unneeded includes cleanup
2014-01-15 14:53:28 +01:00
scrawl
0c4b6ea89f
Minor fix
2014-01-15 14:53:28 +01:00
scrawl
a432661b8a
Minor correction
2014-01-15 14:53:28 +01:00
scrawl
de64c57179
Fix some typos and accidental commit
2014-01-15 14:53:28 +01:00
greye
61707694e8
fix memory leak in AISequence
2014-01-14 16:22:50 +04:00
greye
15d946415e
minor cleanup
...
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
2014-01-14 12:46:53 +04:00
scrawl
52b9ebff9d
Closes #1092 : Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.
2014-01-14 07:42:03 +01:00
scrawl
69381c49c7
Added a todo comment
2014-01-14 07:39:44 +01:00
scrawl
b8583124e0
Correction for RemoveSoulgem instruction
2014-01-14 06:13:30 +01:00
scrawl
90b92a8f41
Move levelled list code out of ContainerStore
2014-01-14 05:37:06 +01:00
scrawl
6aa56354c0
Revert "Bug #991 : Don't autoequip items with harmful permanent enchantments"
...
This is no longer needed, since merchants no longer equip items sold to them (2f35e5a04e71d9755ef1
2014-01-14 05:24:58 +01:00
scrawl
9de3abcb5f
Closes #1105 : Do not reduce magicka if unable to cast
2014-01-14 03:34:30 +01:00
scrawl
396efd580b
Fix a leftover of the old coordinate system
2014-01-14 03:26:56 +01:00
scrawl
2196ce427a
Closes #556 : Link movie volume to 'master' volume slider, instead of 'music'.
2014-01-14 03:08:37 +01:00
scrawl
95651857f3
Fix code duplication
2014-01-14 02:52:34 +01:00
scrawl
0d0005c433
Fix fatigue not restoring when waiting
2014-01-14 02:20:13 +01:00
scrawl
ba27b693f8
Increase sneak skill on successful pickpocket
2014-01-13 10:18:03 +01:00
scrawl
73268a8606
Fix skill progress not working
2014-01-13 10:18:03 +01:00
scrawl
cd06b2177d
Automatically knock down when fatigue goes below zero
2014-01-13 10:18:03 +01:00
scrawl
413bf127de
Allow drain fatigue effect to reduce below zero
2014-01-13 10:18:02 +01:00
scrawl
3a1b6dd354
Handle fCombatKODamageMult and fCombatCriticalStrikeMult. Fix SelectWrapper Function_Detected.
2014-01-13 10:18:02 +01:00
scrawl
83872f6bf5
Knockdown / hit recovery improvements. Use formula and GMSTs from research wiki for knockdown determination. Hand-to-hand automatically knocks out when fatigue empty.
2014-01-13 10:18:02 +01:00
Marc Zinnschlag
3e58eb34e4
Merge remote-tracking branch 'sergeyshambir/startcombat'
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2014-01-13 10:17:10 +01:00
Marc Zinnschlag
63cd70f810
some junk removal
2014-01-13 10:03:25 +01:00
scrawl
7983b07b10
Get bk_treasuryreport script to work properly:
...
- OnPcEquip needs to be set on *using* any item, not just equipping
- Handle PcSkipEquip
- Execute item's script once immediately after setting OnPcEquip
- Do not set OnPcEquip when an item that has skipped equipping sets pcskipequip back to 0 and gets equipped
2014-01-13 06:20:18 +01:00
gus
5d4e148063
some clean up
2014-01-12 22:47:22 +01:00
gus
5d038423ec
attempt to solve Bug #1009 by not building graph every frame
2014-01-12 18:42:31 +01:00
Marc Zinnschlag
9025210965
Merge branch 'refnum' into savedgame
...
Conflicts:
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/manualref.hpp
components/esm/cellref.hpp
2014-01-12 16:58:06 +01:00
gus
0e46c40cb5
Make ACtionTeleport non player specific and teleport actors following the teleporting actor
2014-01-12 14:03:11 +01:00
gus
1ae62665d6
get all actors following a given actor
2014-01-12 14:02:40 +01:00
gus
dd870e35db
get all actors following a given actor
2014-01-12 14:02:15 +01:00
gus
2446abe076
Allow getting current active package
2014-01-12 14:01:54 +01:00
gus
7e96a391da
FollowCell duration = 0 -> infinite time
2014-01-12 11:39:42 +01:00
gus
7066844e52
Follow you until a certain cell is reached
2014-01-12 11:38:58 +01:00
scrawl
f78b846f9e
Handle CasterLinked magic effect flag
2014-01-12 10:21:49 +01:00
scrawl
767c72e619
Fix diagonal movement being faster than forward movement
2014-01-12 10:04:06 +01:00
scrawl
fb778f8ecd
Use fEncumbranceStrMult
2014-01-12 04:09:51 +01:00
scrawl
1d19d36bd6
Remove unused magic effect flags and update esmtool output
2014-01-12 01:25:00 +01:00
scrawl
921ef6cd9c
Closes #1093 : Show weapon when initializing the character controller with a weapon equipped
2014-01-12 00:42:27 +01:00
scrawl
10ddea45e9
Move crime from onHit to hit, since failed hits are apparently also a crime
2014-01-11 23:12:21 +01:00
scrawl
44b2380874
Closes #947 : Decrease fatigue when running, swimming and attacking
2014-01-11 22:28:50 +01:00
scrawl
dddc0979a2
Fix another fatigue cap issue
2014-01-11 22:28:50 +01:00
scrawl
224f288359
Don't attempt to change disposition for creatures
2014-01-11 21:30:26 +01:00
scrawl
3db299f1b2
Fix fall damage crash
2014-01-11 21:30:26 +01:00
gus
051d7141be
check position to stop AIFollow
2014-01-11 20:32:38 +01:00
Marc Zinnschlag
5ea25dc269
player state cleanup
2014-01-11 15:34:32 +01:00
Marc Zinnschlag
b1ffb64a1f
Merge remote-tracking branch 'gus/AIFix2'
2014-01-11 14:33:27 +01:00
gus
ccf07f9406
Bugfix
2014-01-11 12:07:10 +01:00
gus
2d66b2c4fa
AiFollow. Npc get stuck often (no stuck dtection yet)
2014-01-11 12:06:36 +01:00
gus
f41f08c352
Wrong logic... should improve performances
2014-01-11 12:04:32 +01:00
gus
0609b71df9
fix pathfinding
2014-01-11 11:57:07 +01:00
Marc Zinnschlag
a0872b2646
Merge remote-tracking branch 'gus/AIFix2'
2014-01-11 11:51:53 +01:00
Marc Zinnschlag
1b03eec63e
Merge remote-tracking branch 'scrawl/master'
2014-01-11 11:43:12 +01:00
gus
828e5841d8
Windows SDL fix
2014-01-11 11:00:34 +01:00
scrawl
a2ba0dde31
Implemented GoToJail
2014-01-11 06:47:58 +01:00
scrawl
3896c88403
Use VFX_DefaultCast / VFX_DefaultHit if the magic effect does not specify any
2014-01-11 05:58:05 +01:00
scrawl
9ddee8fd8c
Autocalculate NPC reputation as according to research wiki
2014-01-11 04:03:13 +01:00
scrawl
9127839cc1
Add a searchPtr method as required for getting an owner, which may already be dead and disposed of.
2014-01-11 03:33:17 +01:00
scrawl
bf6d302fba
Confiscate stolen items when caught
2014-01-11 03:29:41 +01:00
scrawl
909494ff35
Implement Assault crimes. In other words, NPCs now fight back!
2014-01-11 03:08:16 +01:00
scrawl
12944f2459
Fix an auto equipping bug that allowed twohanded weapon and shield at the same time
2014-01-11 03:07:35 +01:00
scrawl
d4a98ffc27
Increase fight rating when being the victim of a crime
2014-01-11 02:27:44 +01:00
scrawl
aba72ffefe
Fix up the merge a bit
2014-01-11 02:12:41 +01:00
scrawl
727aa30347
Dead actors are unaware of everything
2014-01-11 02:06:54 +01:00
scrawl
d01f89b153
Rewrite some awful code
2014-01-11 00:24:21 +01:00
scrawl
e9f63270d9
Speed fix for "on target" spells
2014-01-10 22:51:42 +01:00
scrawl
621e52f09d
Play "attack" voiced dialogue entries randomly based on iVoiceAttackOdds.
2014-01-10 22:48:42 +01:00
scrawl
d9d6f37619
Use iVoiceHitOdds
2014-01-10 22:44:40 +01:00
scrawl
15e48107f7
Use i1stPersonSneakDelta + some cleanup
2014-01-10 22:39:01 +01:00
scrawl
2744cde40f
Use a few additional GMSTs
2014-01-10 22:27:31 +01:00
scrawl
3bf36515d5
Implement Trespassing crime
2014-01-10 21:26:24 +01:00
scrawl
f5a70dccf0
Fix title of buttons in generate class result dialog
2014-01-10 21:13:03 +01:00
scrawl
627dcddb33
Do not allow training skills above their governing attribute
2014-01-10 20:53:53 +01:00
Marc Zinnschlag
f62497dfdc
Merge remote-tracking branch 'mrcheko/master'
2014-01-10 19:08:35 +01:00
mrcheko
ffcb7fb280
fix for bug scrawl mentioned
2014-01-10 19:04:07 +02:00
mrcheko
d41f27451b
appropriate camera vanity<>preview mode switch + hit recoils fix
2014-01-09 23:36:40 +02:00
scrawl
546b0cee76
Closes #1077 : Replace tags before trying to get the message length
2014-01-09 22:17:51 +01:00
scrawl
aa855e9524
Include some required Ogre headers explicitely
2014-01-09 20:56:24 +01:00
Marc Zinnschlag
5e2eb8caf8
Merge remote-tracking branch 'swick/master'
2014-01-09 09:47:42 +01:00
Marc Zinnschlag
85707b5e3e
Merge remote-tracking branch 'scrawl/master'
2014-01-09 09:35:54 +01:00
scrawl
768d9f7237
Scripting: Add an optional 'required' parameter to getReference (default: true). If required=false, it will not throw an exception if there's no reference. Fixes PcExpell not working without a reference like it's supposed to, and makes the code nicer for some others (use required=false instead of catching the exception)
2014-01-09 02:21:03 +01:00
scrawl
223c1d5a38
Use GMSTs for crime bounty
2014-01-09 02:20:52 +01:00
scrawl
6f9113fe88
Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions
2014-01-09 01:49:58 +01:00
scrawl
baf55df7a1
Gold fixes (when did this break?)
2014-01-09 01:34:10 +01:00
Sebastian Wick
925d28e4a7
crashcatcher uname error checking
2014-01-09 00:52:37 +01:00
scrawl
9bf7bf529c
Implement crime-related dialogue globals as they are described in MSFD
2014-01-09 00:40:25 +01:00
scrawl
d7f69205f6
Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes
2014-01-09 00:06:24 +01:00
scrawl
0f5dc59176
Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure.
2014-01-08 23:37:46 +01:00
scrawl
372cd437d1
Add a utility function for counting items in a container
2014-01-08 23:00:29 +01:00
scrawl
c55f9bd0aa
GetWaterLevel fix (similar to MCP): if there is no water in the cell, return -FLT_MAX to prevent mods from incorrectly thinking the player is underwater.
2014-01-08 20:19:47 +01:00
Marc Zinnschlag
a7be755db0
Merge remote-tracking branch 'mrcheko/master'
2014-01-08 20:13:31 +01:00
scrawl
bf02b77c1d
Closes #1090 : Don't throw an exception if a cell has no region in GetPCCell
2014-01-08 19:57:13 +01:00
scrawl
154fae9f25
Don't suppress exceptions thrown while running scripts
2014-01-08 19:52:57 +01:00
scrawl
9baa1bef78
Expell player from faction when committing a crime against a faction member
2014-01-08 19:26:03 +01:00
scrawl
19d63f392f
Clean up the NpcStats expelled interface. Show message box when expelled.
2014-01-08 18:59:00 +01:00
scrawl
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
2014-01-08 18:39:44 +01:00
scrawl
7b33f6f2ac
Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this.
2014-01-08 17:19:43 +01:00
scrawl
b99ca92fee
Add missing line of sight check
2014-01-08 17:18:13 +01:00
mrcheko
46519062d3
hit recoils/knockdowns feature
2014-01-08 16:05:14 +02:00
scrawl
2bb21f2f76
Don't copy NpcStats/CreatureStats unnecessarily. Fixes a bug: taunt actions would not correctly increase the target's fight rating.
2014-01-08 02:35:36 +01:00
scrawl
c85c2cff4e
Fix disposition changes from trades not applying properly
2014-01-08 01:46:42 +01:00
scrawl
728365b48d
Remove an unused hook
2014-01-07 21:07:02 +01:00
scrawl
03b6334ceb
Get rid of a hack
2014-01-07 20:43:08 +01:00
scrawl
0285d18fc2
Respect items belonging to a faction
2014-01-07 20:24:01 +01:00
scrawl
3c0080d2c1
Implement theft detection
2014-01-07 19:58:17 +01:00
scrawl
d2d76f4f47
Fix disintegration bug
2014-01-07 19:21:19 +01:00
scrawl
c4ab2f417a
Fix exception closing container window
2014-01-07 18:11:19 +01:00
scrawl
90b55c8d4b
Use Ogre's asin/acos functions which will protect against NaNs
2014-01-07 17:09:08 +01:00
Marc Zinnschlag
48a08c4c4d
Merge remote-tracking branch 'endorph/master'
2014-01-07 14:12:15 +01:00
Dmitriy 'Endorph' Shkurskiy
9afa8e952e
tabs -> spaces
2014-01-07 14:32:14 +02:00
Marc Zinnschlag
72a81a2381
Merge remote-tracking branch 'scrawl/master'
2014-01-07 10:17:33 +01:00
scrawl
780bf5a2cd
Implement pickpocket detection. Play a voiced dialogue entry when detected.
2014-01-07 03:01:33 +01:00
scrawl
ea3ee4407f
oops, didn't mean to commit this
2014-01-07 02:48:44 +01:00
Sergey Shambir
d5a0ff17fd
MWScript: updated vmformat.txt, changed opcodes to fix sequence.
...
Opcodes for StartCombat, StopCombat, GetTarget now follow the last
previous opcode.
2014-01-07 05:06:20 +04:00
Sergey Shambir
5c7e39a92f
Implemented script commands StartCombat, StopCombat, GetTarget.
...
Also renamed one field of AIWander class because it's not longer
unknown.
2014-01-07 04:43:06 +04:00
scrawl
887db76ed2
Don't consider swimming or in-air characters as sneaking
2014-01-07 01:22:04 +01:00
scrawl
29c823b9d4
Implement awareness check function. Use this for combat AI and GetDetected instruction.
2014-01-07 00:51:09 +01:00
scrawl
4a3d148a48
Fixes #1089 (skill increases)
2014-01-07 00:37:52 +01:00
Marc Zinnschlag
fefaec5804
Merge remote-tracking branch 'scrawl/savedgame' into savedgame
2014-01-06 22:30:08 +01:00
scrawl
68b87714bb
Addition to 2f35e5a04e: companions should still auto equip
2014-01-06 22:14:11 +01:00
mrcheko
2591ff2d5a
bug repairing
2014-01-06 22:00:01 +02:00
Marc Zinnschlag
43dd3b8ef2
removed redundant deletion flag from CellRef
2014-01-06 13:53:20 +01:00
Marc Zinnschlag
0ad7aa1f53
Merge remote-tracking branch 'scrawl/master'
2014-01-06 10:22:07 +01:00
scrawl
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
2014-01-06 00:23:17 +01:00
scrawl
2f35e5a04e
Stop merchants from autoequipping items sold to them
2014-01-05 22:43:09 +01:00
Marc Zinnschlag
e63b4964b2
Merge remote-tracking branch 'scrawl/master'
2014-01-05 21:27:06 +01:00
scrawl
dde2cd5d5a
Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface.
2014-01-05 20:53:45 +01:00
scrawl
73f8161d1e
Fix spell deletion not resetting the selected spell correctly
2014-01-05 19:40:05 +01:00
scrawl
b3764c504a
Implement GetPcJumping instruction
2014-01-05 19:08:12 +01:00
scrawl
45847c67ad
Lock NIF cache when loading an interior cell as well. Should improve load performance.
2014-01-05 18:38:21 +01:00
scrawl
c004fb778f
Get rid of underscore defines. They are reserved by the standard.
2014-01-05 18:22:29 +01:00
scrawl
b8e9343764
Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes
2014-01-05 18:09:50 +01:00
scrawl
ce013315ba
Nothing to see here, move along.
...
Fine... it's flying cliff racers. But did you really want to know?
2014-01-05 16:09:06 +01:00
scrawl
44e96fcaaa
Implement Charm magic effect
2014-01-05 01:56:36 +01:00
scrawl
14b70a3ce6
Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)
2014-01-05 01:34:35 +01:00
scrawl
634a53211c
Make sure materials are built before trying to determine their transparency
2014-01-04 22:56:06 +01:00
pvdk
92234cf783
Changed crashcatcher's uname system info retrieval and cleaned indentation
2014-01-04 21:46:38 +01:00
scrawl
c4e4a8fb57
Closes #1083 : Fix werewolf change handling
2014-01-04 20:50:18 +01:00
scrawl
f4517c8221
For dialogue filtering, use the Vampirism magic effect instead of the untouched NpcStats::mVampire
2014-01-04 20:50:18 +01:00
mrcheko
7002412760
resolve conflict in character.cpp
2014-01-04 17:55:09 +02:00
Marc Zinnschlag
356b53bd22
Merge remote-tracking branch 'scrawl/master'
2014-01-04 11:38:31 +01:00
Dmitriy 'Endorph' Shkurskiy
7023395012
Windows-specific definition to omit inclusion of unused stuff from Windows.h
2014-01-04 07:46:29 +02:00
Dmitriy 'Endorph' Shkurskiy
18d4cdb2ac
Fix for VS2010-Debug: manual assignment operator and cctor added for MMWorld::ContainerStoreIterator
2014-01-04 07:46:29 +02:00
scrawl
16838595a3
Another console fix: discard text markup when getting the command line's text
2014-01-04 05:24:32 +01:00
scrawl
1b96c5d266
Console improvements: Show scrollbar, allow copying text from the history
2014-01-04 05:13:53 +01:00
scrawl
710a1e2f37
Smash case for manual reference IDs as well, consistent with references in data files
2014-01-04 04:39:06 +01:00
scrawl
557652112f
Show the target HP bar also when casting a heal effect (same as MCP)
2014-01-04 04:21:44 +01:00
scrawl
12691040d1
Fix incorrect disposition testing and get rid of of a related hack that is no longer needed.
2014-01-04 02:49:10 +01:00
scrawl
09d491d1ba
Move a piece of functionality to its appropriate place
2014-01-04 01:13:19 +01:00
scrawl
be2ebc5cac
Closes #1081 : Implement disease contraction
2014-01-03 23:33:14 +01:00
scrawl
2a7d610f87
Implement GetSpellReadied instruction
2014-01-03 22:55:17 +01:00
scrawl
c0fbcf413f
Use the playermagic and playerfighting control switches
2014-01-03 22:44:35 +01:00
scrawl
e9bd43e2da
Use GMSTs for bound items/creatures
2014-01-03 20:54:14 +01:00
scrawl
617a65cdd2
Print message to dialogue window after successful trade
2014-01-03 17:40:14 +01:00
scrawl
b22dd40b41
Implement Paralyze magic effect
2014-01-03 17:06:05 +01:00
Marc Zinnschlag
ee621245bb
Merge remote-tracking branch 'scrawl/master'
2014-01-03 15:59:06 +01:00
scrawl
55c5d7cee4
Implement Resurrect instruction
2014-01-03 15:54:23 +01:00
scrawl
b4230f716e
Implement RemoveEffects instruction
2014-01-03 05:19:10 +01:00
scrawl
7d8ca91286
Implement RemoveSpellEffects instruction
2014-01-03 05:18:44 +01:00
scrawl
366801f3d5
Implement explodeSpell instruction (like Cast, with caster = target)
2014-01-03 04:44:50 +01:00
scrawl
93e1a2df73
Implement Cast script instruction (shrines work now)
2014-01-03 04:09:52 +01:00
scrawl
b42240be6d
Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.
2014-01-03 03:48:43 +01:00
scrawl
32ff3b530c
Change all instances of skill/attribute values to use an appropriate typedef.
2014-01-03 01:59:15 +01:00
scrawl
623cdef69f
Code cleanup
2014-01-02 21:49:12 +01:00
scrawl
eba60858dd
Closes #1078 : Show stat bar text even when 0
2014-01-02 21:48:33 +01:00
scrawl
299690631f
Implement SoulTrap magic effect
2014-01-02 21:21:28 +01:00
mrcheko
79e972bdb6
resolved accompanying minor problems
2014-01-02 21:54:41 +02:00
Lukasz Gromanowski
b017a3be3e
Bug #1074 : Inventory paperdoll obscures armour rating
...
Changed size of inventory paperdoll.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-02 20:20:57 +01:00
scrawl
596e0c8a49
Correct Dispel effect (use magnitude as chance)
2014-01-02 20:15:07 +01:00
scrawl
94d2ec8e4e
Add missing spells update
2014-01-02 20:02:28 +01:00
scrawl
12de351feb
Check if levitation is enabled before levitating
2014-01-02 16:38:23 +01:00
scrawl
0990ca4b75
Closes #1072 : Fix extra light being added multiple times when showCarriedLeft(true) is called repeatedly
2014-01-02 15:58:00 +01:00
scrawl
e6c0e187bc
Closes #1073 : Check for all gold types in canSell. For containers, only gold_001 is relevant, but items in the world can be sold as well.
2014-01-02 15:44:58 +01:00
Marc Zinnschlag
a6e6411686
Merge remote-tracking branch 'scrawl/master'
2014-01-02 12:12:52 +01:00
scrawl
c558e12212
Don't try to move objects that are not in a cell
2014-01-02 03:06:48 +01:00
scrawl
993edf0384
Bug #1063 : Safety check in moveObject. Required when items in containers execute script commands like setAtStart etc.
2014-01-02 02:27:48 +01:00
scrawl
0f2b2fabdb
Implement water walking
2014-01-02 02:03:44 +01:00
scrawl
783c501d70
Some checks to prevent bound item abuse
2014-01-02 01:36:08 +01:00
scrawl
590c8cb4a0
Implement Disintegrate effects. When an armor/weapon breaks, unequip it and do not allow equipping it again.
2014-01-02 01:03:44 +01:00
scrawl
899214a906
Use fVanityDelay
2014-01-02 00:13:23 +01:00
scrawl
c6421276bd
Closes #841 : Correct activation distance in third person mode
2014-01-01 23:59:17 +01:00
scrawl
24aa743573
Add function for converting feet to game units
2014-01-01 23:34:18 +01:00
scrawl
f6387d5979
Implement Telekinesis magic effect. Remove some duplicate code.
2014-01-01 23:30:58 +01:00
scrawl
531bef6193
Shorter Vector3 initialisation
2014-01-01 22:46:10 +01:00
scrawl
5729672262
Show marked position on map. Implement Detect X magic effects.
2014-01-01 22:37:52 +01:00
mrcheko
16e10cc702
error fix
2014-01-01 22:46:29 +02:00
scrawl
bfc9fcf2cd
Add starting spells when building player (F_PCStart flag)
2014-01-01 21:34:00 +01:00
mrcheko
09a0a69b04
more improvements
2014-01-01 21:40:31 +02:00
Marc Zinnschlag
1f4c192bf6
Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'
2014-01-01 19:47:11 +01:00
Marc Zinnschlag
e1355be47c
Merge remote-tracking branch 'lgro/valgrind_warnings'
2014-01-01 19:41:52 +01:00
scrawl
eab7ffd6b4
Remove redundant finding of default exterior position height
2014-01-01 18:05:28 +01:00
scrawl
8e5cae1081
Implement mark/recall magic effects
2014-01-01 17:06:21 +01:00
Lukasz Gromanowski
2d4e06cd50
Updated comments about freeing format_ctx->pb->buffer.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-01 17:05:49 +01:00
Lukasz Gromanowski
722469d57b
Correction to the e9844e1 commit.
...
Restored interrior check in WeatherManager::update().
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-01 16:45:39 +01:00
scrawl
69ba8a40bf
Fix weird formatting added during the merge
2014-01-01 16:13:20 +01:00
scrawl
b3cd10dbea
Remove redundant setTeleported calls
2014-01-01 15:18:25 +01:00
Marc Zinnschlag
c3482b6f24
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/openmw/mwmechanics/spellcasting.cpp
2014-01-01 15:05:42 +01:00
Marc Zinnschlag
5fa9aa5d1e
Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'
...
Conflicts:
apps/openmw/mwworld/weather.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-01 14:57:14 +01:00
scrawl
ea3b88951a
Implement divine/almsivi intervention magic effects
2014-01-01 02:22:11 +01:00
scrawl
c86760e3cd
Remember the last known exterior position of the player in case we fail to map the interior to a world position.
2014-01-01 01:10:55 +01:00
Lukasz Gromanowski
101813fd0d
Fixes #417 : Apply weather instantly when teleporting
...
Correction to previous commit - WeatherManager->update()
will always be called.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 21:18:10 +01:00
Lukasz Gromanowski
e9844e1b37
Fixes #417 : Apply weather instantly when teleporting
...
Changed teleporting detection from "position tracking" to manually
setting "teleportation" flag ( player->setTeleported(true) ).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 20:40:23 +01:00
scrawl
b02b966c44
Closes #994 : Don't cap skills to 100 when set via console (except for modX variants)
2013-12-31 19:11:16 +01:00
Marc Zinnschlag
c34b586b65
Merge remote-tracking branch 'ace/fix'
2013-12-31 18:37:12 +01:00
scrawl
3604b9d171
Closes #566 : In interior cells, update global map position marker using the first exterior teleport door
2013-12-31 18:35:46 +01:00
scrawl
be1938ee90
Closes #805 : Don't add entities that are supposed to be invisible to static geometry
2013-12-31 18:32:46 +01:00
Lukasz Gromanowski
1ce4663065
Updated compiler opcodes for COE, and setHello.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 18:13:38 +01:00
mrcheko
a8fb1ae51c
improved, added knockdown after falling
2013-12-31 17:55:04 +02:00
Alexander "Ace" Olofsson
8381cad5a4
Don't try to set a cursor before one exists
2013-12-31 14:13:42 +01:00
mrcheko
d6345bce91
added npc hit reactions
2013-12-31 13:24:20 +02:00
scrawl
94cdc1efd2
Enable mipmap generator for 1.9+
2013-12-31 00:54:40 +01:00
Lukasz Gromanowski
cb04f43384
Fixes for "Conditional jump or move depends on uninitialised value(s)"
...
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 23:08:53 +01:00
Lukasz Gromanowski
6107d5bad2
Updated ffmpeg decoder fix
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 22:16:06 +01:00
Lukasz Gromanowski
5c5f87445b
Fixes for "Conditional jump or move depends on uninitialised value(s)"
...
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 21:47:06 +01:00
scrawl
b8ac37347c
Code cleanup for Class::canBeEquipped
2013-12-30 19:04:35 +01:00
scrawl
79a440e94a
Many additions to 900bc06d2c:
...
- Fix indentation
- Consider any kind of light, not just torch_infinite_time
- Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon)
- Remove redundant code and don't add additional lights to the inventory
- World::isDark returns false for interiors which are unaffected by weather
2013-12-30 17:57:41 +01:00
Scott Howard
2f082ef796
remove unneeded libraries
2013-12-29 16:25:49 -05:00
Lukasz Gromanowski
c65f018760
Fixes #417 : Apply weather instantly when teleporting
...
Corrected constant name.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 15:09:49 +01:00
Marc Zinnschlag
6de39a7329
Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day'
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
2013-12-29 15:00:31 +01:00
Lukasz Gromanowski
faf8011c48
Fixes #417 : Apply weather instantly when teleporting
...
Removed changing speed of weather transition introduced in previous
commit. Instead try to detect player "teleporting" (ie. coc),
and then switch instantly to the next weather type.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 12:47:44 +01:00
scrawl
04f9f7af56
Closes #990 : Add option to unlock mouse cursor when in any menu
2013-12-29 00:58:48 +01:00
scrawl
17ff8165d2
Closes #1065 : Don't apply fall damage when landing in water
2013-12-29 00:36:36 +01:00
scrawl
2a8ab932ef
Bug #951 : Only recalculate derived stats when attributes change
2013-12-28 17:19:35 +01:00
Lukasz Gromanowski
100edda8c0
Fixes #417 : Apply weather instantly when teleporting
...
Change speed of weather transition from blight to other (twice fast as normal)
and from other to blight (four times faster than normal).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-28 16:15:34 +01:00
scrawl
596c9b80a9
Check if threads are joinable before joining (issue with boost 1.52)
2013-12-27 22:38:30 +01:00
scrawl
85ec80100c
Bug #1005 : Hide torches/shields during spellcasting and hand-to-hand combat
2013-12-27 22:00:16 +01:00
scrawl
7265b427fe
Bug #1013 : Rewrote fall height detection
2013-12-27 21:21:18 +01:00
scrawl
02277db685
Bug #1052 : Don't use set/getOnlyText which discards escape characters
2013-12-27 19:52:10 +01:00
scrawl
686d9efac3
Bug #1060 : Fix incorrect spell type checks
2013-12-27 18:58:35 +01:00
scrawl
27092a4494
flagAsModified should be private
2013-12-27 18:58:35 +01:00
scrawl
6400f23ab0
Use the material controller manager for effects with overridden texture
2013-12-27 14:54:36 +01:00
scrawl
d262d9e6b0
Bug #1054 : Set render queue group for effects
2013-12-27 14:51:59 +01:00
scrawl
1c60a781a5
Add header to CMakeLists
2013-12-27 14:42:22 +01:00
scrawl
561c661156
Reset starting angle / position when adding world item to a container
2013-12-27 01:57:08 +01:00
scrawl
608bd0f525
Don't copy the base node pointer when adding a world object to a container. Fixes bug #1028
2013-12-27 01:34:56 +01:00
scrawl
30b1da996b
Issue #1029 - Quick keys menu: Select compatible replacement when tool used up
2013-12-27 00:51:29 +01:00
scrawl
5a287a7e01
Remove no longer accurate flagAsModified calls. Container items are now modified via ContainerStore, not RefData.
2013-12-27 00:41:19 +01:00
scrawl
d09a86e208
Issue #1018 : Don't allow view mode switching while performing an action
2013-12-27 00:36:06 +01:00
scrawl
a3017e16d4
Don't allow changing the spell that is being cast mid-animation
2013-12-26 22:32:39 +01:00
scrawl
5054d8e6c1
Bug #1055 : Check power use and mana before starting cast animation
2013-12-26 22:06:13 +01:00
scrawl
71d9755ef1
Bug #991 : Don't autoequip items with harmful permanent enchantments
2013-12-26 21:26:59 +01:00
scrawl
5931fdcbde
Implement NiBillboardNode. Flags not handled yet.
2013-12-26 20:53:52 +01:00
scrawl
fb845e81a4
Rename nosound to no-sound for consistency
2013-12-26 20:53:52 +01:00
scrawl
85ed21dbd2
Remove unused command line option
2013-12-26 20:53:51 +01:00
scrawl
33389b9b63
XDG compliant paths
2013-12-26 20:53:51 +01:00
scrawl
a9e1e89bbc
Bug #1007 : Fix the console getting key focus when a reference becomes unavailable, even if the console is not visible
2013-12-26 20:53:51 +01:00
scrawl
31c1f484ed
Slight performance improvement for WindowManager::updateVisible
2013-12-26 20:53:51 +01:00
scrawl
b6bad969a0
Fix an issue with items that have no UI icon
2013-12-26 20:53:51 +01:00
scrawl
81ec8c2f55
Handle --version and --help before reading configuration - putting these options into openmw.cfg makes no sense
2013-12-26 20:53:51 +01:00
scrawl
6d27ebabb6
Integrate AddGlow with material controllers
2013-12-26 20:53:45 +01:00
Lukasz Gromanowski
900bc06d2c
Fixes #845 : NPCs hold torches during the day
...
Moved 'equipping torches at night and unequipping at day' code from Character
to Actors class.
Removed unneeded showLights method (introduced in previous commits)
from animation/npcanimation classes.
Since this commit autoEquip() method doesn't automatically equip lights.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 22:38:23 +01:00
Marc Zinnschlag
18e7e83585
Merge remote-tracking branch 'mrcheko/savedgame' into savedgame
2013-12-20 13:13:06 +01:00
mrcheko
8eb2696f6c
using gmst string
2013-12-20 14:04:59 +02:00
Lukasz Gromanowski
abc126e2af
Fixes #845 : NPCs hold torches during the day
...
Added check for Player character so it won't be affected by showing,
or hidding torches.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 01:01:30 +01:00
Lukasz Gromanowski
6eb674e4e5
Fixes #845 : NPCs hold torches during the day
...
Added equipping/unequipping torches.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 00:18:34 +01:00
Lukasz Gromanowski
92072d968b
Fixes #845 : NPCs hold torches during the day
...
Simplified a bit code which shows and hides light.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-19 21:11:07 +01:00
mrcheko
3816a09c6f
bug 428 ask to load recent saved game
2013-12-19 22:08:34 +02:00
scrawl
9afdf71af3
Fix crash with player->position command
2013-12-19 00:37:57 +01:00
scrawl
a0d38dfb63
Fix highlighted topics being selectable when in a choice
2013-12-19 00:26:08 +01:00
scrawl
876fb9a899
Addition to bb4bd999ba : adjust position for objects placed from inventory
2013-12-19 00:11:14 +01:00
Marc Zinnschlag
c22e38f825
removing 255 content file limitation
2013-12-17 21:19:05 +01:00
Marc Zinnschlag
09fadd446b
Merge remote-tracking branch 'mrcheko/savedgame' into savedgame
2013-12-17 19:33:32 +01:00
mrcheko
a854eb73db
StateRunning check returns
2013-12-16 21:02:21 +02:00
scrawl
eb5e4ecec2
Remove more unused code
2013-12-16 15:35:38 +01:00
mrcheko
f50ff0b1c4
reworked http://bugs.openmw.org/issues/428
2013-12-16 15:40:47 +02:00
scrawl
19e5978a01
Merge branch 'master' of https://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/main.cpp
2013-12-16 13:35:31 +01:00
scrawl
56893a097d
Don't stack used torches
2013-12-16 13:31:03 +01:00
scrawl
cd756a8a39
Fix incorrect value for partially used items (missing float casts). Make sure the correct value is displayed in tooltips.
2013-12-16 13:22:27 +01:00
Marc Zinnschlag
1cf1d49bc4
fix to content file reading error reporting in case of missing dependency
2013-12-16 11:39:24 +01:00
mrcheko
fd9f8c34f6
bug fix http://bugs.openmw.org/issues/428
2013-12-15 18:50:25 +02:00
Marc Zinnschlag
3590fa40bd
store global script state in saved game files
2013-12-15 16:16:50 +01:00
Marc Zinnschlag
0890fa66b0
Merge remote-tracking branch 'mrcheko/master'
2013-12-13 18:47:11 +01:00
mrcheko
8b3a393a6b
bug fix at http://bugs.openmw.org/issues/985
2013-12-13 19:33:01 +02:00
mrcheko
c8bf69b91a
Revert "bug fix http://bugs.openmw.org/issues/985 "
...
This reverts commit 7a9b64c6f4
2013-12-13 19:02:25 +02:00
scrawl
39eea24dc3
Don't try to show exceptions in a message box if SDL was not initialized
2013-12-13 03:50:01 +01:00
mrcheko
7a9b64c6f4
bug fix http://bugs.openmw.org/issues/985
2013-12-12 16:09:38 +02:00
Marc Zinnschlag
2a35c7d33a
fixed running global scripts a second time after they have been stopped
2013-12-12 13:16:32 +01:00
Marc Zinnschlag
74793c1c2f
globals script cleanup; fixed potential case folding bug
2013-12-12 13:15:38 +01:00
Marc Zinnschlag
fc37c77a91
store global variables in saved game files
2013-12-12 12:19:25 +01:00
Lukasz Gromanowski
91a4d9a2eb
Fixes #845 : NPCs hold torches during the day
...
Added method in WeatherManger and World which returns true if it is night.
This method is used later in character controller to show torches
(or other sources of light) at night and hide them at day.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-10 23:48:49 +01:00
Marc Zinnschlag
b38bfe1f21
removed a redundant function for listing global variables
2013-12-10 15:22:38 +01:00
Marc Zinnschlag
51bfa5cde3
rewrote global variable storage (using ESM variant type now)
2013-12-10 15:09:58 +01:00
Marc Zinnschlag
1fdd43bbb7
removed a redundant new
2013-12-10 12:31:18 +01:00
Emanuel Guevel
357ecd92b2
Do not display negative stat values
...
Display zero instead of negative values.
Also remove useless for loops and some unused attributes.
2013-12-10 00:41:36 +01:00
Emanuel Guevel
fc8bd1aacb
Allow fatigue stat to become negative when fatigue damages are taken
2013-12-09 21:53:04 +01:00
Marc Zinnschlag
77a2179d1e
Merge remote-tracking branch 'scrawl/master'
2013-12-09 18:39:34 +01:00
scrawl
0bc3a13c0f
Break invisibility on Use or Activate
2013-12-08 23:36:37 +01:00
scrawl
5fd2df5546
Ignore invisible targets for combat AI
2013-12-08 23:21:23 +01:00
scrawl
37a7ee8fcd
Set alpha value of character animations according to Invisibility / Chameleon effects.
2013-12-08 23:05:21 +01:00
Lukasz Gromanowski
594cc693b2
Fixes #1006 : Many NPCs have 0 skill
...
Added calculation of skill values for NPC with mNpdtType
set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-08 21:47:43 +01:00
Lukasz Gromanowski
8d63f8eea2
Fixes #998 : Setting the max health should also set the current health
...
Added setting current value of dynamic stat in OpSetDynamic class.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-07 21:00:46 +01:00
scrawl
1624e0fd8a
Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.
2013-12-07 20:15:39 +01:00
Marc Zinnschlag
ef8c0fab73
Merge remote-tracking branch 'scrawl/master'
2013-12-07 16:26:52 +01:00
scrawl
742e0e014d
Remove more cruft in MessageBox. Fixes inconsistent sizing when close to a newline.
2013-12-07 14:15:51 +01:00
scrawl
bb70deabb1
Add an incomplete implementation of SayAnimationValue (lip animation)
2013-12-07 14:15:45 +01:00
Marc Zinnschlag
1c13a9037a
save and load dynamic records
2013-12-07 13:17:28 +01:00
Marc Zinnschlag
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
2013-12-07 12:27:06 +01:00
Lukasz Gromanowski
e01085cac5
Fixes #1015 : Player status window scroll state resets on status change
...
Removed resetting scroll state position.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-07 02:57:30 +01:00
Marc Zinnschlag
48b779af80
Merge remote-tracking branch 'ace/win-fix'
2013-12-06 15:17:34 +01:00
Alexander "Ace" Olofsson
baacf91de4
Another windows build fix
2013-12-06 11:37:29 +01:00
Marc Zinnschlag
14eff87339
removed some junk from ESM store
2013-12-06 11:34:24 +01:00
Lukasz Gromanowski
bfd79bfbe6
Various fixes for CppCheck warnings.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-06 07:36:16 +01:00
scrawl
845bc5f7eb
Show fatal exceptions in a message box instead of cerr when running without a terminal
2013-12-05 15:51:07 +01:00
scrawl
afa71bb622
Throw an exception if a BSA is not found
2013-12-05 15:51:07 +01:00
scrawl
f695deb29d
Remember window positions
2013-12-05 15:46:23 +01:00
Marc Zinnschlag
ee6ddc3404
block saving while chargen is in progress
2013-12-05 14:56:30 +01:00
Marc Zinnschlag
8b7889f8e5
setup player after loading a saved game
2013-12-05 14:22:08 +01:00
Marc Zinnschlag
a7b42b867b
more cleanup
2013-12-05 14:18:43 +01:00
Marc Zinnschlag
ce624e024b
make sure player record stays in place across cleanups
2013-12-05 14:03:25 +01:00
Marc Zinnschlag
e818d43bc3
removed an outdated typedef and some dead code
2013-12-05 13:21:26 +01:00
Marc Zinnschlag
537b2efe8e
first round of cleaning up world cleanup
2013-12-05 12:49:25 +01:00
scrawl
8f4ffe4ddc
Fix new window size not being written to settings when manually resizing window
2013-12-03 15:55:31 +01:00
Marc Zinnschlag
63721682f6
GUI fix: previous character was selected when saving new character
2013-12-03 15:19:13 +01:00
Marc Zinnschlag
34cdd2bb1f
deal with dialogue/info records that don't exist anymore
2013-12-03 14:39:54 +01:00
Marc Zinnschlag
2293b92efe
storing and loading the journal
2013-12-03 14:28:46 +01:00
Marc Zinnschlag
0f971163f7
use Entry instead of plain string for topic and quest entries
2013-12-01 14:50:25 +01:00
Marc Zinnschlag
b273f9e387
splitting JournalEntry into Entry and JournalEntry
2013-12-01 14:44:27 +01:00
scrawl
8391891a5b
Ignore case for content file extensions
2013-11-30 14:25:29 +01:00
Marc Zinnschlag
43f5f16731
removed a todo comment
2013-11-30 12:54:44 +01:00
Marc Zinnschlag
177aab536d
storing topic name in MWDialogue::Topic (avoids a lookup in the GUI and also serves as preparation for better localisation support in OpenMW 1.1)
2013-11-30 12:41:18 +01:00
Marc Zinnschlag
eed46960fe
some spelling fixes
2013-11-30 12:02:56 +01:00
Marc Zinnschlag
9d64c92d33
store text in journal entries
2013-11-30 11:57:33 +01:00
Marc Zinnschlag
aebc2791a5
fixed selecting current character based on value stored in settings
2013-11-30 11:08:41 +01:00
scrawl
4b4025ed0f
Keep the player's CharacterController when changing cells. Fixes several glitches.
2013-11-30 11:01:45 +01:00
scrawl
e1e9de0f02
Don't hide tooltips on mouse click. Probably wasn't such a bright idea.
2013-11-30 09:04:52 +01:00
scrawl
6aa9e18915
Reset filter when starting a trade
2013-11-30 08:33:18 +01:00
scrawl
bb4bd999ba
PlaceAt: Copy the rotation when placing a non-actor. Don't modify placement position by bounding box for non-actors. Fixes placement in Graphic Herbalism mod.
2013-11-30 08:29:22 +01:00
scrawl
0e267b79ec
Don't heal dead actors when resting
2013-11-29 20:21:57 +01:00
scrawl
bcf61331ab
Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.
2013-11-29 20:06:54 +01:00
scrawl
ce2d521b8f
Always apply queued movement, even when there's no duration. Fixes crash with --start="bal isra".
...
When a script disables a reference that still has movement queued, trying to apply that movement will then fail due to the reference not being in the scene. Therefore, we should make sure that movement is always applied in the frame that it's queued in.
2013-11-29 20:03:50 +01:00
scrawl
ffc885853a
Fix bolt for magic effects that don't have one specified
2013-11-29 10:39:37 +01:00
scrawl
b82ee4b44f
Fix some problems with the previous commit
2013-11-28 21:49:15 +01:00
scrawl
076cc9230b
First try at handling target magic
2013-11-28 17:31:17 +01:00
scrawl
20ccfe2324
Play sound when enchanting
2013-11-28 11:37:30 +01:00
Marc Zinnschlag
5aea6ef80f
some clean up for the cleanup code
2013-11-28 11:22:34 +01:00
Marc Zinnschlag
35e8e23037
keep track of total play time per character
2013-11-28 09:33:50 +01:00
Marc Zinnschlag
7e2819c62e
store year in saved game profile
2013-11-28 09:27:10 +01:00
Marc Zinnschlag
b0eb5938bf
removed some redundant code
2013-11-28 09:13:54 +01:00
Marc Zinnschlag
71436b1160
changed interface for global variable access
2013-11-28 09:10:38 +01:00
scrawl
97fadb24ca
Update the Ptr in mObjects in Objects::updateObjectCell
2013-11-27 18:49:04 +01:00
scrawl
03c4b680ca
Fix changePointer
2013-11-27 18:49:04 +01:00
scrawl
a8c838b53a
Don't list deleted refs in CellStore::foreach
2013-11-27 18:49:04 +01:00
scrawl
49ea1aae67
Use GMST for sun damage reduction
2013-11-26 15:01:22 +01:00
Marc Zinnschlag
99ea63dc4a
factored out code for generating month names
2013-11-26 12:47:30 +01:00
Marc Zinnschlag
e6dc927f11
removed duplicates of the cell name function
2013-11-26 11:49:07 +01:00
Marc Zinnschlag
bc6fe682c9
replaced getCurrentCellName function with a more general getCellName function
2013-11-26 11:39:58 +01:00
Marc Zinnschlag
eea433f141
restore last played character selection across sessions
2013-11-26 10:37:58 +01:00
scrawl
eba068149d
Fix AIWander crash
2013-11-25 15:38:18 +01:00
Marc Zinnschlag
ad143e0524
case fix (content file names)
2013-11-25 14:56:05 +01:00
Marc Zinnschlag
616e3aa32f
store content file list in saved games and reject saved games not matching the current game
2013-11-25 13:00:05 +01:00
Marc Zinnschlag
55544e931c
reject newer formats when scanning saved games
2013-11-25 10:21:49 +01:00
Marc Zinnschlag
e3670cff8a
improved character selection logic
2013-11-24 16:58:41 +01:00
Marc Zinnschlag
67cd0887e6
added description field to saved game record; make use of description in GUI
2013-11-24 15:19:56 +01:00
Marc Zinnschlag
7efac4c9a5
fixed handling of characters without a valid slot
2013-11-24 15:05:00 +01:00
Marc Zinnschlag
18a3b38fb4
when scanning saved game directory, reject characters without a valid saved game
2013-11-24 14:42:58 +01:00
scrawl
14c9a4e1d3
Cap enchantment casting cost to 1 as displayed in enchanting window. Display current enchantment charge in spell window.
2013-11-23 23:12:54 +01:00
scrawl
07408a4652
Don't allow selling gold (again - when did this get broken?)
2013-11-23 22:52:20 +01:00
scrawl
4aa9f3bcef
Don't set the enchanted item in HUD for "WhenStrikes" enchantments
2013-11-23 22:48:56 +01:00
scrawl
f3e89e9168
Fix arrow down in console
2013-11-23 22:48:39 +01:00
scrawl
d2ed77f3f2
Fix shields being visible during spellcasting
2013-11-23 20:24:52 +01:00
Marc Zinnschlag
d8c40562ae
Merge remote-tracking branch 'scrawl/light'
2013-11-23 12:44:42 +01:00
scrawl
a1fe07181c
Fix rotation offset of some lights (bug 955)
2013-11-23 05:55:03 +01:00
scrawl
0e254aa7c7
Fix startNewGame assigning an already freed CellStore to the player Ptr supplied to WindowManager. Fixes a crash when equipping lights after starting a new game (bug 967). Side note: The inventory preview's Ptr being assigned a cell at all doesn't make sense, as that is used to determine the light setting which should be the same no matter which cell you're in.
2013-11-23 03:25:55 +01:00
scrawl
39de0510a0
Fix another case of container scripts not getting re-added
2013-11-22 02:12:37 +01:00
scrawl
829512ded4
Fix container scripts not getting re-added when the player changes cells
2013-11-22 01:02:12 +01:00
scrawl
2e87cbc231
Add basic functionality to SaveGameDialog
2013-11-21 20:34:34 +01:00
scrawl
cf79a83d4f
Avoid recreating widgets in MainMenu::updateMenu. Fix crash when pressing new game due to the button being destroyed from within it's own delegate.
2013-11-21 19:07:54 +01:00
scrawl
b490e56ba1
Remove redundant setLocals (already done by ContainerStore::add)
2013-11-21 17:19:41 +01:00
scrawl
61ab6e1739
Use fWortChanceValue for making ingredient/potion effects visible
2013-11-21 17:19:41 +01:00
scrawl
320ba98097
Correct getDerivedDisposition according to wiki (check if player expelled)
2013-11-21 17:19:41 +01:00
