Marc Zinnschlag
0be1e3d12f
removed WriteFilterStage class (functionality integrated into WriteCollectionStage)
2014-08-06 10:03:04 +02:00
Marc Zinnschlag
828536e999
generalised the concept of record scope
2014-08-06 09:53:10 +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
4d49924025
added debug profile record table
2014-08-04 13:36:01 +02: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
Marc Zinnschlag
3f6a7e36d0
removed the (partial broken) return/enter shortcut for custom push buttons, since there is already a space shortcut)
2014-08-01 09:50:49 +02:00
Marc Zinnschlag
1e6d557089
Merge branch 'visibility'
2014-07-31 14:34:25 +02:00
Marc Zinnschlag
f381451ae0
added control element selector toolbar button
2014-07-31 14:33:38 +02:00
Marc Zinnschlag
612202a7a5
fixed several bugs in the layout algorithm of the toggle scene tool
2014-07-31 14:33:12 +02:00
Marc Zinnschlag
507e5c4f6e
explicitly flag scene as modified when changing visibility mask
2014-07-31 14:29:52 +02:00
Marc Zinnschlag
439ba57d46
added visual element selector toolbar button
2014-07-31 14:06:04 +02:00
Marc Zinnschlag
a25758c3b1
fixed visibility flags setting
2014-07-31 14:02:55 +02:00
Marc Zinnschlag
b0a9d17dc3
use name as a tooltip if no tooltip is given for scene tool bar toggle buttons
2014-07-31 13:26:23 +02:00
Marc Zinnschlag
92d322cbd1
added visibility flags
2014-07-31 13:25:30 +02:00
Marc Zinnschlag
71ce78f949
added scene toolbar toggle widget
2014-07-31 13:05:08 +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
Marc Zinnschlag
7a5f73de9e
added navigation mode icons to buttons
2014-07-30 17:02:23 +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
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
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
4421e7a5cc
added lighting mode toolbar icons
2014-07-25 11:15:04 +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
4e0c133fb3
Add comment to Cell NAM0 (it's a RefId counter)
2014-07-24 02:19:36 +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
a9f9dec923
consider script blacklist in OpenCS verifier
2014-07-21 12:15:21 +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
Marc Zinnschlag
1a1f5dfc4a
added tooltips to dialgoue subview buttons
2014-07-15 12:46:52 +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
Marc Zinnschlag
517b27e29a
Merge branch 'toolbar'
2014-07-14 14:18:08 +02:00
Marc Zinnschlag
0430558c3c
fixed focussed button in mode tool panel when panel is opened
2014-07-14 14:17:27 +02:00
Marc Zinnschlag
17fc570e38
new keyboard shortcut (T): move focus from toolbar to scene widget
2014-07-14 13:49:55 +02:00
Marc Zinnschlag
92af093856
new keyboard shortcut (T): move focus from scene widget to toolbar
2014-07-14 11:19:59 +02:00
Marc Zinnschlag
688d413b8c
when scene toolbar gains focus, focus first button
2014-07-14 11:06:12 +02:00
scrawl
7c7c71428a
Don't crash if certain class doesn't exist
2014-07-13 14:26:59 +02:00
Marc Zinnschlag
c2ea8f3f0a
added self-adjusting tooltips to the top-level toolbar buttons
2014-07-13 14:21:50 +02:00
Marc Zinnschlag
26f87f5d23
added navigation mode button tooltips
2014-07-13 12:15:05 +02:00
Marc Zinnschlag
e855e55318
added tooltip to user settings button on startup window
2014-07-13 10:52:33 +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
Marc Zinnschlag
cae0c4a044
Merge remote-tracking branch 'scrawl/master'
2014-07-12 21:19:15 +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
40c3fa0dc1
Fix travis
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
Marc Zinnschlag
490442cf62
added lighting mode tooltips
2014-07-10 13:18:24 +02:00
Marc Zinnschlag
61a02d8a40
replaced custom toolbutton push flag with type enum
2014-07-10 13:04:30 +02:00
Marc Zinnschlag
32e48edb83
toolbar tooltip system
2014-07-10 12:53:57 +02:00
Marc Zinnschlag
67ad7d5b0e
fixed scene subview focus problem
2014-07-10 12:20:48 +02:00
Marc Zinnschlag
57b9b8d884
set focus when opening a toolbar panel
2014-07-10 12:13:27 +02:00
Marc Zinnschlag
d6c0b8d0ac
use custom button on toolbar (top level)
2014-07-10 11:45:45 +02:00
Marc Zinnschlag
44b95bbd7b
added push mode and icon-less push button constructor
2014-07-10 11:45:20 +02:00
Marc Zinnschlag
8b239df1b1
removed text argument from button constructor, because toolbar buttons will always be icon only
2014-07-10 11:34:09 +02:00
Marc Zinnschlag
365b721878
return/enter activate the selected button
2014-07-10 11:32:20 +02:00
Marc Zinnschlag
50ee815dd8
make buttons in mode panel act like radiobuttons
2014-07-10 11:23:48 +02:00
Marc Zinnschlag
dd0aa20390
custom push button
2014-07-10 11:03:55 +02:00
Marc Zinnschlag
930f782bc5
SceneWidget::setLighting was missing an update call
2014-07-10 10:09:21 +02:00
scrawl
0704fa2b3d
Reset local rotation axis in SetAngle ( Fixes #1630 )
2014-07-09 10:23:01 +02:00
Marc Zinnschlag
3333f67830
removed a left-over marker
2014-07-08 12:53:25 +02:00
Marc Zinnschlag
03f67cd6bd
moved low level widgets from CSVWorld into a separate namespace/directory
2014-07-08 12:39:12 +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
Marc Zinnschlag
1548f4670a
drop part of resources drag and drop
2014-07-08 09:51:17 +02:00
Marc Zinnschlag
b6c5ee125d
more refactoring
2014-07-08 09:24:05 +02:00
Marc Zinnschlag
9d5956585c
added separate display type for colours
2014-07-08 09:08:01 +02:00
Marc Zinnschlag
b2ce94f28a
fixed exceptions
2014-07-08 08:56:28 +02:00
Marc Zinnschlag
b2c2342988
some refactoring (removing redundant code)
2014-07-08 08:53:39 +02:00
Marc Zinnschlag
c1bbefb840
enable dragging from resources tables
2014-07-07 15:20:05 +02:00
Marc Zinnschlag
df6996d4ae
filter resources files based on extension
2014-07-07 11:34:24 +02:00
Marc Zinnschlag
19828df799
added subviews for resources tables
2014-07-05 15:51:17 +02:00
Marc Zinnschlag
b2c957a56f
added resources tables
2014-07-05 15:50:47 +02:00
Marc Zinnschlag
42db9a5091
make modification column optional in table views
2014-07-05 15:50:17 +02:00
Marc Zinnschlag
4f6c7b0e84
resolved UniversalId naming ambiguity
2014-07-05 15:07:17 +02:00
Marc Zinnschlag
e171babd2f
added Feature_Constant to IdTable
2014-07-05 12:44:11 +02:00
Marc Zinnschlag
1b1f1bade3
injected new class IdTableBase between QAbstractItemModel and IdTable
2014-07-04 13:25:56 +02:00
Marc Zinnschlag
63d0fdee7f
removed leftover data member
2014-07-04 12:48:18 +02:00
Marc Zinnschlag
879ab49e9c
added resources manager
2014-07-04 12:46:57 +02:00
Marc Zinnschlag
1ce60fa13b
Merge branch 'tables'
2014-07-03 12:03:21 +02:00
Marc Zinnschlag
1745335982
body part table fix: forgot to include body parts in ID listings
2014-07-03 12:03:01 +02:00
Marc Zinnschlag
607445d40c
Merge branch 'editorfixes'
2014-07-03 10:34:23 +02:00
Marc Zinnschlag
9ce92302d7
interpret empty filter strings as no filter instead of a broken filter ( Fixes #1311 )
2014-07-03 10:22:39 +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
Marc Zinnschlag
37a2b48fa2
added missing type columns to body part table
2014-07-01 14:28:12 +02:00
Marc Zinnschlag
d96ed38d49
added body part table
2014-07-01 12:37:22 +02:00
Marc Zinnschlag
5649552f18
added other missing columns for enchantment table; fixed dialogue subviews for enchantment records
2014-07-01 09:50:43 +02:00
Marc Zinnschlag
ab8bee4d1a
added enchantment type column to enchantment table
2014-07-01 09:42:56 +02:00
Marc Zinnschlag
395c45c88b
Merge branch 'editorfixes' into tables
2014-06-30 20:49:41 +02:00
Marc Zinnschlag
e97fd35ae6
added enchantments table
2014-06-30 20:40:34 +02:00
Marc Zinnschlag
4f08efc4d7
added missing combat, magic and stealth columns for creatures (Feature #1312 )
2014-06-30 19:51:59 +02:00
scrawl
205e039a39
Allow modCurrent instructions to decrease below zero (Bug #1589 )
2014-06-30 17:58:08 +02:00
Marc Zinnschlag
a25321f07e
update paged scene view according to changes made to cell records
2014-06-30 17:57:38 +02:00
scrawl
2506c16bf5
Add a dummy GetStat function returning 0 ( Fixes #1589 )
2014-06-30 17:49:01 +02:00
Marc Zinnschlag
5fb2e1a877
do not render deleted exterior cells in scene view
2014-06-30 17:33:03 +02:00
Marc Zinnschlag
af59106533
for regular IdCollections when loading a record make the record a copy of the existing record first (adresses some incomplete records in some content files)
2014-06-30 12:35:34 +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
b5650f5d4f
Merge branch 'cells'
2014-06-29 16:00:26 +02:00
Marc Zinnschlag
2fe2def64c
added cell rendering in paged worldspaces
2014-06-29 16:00:06 +02:00
Marc Zinnschlag
a6626b94c8
added cell rendering in unpaged worldspaces
2014-06-29 14:19:10 +02:00
Marc Zinnschlag
74ed9cbb2d
added cell rendering class
2014-06-29 14:18:46 +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
Marc Zinnschlag
c35b87de95
various Object class fixes
2014-06-28 11:25:28 +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
3541d03809
fixed deleting of referenceables (modification state column was incorrectly flagged as non-editable)
2014-06-27 12:29:23 +02:00
Marc Zinnschlag
099c406226
Merge branch 'objects'
2014-06-27 11:55:28 +02:00
Marc Zinnschlag
6020edf60f
make preview watch for changes in modification state of relevant records
2014-06-27 11:55:02 +02:00
Marc Zinnschlag
a2f514f024
disabled preview function for deleted records
2014-06-27 11:38:34 +02:00
Marc Zinnschlag
36c1170d09
fixed some function names
2014-06-27 10:35:00 +02:00
Marc Zinnschlag
0c1ad54e68
refactored object rendering into a separate class
2014-06-27 09:12:26 +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
e19bbfd1b5
Fix OpenCS crash when drag and drop is used with unexpected data, e.g. plain text ( Fixes #1543 )
2014-06-26 20:49:22 +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
Marc Zinnschlag
06e89d8bd3
reduced loading batch size (making the the loading progress bars a bit more responsive
2014-06-26 11:43:21 +02:00
Marc Zinnschlag
bd252d0aec
display record count in loading window
2014-06-26 11:41:21 +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
Marc Zinnschlag
073cc3f02c
fixed base flag in content file loader code
2014-06-17 11:01:17 +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
c23e9e03fd
Merge branch 'refs'
2014-06-11 11:44:43 +02:00
Marc Zinnschlag
7d1ecea20c
added extended versions of revert and delete
2014-06-11 11:43:38 +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
.
Conflicts:
apps/openmw/main.cpp
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
48468b7d0c
some dialogue subview cleanup and start of command dispatching refactoring
2014-06-08 14:10:08 +02: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
Marc Zinnschlag
7ede6573eb
removed more hardcoded column numbers
2014-06-07 14:39:34 +02:00
Marc Zinnschlag
302e2f8e9a
fixed some proxy model problems related to column numbers
2014-06-07 14:32:12 +02:00
Marc Zinnschlag
e4a37ef709
removed some hardcoded column numbers
2014-06-07 13:06:19 +02:00
Marc Zinnschlag
85fca19fd9
replaced selection model in CommandDispatcher with a slightly slower but more robust implementation
2014-06-07 13:02:45 +02: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
f6ae967ba0
simplified Data constructor
2014-06-06 20:47:31 +02: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
Marc Zinnschlag
c6557e1ade
some UniversalId cleanup and enhancements
2014-06-06 14:25:06 +02:00
scrawl
f3cece8dec
Fix alchemy allowing same item ID in different slots ( Fixes #1407 )
2014-06-06 14:12:50 +02:00
Marc Zinnschlag
3e0c6ec732
some general cleanup; fixed two cases of dialogue subviews that allowed creating records where they shouldn't have
2014-06-06 13:09:17 +02:00
Marc Zinnschlag
83d5f2aaeb
factored out command creation from table view into a separate class
2014-06-06 12:43:21 +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
1b9b275f30
fix for bug #1369
2014-06-05 13:40:37 +02:00
Marc Zinnschlag
a28a2bc2fe
simplified feature management for record tables
2014-06-05 10:28:10 +02:00
Marc Zinnschlag
c4e7386770
Revert "added changed reference tracking for cells"
...
This reverts commit f4334da42e
.
2014-06-04 21:12:23 +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
be7f344eca
Merge branch 'refs'
...
Conflicts:
apps/opencs/model/doc/savingstate.cpp
components/esm/cellref.hpp
2014-05-30 10:38:38 +02:00
Marc Zinnschlag
4778c27548
silenced two warnings
2014-05-30 10:18:05 +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
Marc Zinnschlag
ae50632774
implemented cell and reference saving int OpenCS
2014-05-29 18:08:40 +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
Marc Zinnschlag
bb011f278e
Merge remote-tracking branch 'cc9cii/master'
2014-05-28 14:45:57 +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
cc9cii
bbe77d656a
Minor fixes from static analysis.
2014-05-28 21:15:50 +10: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
49a6579d3a
Fixed esmtool
2014-05-27 15:37:04 +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
Marc Zinnschlag
1665822224
Merge remote-tracking branch 'puppykevin/master'
2014-05-27 12:42:48 +02:00
Marc Zinnschlag
e0ba9a4bf2
added reference collection stage to saving operation (preparation for cell saving)
2014-05-27 12:39:26 +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
Kevin Poitra
beba58268c
Fix a typo within the launcher. Fixes bug #1058 .
2014-05-27 01:47:57 -05: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
Scott Howard
c9011f707f
missing #include <iostream> in mwiniimporter
...
missing #include <iostream> in mwiniimporter/main.cpp
2014-05-23 08:41:49 -04: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
Marc Zinnschlag
f4334da42e
added changed reference tracking for cells
2014-05-23 09:32:34 +02: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
663d5c314e
be more verbose on change reasons
2014-05-22 16:35:57 +04: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
greye
cb598f0455
the same for data-local entry
2014-05-22 01:13:27 +04:00
greye
28b59f4008
process paths as UTF-8 in launcher
2014-05-22 01:08:03 +04: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
e0b6bf6aeb
implemented reference record deleting
2014-05-20 09:28:18 +02:00
Marc Zinnschlag
d8440e1fdc
implemented reference record merging
2014-05-20 09:02:22 +02:00
greye
9dbe3f21d9
keep non-const signature for argv after conversion
2014-05-20 10:42:21 +04:00
greye
130349e0cd
open files in binary mode when necessary
2014-05-20 08:14:29 +04: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
greye
20527e0bd4
use boost::filesystem instead of boost::iostreams
2014-05-19 16:56:41 +04:00
scrawl
6bd0bbb8df
Do not load (0,0) on new game
2014-05-19 14:09:16 +02:00
greye
db16bb8983
fix OpenCS saving to Unicode path destination
2014-05-19 15:52:19 +04: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
7c149e98e0
Merge branch 'openmw-30'
2014-05-18 22:38:52 +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
greye
18b3cfebdb
fix importer crash on empty lines (thanks to Ace)
2014-05-18 14:55:05 +04:00
greye
b4950509bc
use converted widechars in ini importer
2014-05-18 14:55:05 +04:00
greye
cd990a665a
create QString from utf-8 when expected
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
cc9cii
8971db8962
SceneWidget windowHandle fix for Windows.
2014-05-17 23:53:33 +10: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
when using --skip-menu=0.
2014-05-16 00:58:12 +02:00
mrcheko
5be37f04ef
Feature 1314: make npc fight creatures
2014-05-16 00:03:48 +04:00
scrawl
b3735981d6
Remove unused file_finder
2014-05-15 21:36:24 +02: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
Marc Zinnschlag
2116f16289
Merge remote-tracking branch 'digmaster/master'
2014-05-14 21:16:24 +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
Marc Zinnschlag
c2ea92b93a
Merge remote-tracking branch 'sirherrbatka/Feature#1274'
2014-05-14 14:41:04 +02:00
Marek Kochanowicz
3439900239
ignore all drops that will not create usefull filter
2014-05-14 11:56:23 +02: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