Marc Zinnschlag
bb741eb8d7
Merge remote-tracking branch 'crysthala/master'
2014-07-30 16:49:27 +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
crysthala
f25e0b13b2
render window controls icons
...
eyeball dude: first person
flying eye: free cam
orbit2: orbiting cam
2014-07-30 07:55:21 -05: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
ccde462308
Fix typo (RefId -> RefNum)
2014-07-29 19:01:14 +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
Marc Zinnschlag
ff407a5b87
Merge remote-tracking branch 'funkybit/master'
2014-07-29 08:55:56 +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
7dfb624ee2
Support loading text keys for objects without a skeleton
...
This means we can no longer map them to bone IDs, but they are unused anyway.
Required to load text keys from the default head models (such as Talk: Start/Stop and Blink: Start/Stop)
2014-07-29 00:23:00 +02:00
bogglez
c006393178
Fix http://bugs.openmw.org/issues/768
...
Changes application_name in configuration manager to OpenMW instead of
openmw, if on windows. This shouldn't break anything since Windows uses
case-insensitive filesystems. Strictly speaking the installation
directory must be OpenMW now though (not sure whether this is the case)
2014-07-28 21:52:34 +02:00
Marc Zinnschlag
0032426817
updated credits file
2014-07-28 20:39:37 +02: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
bb9e5f9eb1
Merge branch 'openmw-31'
...
Conflicts:
apps/openmw/mwgui/companionwindow.cpp
apps/openmw/mwgui/container.cpp
readme.txt
2014-07-28 10:11:55 +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
Marc Zinnschlag
ad50b926f5
reducing some stray arguments again
2014-07-28 09:01:44 +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
Marc Zinnschlag
17bd094afd
allow a few more stray arguments
2014-07-27 20:55:54 +02:00
Marc Zinnschlag
2abc4e42c8
end parsing of line after parsing a declaration
2014-07-27 20:49:57 +02:00
scrawl
d81e9cfefd
Implement actors fighting for the actor they are following ( Fixes #1141 )
2014-07-27 20:33:45 +02:00
scrawl
1a04501951
Handle faction save/load properly when player has faction reputation in a faction he is not a member of ( Fixes #1573 )
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
d7acb7fc7d
Ignore invalid shader cache index (Bug #1664 )
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
