1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-23 05:23:51 +00:00
Commit graph

8740 commits

Author SHA1 Message Date
scrawl
483dc9de45 Stop viewer threading before changing MyGUI textures 2015-05-07 23:17:47 +02:00
scrawl
00f4f78717 Give a name to video streams for logging purposes 2015-05-07 23:08:52 +02:00
scrawl
77f733362c Add stats graphs for Script, Mechanics and Physics timings 2015-05-07 21:57:02 +02:00
scrawl
100d6e5fff Render MyGUI in background thread, i.e. refactor to get rid of DYNAMIC DataVariance 2015-05-05 02:38:59 +02:00
scrawl
e191f0e044 Rename MWRender::Debugging to MWRender::Pathgrid 2015-05-04 17:41:30 +02:00
scrawl
c1edc30ad7 Dead code removal 2015-05-04 03:29:12 +02:00
scrawl
e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
2015-05-04 02:41:50 +02:00
scrawl
f0789352c6 Silence error message 2015-05-04 00:34:30 +02:00
scrawl
5a759f8b0d GUI cleanup fix 2015-05-03 18:35:29 +02:00
scrawl
9de575ad42 Use IncrementalCompileOperation to incrementally upload OpenGL objects during the loading screen
For now, not much difference, but should result in a sizable speed up once MyGUI no longer needs the DYNAMIC flag (i.e. the loading screen truly renders in the background).
2015-05-03 18:16:54 +02:00
scrawl
37e3118d21 FontLoader cleanup fix 2015-05-03 17:52:50 +02:00
scrawl
283b252142 Stub InputManager 2015-05-03 17:24:35 +02:00
scrawl
31ead3a9f4 Increase loading screen FPS
Now that it's rendered in a background thread, we can have a smooth loading bar at virtually no performance cost.
2015-05-03 17:04:21 +02:00
scrawl
351fd842fd Port loading screen 2015-05-03 16:58:05 +02:00
Marc Zinnschlag
83a7eea2a9 Merge remote-tracking branch 'scrawl/master' 2015-05-03 09:54:32 +02:00
scrawl
92cbc13964 Remove BtOgre 2015-05-03 00:50:56 +02:00
scrawl
1943110170 Add bullet debug drawer 2015-05-03 00:39:01 +02:00
scrawl
9cf9c2876e Pathgrid rendering 2015-05-02 22:45:39 +02:00
scrawl
1a5407af98 Reduce texture memory usage in OpenMW 2015-05-02 19:36:36 +02:00
scrawl
d772da3720 Main menu background videos 2015-05-02 18:15:00 +02:00
scrawl
dc9b27acfe Create manual GUI textures 2015-05-02 18:06:54 +02:00
scrawl
8817f44d63 Remove advanced FPS counter (obsoleted by the OSG stats viewer) 2015-05-02 17:48:24 +02:00
scrawl
bddd31e385 Dead code removal 2015-05-02 17:11:51 +02:00
scrawl
d9d84bd7b2 Remove bullet raycasting shapes, to be replaced with OSG ray casts 2015-05-01 21:43:21 +02:00
scrawl
82c4d01b37 Add back resource handling workarounds to the gui code 2015-05-01 18:37:24 +02:00
scrawl
bd8f0248f0 Player rendering 2015-05-01 18:21:50 +02:00
scrawl
b0804734e5 Port VideoWidget 2015-05-01 03:03:44 +02:00
scrawl
223e3a53f5 Move OEngine::Gui::Layout to MWGui 2015-05-01 02:22:51 +02:00
scrawl
6afb0e43ef Port FontLoader - requires MyGUI patch from https://github.com/MyGUI/mygui/pull/69 2015-05-01 01:44:21 +02:00
scrawl
a59940a2c7 Move MyGUI platform to components 2015-05-01 01:44:21 +02:00
scrawl
db7fe1952d Move MyGUI texture to a separate file 2015-05-01 01:44:21 +02:00
scrawl
62847f0489 Use node masks to separate Scene and GUI 2015-05-01 01:44:21 +02:00
scrawl
c90125f936 Uninitialized basenode fix 2015-05-01 01:44:21 +02:00
scrawl
83c6ba97c0 Disable skinning updates for actors beyond the AI processing distance 2015-04-30 00:10:24 +02:00
k1ll
96d9afec38 More header case fixes 2015-04-29 18:31:30 +02:00
k1ll
a230050ec8 Boost tr1 unordered map does not work with mingw 2015-04-29 18:31:29 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
scrawl
48a6d7c1a0 Remove mygui platform libraries from cmake 2015-04-28 16:33:30 +02:00
scrawl
a27446c8fb Remove unused headers 2015-04-28 16:02:29 +02:00
scrawl
8971a200f7 Sky fix 2015-04-26 14:34:14 +02:00
scrawl
7809caf9dc Dead code removal 2015-04-25 15:53:11 +02:00
scrawl
0ff7b2ff11 MechanicsManager, frame update 2015-04-25 15:19:17 +02:00
scrawl
2db097f80e Fix nested callbacks bug 2015-04-25 15:10:37 +02:00
scrawl
372a54bbc7 Dead code removal 2015-04-25 01:28:01 +02:00
scrawl
a3417a9c49 CharacterController compiles 2015-04-25 01:20:07 +02:00
scrawl
15164e20f7 Cleanup fix 2015-04-24 23:30:30 +02:00
scrawl
42d6c6140c Add mygui backend by chris 2015-04-24 21:55:30 +02:00
scrawl
9f12e53956 Scale NPCs by their Weight property (Fixes #814) 2015-04-24 14:49:20 +02:00
scrawl
1c0e3a6488 rotateObject, scaleObject 2015-04-23 23:50:46 +02:00
scrawl
6f3e920f85 Animation port complete 2015-04-23 23:30:06 +02:00
scrawl
86b4a610cb Movement accumulation works 2015-04-23 22:46:07 +02:00
scrawl
09742d5b95 Animation playback works, no movement accumulation yet 2015-04-23 20:41:31 +02:00
scrawl
1a19cd3607 Some cleanup 2015-04-22 19:08:56 +02:00
scrawl
8c810e3620 Move rng to components 2015-04-22 17:58:55 +02:00
scrawl
7a46d4f46a Dead code removal 2015-04-22 17:48:06 +02:00
scrawl
04accb7652 Add LightController 2015-04-22 17:37:39 +02:00
scrawl
e49b8fe690 Fix persuasion mechanics using player stats instead of NPC's (Fixes #2475) 2015-04-22 01:17:34 +02:00
scrawl
dfd8e08698 Dead code removal 2015-04-21 23:40:10 +02:00
scrawl
26766b8e0a Dead code removal 2015-04-21 23:36:36 +02:00
scrawl
9e177df61b Add fog, view distance, and far plane culling 2015-04-21 23:36:36 +02:00
scrawl
c53a56ed6e clear stream errors before attempting the read 2015-04-21 16:10:11 +02:00
scrawl
92ef9b1c57 Rename to osg-ffmpeg-videoplayer 2015-04-19 20:14:06 +02:00
scrawl
42f6d9e15b Port video player 2015-04-19 20:07:18 +02:00
scrawl
68f93294da Port EffectManager 2015-04-19 17:55:56 +02:00
scrawl
fcc7aa02ab Port addExtraLight 2015-04-19 15:03:08 +02:00
scrawl
c924e64047 Port HeadAnimationTime 2015-04-19 14:42:47 +02:00
scrawl
f7d2a28930 Port BoneOffset 2015-04-19 14:25:36 +02:00
scrawl
9c4b2ea61a CreatureAnimation compiles 2015-04-19 03:05:47 +02:00
scrawl
27cfe8fb58 Crash fix 2015-04-19 02:39:10 +02:00
scrawl
1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/view/render/cell.cpp
2015-04-19 02:29:16 +02:00
scrawl
edc5cad79e Port Animation::addEffect 2015-04-19 01:57:52 +02:00
scrawl
083c41c950 Environment map for enchanted objects 2015-04-17 01:23:37 +02:00
scrawl
c334a76a6f Fix skinning bug 2015-04-15 22:38:43 +02:00
scrawl
5b8c28f641 NpcAnimation compiles 2015-04-15 22:11:38 +02:00
scrawl
13a1ba0aab Moon rendering 2015-04-15 18:50:50 +02:00
scrawl
c516e897ee Move Controller base classes to SceneUtil, add visitor to assign ControllerSources 2015-04-14 17:51:46 +02:00
scrawl
5dd1ab24fe More efficient StateSetController, beginnings of sky rendering 2015-04-14 15:58:16 +02:00
scrawl
8c7c89a4aa Port SoundManager 2015-04-13 22:48:37 +02:00
scrawl
246b06ca27 Forgot to add 2015-04-13 17:30:32 +02:00
scrawl
61aaf0cf70 Attach light lists to the object base nodes instead of each renderable
Apparently that is how Ogre worked (on the SceneNode) so let's roll with it for now. Have not tested yet what MW does.
2015-04-12 18:03:36 +02:00
scrawl
c92592493e OpenMW: create a window and render the starting cell(s) 2015-04-12 15:38:30 +02:00
scrawl
642c1d2d36 Build fix 2015-04-10 15:31:19 +02:00
dteviot
0a5de33a1a fireEquipmentChangedEvent() updates the InventoryWindow. (Fixes #2424) 2015-04-06 15:13:09 +12:00
dteviot
fe69dc2863 Made LineInfo a struct, as requested by Scrawl. 2015-04-05 14:56:29 +12:00
dteviot
52de622e97 provide incremental update of SpellWindow (Fixes #2411)
When SpellWindow is visible, every 0.5 seconds update the cost/changes for spells/enchanted items shown.
Also, check to see if more substantial update of the window is required.
2015-04-03 17:59:13 +13:00
dteviot
6b6bed520d removed redundant calls. 2015-04-03 13:45:13 +13:00
scrawl
af67de73a5 Delete shiny 2015-04-01 17:06:31 +02:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +02:00
dteviot
be6ee927b9 AiWander, use closest two points if distance is too small (Fixes #1317)
In AiWander, if wander distance is set too small to get two points, take the closest two points.
2015-03-28 20:05:54 +13:00
scrawl
236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
2015-03-27 17:30:48 +01:00
dteviot
63ab856024 Removed duplicated code. 2015-03-23 20:57:36 +13:00
dteviot
eb1090a1b6 Waypoint check only considers X & Y distance (Fixes #2423)
When pathfinder checks if actor has reached a waypoint, ignore actor's altitude.
2015-03-23 20:09:46 +13:00
scrawl
5cb61fa01c Don't mark gold as stolen, adjust stolen tooltip (Fixes #2465) 2015-03-22 17:28:27 +01:00
Marc Zinnschlag
47bac13749 Merge remote-tracking branch 'scrawl/master' 2015-03-18 12:07:40 +01:00
Marc Zinnschlag
c032113247 Merge remote-tracking branch 'sandstranger/release-jni-memory' 2015-03-17 11:41:41 +01:00
scrawl
d573458896 Fix case sensitivity bug in default head/hair selection (Fixes #2453) 2015-03-16 17:42:15 +01:00
sylar
db10c87b89 release jni memory 2015-03-16 18:21:38 +04:00
Marc Zinnschlag
545ca9c9b4 Merge remote-tracking branch 'sandstranger/fix-bad-code-in-command-line' 2015-03-16 08:42:22 +01:00
sylar
bd4e832cf3 fix memory leaks in emulating command line 2015-03-16 07:41:51 +04:00
Marc Zinnschlag
e6e02714a0 Merge remote-tracking branch 'sandstranger/command-line-support-for-Android' 2015-03-15 22:52:34 +01:00
Marc Zinnschlag
86d39cede9 Merge remote-tracking branch 'dteviot/Rng' 2015-03-15 22:04:26 +01:00
sylar
a418b70937 command line support for Android 2015-03-15 21:15:58 +04:00
dteviot
3f28634d1f consolidate random number logic
Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
2015-03-15 14:07:47 +13:00
dteviot
1d7f3474fa Fixed more MSVC 2013 warnings. 2015-03-15 08:49:03 +13:00
Marc Zinnschlag
cf077dcf5d Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn' 2015-03-14 14:25:49 +01:00
Rohit Nirmal
2540a901d5 Remove unused variable. 2015-03-13 20:04:47 -05:00
cc9cii
4d46d7ba72 Fix some compiler warnings. 2015-03-14 06:07:12 +11:00
Marc Zinnschlag
f0a7b202b9 Merge branch 'openmw-35-1' 2015-03-13 17:33:08 +01:00
Marc Zinnschlag
056bc66c6c Merge remote-tracking branch 'scrawl/master' 2015-03-12 10:29:39 +01:00
scrawl
767624f518 Combat mechanic fixes 2015-03-12 03:08:58 +01:00
scrawl
a846bb1aa3 Update hit chance according to wiki and implement fCombatInvisoMult 2015-03-12 02:47:16 +01:00
scrawl
f603a68144 Allow binding Hand To Hand in quick keys menu (Fixes #2024) 2015-03-12 02:23:46 +01:00
scrawl
7fd1c2c2e2 CharacterCreation refactoring 2015-03-12 00:43:28 +01:00
scrawl
d00c75d428 Remove more outdated TODO comments. 2015-03-12 00:37:28 +01:00
scrawl
3879ce6ac1 Get rid of "player" string checks (Fixes #2216) 2015-03-11 23:07:39 +01:00
scrawl
68de876051 Switch to weapon drawstate when creating a bound weapon (Fixes #2387) 2015-03-11 21:12:08 +01:00
scrawl
48ea6286fd Book/scroll window refactoring 2015-03-11 20:33:55 +01:00
scrawl
37a6d7da76 WindowManager refactoring 2015-03-11 20:04:25 +01:00
Scott Howard
e2ef8c4022 fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
scrawl
e30f240ba2 Add travel service support for creatures (Fixes #2432) 2015-03-09 03:15:11 +01:00
scrawl
457c135097 Remove old workaround 2015-03-09 03:15:11 +01:00
scrawl
36e1b6cc48 Support fatigue below zero for the Drain effect (Fixes #2430) 2015-03-09 03:15:11 +01:00
scrawl
3d5c1d1190 Adjust fix for maximum attribute damage limit 2015-03-09 03:15:11 +01:00
Ivy Foster
4f100e6870 Fix rapid toggling when holding sneak button. 2015-03-08 16:08:45 -05:00
Ivy Foster
ba7fc8609c Add toggle sneak option; fix bug #2119
To enable toggle sneak mode, set "toggle sneak = true" in
the [Input] section of settings.cfg.

Outstanding issues:
    - In toggle sneak mode, holding the Sneak button causes
      rapid, repeated toggling.
    - The button in the settings menu doesn't do anything.
2015-03-08 15:23:46 -05:00
dteviot
36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	extern/sdl4ogre/sdlcursormanager.cpp
2015-03-08 18:29:12 +13:00
dteviot
f19863b545 fixing MSVC 2013 warning C4244: & C4305
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 18:11:54 +13:00
dteviot
ca8c8c6aa4 fixing MSVC 2013 warning C4244: & C4305
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 17:42:07 +13:00
dteviot
e6cd8484a2 fixing MSVC 2013 warning C4244: & C4305
fixes for mistakes in last commit.
2015-03-08 13:22:56 +13:00
dteviot
e197f5318b fixing MSVC 2013 warning C4244: & C4305
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 2015-03-07 18:34:29 +01:00
scrawl
58807064b4 Revert "Fix reference cell movement leaving behind deleted Ptrs for script access"
This reverts commit 666248618e.
2015-03-07 15:31:21 +01:00
dteviot
f2ac939e61 reverted mShouldRepeat back to unsigned char.
As recommended by Scrawl.
2015-03-07 11:04:54 +13:00
dteviot
27f91a8326 correction from Scrawl.
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
2015-03-06 19:47:46 +01:00
Marc Zinnschlag
907ac5ef7f Merge remote-tracking branch 'scrawl/master' 2015-03-06 19:24:15 +01:00
dteviot
45b6538820 fixed MSVC 2013 warning C4800
forcing value to bool 'true' or 'false'
2015-03-06 23:19:57 +13:00
dteviot
407cd50890 fixed warning C4099:
type name first seen using 'class' now seen using 'struct'
2015-03-06 21:36:42 +13:00
scrawl
0fda1cdd53 Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs 2015-03-06 02:36:12 +01:00
dteviot
80fe24207c correction from Scrawl.
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
2015-03-05 20:21:22 +13:00
Marc Zinnschlag
9f155df761 Merge remote-tracking branch 'maqifrnswa/bug2407' into openmw-35-1 2015-03-04 17:09:13 +01:00
Marc Zinnschlag
2e31f01585 Merge remote-tracking branch 'maqifrnswa/bug2407' 2015-03-04 16:55:46 +01:00
scrawl
cced508916 Remove unintended 1.5 factor for damage/restore magic effects 2015-03-04 01:49:00 +01:00
scrawl
8931ddf428 Remove unneeded casts 2015-03-03 23:46:53 +01:00
Scott Howard
d01e8cc97d PositionCell/PlaceItemCell: add console message if cell doesn't exist 2015-03-03 17:36:22 -05:00
Marc Zinnschlag
c66bf41ac2 Merge remote-tracking branch 'scrawl/master' into openmw-35-1 2015-03-03 18:23:38 +01:00
Marc Zinnschlag
bf92d5cde9 removed redundant mScript field in ESM::StartScript 2015-03-03 13:04:57 +01:00
Marc Zinnschlag
3b8d709583 Merge remote-tracking branch 'maqifrnswa/bug2407' 2015-03-03 11:26:25 +01:00
scrawl
a8cb4e807b Warning fix 2015-03-03 11:24:23 +01:00
scrawl
f09cbfb167 Add a comment 2015-03-02 23:29:33 +01:00
scrawl
666248618e Fix reference cell movement leaving behind deleted Ptrs for script access 2015-03-02 23:20:59 +01:00
scrawl
8eb1f4e70e Remove more log spam 2015-03-02 22:13:50 +01:00
scrawl
e3f1cb8305 Remove "loading cell" message
This spams the log too much, in particular when loading a savegame.
2015-03-02 21:12:21 +01:00
scrawl
653ddd3f25 Warning fix 2015-03-02 20:16:11 +01:00
Marc Zinnschlag
8b84fa5579 Merge remote-tracking branch 'scrawl/master' 2015-03-02 20:01:31 +01:00
Scott Howard
53213bf236 if cell doesn't exist, PositionCell and PlaceItemCell warn std::err but still execute, bug #2407 2015-03-02 11:53:59 -05:00
scrawl
730138035d Cycle infinite loop fix (Fixes #2421) 2015-03-02 17:25:26 +01:00
scrawl
191c0104f6 Crash fix for creatures with no skeleton base (Fixes #2419) 2015-03-02 15:19:57 +01:00
scrawl
a653716e2c Fix for damage/restore effects using the instant apply path when they have a duration 2015-03-01 22:22:20 +01:00
scrawl
239c0071f5 Armor tooltip should show the effective armor rating 2015-03-01 19:40:38 +01:00
Marc Zinnschlag
185757da43 Merge remote-tracking branch 'dteviot/Bug2367' 2015-03-01 10:24:02 +01:00
dteviot
cdee6f41fc fix: multi effect spell with different ranges (Fixes #2285)
Applies all effects for a spell with multiple effects, where not all effects have the same range.
2015-03-01 15:34:18 +13:00
dteviot
41e15e0c2d Limit maximum attribute damage (Fixes #2367)
Maximum damage that an attribute can have = base + fortify.
2015-03-01 10:27:51 +13:00
scrawl
2f2a95f735 Fix crash for terrain without data, part 2 2015-02-28 19:33:49 +01:00
scrawl
f82751422d Fix constant effect restore enchantments being applied incorrectly (Fixes #2408) 2015-02-28 16:31:22 +01:00
scrawl
2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
Conflicts:
	CMakeLists.txt
2015-02-27 22:37:22 +01:00
Digmaster
84ff11d0ab check if v2 exists before attemping to copy it 2015-02-27 22:21:33 +01:00
Digmaster
464bbe4d6f if v2 doesn't exist, don't erroneously set keyboardUserExists to true. 2015-02-27 22:21:07 +01:00
Digmaster
5d77ebdc60 If v3 doesn't exist, copy from v2 2015-02-27 22:21:07 +01:00
scrawl
97cc2522c0 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
2015-02-27 22:21:02 +01:00
Digmaster
df5513da7c uses v3 input bindings, not v2 2015-02-27 22:19:13 +01:00
Digmaster
a192836582 (hopefully) correct gamecontrollerdb.txt behavior 2015-02-27 22:19:13 +01:00
Digmaster
796b4b01b0 Fix activating every frame when action is bound to a trigger 2015-02-27 22:19:13 +01:00
Digmaster
e3e6190b85 Added multiple joystick support in ICS. Will fix other issues shortly 2015-02-27 22:19:12 +01:00
Digmaster
1e4a845b6f Minor code cleanup 2015-02-27 22:19:08 +01:00
scrawl
2eedb3acec Include fix 2015-02-27 20:22:43 +01:00
sylar
cda3782cf2 fix crash game on Android after start loading 2015-02-26 18:30:38 +04:00
sylar
1bb29f610f enable mipmapping for Android again 2015-02-26 18:29:38 +04:00
Marc Zinnschlag
281e0042ab Merge remote-tracking branch 'scrawl/master' 2015-02-26 13:23:15 +01:00
scrawl
e7989a197d Add defaults for some required globals (Fixes #2397) 2015-02-25 20:35:11 +01:00
Jordan Ayers
659a8ba279 Correction to teleportation changes.
OMW Bug #2400
Related to OMW Bug #1533

Don't crash on confiscating items if a prison marker cannot be found.
2015-02-24 21:10:01 -06:00
Jordan Ayers
691ebd2372 Correction to teleportation changes.
OMW Bug #2400
Related to OMW Bug #1533

Don't crash when finding the closest marker to an exterior position.
2015-02-24 20:51:57 -06:00
scrawl
24de6ba27e Fix crash for LAND records without data 2015-02-24 21:42:40 +01:00
Marc Zinnschlag
da9bd09a8c Merge remote-tracking branch 'miroslavr/master' 2015-02-23 20:53:44 +01:00
Marc Zinnschlag
9109162030 Merge remote-tracking branch 'scrawl/master' 2015-02-23 20:51:18 +01:00
scrawl
77bb77b367 Fix for instant restore effects (Fixes #2392) 2015-02-23 19:07:12 +01:00
MiroslavR
47c053444f Make the jail progress last one second 2015-02-23 00:23:09 +01:00
Marc Zinnschlag
8e007c91fd Merge remote-tracking branch 'jordan-ayers/bugfix/1533' 2015-02-22 21:58:01 +01:00
Marc Zinnschlag
07c27065d6 Merge remote-tracking branch 'slothlife/msvc-warning-fixes' 2015-02-22 21:34:46 +01:00
Jordan Ayers
5edafc2a4c Cleanup: Add const to read-only CellRefList access.
OMW Bug #1533
2015-02-22 12:25:10 -06:00
Jordan Ayers
399259a95c Improve CellStore exception messages. 2015-02-22 12:12:54 -06:00
Jordan Ayers
c21b59ecff Teleportation: Avoid marking searched cells as changed.
OMW Bug #1533
Only mark cells with the target marker / evidence chest as 'changed'.
2015-02-21 17:55:05 -06:00
scrawl
a5847afdac Fix ignored clicks on HUD mini-map (Fixes #2388) 2015-02-20 00:00:13 +01:00
scrawl
6d62aa7544 Don't prompt for spell deletion when using cycling keys (Fixes #2382) 2015-02-18 19:06:36 +01:00
Marc Zinnschlag
4c5bba2947 Merge remote-tracking branch 'dteviot/SpellCastingFixes' 2015-02-17 16:44:14 +01:00
Marc Zinnschlag
8686ffcedb Merge remote-tracking branch 'scrawl/master' 2015-02-17 11:55:12 +01:00
dteviot
6e2d6a0282 Minor correction, MWWorld::getMaxActivationDistance() is now public. 2015-02-17 22:51:30 +13:00
dteviot
8d7de7d1ec Telekinesis allows safe opening of traps (Fixes #1916)
When trap activated at beyond normal activation distance, assume telekinesis used and detonate trap at trapped object's location.
Also some minor code refactoring of spellcasting.
1. Corrected parameter passed to explodeSpell().
2. For loop now correctly does an early exit.
3. Removed duplicated tests.
2015-02-17 22:14:25 +13:00
cc9cii
efdee19477 Suppress warning about the lack of virtual destructor. 2015-02-16 16:41:53 +11:00
slothlife
a9b74671a6 Fix various MSVC warnings 2015-02-15 20:10:21 -06:00
Jordan Ayers
6d1aec6970 Confiscate stolen goods: Support Mournhold prisons.
OMW Bug #1533
2015-02-14 16:09:17 -06:00
Jordan Ayers
5ef78903dc Teleportation: Support markers in Mournhold.
OMW Bug #1533
Note:  the 'stolen goods' search is not yet correct for Mournhald.
2015-02-14 15:43:09 -06:00
scrawl
81925645a3 Unreachable enemies combat AI fix (Fixes #2271) 2015-02-14 16:51:54 +01:00
scrawl
37a85e31d6 Ripples fix 2015-02-14 16:51:47 +01:00
scrawl
93ffdb427c Small tweak to ripples 2015-02-14 15:53:01 +01:00
scrawl
a139e4efb0 Grey out completed quests in journal quests list 2015-02-13 16:51:34 +01:00
Jordan Ayers
1d18d3ff4c Add a full search to findInteriorPositionInWorldSpace.
Part of OMW Bug #1533
Implement a search for one of the 'nearest' exterior cells.  In this
case, 'nearest' means the fewest number of cells away via door markers.
This causes the world map position to update immediately after teleporting,
unless the new cell has no connecting path to an exterior.  Intervention
spells and Jail travel will be much closer to vanialla Morrowind,
except for in Mournhold.
2015-02-12 22:38:08 -06:00
scrawl
75db4d6473 Merge remote-tracking branch 'upstream/openmw-35' into HEAD 2015-02-11 12:11:59 +01:00
scrawl
dfaab1188f Fix for broken levelled creature spawning (Fixes #2365) 2015-02-11 12:10:46 +01:00
Marc Zinnschlag
2b619296d7 Merge remote-tracking branch 'scrawl/master' 2015-02-11 11:30:44 +01:00
scrawl
bf1839b370 Always print the exception to stderr 2015-02-10 22:01:57 +01:00
scrawl
3ccf4642b4 Implement ToggleScripts 2015-02-10 20:25:57 +01:00
Alexander "Ace" Olofsson
1a19253158 Fix MSVC build due to missing M_PI define
Apparently the header guard on cmath only adds the defines if _USE_MATH_DEFINES is defined when cmath is included for the first time.

So enabling that define and moving cmath up to be the first include, so that nothing else includes it without the define set.
2015-02-10 15:32:54 +01:00
scrawl
218f789d88 Fix player DrawState reset when selecting enchanted item (Fixes #2356) 2015-02-09 20:16:29 +01:00
scrawl
801c0eb57c Detect Creature should detect alive creatures only (Fixes #2353) 2015-02-09 20:15:41 +01:00
scrawl
c27c20a859 Merge remote-tracking branch 'upstream/openmw-35' into HEAD
Conflicts:
	files/materials/water.shader
2015-02-09 19:40:59 +01:00
scrawl
dbd4abd6fe Fix ripples for D3D - added simpler effect (Fixes #1649) 2015-02-09 19:30:11 +01:00
Marc Zinnschlag
e9d6e4f6df Merge remote-tracking branch 'ace/include-cleanup' 2015-02-09 18:03:28 +01:00
Marc Zinnschlag
985f7cbff9 Merge remote-tracking branch 'miroslavr/master' 2015-02-09 17:58:57 +01:00
Alexander "Ace" Olofsson
fce404acc5 Remove some including of mwbase/world.hpp
Since ref.hpp is rather well used in OpenMW-CS this should help compile times there
2015-02-09 17:45:48 +01:00
Alexander "Ace" Olofsson
f2c5060cc0 Fix cstdint issue on travis GCC build 2015-02-09 16:37:20 +01:00
Alexander "Ace" Olofsson
d3128a12b6 Remove a large include form mwbase/windowmanager.hpp 2015-02-09 16:23:41 +01:00
Alexander "Ace" Olofsson
8c49812d56 Remove unneeded include in obstacle.hpp 2015-02-09 15:12:10 +01:00
Alexander "Ace" Olofsson
df5a08b6de Move manualref code out of header 2015-02-09 15:01:49 +01:00
Jordan Ayers
ec3487b669 Sun trajectory: handle mNightStart <= mSunriseTime
OMW Bug #781
Note:  mNightStart == mSunriseTime is treated as 24-hour night.
2015-02-08 14:31:45 -06:00
scrawl
e81d2a9dde Merge remote-tracking branch 'upstream/openmw-35' into HEAD
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
2015-02-08 21:28:29 +01:00
scrawl
9dbd9af31c Adjust fix for Bug #2360 to repair affected savegames 2015-02-08 21:26:58 +01:00
scrawl
b542143e3a Fix faction reputation case sensitivity issue (Fixes #2360) 2015-02-08 21:04:01 +01:00
scrawl
ad8790fba0 Fix setWaterLevel script instruction not affecting physics 2015-02-08 15:50:40 +01:00
scrawl
01e32aef79 Fix exception moving a disabled object between cells 2015-02-08 14:34:31 +01:00
MiroslavR
2223a69ab8 Fix getpcinjail returning 0 when the console is open 2015-02-07 20:13:11 +01:00
Jordan Ayers
23024d2beb Re-work the sun's trajectory.
OMW Bug #781
Have the sun travel 15 degrees south of vertical.
2015-02-07 12:36:27 -06:00
MiroslavR
9bbe6f8c5e Remove todo 2015-02-07 18:39:05 +01:00
MiroslavR
1230cf49bf Properly center jail progress widget, fix a bug with it not disappearing if the console is open 2015-02-07 18:38:41 +01:00
Jordan Ayers
2d17eaa5ea Fix argument name for setSunDirection. 2015-02-06 22:26:58 -06:00
MiroslavR
1d9e973573 Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714) 2015-02-07 04:05:28 +01:00
Marc Zinnschlag
6c4920c58e Merge remote-tracking branch 'scrawl/master' 2015-02-06 09:23:45 +01:00
scrawl
01b4177872 Make sure birthsign spells are added when loading savegame 2015-02-06 01:27:17 +01:00
scrawl
9ce3e4b4e1 UI consistency fix in levelup dialog 2015-02-06 01:27:17 +01:00
scrawl
61ec9196c8 Cap the displayed attribute multiplier in levelup to attribute points left to 100 2015-02-06 01:27:17 +01:00
scrawl
b5e0e45c78 Fix iLevelUpTotal not being used in the levelUp logic 2015-02-06 01:27:17 +01:00
scrawl
55cd9b526c Skill progress bar changed to match MW 2015-02-06 01:27:17 +01:00
scrawl
f0b1d889c0 ESSImport: import player skill progress 2015-02-06 01:27:17 +01:00
scrawl
ae77eacd7e Skill progress refactoring 2015-02-06 01:27:16 +01:00
scrawl
dd8aab2a7f Adjust help for --load-savegame again 2015-02-06 01:27:16 +01:00
scrawl
356d1c7657 ESSImport: convert stolen item tracker 2015-02-06 01:27:16 +01:00
scrawl
bea88c3643 Stolen item tracking overhaul part 2 (Fixes #2338) 2015-02-06 01:27:16 +01:00
scrawl
c1862cbfc2 Clarify documentation for --load-savegame 2015-02-05 04:18:43 +01:00
scrawl
8087a7d920 Add possibility to dress up corpses (Fixes #2221) 2015-02-05 04:18:43 +01:00
scrawl
aa6ebcd75c Change stolen items handling to match MW (Fixes #1443, Fixes #2290) 2015-02-05 04:18:43 +01:00
scrawl
955505c167 Remove unused function 2015-02-05 04:18:43 +01:00
scrawl
27dc49a135 Rewrite game settings manager
Removes the abhorrent dependency on Ogre for this code and improves the error handling.
2015-02-05 04:18:42 +01:00
scrawl
6ea59c93ab Ignore the object scale in Move instruction (Fixes #2275) 2015-02-05 04:18:42 +01:00
scrawl
6d097fbfbd Normalise spelling of "levelled" throughout the code 2015-02-05 04:18:42 +01:00
scrawl
0c6e2170db Include cleanup 2015-02-05 04:18:42 +01:00
Jordan Ayers
1f036c0381 Patch for COC Spawn Issue.
OMW Bug #1079
Fall back to the first static's position, if there are no door markers.
2015-02-04 12:10:56 -06:00
scrawl
fbb8998184 Account for not yet listed cells in getInteriorPtrs 2015-02-04 16:41:14 +01:00
scrawl
14923f3e8b Fix for broken unsetRefNum 2015-02-03 23:05:06 +01:00
MiroslavR
ee8f88fc42 Reset health modifier when actor dies (Fixes #2330) 2015-02-01 22:04:49 +01:00
Marc Zinnschlag
82ff737c31 Merge remote-tracking branch 'scrawl/master' 2015-02-01 12:10:28 +01:00
scrawl
7e33471edb Fix code duplication 2015-01-31 22:40:43 +01:00
scrawl
c98b7db4c1 Fix swim height, use fSwimHeightScale GMST 2015-01-31 22:40:43 +01:00
scrawl
56799c79f4 Fix attachArrow exception when changing weapon (Fixes #2332) 2015-01-31 22:40:42 +01:00
scrawl
fec8cf91f5 Add exception handling to various uses of DataStream::read 2015-01-31 22:40:42 +01:00
scrawl
86165d38d2 Add exception handling in addObjectToScene 2015-01-31 22:40:42 +01:00
scrawl
73e57f53a8 Always print openmw version in the log 2015-01-31 22:40:42 +01:00
scrawl
cbe135c60f Don't require magicka for casting spells in God Mode (Fixes #2331) 2015-01-31 22:40:42 +01:00
scrawl
7d76f1a113 PlaceAt count argument should spawn independent references (Fixes #2283) 2015-01-31 22:40:41 +01:00
scrawl
7542fb5cd9 Show map notes on door marker leading to the cell with the note (Fixes #2284) 2015-01-31 22:40:41 +01:00
scrawl
54e79c8c98 Use mouse pressed event for pin button instead of mouse click 2015-01-31 22:40:41 +01:00
scrawl
c093e284d9 Delegate cleanup 2015-01-31 22:40:41 +01:00
scrawl
bdcc3a4036 Add missing swish sound for thrown weapons 2015-01-31 22:40:40 +01:00
scrawl
326eaea8a6 Add missing sound for drawing throwing weapons (Fixes #2308) 2015-01-31 22:40:40 +01:00
scrawl
0497a40d09 Fix incorrect sound for thrown weapons 2015-01-31 22:40:40 +01:00
scrawl
2346c3528d Remove NpcStats::mProfit and store it in the script instead
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
2015-01-31 22:40:40 +01:00
scrawl
bd0a0e64a9 Fix overwriting script records not working 2015-01-31 22:40:40 +01:00
scrawl
d1b5956a98 Fix crash on exit 2015-01-31 22:40:40 +01:00
scrawl
b9acf437fd Remove friendly hits from the save file
The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature rather than a bug.
2015-01-31 22:40:39 +01:00
scrawl
5a9b30a8ca Don't show VFX on the map (Fixes #2324) 2015-01-31 22:40:38 +01:00
scrawl
417f60f467 Use the mooncircle textures (Fixes #1624, Fixes #1743) 2015-01-31 22:40:38 +01:00
scrawl
dac1290597 Reduce size of water plane and increase subdivisions (Fixes #969) 2015-01-31 22:40:37 +01:00
Marc Zinnschlag
c02c72e134 Merge remote-tracking branch 'jordan-ayers/topic/dialogue-set' 2015-01-30 18:23:14 +01:00
Jordan Ayers
419046e121 Dialogue: Use std::set for known topics in the manager.
There were three different data structures being used for topic lists
in this code.  (map< string, true >, list< string >, and vector< string >)
Switch the local topic lists to set< string >.  This supports everything
the list and map were doing, reduces the variety of data structures, and
makes count (a more efficient search) available.

The vector has not changed, since it's tied to the ESM modules, and must
meet other requirements.
2015-01-29 18:28:13 -06:00
scrawl
e712b0353b Terrain refactoring, reduce game startup time and memory usage 2015-01-29 03:39:01 +01:00
scrawl
62a32220ff Use low-LOD heightmap for world map rendering
Add vanilla-accurate colour palette (thanks Hrnchamd)
2015-01-29 03:39:01 +01:00
scrawl
c0a88161b2 Get rid of unneeded setSize/setCoord overrides 2015-01-29 03:38:59 +01:00
scrawl
f4c8064d39 Fix camera not being attached properly when player becomes vampire (Fixes #2319) 2015-01-28 19:14:57 +01:00
scrawl
9bcc84ceec Add option to stretch menu backgrounds/cutscenes to the whole screen 2015-01-28 00:22:56 +01:00
scrawl
431f540791 ESSImport: fix NPC factions 2015-01-27 23:12:21 +01:00
scrawl
6367b4dc0b Improve INFO struct naming 2015-01-27 23:12:21 +01:00
scrawl
4cbb79191f Don't put duplicate lines in the console history 2015-01-27 23:12:20 +01:00
scrawl
6f41e0d12e Reapply quest index when loading quest from savegame (Bug #2260) 2015-01-27 23:12:20 +01:00
scrawl
f35c9b7a69 Clang warning fixes (thanks hemite) 2015-01-27 23:12:20 +01:00
scrawl
d34c8526f6 Enchanted arrows should not be added to victim (Fixes #2306) 2015-01-27 23:12:20 +01:00
scrawl
67491c7164 Fix leveled item argument issue (Fixes #2302) 2015-01-27 23:12:20 +01:00
scrawl
9d3f0b2ed5 Remove some unused code, include cleanup 2015-01-27 23:12:13 +01:00
scrawl
4921c6ef9e Split window caption bars so that the caption can be transparent (Fixes #531)
Fix transparent window background not applying to the header bar (Fixes #2294)
2015-01-27 23:05:19 +01:00
scrawl
697ab16ec5 Fix for coverity defects 2015-01-27 19:00:26 +01:00
Jordan Ayers
1410819e20 Dialog fix for line breaks in the middle of words.
Issue 1049
Adjust the TypesetBookImpl::Typesetter to not assume a word break
at the end of write() calls.
A word break is assumed if any of the other content insertion methods
are used (section break, add/select content, etc).
2015-01-25 22:36:20 -06:00
scrawl
72f7c2e555 Move weather reset to clear() method 2015-01-24 16:45:36 +01:00
scrawl
b1bd236345 ESSImport: convert script local variables
Had to add special reading code to openmw, because the variable names are not stored.
2015-01-24 16:45:36 +01:00
scrawl
b0c2aec374 Add warning for missing body parts 2015-01-23 17:31:26 +01:00
scrawl
79d2eebe54 Store selected enchant item in savegame (Fixes #1702) 2015-01-23 16:45:47 +01:00
scrawl
a619cff615 Implement EnableLevelupMenu to trigger level-up 2015-01-23 15:34:47 +01:00
scrawl
c883a73d30 Several warning fixes 2015-01-23 15:34:47 +01:00
scrawl
8b5effe3e0 Fix wrong magic number for JOUR in openmw savegames 2015-01-23 15:34:47 +01:00
scrawl
378e91545d Fix Tribunal/BM summon effects not working 2015-01-23 15:34:47 +01:00
scrawl
0fd5575efe Improve warning message in ContainerStore::readState 2015-01-23 15:34:47 +01:00
scrawl
cc7be1600d Make missing hair/head in NpcAnimation non-fatal for consistency with addOrReplaceIndividualPart 2015-01-23 15:34:14 +01:00
scrawl
69676906ae Don't clear known spells when reading from the savegame
This is needed because the .ess format doesn't include the racial spells in the player's spell list.
2015-01-23 15:34:14 +01:00
scrawl
c7d15e6f74 Revert "Revert "Light charge handling fix""
This reverts commit b95748d044.
2015-01-23 15:33:39 +01:00
scrawl
d13335ba40 Ensure the item can be equipped in the given slot when loading inventory 2015-01-23 15:32:34 +01:00
scrawl
c65f9cb3c0 Revert "Change save format to store relative equipment index"
This reverts commit 89d9649b50.
2015-01-23 02:32:43 +01:00
scrawl
b95748d044 Revert "Light charge handling fix"
This reverts commit 5e0428243b.
2015-01-23 02:32:38 +01:00
Marc Zinnschlag
cd62dbc5b7 Merge remote-tracking branch 'scrawl/essimporter' 2015-01-21 15:12:04 +01:00
scrawl
5e0428243b Light charge handling fix 2015-01-21 01:59:45 +01:00
scrawl
89d9649b50 Change save format to store relative equipment index
Store the index for the allowedSlots vector instead of the absolute slot index. This will more gracefully handle edge cases like the available slots for an item having changed when loading the game, or the "allows stacking" property having changed. However the main reason this was done is to ease work on the essimporter.
2015-01-20 23:55:26 +01:00
scrawl
eede2c8e55 ESSImport: convert breath meter and skill increases 2015-01-20 19:30:39 +01:00
Alexander "Ace" Olofsson
3a88f4ebd5 Fix windows build, MessageBox is a defined symbol
Windows and its stupid defines...
2015-01-20 17:07:26 +01:00
scrawl
5104a5a023 Add missing setFactionReaction instruction, use absolute storage instead of difference
Seems to be closer to how MW is storing it (it has the complete FACT record in the savegame, actually).

This (somewhat) breaks OMW savegame compatibility in that old changes are discarded, but I don't think the faction reactions are quest relevant anywhere.
2015-01-20 00:53:31 +01:00
scrawl
9014dc48ee Don't require the object type id for reading references from savegames
This is redundant, since we can look it up from the RefID.
2015-01-20 00:42:25 +01:00
scrawl
235683e449 Remove LightState from openmw save format to streamline inventory loading 2015-01-19 11:36:00 +01:00
scrawl
f9cf31fcd5 ESSImport: convert custom map markers, not working for interiors yet 2015-01-19 09:29:21 +01:00
scrawl
14aacf9a72 Add comment 2015-01-17 00:10:49 +01:00
scrawl
1869d37cfc Remove unused mLastDrowningHit 2015-01-17 00:10:45 +01:00
scrawl
714b19015c Fix unknown record error message 2015-01-15 20:31:08 +01:00
scrawl
fc6aa256bf Add comment 2015-01-15 16:05:25 +01:00
scrawl
bf915d929a Update idle voices according to research 2015-01-15 03:35:46 +01:00
scrawl
6b2df95167 Fix for some coverity defects 2015-01-15 02:03:27 +01:00
scrawl
edbac30a57 Change another dynamic_cast to static_cast (coverity) 2015-01-15 01:23:58 +01:00
scrawl
cef72385d4 Fix extreme frame drop when running into certain corners (Fixes #2023) 2015-01-15 00:58:12 +01:00
scrawl
52ed3d92a8 Fix btCompoundShape scaling (Fixes #1683) 2015-01-14 17:59:04 +01:00
scrawl
a3c861b7fa Idle voice fix 2015-01-14 00:07:14 +01:00
scrawl
2ac4a74a34 Fix running AI for dead actors 2015-01-13 18:13:02 +01:00
scrawl
883f7ec7ce Move workaround for hiding markers from NIF loader to Scene 2015-01-13 17:19:39 +01:00
scrawl
3ce22d31d8 Fix cursor issue when loading savegame from within mouselook-mode and a warning pops up 2015-01-13 05:37:44 +01:00
scrawl
fafc14d5a0 Add proper air movement mechanics (Fixes #2077) 2015-01-13 05:37:43 +01:00
scrawl
41b3a9dba9 Rewrite animated collision shape support (Fixes #2123) 2015-01-13 05:37:37 +01:00
scrawl
4ed3e7bbb7 Enchanting code cleanup 2015-01-12 23:29:58 +01:00
scrawl
bb718f216d Initialize ENAMstruct in SpellCreationDialog (Coverity) 2015-01-12 23:29:58 +01:00
scrawl
08d8dd287c I think this was committed by accident 2015-01-12 23:29:58 +01:00
scrawl
de23ad5c8d Change dynamic_cast to static_cast to make coverity happy 2015-01-12 23:29:58 +01:00
scrawl
cda2eea906 Enchanting: use fEnchantmentConstantDurationMult and fEffectCostMult 2015-01-12 23:29:58 +01:00
scrawl
871d59de6c Reduce Idle voice chance (Fixes #1964) 2015-01-12 23:29:58 +01:00
scrawl
82eaa9f1bc Fix loading crash (don't apply viewmode before player is set up) (Fixes #2272) 2015-01-12 23:29:39 +01:00
scrawl
c3f3f8b3d0 Use only Cell records for saving progress bar (Fixes #2259) 2015-01-11 18:01:06 +01:00
scrawl
0ec018f7f1 More accurate savegame loading progress bar, uses position in the file (Bug #2259) 2015-01-11 17:54:15 +01:00
scrawl
1780bcc238 Print RefNum in BetaComment 2015-01-11 17:04:58 +01:00
scrawl
4d4f2fc475 Add maximum distance for teleporting followers on using a door 2015-01-11 17:04:58 +01:00
scrawl
b108fbe986 Remove incorrect implementation of fGreetDistanceReset
This can't be right. A reset distance of 512 is smaller than the maximum greeting distance for certain NPCs, which would then say greetings non-stop.
2015-01-11 17:04:58 +01:00
scrawl
716e14a37a Print missing savegame dependencies on the console 2015-01-11 17:04:58 +01:00
Marc Zinnschlag
289a912817 Merge remote-tracking branch 'scrawl/master' 2015-01-11 12:24:51 +01:00
dteviot
458b82c308 Centralized "fish can't attack non-swimmer" logic. 2015-01-11 14:25:46 +13:00
dteviot
7aa0f887c0 Minor changes to ESM::RefNum
1. Changed mIndex to unsigned, to solve potential implementation defined behavior with right shift.
2. Refactoring to minimize use of magic number -1 to indicate "no Content File".
2015-01-11 12:20:22 +13:00
scrawl
f9227beedd Add warning when loading a savegame that depends on non-existing content files (Fixes #2261) 2015-01-11 00:06:52 +01:00
scrawl
579f5d232f Move interactive messageBox to separate function 2015-01-10 23:23:48 +01:00
scrawl
91571f51be Ogre crash workaround (Fixes #1745) 2015-01-10 22:45:08 +01:00
Marc Zinnschlag
595c08817f Merge remote-tracking branch 'scrawl/master' 2015-01-10 17:02:46 +01:00
scrawl
37bea9d4dc Fix exception for empty dialog topics (Fixes #2267) 2015-01-10 15:06:30 +01:00
Marc Zinnschlag
e439065897 Merge remote-tracking branch 'scrawl/master' 2015-01-10 11:33:04 +01:00
scrawl
5b9d10f851 Reduce includes in MWGui 2015-01-10 03:56:06 +01:00
scrawl
728b842e72 Use MyGUI::utility in favor of boost lexical_cast 2015-01-10 03:01:01 +01:00
scrawl
eecea4131f Reduce MyGUI includes 2015-01-10 02:50:43 +01:00
scrawl
4b704f665f Reduce includes, move DragAndDrop to separate file 2015-01-10 01:21:17 +01:00
scrawl
eb99ed697b Reduce includes 2015-01-10 01:00:52 +01:00
scrawl
2ac23008f5 Remove an old workaround (Fixes #2263)
The workaround was added when we were still using OIS for input. It doesn't seem to be needed with SDL.
2015-01-10 00:07:55 +01:00
scrawl
dfdf26e95e Add assertion to Store 2015-01-09 20:58:53 +01:00
scrawl
ce2cbab402 Dialogue: improve conflict resolution for chains of overlapping keywords (unit test for such a case will follow) 2015-01-09 20:08:52 +01:00
Marc Zinnschlag
4e7f7baf8b Merge remote-tracking branch 'dteviot/Bug2076' 2015-01-09 13:57:21 +01:00
dteviot
64cd1396ac Fixed minor issues.
1. Renamed "hightRatio" to "heightRatio".
2. Replaced magic numbers with named constants.
2015-01-09 22:17:53 +13:00
dteviot
7fe2f86d06 Slaughter fish attacks when player only knee deep in water (Fixes #2076) 2015-01-09 21:40:53 +13:00
scrawl
65ab31eae6 Remove now redundant Store::setUp implementation 2015-01-09 04:31:02 +01:00
scrawl
ddd6e682bc Dialogue: add conflict resolution for overlapping keywords (Fixes #2245) 2015-01-09 04:19:38 +01:00
scrawl
c77660ba20 Remove some nonsense code 2015-01-09 01:59:38 +01:00
scrawl
2ddbe22da3 Fix for NPC store clearDynamic bug
It was clearing the whole mShared vector, instead of only the dynamic part. Actually, that whole overload was pointless to begin with. All it does is making sure the Player record isn't cleared, but ESMStore::clearDynamic re-inserts the player record anyway after clearing.
2015-01-09 01:59:32 +01:00
Marc Zinnschlag
f8a3ec3ee3 Merge remote-tracking branch 'scrawl/cmdline-savegame' 2015-01-08 20:57:49 +01:00
scrawl
d31ae2b345 Fix mIds mapping for dynamic records being lost on save/reload 2015-01-08 16:27:13 +01:00
scrawl
928b9ee41b Fix missing GUI mode update when showing soulgem dialog 2015-01-08 16:27:13 +01:00
scrawl
ef7e0070a6 Don't right-shift signed integers which is implementation-defined 2015-01-08 16:27:13 +01:00
Marc Zinnschlag
38a413a483 Merge remote-tracking branch 'scrawl/master' 2015-01-07 20:22:15 +01:00
scrawl
4684014a83 Use .omwsave extension for save game files 2015-01-07 15:06:39 +01:00
scrawl
13c5bd5cc2 Enchanting: fix skill-based cast cost bonus being applied twice 2015-01-07 04:41:12 +01:00
scrawl
ef1b0a191b Revert "Enchanting: fix inverted self-enchant success chance"
It wasn't inverted to begin with. The author of this commit is an idiot.
2015-01-07 03:48:16 +01:00
scrawl
4e92f6ab48 Add commandline option to load a save game on startup 2015-01-07 03:27:24 +01:00
scrawl
157438460b Fix being able to activate objects when paralyzed 2015-01-07 02:34:29 +01:00
scrawl
dc5ed5b861 Remove weather particles underwater (Fixes #2010) 2015-01-07 02:34:29 +01:00
scrawl
d02e075bab Add setting for exterior cell grid size (Fixes #1537) 2015-01-07 02:34:29 +01:00
scrawl
a17252eab3 Remove unused checkWaypoint function
It was an almost exact copy of the checkPathCompleted function anyway.
2015-01-07 02:34:28 +01:00
scrawl
4d9100091d Reduce default pathing arrival tolerance to 32 units (Fixes #1605) 2015-01-07 02:34:28 +01:00
scrawl
e19ab77d00 Store camera first person state in savegame (Fixes #2255) 2015-01-07 02:34:24 +01:00
scrawl
992b87ea44 Reset existing summons when the spell is re-casted (Fixes #2135) 2015-01-06 16:11:10 +01:00
scrawl
f267497c03 Allow separate summoned creature instances for each spell ID (Fixes #2194) 2015-01-06 16:11:05 +01:00
Marc Zinnschlag
31f6ccdf4d Merge remote-tracking branch 'internecine/bug2031' 2015-01-06 09:43:59 +01:00
Internecine
e1fdcb608e Fixed incorrect index 2015-01-06 15:00:24 +13:00
scrawl
464f8abb3f List exterior cell names in tab completion (Fixes #2252) 2015-01-06 01:10:09 +01:00
scrawl
708dbc2518 Crime fix 2015-01-05 20:31:50 +01:00
scrawl
c343a5c803 stopCombat fix 2015-01-05 20:31:50 +01:00
scrawl
c1955ef7fa Fix enchanting dialog effect labels showing a duration for constant effects 2015-01-05 18:57:08 +01:00
scrawl
5e7e40aac9 Fix being able to switch weapons while knocked out 2015-01-04 19:54:49 +01:00
scrawl
de12c96a46 Fix crash on exit if the window wasn't created (Fixes #2249) 2015-01-04 19:23:31 +01:00
scrawl
bc686c93b5 Potential fix for thrown weapons being regarded as broken 2015-01-04 19:20:30 +01:00
scrawl
398fe6e780 Thrown weapon fix (Fixes #2248) 2015-01-04 19:20:24 +01:00
scrawl
d56906acf7 Fix the creature position glitch 2015-01-03 19:10:15 +01:00
scrawl
6f747df713 Remove an unused constructor 2015-01-03 19:10:15 +01:00
scrawl
593ca6bd48 Fix for framerate-dependent maximum stepping distance (Bug #1638) 2015-01-03 19:10:15 +01:00
Marc Zinnschlag
9f6a2d00e8 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2015-01-02 18:17:25 +01:00
Marc Zinnschlag
ec1df719fe Merge remote-tracking branch 'mrcheko/master' 2015-01-02 18:08:47 +01:00
mrcheko
a8621e6230 defaults are set to 1.0; remove contrast setting
(can be changed in config though); disable gamma control for not Windows
OSs
2015-01-02 16:49:22 +03:00
Thoronador
526fb1b37b fix uninitialized value in BillboardObject 2015-01-02 00:45:50 +01:00
scrawl
326d0d3ebf Add default values for fNPCHealthBarTime and fNPCHealthBarFade (Fixes #2243)
These GMSTs are missing in unpatched versions of the game.
2015-01-01 22:55:43 +01:00
scrawl
92e4a0669c Fix for AiWander state loading 2015-01-01 18:58:17 +01:00
scrawl
559ddbb480 Quick fix for Ai fast-forward crash in exteriors (Fixes #2241) 2015-01-01 18:18:46 +01:00
Internecine
a7a3ab0c78 Fixed instant negative dynamic stat changes being applied as positive 2015-01-01 21:26:09 +13:00
scrawl
dc1c52bda7 Add some todo comments 2015-01-01 03:38:54 +01:00
scrawl
e0d083f702 Add hand-to-hand combat mechanics for bipedal creatures
You can now have a fistfight with vivec, if you so desire.
2015-01-01 03:38:54 +01:00
scrawl
70d3bfc6ed Fix idle animation not restarting immediately for creatures 2015-01-01 03:38:54 +01:00
scrawl
01652bbcc5 Store original actor position in AiWander package (Fixes #2200) 2015-01-01 03:38:49 +01:00
scrawl
5d7eb11596 Fix lights being rendered on the map (broken by d55fe43fc9) 2014-12-31 21:04:13 +01:00
scrawl
99ae0f901b Implement AiTravel fast-forward (Fixes #1125) 2014-12-31 20:42:29 +01:00
scrawl
a8ae0dec52 Implement AiWander fast-forward (Feature #1125) 2014-12-31 18:41:57 +01:00
scrawl
d26d5f6c26 Fix outdated bone locations when camera view is changed while paralyzed 2014-12-31 17:25:06 +01:00
scrawl
d1a29300f0 Handle bipedal creatures not using weapons (Fixes #2238) 2014-12-31 16:59:21 +01:00
mrcheko
60a74d5eb8 increase robustness for gamma to persist in the system;
use GMST strings for gamma interface
2014-12-31 18:40:01 +03:00
scrawl
363d1f9207 Merge remote-tracking branch 'upstream/master' 2014-12-30 23:01:45 +01:00
mrcheko
04d95810d1 gamma/contrast system reworked 2014-12-30 18:33:11 +03:00
scrawl
9c693d078b Fix equipment update removing ammunition (Fixes #2144) 2014-12-30 16:22:06 +01:00
scrawl
18fb3f831a Make the maximum horizontal stepping distance independent of movement speed (Fixes #1638) 2014-12-30 15:46:33 +01:00
scrawl
e2346d7c37 Store permanent magic effects in savegame (Fixes #1648) 2014-12-30 01:36:31 +01:00
scrawl
6c9875969a Stop idle animations for non-biped creatures when attacking/moving
The idle animation wouldn't be visible anyway, since these creatures don't have animation layers. However sounds tagged in the animation would still play.
2014-12-28 15:34:47 +01:00
scrawl
a58bc9f2f7 Remove sneaking effect on combat AI (Fixes #2237) 2014-12-28 14:45:20 +01:00
scrawl
1bd3ab8a2d Fix torch animation playing when torch is hidden (Fixes #2236) 2014-12-28 14:17:53 +01:00
scrawl
377b79d5ba Use SoundGen fallback for type Land only (Fixes #2228) 2014-12-28 02:39:54 +01:00
scrawl
de9d347018 Fix on touch area effect spells (Fixes #2233) 2014-12-28 01:51:12 +01:00
scrawl
25954a80f5 Fix recharging of items in player inventory 2014-12-28 01:06:49 +01:00
scrawl
0a2dd4c6cb Fix unsafe use of BaseNode in Move script instruction 2014-12-27 17:20:37 +01:00
scrawl
a62fe38a1b Fix unsafe use of BaseNode 2014-12-27 15:02:05 +01:00
scrawl
50e31877ab Fix crash when northmarker has been disabled (Bug #2230) 2014-12-27 14:52:33 +01:00
Internecine
5f9540318a Fixed incorrect indexes 2014-12-27 19:49:14 +13:00
Internecine
a87fe71ddf Added a helper function to handle dynamic stat changes 2014-12-27 19:46:54 +13:00
scrawl
2f0793390f Fix cut off text for some widgets in the stats window 2014-12-27 01:25:26 +01:00
Marc Zinnschlag
2fa0764c89 Merge remote-tracking branch 'swick/master' 2014-12-26 16:08:07 +01:00
Marc Zinnschlag
5f8b8b127c Merge remote-tracking branch 'psi29a/clang_lintian' 2014-12-26 16:07:07 +01:00
Marc Zinnschlag
da722a5cf1 Merge remote-tracking branch 'miroslavr/master' 2014-12-26 16:05:20 +01:00
Sebastian Wick
764cd9ca16 disable "window border" setting in the ingame settings UI if fullscreen is enabled 2014-12-24 16:31:23 +01:00
scrawl
6f72989cb1 SpellModel, SortFilterItemModel: case insensitive sorting 2014-12-24 15:45:15 +01:00
scrawl
2e5e7370ba Adjust default angle, FOV and viewport of character preview (Fixes #2220) 2014-12-24 15:45:15 +01:00
scrawl
9a1bde684f Sort class list in select class dialog 2014-12-24 15:45:14 +01:00
scrawl
768c4a5757 Update crime response to pickpocket attempts (thanks Hrnchamd) 2014-12-24 15:45:14 +01:00
scrawl
b8fa73dfa9 Preserve record ordering in Store
This fixes the default head/hair used for some races in the chargen UI.
2014-12-24 15:45:14 +01:00
scrawl
5d7dcafa53 Make local map widget size configurable 2014-12-24 15:45:14 +01:00
scrawl
a47de06492 Make local map resolution configurable and use lower default value
This seems to be the resolution the original engine is using. The change also significantly reduces cell loading time.
2014-12-24 15:45:14 +01:00
scrawl
7f0d71f8f4 Swap use of iDispAttackMod/fDispAttacking (thanks Hrnchamd) 2014-12-24 15:45:14 +01:00
scrawl
59f21c6105 Use "hair" as filter for PRT_Hair parts (Fixes #2218) 2014-12-24 15:45:14 +01:00
scrawl
d55fe43fc9 Support animation groups for Light and Door objects (Fixes #2039) 2014-12-24 15:45:14 +01:00
scrawl
019cd96719 Stop AiPursue when target has invisibility or chameleon>=75 2014-12-24 15:45:14 +01:00
scrawl
e5de253169 Use maximum step size of 62 units for stepping down (Fixes #1809) 2014-12-24 15:45:14 +01:00
scrawl
edc128572d Add MWMechanics::Actor class for temporary actor state, move AiState there 2014-12-24 15:45:14 +01:00
scrawl
42d63a4eb2 Fix position flicker after an animation ends 2014-12-24 15:45:14 +01:00
scrawl
8bc7eb5530 PlayGroup: Don't loop animations with no loop keys (Fixes #2223) 2014-12-24 15:45:13 +01:00
scrawl
9e5dfb6e98 Update crime system according to research wiki for more accurate attack responses 2014-12-24 15:45:13 +01:00
scrawl
2410d79410 Fix iFightAttack and iFightAttacking being swapped
Looks like the research wiki page was incorrect, the higher value (iFightAttack) being for the victim makes more sense, is consistent with iDispAttackMod/fDispAttacking, and seems to be how the original game behaves as well.
2014-12-24 15:45:13 +01:00
scrawl
e73e975291 Fix player being able to activate objects when knocked out 2014-12-24 15:45:13 +01:00
scrawl
3912ee2b1d Fix faction rank not being set on items in faction-owned containers 2014-12-24 15:45:13 +01:00
scrawl
0081a68376 Use fMagicStartIconBlink for spell effect indicator fading 2014-12-24 15:45:13 +01:00
scrawl
877e07823d Fix incorrect sound for spell creation success 2014-12-24 15:45:13 +01:00
scrawl
fb542a64ec Merchant items should be restocked instantly 2014-12-24 15:45:13 +01:00
scrawl
1bcc4430e0 Fix owner not getting set on restocked items 2014-12-24 15:45:13 +01:00
scrawl
9ed71765a9 Fix deleted containers showing in merchant inventories 2014-12-24 15:45:13 +01:00
scrawl
f3738e9a98 Say an "intruder" voice dialogue for trespassing crimes (Fixes #1082)
Seems to be broken in the original engine, but according to the TES-CS help this is how the intruder voices should be used. There are legitimate entries for "intruder" in the game's files, so we might as well use them.
2014-12-24 15:45:13 +01:00
scrawl
37e11b7272 Adjust loading box size for large captions 2014-12-24 15:45:12 +01:00
scrawl
866fdfe8bd Crime system improvements
- If someone saw the crime, they will notify everyone else in range, even if the Alarm rating of the witness is 0.
- Pickpocket and selling stolen items now works properly, i.e. honors the victim's Alarm rating instead of always being reported.
2014-12-24 15:45:12 +01:00
scrawl
307b84e9f6 Add enemy health bar fading and use relevant GMSTs 2014-12-24 15:45:12 +01:00
scrawl
1910327469 Implement disposition changes due to crimes 2014-12-24 15:45:12 +01:00
scrawl
cc9af9562b Function_CreatureTargetted should return '2' for werewolfs
This makes NPCs say the correct attack voice files when fighting a werewolf.
2014-12-24 15:45:12 +01:00
scrawl
efa9ff3a76 Fix incorrect implementation of iWerewolfBounty 2014-12-24 15:45:12 +01:00
scrawl
35d2bfabca Adjust NPC response to pickpocket attempts (Fixes #2219) 2014-12-24 15:45:12 +01:00
scrawl
4aed5158cc Support region names in cell dialogue filter (Fixes #2113) 2014-12-24 15:45:12 +01:00
scrawl
105f0f8716 Head tracking: don't look at dead actors 2014-12-24 15:45:12 +01:00
scrawl
8a210c49e9 Improve AI prioritising health potions 2014-12-24 15:45:12 +01:00
scrawl
a29abb85f1 Fix ItemView sizing bug 2014-12-24 15:45:12 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 2014-12-24 15:45:12 +01:00
scrawl
1b9209df4a Allow blocking of hand-to-hand attacks 2014-12-24 15:45:11 +01:00
Sebastian Wick
e85df00158 change setting "borderless" to "window border"
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
2014-12-24 15:09:50 +01:00
Bret Curtis
45299abe99 make it C98 compat 2014-12-23 17:13:11 +01:00
Bret Curtis
dcfadeb51a fix typo and annoying gcc/clang unused return values in crash catcher 2014-12-22 10:45:34 +01:00
Sebastian Wick
639fbfad0b make borderless setting available to the UI 2014-12-22 02:44:20 +01:00
MiroslavR
c796589420 Allow adding multiple Attribute/Skill effects in spell making (Fixes #2224) 2014-12-22 01:54:24 +01:00
Alexander "Ace" Olofsson
462b41a3a8 Missing files, aka; Why you shouldn't stresscommit 2014-12-19 11:26:54 +01:00
Alexander "Ace" Olofsson
0af5c7b379 Starting to clean up some heavy includes 2014-12-19 09:23:16 +01:00
Marc Zinnschlag
057d0913d6 Merge branch 'scriptfixes' 2014-12-18 10:22:07 +01:00
Marc Zinnschlag
a6d30bc2e3 consider --script-warn when running with --script-all-dialogue 2014-12-18 10:20:15 +01:00
Marc Zinnschlag
899ae763e6 fixing a travis build problem 2014-12-17 09:33:40 +01:00
scrawl
c2771bc8ab Head tracking fix 2014-12-17 02:15:40 +01:00
scrawl
31d28e727f Implement leveled list script functions (Fixes #1546) 2014-12-17 01:24:22 +01:00
scrawl
d642512f71 Error message fix 2014-12-17 00:57:04 +01:00
scrawl
88c5e1991c Fix being able to stand on top of actors (Fixes #1192) 2014-12-16 23:18:41 +01:00
scrawl
d962f0918d Implement NPC head tracking (Fixes #1720) 2014-12-16 20:47:45 +01:00
scrawl
b9e5aa9db6 Movement controller: Don't allow stepping up other actors
This seems to fix issues with NPCs inadvertently being placed on top of a small creature while fighting it.
Note that jumping on top of actors is still possible (Bug #1192)
2014-12-16 20:44:42 +01:00
scrawl
0dc9401269 Fix GUI crash due to outdated spells list 2014-12-15 20:20:17 +01:00
scrawl
ec00c830e5 Fix missing armor rating label update 2014-12-15 19:19:08 +01:00
scrawl
e4127aa491 Use space in ItemView more efficiently 2014-12-15 19:04:53 +01:00
scrawl
c7e1c0b595 Fix weapon cycle getting stuck for same item IDs 2014-12-15 17:49:08 +01:00
scrawl
935cccf974 Implement weapon/spell cycling hotkeys (Fixes #1024) 2014-12-15 16:23:08 +01:00
scrawl
4d5adfb5dd Fix being able to use enchantments of items that failed to equip (Fixes #2215) 2014-12-15 13:47:34 +01:00
scrawl
4e0d16da8c Take Scale field in creature record into account (Fixes #2214) 2014-12-15 13:34:04 +01:00
scrawl
79237d16a7 Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu
This should also improve window resizing performance, the widgets are now just resized instead of recreated.
2014-12-15 13:28:03 +01:00
scrawl
7abbca8be9 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-12-14 20:27:12 +01:00
scrawl
2b78e9795d Implement Calm effect removing combat packages (Fixes #1985) 2014-12-14 19:35:34 +01:00
scrawl
4f3995a4d8 Fix werewolf AI being able to use items 2014-12-14 19:15:43 +01:00
scrawl
4acc25f59c Use SoundGen with no creature field as fallback
This fixes the adorable "thump" sounds in the Scrib's idle animation not playing.
2014-12-14 17:52:06 +01:00
scrawl
192626c6f5 SoundGen fix: use Original Creature field only if non-empty 2014-12-14 17:44:03 +01:00
MiroslavR
c5a604453e Fix several book formatting issues (Fixes #2204) 2014-12-14 16:25:27 +01:00
scrawl
88a2e4c043 Graceful error handling for missing spells/factions (Fixes #1825, Bug #2176, Bug #2203) 2014-12-14 02:38:27 +01:00
Nik Dyonin
80c92789c2 Fix issue when killed NPC cannot be looted if it was in combat mode before killing. 2014-12-14 02:58:42 +03:00
Marc Zinnschlag
1f74d8cca5 Merge remote-tracking branch 'scrawl/scripttest' 2014-12-13 12:49:33 +01:00
scrawl
ba65c6cc7f Add --script-all-dialogue switch to compile all dialogue scripts (Fixes #1659) 2014-12-13 02:51:18 +01:00
scrawl
2ebf328dec Always print the failing dialogue script
These aren't usually very long, so printing them shouldn't spam the console by too much.
2014-12-13 00:39:24 +01:00
scrawl
ed6face4aa Disable activation scripts for actors in combat 2014-12-12 22:21:57 +01:00
scrawl
60aa209144 Implement drowning when knocked out underwater (Fixes #1228) 2014-12-12 17:42:56 +01:00
scrawl
d034a079e6 Allow equipping twohanded weapon and shield at the same time (Fixes #1785)
The shield can be equipped, meaning armor rating and item enchantments apply, but can not be blocked with.
2014-12-12 16:49:22 +01:00
scrawl
bc85bb32c2 Fix vampirism magic effect not applying immediately (Fixes #1984) 2014-12-12 02:39:59 +01:00
scrawl
03da21f088 Remove redundant GUI element showing during loading screens 2014-12-12 02:13:50 +01:00
scrawl
e69cf11029 Hide tooltips during loading screens 2014-12-12 02:09:15 +01:00
scrawl
cf5fc60e86 Make ToggleMenus affect tooltips (Fixes #1989) 2014-12-12 01:42:13 +01:00
scrawl
f42420bc19 Use the Original Creature field for SoundGen lookups 2014-12-12 01:24:35 +01:00
scrawl
2601b26217 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-12-11 22:44:58 +01:00
scrawl
7892ed35f3 PlaceItem, PlaceItemCell: Make sure references are placed above terrain (Bug #2078) 2014-12-11 22:25:53 +01:00
scrawl
886903d70e Implement HitAttemptOnMe function (Bug #2078) 2014-12-11 22:25:41 +01:00
scrawl
5f00a3d5c3 Reset lastHitObject when it is retrieved rather than every frame
This seems to be how vanilla MW does it.
2014-12-11 22:00:31 +01:00
scrawl
a355550cab Add support for NPCs with missing head/hair models (Fixes #2078) 2014-12-11 21:43:31 +01:00
scrawl
be16f1d0a5 Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078) 2014-12-11 21:00:02 +01:00
scrawl
d955017079 Don't report script operation status via messageBox (Bug #1942) 2014-12-11 20:51:02 +01:00
Marc Zinnschlag
912dcdc418 Merge remote-tracking branch 'scrawl/ptrupdate' 2014-12-11 20:41:53 +01:00
Marc Zinnschlag
19bd07648b Merge remote-tracking branch 'scrawl/pathgrid' 2014-12-11 20:32:32 +01:00
scrawl
ed2aa5a233 Fix crash caused by dangling baseNode pointer 2014-12-11 20:32:05 +01:00
scrawl
7e8ca3fff1 Fix object movement between cells producing a stale Ptr within the script execution (Bug #1942) 2014-12-11 19:29:06 +01:00
scrawl
3270f0e932 Change pathgrid workaround to check for interior cell name 2014-12-11 15:19:48 +01:00
scrawl
623783cd6a Enchanting: fix cast cost for "on use" enchantments being set incorrectly 2014-12-10 18:05:11 +01:00
scrawl
619ea846b4 Enchanting: fixed case where no range types at all are allowed (e.g. a Constant Effect item with an effect that does not allow the Self range-type) 2014-12-10 17:55:48 +01:00
scrawl
74c345f790 Enchanting: fix being able to create On Touch / On Target constant effect enchantments (this combination makes no sense) 2014-12-10 17:40:59 +01:00
scrawl
ead6bf1601 Enchanting: cast the enchant points for the item to int (Fixes #2202) 2014-12-10 17:34:05 +01:00
scrawl
3c747195ae Add fall damage for creatures (Fixes #2201) 2014-12-10 17:21:34 +01:00
scrawl
e0c6f84546 AiFollow: target has to be seen in order to start following (Fixes #1637) 2014-12-09 22:25:28 +01:00
Digmaster
95219a7936 Show currently selected input type for settings window 2014-12-09 14:48:34 -06:00
Digmaster
bb6ed06a4e read gamecontrollerdb file location from settings file 2014-12-09 14:37:32 -06:00
Digmaster
a7a211860a Fixed binding controls to A on joystick 2014-12-09 12:12:38 -06:00
Digmaster
ad54e09593 Inital value for joysticks is 0.5 2014-12-09 11:16:17 -06:00
scrawl
109a3f78a1 Adjust AiFollow distance for groups of multiple followers (Fixes #1637) 2014-12-09 16:06:04 +01:00
scrawl
3ad0189982 Take sound listener y rotation (roll) into account, though currently unused for actors 2014-12-09 12:07:22 +01:00
Digmaster
073a2f0674 Fixed issue with walking 2014-12-09 00:02:18 -06:00
Digmaster
c37881ead1 Joystick Support 2014-12-08 21:57:32 -06:00
scrawl
0fe7500f74 Work around pathgrid record limitation (Fixes #2195) 2014-12-09 00:13:56 +01:00
scrawl
855fe33c59 Add vanilla-compatible range limiting for playloopsound (Fixes #244, Fixes #1342) 2014-12-08 23:58:20 +01:00
scrawl
f6960debcb Attach sound listener to the player head instead of camera 2014-12-08 23:26:09 +01:00
scrawl
cf85cbbc8e Switch sound distance model to AL_INVERSE_DISTANCE 2014-12-08 17:43:56 +01:00
scrawl
fbed429b25 Use GMSTs for sound fading distance 2014-12-08 17:25:17 +01:00
scrawl
9f90a1e44b Remove script access to deleted references that have no content file
In original MW these objects are permanently deleted and can not be accessed anymore.
2014-12-07 22:37:50 +01:00
scrawl
f49fde3d5d Add support for undeleting references (Fixes #2193)
Deleted references should be accessible via an explicit reference, and can be undeleted using "setdelete 0". Also the Resurrect function implicitely undeletes the given reference.
2014-12-06 21:08:18 +01:00
scrawl
2952a0e2aa Make Resurrect function reset most of the runtime state (Fixes #2181) 2014-12-06 19:53:24 +01:00
scrawl
41542dedf7 Fix map insert return value mixup (Fixes #2192) 2014-12-06 17:24:05 +01:00
scrawl
9a1b7cbe52 Add SharedStateButton, used in spell window and controls box to apply mouseover effect to all buttons within one row (Fixes #1986) 2014-12-06 16:50:09 +01:00
scrawl
416d549568 Fix animation glitch caused by knockdown
If the player was knocked down while having no weapon, spell nor fists ready, the animation state would incorrectly shift to "weapon equipped" even though no weapon is equipped.
2014-12-05 22:02:18 +01:00
scrawl
e313ed3cef Support animated container models 2014-12-05 20:58:33 +01:00
scrawl
65536f0857 Load initial particle system state from NIF files (Fixes #2178) 2014-12-05 18:00:30 +01:00
scrawl
a67e7c64ea Optimize pathgrid store 2014-12-05 15:58:22 +01:00
scrawl
83dcf9ce4b Overwrite existing records in IndexedStore (Fixes #2182) 2014-12-05 15:58:05 +01:00
Marc Zinnschlag
eb6e1576be Merge remote-tracking branch 'scrawl/master' 2014-12-03 20:17:34 +01:00
scrawl
fee08f97ed Fix crash in character preview for non-existing meshes (Fixes #2128) 2014-12-03 18:28:35 +01:00
scrawl
75b0da5dce Don't updateBoneTree for non-skinned parts (Fixes #2124) 2014-12-03 18:28:35 +01:00
scrawl
14ae6d28b0 Fix being able to jump when overencumbered 2014-12-03 18:28:35 +01:00
scrawl
3519d23518 Race dialog: remove incorrect assumption about numeric index in head/hair record IDs 2014-12-03 18:28:35 +01:00
scrawl
7faa849cef Fix fatigue recalculation using older value (oops) 2014-12-03 18:28:34 +01:00
scrawl
dd0cea21b0 Implement overwriting pathgrid records (Fixes #2175) 2014-12-03 18:28:34 +01:00
Paulo Viadanna
bfa048e687 Fix #1734: AI will stop combat if target disappear 2014-12-02 17:38:25 -02:00
scrawl
fadbb5ad21 Add particle and sound fading for weather transitions (Fixes #2130) 2014-12-01 23:09:47 +01:00
scrawl
b9d0552166 Fix positionCell rotation argument when used on the player
This fixes the player's initial orientation on the starting boat, to properly face Jiub.
2014-12-01 23:09:47 +01:00
scrawl
46d93f1b08 Crime update: NPCs can report crimes if they didn't see the crime, but were alerted by someone who saw it and did not report it themselves. 2014-12-01 23:09:46 +01:00
scrawl
507cbcfae3 Remove incorrect implementation of the iAlarm* GMSTs, not used by vanilla MW (Fixes #2064)
According to Hrnchamd, these are unused. The real mechanics are not fully documented, but from a quick test only NPCs with an alarm value of 100 will report crimes.
2014-12-01 23:09:46 +01:00
scrawl
ed686ddd2f Don't update nodes with an empty name from the skeleton source (Fixes #2125) 2014-12-01 23:09:46 +01:00
scrawl
a1226501fa AiWander: move idle animation handling to non-delayed section (Fixes #2073) 2014-12-01 23:09:46 +01:00
scrawl
f9ae0d9d66 Fix dialogue goodbye link conflicting with choice links 2014-12-01 23:09:46 +01:00
scrawl
8103d25b09 Make ToggleMenus close open windows (Fixes #2045) 2014-12-01 23:09:46 +01:00
scrawl
c684c99a95 Combat AI: Don't attempt to cast spells when impossible to succeed (Fixes #2059) 2014-12-01 23:09:46 +01:00
scrawl
6960cac5eb Disable third person zoom feature by default due to usability issues (Fixes #2129) 2014-12-01 23:09:46 +01:00
scrawl
61d1aa78ce Move AiWander path finder to temporary storage (Fixes #2082) 2014-12-01 23:09:46 +01:00
Marc Zinnschlag
b7cf114d5d Merge remote-tracking branch 'scrawl/delete' 2014-12-01 22:57:41 +01:00
scrawl
48d5789aeb Use a separate flag for references deleted by a content file (Fixes #2018)
The flag must be separate so as to not contaminate the user's savegame.

Fixes the following use cases that were broken before:

 - Content file edits a reference that was already deleted by a previously loaded content file -> reference must stay deleted
 - Changed or new content file deletes a reference that is already present in the user's savegame -> reference must be deleted
 - Said content file is disabled again - reference must be undeleted
2014-12-01 22:16:45 +01:00
MiroslavR
6e1a11f322 Queue screen fade operations invoked by scripts 2014-12-01 19:13:04 +01:00
Marc Zinnschlag
003675318d Merge remote-tracking branch 'scrawl/master' 2014-11-29 20:54:04 +01:00
scrawl
5f5fcc2fef Make PlayGroup use an indefinite number of loops (Fixes #2156) 2014-11-28 17:15:31 +01:00
scrawl
4fd3a994e9 Add model and script information to BetaComment 2014-11-28 16:27:18 +01:00
scrawl
ea8f617508 Add missing player control enabled checks (Fixes #2152) 2014-11-28 15:54:38 +01:00
scrawl
d7220cdc2f Do not allow decrease below zero in modCurrentMagicka and modCurrentHealth (Fixes #2158) 2014-11-28 15:16:53 +01:00
scrawl
0a466ad643 Make recalculation of magicka less aggressive (Fixes #2155) 2014-11-28 14:45:35 +01:00
MiroslavR
cb74c1c36e Set health to 0 if it drops below 1 (Fixes #2163) 2014-11-27 20:44:41 +01:00
MiroslavR
238325455d Erase effects that have expired (Fixes #2134) 2014-11-25 10:33:03 +01:00
scrawl
d36dfbe779 Apply the frame time cap to Ogre's ControllerManager (Fixes #2154)
This fixes particle systems getting out of whack due to a particularly long frame time, e.g. after a loading screen.
2014-11-25 02:44:11 +01:00
scrawl
ada4e37556 Fix race preview texture not being destroyed properly (Fixes #2098) 2014-11-24 01:02:18 +01:00
scrawl
c1e6b8608b Always create a skeleton if there's an "ArrowBone" node (Fixes #2117) 2014-11-23 16:37:31 +01:00
scrawl
414f7ea02c Ignore mouse movements during video playback (Fixes #2139) 2014-11-22 12:59:31 +01:00
scrawl
273a80e2c0 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-11-11 15:43:46 +01:00
Evgenii Babinets
fe385214e4 Added proper slow fall effect mechanics. 2014-11-10 02:42:44 -05:00
Marc Zinnschlag
de3a26e21b Merge remote-tracking branch 'miroslavr/master' 2014-11-08 11:00:19 +01:00
MiroslavR
b8d5a9486a Make Restore/Damage Attribute/Skill effects continuous 2014-11-08 00:57:03 +01:00
scrawl
d5768af952 Fix INT_MIN trade exploit (Fixes #2096) 2014-11-06 03:51:18 +01:00
cc9cii
f051fb65ff Fix memory leak when multiple documents in 3D edit. Support multiple physics engine per document. 2014-11-06 08:35:24 +11:00
Internecine
edc51ab768 Removed debug output 2014-11-05 15:26:13 +13:00
Internecine
6741fbe7a9 Fixes bug #2031 2014-11-05 15:22:44 +13:00
Internecine
9c5f156793 Fixes tooltip displaying 0 durations 2014-11-05 00:46:33 +13:00
MiroslavR
140013820b Fix invalidated iterator 2014-11-02 15:40:08 +01:00
MiroslavR
a4d0068e29 Make forcegreeting no-op for disabled references (Fixes #2093) 2014-11-02 15:36:13 +01:00
Marc Zinnschlag
29c9b6bd01 Merge remote-tracking branch 'scrawl/master' 2014-11-02 10:38:42 +01:00
scrawl
17cb181f88 Use av_get_default_channel_layout for unknown channel layouts 2014-11-01 19:37:54 +01:00
scrawl
efa4d09c48 Fix crash when avcodec_decode_audio4 doesn't return a full frame (Fixes #2088) 2014-11-01 19:32:07 +01:00
Marc Zinnschlag
8b3d876534 Merge remote-tracking branch 'lgro/ffmpeg_decoder' 2014-11-01 10:57:21 +01:00
Marc Zinnschlag
7785e3a0bc fixed for potential crash during saved game loading 2014-10-31 17:59:55 +01:00
Marc Zinnschlag
ac58dd735b do not crash on exceptions while adding startup scripts 2014-10-31 11:02:42 +01:00
scrawl
45f14f0704 Fix stolen faction-owned items not being confiscated 2014-10-31 00:25:37 +01:00
scrawl
f7ba1dbfc8 Add error handling for getPcRank and similar defines (Fixes #2071) 2014-10-28 16:07:37 +01:00
scrawl
e48dc45ede Fix creatures not being able to move with 0/0 encumbrance 2014-10-27 21:53:00 +01:00
scrawl
c194226d08 Increase maximum height for finding spawn points to 500 (Fixes #2056) 2014-10-27 21:52:59 +01:00
scrawl
aa02974d3b Fix Journal instruction for non-existing journal indices (Fixes #2063) 2014-10-27 21:52:59 +01:00
scrawl
dab05471be Reset crime when bounty is reset to 0 by a script (Fixes #2057) 2014-10-25 21:09:37 +02:00
scrawl
ac067564ea Don't include al.h in decoder classes, format support check will need to be redone later. For now, resample all formats that might not be supported on any hardware. 2014-10-25 20:50:41 +02:00
scrawl
4680bc6c93 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-10-25 19:59:23 +02:00
scrawl
55c9c0a266 Audio resampling fixes
- Don't try to use float audio or extended channel layouts if the hardware does not support them
- Add channel layout resampling support to ffmpeg_decoder
2014-10-25 17:17:57 +02:00
Marc Zinnschlag
a87092d11b Merge remote-tracking branch 'miroslavr/master' 2014-10-25 12:09:36 +02:00
Marc Zinnschlag
a4be214fb1 Merge remote-tracking branch 'scrawl/master' 2014-10-25 12:08:16 +02:00
cc9cii
e01795556f Suppress some warnings for MSVC. 2014-10-25 10:37:57 +11:00
scrawl
dbe30e31b9 Make creature's model take priority over base_anim.nif (Fixes #2055) 2014-10-25 00:56:43 +02:00
scrawl
b39d69e98c Videoplayer fixes, play/pause & seeking
- Fix rindex overflow
 - Fix audio sample size bugs (was using sample_fmt and channel count of the decoder, instead of the resampled settings). We didn't notice this bug before, because the OpenAL MovieAudioFactory tries to resample to a format of the same byte size.
 - Add support for play/pause and seeking controls (not used by cutscenes in OpenMW)
 - Closing the video when arriving at the stream end is now handled by the user (we may also want to keep the video open and seek back)

The video player now has a standalone demo, at https://github.com/scrawl/ogre-ffmpeg-videoplayer
2014-10-24 21:31:11 +02:00
MiroslavR
ed3a3f717f Handle getdistance on objects inside a container (Fixes #2046) 2014-10-24 19:05:43 +02:00
MiroslavR
fa746b8e54 Do not display weight or value in tooltip for zero-weight items (Fixes #2047) 2014-10-24 19:05:43 +02:00
MiroslavR
925fa8d193 Reset ownership of items dropped via 'drop' instruction (Fixes #2053) 2014-10-24 19:04:47 +02:00
scrawl
e2bad395e5 Leak fix 2014-10-24 18:07:17 +02:00
Marc Zinnschlag
19b380d0b4 Merge remote-tracking branch 'scrawl/master' 2014-10-23 20:07:40 +02:00
scrawl
eb1c24ffe6 Refactor video player engine to get rid of MWSound dependencies
- Split video player to separate source files.
 - Move video player engine sources to extern/ (repository will be set up on github soon).
 - Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
 - Handle conversion of unsupported channel layouts via ffmpeg's swresample.
2014-10-22 22:33:32 +02:00
Marc Zinnschlag
c1d867a213 Merge remote-tracking branch 'origin/master' 2014-10-22 09:48:30 +02:00
Marc Zinnschlag
8f0add75f5 Merge remote-tracking branch 'scrawl/master' 2014-10-22 09:42:28 +02:00
Marc Zinnschlag
94d5151273 Merge remote-tracking branch 'miroslavr/master' 2014-10-22 09:39:54 +02:00
scrawl
bcb2d714c0 Add TODO comments for future videoplayer enhancements 2014-10-21 23:46:04 +02:00
scrawl
41df4289c6 Merge remote-tracking branch 'upstream/openmw-33' into HEAD
Conflicts:
	apps/openmw/mwworld/store.hpp
2014-10-21 19:40:58 +02:00
Alexander "Ace" Olofsson
b5a57920b6 Fix compile error on Windows 2014-10-21 19:35:17 +02:00
scrawl
5711103322 Remove leftover comment 2014-10-21 17:51:59 +02:00
scrawl
202cfa879f Implement frame drop support in the videoplayer (Fixes #1343) 2014-10-21 17:01:53 +02:00
scrawl
290aacd2a6 Fix videoplayer crash on quit
The sound stream thread was trying to update the stream during/after destruction of the video state.
2014-10-21 17:01:53 +02:00
scrawl
8472695f89 Revert "Fix for compiler warnings and deprecated functions usage in videoplayer."
This reverts commit d77546b7dc.

Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
2014-10-21 17:01:53 +02:00
scrawl
de0e0fedff Revert "Fix for compiler warnings and deprecated functions usage in videoplayer."
This reverts commit f5589b42ea.

Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
2014-10-21 17:01:53 +02:00
scrawl
681f3fa530 Revert "Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder."
This reverts commit b40c1ff26c.
2014-10-21 17:01:52 +02:00
scrawl
8b3755a770 Compile fix 2014-10-20 17:45:24 +02:00
scrawl
f2877c69d7 Fix old alchemy apparatus still showing in alchemy window after removal 2014-10-20 17:45:18 +02:00
scrawl
192069a181 Add automatic potion naming 2014-10-20 17:45:11 +02:00
scrawl
fd7c181e06 Fix alchemy producing potion IDs from content files 2014-10-20 17:45:06 +02:00
scrawl
9bb51fd9c2 Compile fix 2014-10-20 17:42:51 +02:00
scrawl
ace8e0175b Fix old alchemy apparatus still showing in alchemy window after removal 2014-10-20 17:28:51 +02:00
scrawl
29ac97be7a Add automatic potion naming 2014-10-20 17:28:51 +02:00
scrawl
7f06e3e7e3 Fix alchemy producing potion IDs from content files 2014-10-20 17:07:54 +02:00
MiroslavR
5a7dbb19f7 Code clarity 2014-10-20 01:10:08 +02:00
scrawl
4047e3c928 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 2014-10-19 17:46:28 +02:00
scrawl
b0f98687e6 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 2014-10-19 17:45:18 +02:00
MiroslavR
ed6bdc0bde Use all topics to search for keywords in dialogues (Fixes #2013)
Move KeywordSearch to MWDialogue
Move hypertext parsing functions to a new file
2014-10-18 20:07:40 +02:00
scrawl
deabc52c16 Treat "Root Bone" as the animation root if existing (Fixes #2019) 2014-10-17 23:29:59 +02:00
scrawl
415f67f859 Treat "Root Bone" as the animation root if existing (Fixes #2019) 2014-10-17 23:29:13 +02:00
scrawl
5892fd9e65 Fix NpcAnimation non-existing skeleton crash (Fixes #2028) 2014-10-17 23:07:01 +02:00
scrawl
8233f5894a Fix NpcAnimation non-existing skeleton crash (Fixes #2028) 2014-10-17 23:04:36 +02:00
scrawl
f117a75747 Force walk animation when flying (Fixes #2015) 2014-10-17 19:11:06 +02:00
scrawl
5f11ccc298 Show tooltip for non-affordable list items (Fixes #2025) 2014-10-17 19:02:31 +02:00
scrawl
2be65a89a7 Show tooltip for non-affordable list items (Fixes #2025) 2014-10-17 19:01:28 +02:00
Marc Zinnschlag
c97845d35d better script compiler diagnostics 2014-10-17 10:59:25 +02:00
scrawl
c3ef39eb6f Fix ItemWidget text cleanup (Fixes #2022) 2014-10-17 02:41:43 +02:00
scrawl
c4e81adb83 Fix settings window being too small for all tabs on some localizations 2014-10-16 15:49:01 +02:00
scrawl
244db5cbfe Merge branch 'openmw-33' of https://github.com/OpenMW/openmw into openmw-33 2014-10-15 17:22:53 +02:00
Marc Zinnschlag
984b586bb1 fix for implicit references 2014-10-15 16:27:03 +02:00
Marc Zinnschlag
8afdf0f46b dagoth fix 2014-10-15 16:12:57 +02:00
scrawl
69bbbefc09 setDynamic workaround for broken endgame scripts (Fixes #2016) 2014-10-15 15:00:45 +02:00
Alexander "Ace" Olofsson
dc788512e2 Fix LNK2019 link error on Visual Studio 2010 builds
For some reason VS2010 (Haven't tested 2013) is REALLY pedantic about class/struct being two different things when it comes to function signatures
2014-10-14 16:10:19 +02:00
Marc Zinnschlag
6beee95151 Merge remote-tracking branch 'terrorfisch/aistate' 2014-10-13 19:14:15 +02:00
Marc Zinnschlag
528dcf761d Merge remote-tracking branch 'internecine/master' 2014-10-13 19:11:14 +02:00
Marc Zinnschlag
eb45793eab Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage' 2014-10-13 11:03:03 +02:00
Marc Zinnschlag
61731d3277 Merge remote-tracking branch 'miroslavr/master' 2014-10-13 10:57:04 +02:00
Thoronador
4d62541b62 fix usage of numeric_limits static functions min() and max()
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
2014-10-12 23:28:16 +02:00
MiroslavR
8456741eaa Fix blindness and create a separate fader for it 2014-10-12 19:06:40 +02:00
scrawl
9edcc332ec Don't remove player's sounds when unloading a cell 2014-10-12 18:35:15 +02:00
scrawl
d51daf5875 Fix AI not using F_Always spells, for example "vampire touch" 2014-10-12 17:18:27 +02:00
scrawl
8cb09e89ed Make spells cast by scripts always succeed (Fixes #1993) 2014-10-12 17:18:27 +02:00
Marc Zinnschlag
aefe8cd4ae Merge remote-tracking branch 'lgro/issue1887_equipped_items_doesnt_emit_sound'
Conflicts:
	apps/openmw/mwworld/class.cpp
2014-10-12 14:06:08 +02:00
Lukasz Gromanowski
a6a3eca930 Fixes #1887: Equipped items do not emit sounds
Corrected wrong return type of Class::getSound() method.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-12 13:38:41 +02:00
Lukasz Gromanowski
e1663de7cf Fixes #1887: Equipped items do not emit sounds
Added getSound() method to MWClass class and implementation
into Light class.

Also added additional bool parameter responsible for enabling/disabling
of playing items sounds into NpcAnimation class constructor.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-12 11:40:14 +02:00
MiroslavR
ad253059b1 Hit indicator for absorb/damage health effect 2014-10-12 01:15:40 +02:00
MiroslavR
8dd95fd77e Construct hit fader with correct texture right away to prevent mygui warning 2014-10-12 00:40:31 +02:00
MiroslavR
a5e972aeb5 Make collision events available on every frame (thanks, scrawl), make hurtStandingActor and hurtCollidingActor no-op in guimode 2014-10-12 00:13:24 +02:00
Lukasz Gromanowski
b44ba84a80 Issue #1887: Equipped items do not emit sounds
Use separate arrays for sound ids and object parts.
Restored getting inventoryStore via getInventoryStore()
call (removed mInv introduced in previous commit).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 23:20:40 +02:00
MiroslavR
2162a9e1b9 Fall back to player_hit_01.dds if bm_player_hit_01.dds is not available 2014-10-11 23:09:20 +02:00
Lukasz Gromanowski
1a0c3dc6cf Issue #1887: Equipped items do not emit sounds
Removed unused mUnequipping and mFirstEquip member variables.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 22:33:11 +02:00
Lukasz Gromanowski
3b9cfba03c Issue #1887: Equipped items do not emit sounds
Sounds are played only when actors draw state
is equal to MWMechanics::DrawState_Nothing

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 22:21:59 +02:00
MiroslavR
0ae604990e Implement continuous damage indication (Fixes #1970) 2014-10-11 22:21:48 +02:00
MiroslavR
4dc613a04b Merge branch 'master' of github.com:OpenMW/openmw 2014-10-11 22:03:47 +02:00
Lukasz Gromanowski
fa65c8981a Issue #1887: Equipped items do not emit sounds
Played sound items are based on parts not inserted items.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 21:05:12 +02:00
Marc Zinnschlag
3fd10d2a82 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2014-10-11 14:51:55 +02:00
Marc Zinnschlag
82b4148a62 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2014-10-11 13:09:33 +02:00
Thoronador
f29a71b498 remove unused var. mSoftwareCursor in WindowManager 2014-10-11 12:54:15 +02:00
Nikolay Kasyanov
138e3032ce Fix: initialize boolean field with boolean value, not NULL 2014-10-11 10:07:01 +04:00
Thoronador
8361019456 fix uninitialized (pointer) vars in more classes 2014-10-11 02:31:26 +02:00
Thoronador
13a0c5624c fix uninitialized member variables in OcclusionQuery class 2014-10-11 01:35:12 +02:00
Thoronador
db38108801 fix uninitialized pointer variables in some classes 2014-10-11 01:20:33 +02:00
Thoronador
a5245d5a13 remove unused dummy variable 2014-10-11 00:56:57 +02:00
terrorfisch
c4badcea6e removed warning 2014-10-10 23:51:29 +02:00
terrorfisch
c28dfc2fa4 Travis CI fix? 2014-10-10 23:34:58 +02:00
terrorfisch
4eb1668467 references now initialized when they are needed 2014-10-10 23:32:15 +02:00
terrorfisch
bbca942601 -improved trigonometric precision
-cleanup
2014-10-10 23:31:01 +02:00
terrorfisch
5248917a6c - changed namespace 2014-10-10 23:28:49 +02:00
Internecine
470d375177 Removed duplicate functions and moved pause check in weather.cpp 2014-10-10 23:29:51 +13:00
terrorfisch
db1b93498d Added comment. 2014-10-10 00:17:50 +02:00
terrorfisch
730abf6841 Moved all variables in temporary storage for AiCombat and some more for AiWander.
+Buxfix for previous AiWander changes
2014-10-10 00:16:17 +02:00
MiroslavR
29f5cb46ac Merge branch 'master' of github.com:OpenMW/openmw 2014-10-09 19:17:39 +02:00
Internecine
782e851eb1 Better fix, now allows for teleporting to change weather while still paused. 2014-10-09 19:41:51 +13:00
terrorfisch
cae948df96 removed unecessary PathFinders 2014-10-08 23:09:50 +02:00
terrorfisch
4c36c67fb8 Updated AiCombat:
-moved everything except target to temporary storage
-removed the Pathfinder since present in baseclass
-cleaned some trigonometric mess
2014-10-08 23:00:36 +02:00
terrorfisch
4391c1fd00 Addded the parts of AiWander that I fully understand to the temporary storage.
The rest should be done by someone who has a clearer overview over the class.
2014-10-08 22:11:45 +02:00
terrorfisch
0871d45790 Draft how to move temporary package state to CharacterController.
Example for a few values shown in AiWander.
2014-10-08 10:58:52 +02:00
sylar
70fd531722 None texturing filtering enable for android by default 2014-10-08 00:15:22 +04:00
sylar
f75721a217 Add none texture filtering .It is fixes a bug with black objects in shaders glsles 2014-10-07 23:30:31 +04:00
Marc Zinnschlag
744c56943a Merge remote-tracking branch 'jordan-ayers/topic/misc-cleanup' 2014-10-07 18:03:25 +02:00
Jordan Ayers
56db525a93 Document the return value of getEffectMultiplier. 2014-10-06 21:56:41 -05:00
MiroslavR
d1dc9951d4 Do not display werewolf overlay in third person 2014-10-06 20:24:53 +02:00
MiroslavR
0e19c3fdeb Silence werewolves' footstep sounds when they are running with their claws sheathed 2014-10-06 18:48:22 +02:00
MiroslavR
4086bc4848 Do not spawn blood vfx on player if hit fader is enabled 2014-10-06 18:33:41 +02:00
MiroslavR
b6abfb0145 Do not display hit fader if the player wasn't damaged 2014-10-06 18:31:02 +02:00
MiroslavR
ff74d54e98 Merge branch 'master' of github.com:OpenMW/openmw 2014-10-06 18:24:41 +02:00
scrawl
9ab8d0a8e6 Hotfix for crash when deleting an actor 2014-10-06 14:56:49 +02:00
scrawl
8097d9801d Fix HasSoulgem function to return number of soulgems 2014-10-06 14:56:49 +02:00
Internecine
3dee4c2b0e Fixes #1706 2014-10-06 16:10:58 +13:00
Jordan Ayers
aac2de270e Cleanup: Don't call <environment obj>.get().
mEnvironment.get() is redundant.  Switch the call to resemble the
surrounding environment get() calls, instead.
2014-10-05 18:12:55 -05:00
Jordan Ayers
2f5721bf61 Fix typo in comments. 2014-10-05 18:12:33 -05:00
scrawl
9cce3bc31b Implement fDispositionMod according to research wiki 2014-10-05 23:03:30 +02:00
scrawl
39bc11681e Fix broken onGround status when levitating 2014-10-05 22:59:24 +02:00
scrawl
829a7bfd1b Fix being able to rest while water-walking (Fixes #1712) 2014-10-05 22:35:53 +02:00
scrawl
d9165593d9 Fix footstep sounds played during water-walking 2014-10-05 22:27:25 +02:00
scrawl
064f1964ba More efficient water walking 2014-10-05 22:27:20 +02:00
MiroslavR
e1799cbcf4 Fix a typo in condition 2014-10-05 19:53:36 +02:00
scrawl
04614651fa Fix recharging items not being updated for actor's initial inventory 2014-10-05 18:27:26 +02:00
MiroslavR
de2cb8926a Feature #1697: Queue fade operations, implement hit fader & werewolf overlay 2014-10-05 17:53:50 +02:00
scrawl
d790506525 Fix projectiles colliding with dead actors (Fixes #1971) 2014-10-05 17:41:56 +02:00
scrawl
c4fa671381 Don't allow raising faction rank if the next rank has no name (Fixes #1975) 2014-10-05 16:47:55 +02:00
scrawl
fe4d74a6cb Fix not being able to move with 0/0 encumbrance (Fixes #1979) 2014-10-05 15:52:33 +02:00
scrawl
5c3bc6563b Fix divisions by zero in normalizedEncumbrance 2014-10-05 15:50:01 +02:00
scrawl
8dd410fe96 Teleport indirect followers as well when using a door (Fixes #1974) 2014-10-05 15:18:32 +02:00
scrawl
ff11745429 Fix magic projectile sound disappearing after multiple save/load cycles 2014-10-05 14:47:23 +02:00
Jordan Ayers
663647bee8 Simplify getEffectMultiplier.
Both return cases were same, except for some overflow conditions.
2014-10-04 15:28:58 -05:00
Lukasz Gromanowski
bcb38c3eba Issue #1887: Equipped items do not emit sounds
Added handling of autoEquip and unequipAll cases.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-04 22:27:23 +02:00
scrawl
20777c1b2e Optimize physics shape scaling on cell load 2014-10-04 20:37:35 +02:00
scrawl
db6b04d127 Use the footstep volume slider for jump landing sounds (Fixes #1968) 2014-10-04 19:50:38 +02:00
scrawl
95378aa6ac Fix crash when a magic projectile has no sound defined (Fixes #1967) 2014-10-04 18:37:35 +02:00
Lukasz Gromanowski
e566e4abf2 Issue #1887: Equipped items do not emit sounds
Added playing of sounds for equipped items (at this moment only for lights).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-04 16:47:29 +02:00
Lukasz Gromanowski
6a89b67cb1 Revert "Issue #1887: Equipped items do not emit sounds"
This reverts commit 566211e753.
2014-10-04 13:34:36 +02:00
Marc Zinnschlag
cd7cc4bec9 Merge remote-tracking branch 'miroslavr/master' 2014-10-04 09:46:29 +02:00
Lukasz Gromanowski
566211e753 Issue #1887: Equipped items do not emit sounds
Added playing of sounds for equipped items (at this moment only for lights).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-03 22:39:05 +02:00
MiroslavR
95be7ea738 Revert spelling change to preserve consistency, fix a typo 2014-10-03 22:38:06 +02:00
MiroslavR
4829b1f9cc Support "right" alignment in books 2014-10-03 22:30:46 +02:00
MiroslavR
a13039ad1f Allow alignment for images in books 2014-10-03 21:36:45 +02:00
MiroslavR
3287d0b6ef Fix line breaks around IMG tags. 2014-10-03 21:08:52 +02:00
MiroslavR
c5e85ebddc Merge branch 'master' of github.com:OpenMW/openmw 2014-10-03 21:02:15 +02:00
scrawl
cecc64752e Increase maximum height for finding spawn points (Fixes #1633, Fixes #1881) 2014-10-03 18:51:18 +02:00
scrawl
d4ac5c0b57 Use a raycast to find spawn point if convexSweepTest doesn't find one (Fixes #1623, Fixes #1679) 2014-10-03 18:49:41 +02:00
scrawl
6fc53e73ad Don't run AI for knocked-out actors (Fixes #1854) 2014-10-03 15:58:14 +02:00
scrawl
81a9dc0655 Hotfix for not being able to scroll the world map 2014-10-02 22:44:06 +02:00
scrawl
083bcaf483 Fix journal quest logs not being marked finished when there are multiple quest IDs in the log 2014-10-02 19:26:37 +02:00
scrawl
8dc20712de Merge branch 'master' of https://github.com/OpenMW/openmw 2014-10-02 18:22:39 +02:00
scrawl
58672c6bb5 Fix for crash in main menu when reflections are enabled 2014-10-02 18:12:49 +02:00
Marc Zinnschlag
a166034e12 Merge remote-tracking branch 'jordan-ayers/topic/disease-cleanup' 2014-10-02 17:19:32 +02:00
scrawl
7d36a202a8 Implement cell loading threshold (Fixes #1874)
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.

Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
2014-10-02 16:50:10 +02:00
scrawl
861cc26aa6 Don't sell racial spells (Fixes #1961) 2014-10-02 16:50:05 +02:00
scrawl
cc63f7f051 Fix broken idle camera 2014-10-02 14:23:13 +02:00
scrawl
afbd2de511 Fix broken alchemy magnitude/duration 2014-10-02 13:55:42 +02:00
scrawl
7e10818bdf Fix uninitialized flags for custom-made spells 2014-10-02 13:55:42 +02:00
scrawl
0bd9f30c67 Remove comment for old MyGUI version 2014-10-02 13:55:42 +02:00
Jordan Ayers
3bc91c66e6 Disease Check: Shorten the resistance calculations. 2014-10-01 19:29:03 -05:00
Jordan Ayers
a9a0930b85 Disease check: Reuse corprus check from spells.hpp. 2014-10-01 19:26:25 -05:00
scrawl
1c51694aa9 Don't update physics and animation for actors outside the AI processing distance 2014-10-02 00:27:04 +02:00
scrawl
88da7f5157 Adjust border skin for loading bar and message boxes to match vanilla MW 2014-10-02 00:27:03 +02:00
scrawl
85f5754bb6 Apply third person camera distance to the camera node instead of only the camera itself (Fixes #1705) 2014-10-02 00:26:57 +02:00
scrawl
f9b6cc468d Don't reset an unbound input action to its default binding if the key/mouse button for that default binding is already used by another action (Fixes #1960) 2014-10-01 17:54:18 +02:00
scrawl
46adf6344a Adjust third person camera height and default distance to match vanilla MW 2014-10-01 17:45:20 +02:00
scrawl
ee8b85aa2c Fix priority bug in AiSequence::stack (Fixes #1959) 2014-09-30 22:57:38 +02:00
scrawl
795dfdb557 Fix size_t underflow for journals with 1 page (Fixes #1958) 2014-09-30 18:14:25 +02:00
scrawl
c010c28337 Implement ToggleWorld instruction 2014-09-30 15:54:09 +02:00
Jordan Ayers
da9d858201 Add 'const' to a spell helper function. 2014-09-29 20:59:10 -05:00
scrawl
3e153d0a9b Optimize actor physics: Use only one convexSweepTest for stepping down and checking onGround status, instead of 2 2014-09-29 22:30:21 +02:00
scrawl
b345c50a86 Run stepSimulation before moving actors
Shouldn't make too much of a difference, but a nice side effect is seeing the convexSweepTest calls for actor movements in the profiler results.
2014-09-29 14:55:31 +02:00
scrawl
7f18f85a1d Forgot const 2014-09-29 12:04:19 +02:00
scrawl
bdab3fa321 Bullet optimization: Don't update AABBs of static objects every frame 2014-09-28 18:02:57 +02:00
scrawl
ff0b4e0583 Add debug window (F10), displays Bullet's profiler output 2014-09-28 18:02:49 +02:00
scrawl
7c52d05f85 Disable topics list visually when in a choice 2014-09-28 14:00:15 +02:00
scrawl
e9ed0211c9 Attempt to fix Clang warnings 2014-09-28 12:44:47 +02:00
scrawl
58571f7ac2 Revert "Transfer item ownership to the buyer if item wasn't stolen"
Fixes #1953.

This reverts commit 5d77c5e8ca.
2014-09-28 12:18:46 +02:00
scrawl
02dec787fd Cache GMSTs in getDerivedDisposition 2014-09-27 22:44:20 +02:00
scrawl
ea956b537c Don't search for fFatigueReturnBase and fFatigueReturnMult every frame 2014-09-27 22:37:53 +02:00
MiroslavR
508113f271 Resolve merge conflict 2014-09-27 17:50:17 +02:00
MiroslavR
1c4e52a0e5 Book formatter: Fix an excessive line break case 2014-09-27 17:35:57 +02:00
MiroslavR
cb5f661596 Book formatter: Support FONT closing tag, minor code cleanup 2014-09-27 13:31:59 +02:00
scrawl
e868a48a63 Don't trigger OnPcHitMe for friendly hits (Fixes #1950)
Don't consider actors as followers if they are also in combat with the follow target
2014-09-26 22:08:07 +02:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
scrawl
790e0150b1 Fix global map markers being duplicated when cell is visited again 2014-09-26 16:51:48 +02:00
scrawl
18be152ab1 Allow dragging map even when a marker is hovered 2014-09-26 14:27:52 +02:00
scrawl
603e558fb7 Fix broken getCollidingPc / getCollidingActor (cppcheck) 2014-09-26 14:16:46 +02:00
scrawl
97df7c9b22 Get rid of markers.png and use original MW texture, cleanup 2014-09-26 13:40:10 +02:00
scrawl
4f0fc79ea4 Change global map cell size from 24 to 18 and make it configurable 2014-09-26 12:47:33 +02:00
scrawl
0bc840aadd Add NumericEditBox widget 2014-09-25 21:04:51 +02:00
scrawl
f56711f443 Fix crash caused by teleportation spells (Fixes #1904) 2014-09-25 18:14:04 +02:00
scrawl
8ad2b95208 Revert "AiFollow: return from execute() if target is not player"
This reverts commit 061c7813f6.

Fixes #1898.
2014-09-25 17:57:10 +02:00
scrawl
40ce5add59 Don't report crime for attacking an NPC that is already in combat with another NPC (Fixes #1908, Fixes #1821) 2014-09-25 17:33:26 +02:00
scrawl
6b65502557 Add properties for new widget classes to MyGUI plugin 2014-09-25 16:25:08 +02:00
scrawl
2066097202 Fix incorrect reading of global map state in some cases when the map size changed (Fixes #1946) 2014-09-25 15:28:02 +02:00
scrawl
40587f984d Implement price-based mercantile skill progress (Fixes #1947), thanks Hrnchamd
Correct barter formula (removed erroneous clamping)
2014-09-25 13:02:42 +02:00
scrawl
1afcc7adb5 Add imported font colors from openmw.cfg to MyGUI plugin 2014-09-25 00:04:38 +02:00
scrawl
62ab35881e Don't advance skills in werewolf mode (thanks Hrnchamd) 2014-09-25 00:03:55 +02:00
scrawl
088d01d727 Minor cleanup 2014-09-24 23:50:28 +02:00
scrawl
0f99a959eb Update barter offer for all items when another item is added (Fixes #1935) 2014-09-24 12:21:19 +02:00
scrawl
a7c0e07d78 Add missing World cleanup for mLevitationEnabled 2014-09-24 12:21:19 +02:00
scrawl
5d77c5e8ca Transfer item ownership to the buyer if item wasn't stolen (Fixes #1933) 2014-09-24 12:21:19 +02:00
scrawl
45b4304237 Store levitation/teleport enabled state in savegames (Fixes #1923) 2014-09-24 12:21:19 +02:00
Marc Zinnschlag
175d4f3d44 Merge remote-tracking branch 'ragora/playdeathlevelupmusic' 2014-09-23 13:30:50 +02:00
Marc Zinnschlag
56858c98b1 Merge remote-tracking branch 'miroslavr/master' 2014-09-23 13:23:00 +02:00
Ragora
06e683d378 Added code to play music on level up and on death 2014-09-23 04:58:19 -04:00
MiroslavR
22c71cec18 Check for text size 2014-09-22 23:17:44 +02:00
MiroslavR
608e1518a5 Hack to prevent newlines at the end of books possibly creating unnecessary pages for mygui versions lower than 3.2.2 2014-09-22 21:47:21 +02:00
MiroslavR
f87d7c3fce Book formatter: Do not insert last page if it's empty, code cleanup 2014-09-22 21:25:41 +02:00
MiroslavR
4b1df64fba Book parser: Fix comparison between signed and unsigned integer expressions 2014-09-22 16:28:17 +02:00
Marc Zinnschlag
aa7fc8ee47 fix for potential script problem during saved game loading 2014-09-22 10:12:07 +02:00
MiroslavR
51cd2678ae Book formatter: Fix last block of text not displaying 2014-09-21 22:25:54 +02:00
Lukasz Gromanowski
c72369fafe Simplified casting when comparing to AV_NOPTS_VALUE.
AV_NOPTS_VALUE is casted to int64_t when compared with pts,
so with libavc >= 56.1 it should be no-op because in that version
it's already signed int.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 20:11:03 +02:00
MiroslavR
c362ec0f95 Book formatting: Handle line endings as per vanilla, fix tall images causing infinite loop, cleanup 2014-09-21 19:47:52 +02:00
Marc Zinnschlag
3cd717cd47 Merge remote-tracking branch 'lgro/videoplayer' 2014-09-21 19:04:15 +02:00
Lukasz Gromanowski
b40c1ff26c Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
Corrected ifdef from previous commit around codecCtx->refcounted_frames = 1;

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:23:05 +02:00
Lukasz Gromanowski
7ad6a94523 Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian)

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:13:54 +02:00
Lukasz Gromanowski
f5589b42ea Fix for compiler warnings and deprecated functions usage in videoplayer.
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:09:16 +02:00
Lukasz Gromanowski
d77546b7dc Fix for compiler warnings and deprecated functions usage in videoplayer.
Deprecated functions were:

- AVCodecContext::get_buffer
- AVCodecContext::release_buffer

Changed to:
AVCodecContext::get_buffer2 and setting AVCodecContext::refcounted_frames to 1
before call to avcodec_open2().

release_buffer usage was removed.

Also changed places when some fileds were compared to AV_NOPTS_VALUE
- it's signed, so removed unsigned int casting, or changed casting
to signed int.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 12:58:11 +02:00
Marc Zinnschlag
e4b6f135b6 catch exceptions from adding local scripts 2014-09-21 12:43:19 +02:00
scrawl
fb26c2c2de Fix autocalculated NPCs not having health/magicka/fatigue set correctly (Fixes #1943) 2014-09-21 11:39:17 +02:00
scrawl
b1e74e2a85 Remove support for Ogre 1.8 versions 2014-09-21 10:41:13 +02:00
Lukasz Gromanowski
6987dd768a Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 09:52:31 +02:00
scrawl
3ac04060c1 Fix NPCs being able to practice Block skill 2014-09-20 16:17:09 +02:00
scrawl
023d7072f9 Don't play battle music for enemies out of AI processing range 2014-09-20 13:55:57 +02:00
scrawl
d3554084ad Fix weird behaviour of options menu sliders when value was changed out of bounds via cfg file 2014-09-20 13:50:23 +02:00
scrawl
f5868f7ae1 Fix layout problems in generate class result dialog 2014-09-20 13:07:38 +02:00
scrawl
e42cb8020e Change all skins to get font colors from fallback settings (Fixes #704) 2014-09-20 10:40:09 +02:00
scrawl
25e96b8c7b InteractiveMessageBox: Define a maximum width for the message text 2014-09-20 08:57:16 +02:00
MiroslavR
84d27d55e2 Remove redundant includes 2014-09-20 00:51:46 +02:00
MiroslavR
4f89c3e77a Rework book formatter (Fixes #1148) 2014-09-20 00:11:04 +02:00
Marc Zinnschlag
65ddf7acfe Merge remote-tracking branch 'scrawl/master' 2014-09-19 15:59:59 +02:00
Marc Zinnschlag
bc1eaa035d Merge remote-tracking branch 'scrawl/fontcolors' 2014-09-19 15:59:10 +02:00
Marc Zinnschlag
2a48c377a8 Merge remote-tracking branch 'miroslavr/master' 2014-09-19 15:55:24 +02:00
scrawl
9c0649c11d Add basic framework to retrieve font colors from fallback settings (Feature #704) 2014-09-19 11:53:35 +02:00
scrawl
cbc242d857 Move item count text to ItemWidget 2014-09-19 09:29:00 +02:00
scrawl
b145d183ae Fix incorrect alchemy failure handling when an effect has a zero magnitude/duration (Fixes #1922) 2014-09-19 09:11:21 +02:00
scrawl
8a3a3baed4 Tweak AiEscort maximum distances 2014-09-19 05:47:45 +02:00
scrawl
b6c6bfe943 Merge cell names when merging cells (Fixes #1929) 2014-09-19 05:02:54 +02:00
scrawl
b39fe85a51 Implement fPCbaseMagickaMult and fNPCbaseMagickaMult 2014-09-18 14:56:43 +02:00
scrawl
c05874e1ff Reset CreatureLevList spawning flag if levelled list returned no creature 2014-09-18 06:06:20 +02:00
scrawl
c19f89976e Add missing Hit voice dialogue for friendly hits 2014-09-18 05:13:17 +02:00
scrawl
54dac1460c Run global scripts after running local scripts
Turns out to be a compatibility problem with Calvus Horatius contract scripts. The local script needs to be run first, otherwise the cleanup when he quits as result of negative profit does not work properly.
2014-09-18 04:33:49 +02:00
scrawl
08499ea51f Fix Calvus Horatius AiFollow package not being removed after he quits as result of negative profit 2014-09-18 04:26:12 +02:00
scrawl
ac97a0f99d Fix dialogue choices being displayed in incorrect order 2014-09-18 04:10:17 +02:00
scrawl
be7839873a Don't trigger dynamic stats recalculation when setting up actor initial stats (Fixes #1927)
This caused the magicka value set in the CS to be ignored completely, so flame atronachs were spawning with 50 magicka instead of 105.
2014-09-18 03:47:45 +02:00
scrawl
447e93bdb4 Use SpellCast animation for creatures that have it (flame atronach) 2014-09-18 03:24:47 +02:00
scrawl
07cd647e75 Fix broken AI for creatures with OnTarget spells (Bug #1927) 2014-09-18 03:19:13 +02:00
scrawl
09042ba6d9 Use object name instead of ID when available for tooltips 2014-09-17 13:03:12 +02:00
scrawl
2eaceb71ba Reject AiTravel destinations further than 7168 units away, as in vanilla MW (Fixes #1911) 2014-09-17 12:39:10 +02:00
scrawl
441073b475 Remove ancient comment 2014-09-17 07:02:19 +02:00
scrawl
3ce3f31452 Adjust turning animation speed multiplier based on turning speed 2014-09-17 07:02:19 +02:00
scrawl
6debd21ec6 Make sure the Jump control is always handled by the PhysicsSystem even if game runs faster than the minimum physics timestep 2014-09-17 07:02:19 +02:00
scrawl
269c200c8f Fix jump velocity mechanics (Fixes #1708) 2014-09-17 07:02:19 +02:00
scrawl
b6a89c7845 Fix idlestorm animation conflict with torch animation 2014-09-17 07:02:19 +02:00
scrawl
4c285151a3 Fix incorrect movement animation for some creatures (Fixes #1924) 2014-09-17 07:02:10 +02:00
Marc Zinnschlag
71c868aa94 Merge remote-tracking branch 'scrawl/master' 2014-09-15 12:45:00 +02:00
Marc Zinnschlag
3f671c86a8 Merge remote-tracking branch 'cc9cii/ffmpeg-swresample' 2014-09-15 12:44:38 +02:00
scrawl
0c75c6bf1b Improve spellcasting AI for Drain/Damage effects 2014-09-15 10:42:51 +02:00
scrawl
157c53bed4 Handle spellcasting for creatures with no casting animation (Fixes #1856) 2014-09-15 10:42:44 +02:00
Marc Zinnschlag
19f469c7db Merge remote-tracking branch 'scrawl/master' 2014-09-14 12:00:14 +02:00
Marc Zinnschlag
d1d861e1be Merge branch 'run'
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/CMakeLists.txt
2014-09-14 11:59:54 +02:00
Marc Zinnschlag
89000f6196 removed unused OmwLoader 2014-09-14 11:28:28 +02:00
Marc Zinnschlag
ea60c665dd Merge remote-tracking branch 'ragora/bounditemflag' 2014-09-14 10:54:07 +02:00
scrawl
233e221de2 Terminate AI packages when target is disabled or deleted (Fixes #1910) 2014-09-14 10:49:33 +02:00
Marc Zinnschlag
9b7f61b4ba Merge remote-tracking branch 'scrawl/myguiplugin' 2014-09-14 10:45:26 +02:00
scrawl
1270dada34 Don't set Attacked flag when the actor is already in combat with the attacker (Fixes #1909) 2014-09-14 10:35:57 +02:00
scrawl
002b41ba51 Make changeWeather work when the player isn't in a cell yet (workaround for modTESTchargen_v2_5) 2014-09-14 08:38:54 +02:00
scrawl
4b27950879 Don't apply race height to NPC collision shape (Fixes #1487) 2014-09-14 07:04:02 +02:00
scrawl
bd96764229 Mark code that will be obsolete when upgrading to MyGUI 3.2.2 2014-09-14 03:54:50 +02:00
Ragora
b8851790a6 Covered forgotten old bound item checks 2014-09-13 18:59:13 -04:00
Ragora
f250e3df4b Replaced old bound item checks that I knew of to use the new ItemStack::Flag_Bound bit 2014-09-13 18:48:41 -04:00
scrawl
4426b03fa4 Remove some garbage 2014-09-13 22:21:37 +02:00
scrawl
0c273568f2 Increment version number for input configuration
Old files are broken by keycode->scancode switch (319f4e0547)
2014-09-13 21:45:03 +02:00
scrawl
99c276baa9 Set weapon Magical flag when enchanting a weapon 2014-09-13 21:23:44 +02:00
scrawl
a42e60970b Revert "delete death events on adding an actor to the scene"
If we go to a different cell in the exact frame of an actor's death, the death event would be lost permanently.

This reverts commit fd2c07a6f4.

Conflicts:
	apps/openmw/mwmechanics/actors.cpp
2014-09-13 20:57:25 +02:00
scrawl
8625764143 Give 100% of health back when Resurrecting an actor (Fixes #1877) 2014-09-13 20:50:49 +02:00
Marc Zinnschlag
081588f484 add project file to content file list when running OpenMW from OpenCS 2014-09-13 20:48:24 +02:00
Marc Zinnschlag
10fa205ced fixed --data switch (was missing composing option) 2014-09-13 20:41:57 +02:00
scrawl
319f4e0547 Bind to scancodes instead of keycodes 2014-09-13 20:39:59 +02:00
scrawl
dc1e8d4e22 Don't trigger any mouse button bindings while in the settings menu 2014-09-13 20:39:59 +02:00
scrawl
04c79d5f1e Fix case issue when setting companion's profit on the script 2014-09-13 20:39:59 +02:00
scrawl
e54ba2c5d1 Fix broken dialogue Function_HealthPercent 2014-09-13 20:39:58 +02:00
Marc Zinnschlag
882ef37ae3 Merge remote-tracking branch 'ragora/conjureditemsgmstcheck' 2014-09-13 15:58:02 +02:00
Marc Zinnschlag
94a7e38194 Merge remote-tracking branch 'ragora/fixglobalcompassorient' 2014-09-13 15:55:06 +02:00
Marc Zinnschlag
690273d5b3 Merge remote-tracking branch 'ragora/fixmapresize' 2014-09-13 15:52:36 +02:00
scrawl
f82224497a Compatibility fix for MyGUI git 2014-09-13 08:00:24 +02:00
scrawl
2c58a879ec Fix minor exploit when map window is shown with transparency 2014-09-13 07:59:29 +02:00
scrawl
2b5adb325b Remove a useless method 2014-09-13 07:57:15 +02:00
scrawl
cfc57d0fe0 Use MyGUI's castType for widget casts 2014-09-13 04:07:40 +02:00
MiroslavR
4fdef94034 Use player's base name for profiles 2014-09-13 02:58:01 +02:00
MiroslavR
23e6d52844 Fix UI not updating initially for zero stats 2014-09-13 02:56:06 +02:00
Ragora
282e7abd16 Map Arrow Correction; now rotate global map arrow to whatever the local map arrow orientation is 2014-09-12 18:26:38 -04:00
Ragora
35571bb108 Global compass arrow rotates regardless of indoor or outdoor presence 2014-09-12 17:31:37 -04:00
Ragora
25f99c5d5a Discarded use of a static variable and renamed event function to be less ambiguous 2014-09-12 15:06:37 -04:00
Marc Zinnschlag
560eae3f4d Merge remote-tracking branch 'ragora/conjuredequipmentrmvalfix' 2014-09-12 14:22:24 +02:00
cc9cii
1107156334 Workaround incorrectly reported channel_layout 2014-09-12 21:18:54 +10:00
Ragora
58d70c2895 Removed Unused includes from experimentation 2014-09-12 05:20:03 -04:00
Ragora
4ecac31752 Map keeps focus on wherever it was last moved when resizing map window 2014-09-12 05:16:33 -04:00
scrawl
c6bcd75058 Add various custom widgets used in OpenMW to the MyGUI plugin 2014-09-12 05:14:21 +02:00
Ragora
e105202ee2 Use std::set instead of std::map 2014-09-11 22:45:30 -04:00
scrawl
ee3b1e800c Add FontLoader and transparent BG texture to the MyGUI plugin 2014-09-12 04:27:23 +02:00
cc9cii
675d11c0e5 Mental note: need to get a linux box 2014-09-12 11:25:11 +10:00
cc9cii
8fe6877cb2 More include madness b/w different systems & compilers 2014-09-12 11:05:02 +10:00
cc9cii
de41dfc314 Add includes. 2014-09-12 10:52:10 +10:00
Ragora
f9e2fd0f3d Also forgot to remove a now unused variable I introduced 2014-09-11 20:47:14 -04:00
Ragora
efaa820ee2 Managed to forget the itemmodel.cpp code 2014-09-11 20:46:21 -04:00
Ragora
ea43a23505 All GMST logic is done in itemmodel.cpp now with usage of a static cache std::map 2014-09-11 20:45:22 -04:00
cc9cii
0121fdca2c Don't use C99 in printf. 2014-09-12 10:31:49 +10:00
cc9cii
be74db8b24 Don't use to_string() 2014-09-12 10:04:46 +10:00
Ragora
83868bca23 Removed unused include left over from experimentation 2014-09-11 19:37:00 -04:00
Ragora
ee6298f520 Added Flag_Bound flag for ItemStack to check against but the system behind it is probably not the best 2014-09-11 19:33:45 -04:00
cc9cii
ecd9dd81ea Moved debug statements before exception.. 2014-09-12 08:41:33 +10:00
cc9cii
ce3077c970 Test version with debug statements. Also moved some common code out to a separate file. 2014-09-12 08:27:25 +10:00
Marc Zinnschlag
5dd424b6c6 Merge remote-tracking branch 'cc9cii/Bug-No-1655' 2014-09-11 14:14:02 +02:00
cc9cii
48a36442c6 Add libswresample and libavresample support for sounds. 2014-09-11 21:15:18 +10:00
Marc Zinnschlag
b5d5eadf79 Merge remote-tracking branch 'scrawl/master' 2014-09-11 09:01:21 +02:00
cc9cii
862c5fc8f6 Add libavresample support. Tested on windows x64 only. 2014-09-11 16:47:00 +10:00
Ragora
74e1db3ac8 Minor Correction to existing conjured item logic 2014-09-11 01:00:39 -04:00
scrawl
f3d4b63aaf Fix AI moving load doors and throw an exception when trying to do this (Fixes #1907) 2014-09-11 05:53:56 +02:00
Ragora
69dbd6b30f Added checks for different bound item situations 2014-09-10 23:38:38 -04:00
scrawl
36a90198e2 Add option to change screenshot image format 2014-09-11 04:32:31 +02:00
Ragora
141755b473 Appears to have resolved the issue with unequipping conjured items and all possible error conditions deriving from being able to unequip them 2014-09-10 21:34:17 -04:00
scrawl
7fa3100993 Refactor TradeWindow balance buttons to use ControllerRepeatClick 2014-09-11 00:25:09 +02:00
scrawl
ebab911e44 Add a hack to support binding the console to a printable key (Fixes #371) and change default console key to morrowind default (GRAVE) 2014-09-10 18:13:39 +02:00
scrawl
cf355d0fcb Change Always Run key default to Caps Lock, as in vanilla
A poor choice, but it's still what players coming from vanilla MW will expect.
2014-09-10 18:09:05 +02:00
MiroslavR
d64be1c092 Use CellId::mWorldspace to find out whether objects are in the same worldspace 2014-09-10 02:49:57 +02:00
MiroslavR
621e81fa7d Make getdistance return maximum value only if the given objects are in different worldspaces (Fixes #1895) 2014-09-10 01:40:33 +02:00
scrawl
616148e168 Fix "failed to open file" error when no startup script is given 2014-09-09 18:28:49 +02:00
MiroslavR
45c90bdcb5 Call getPtrViaHandle instead of searchPtrViaHandle for faced handle 2014-09-09 18:10:34 +02:00
MiroslavR
7e6e248511 Don't cache faced handle, as its context may have been changed during the frame by input events 2014-09-09 17:50:56 +02:00
MiroslavR
86c286c24e Fix werewolf globals 2014-09-09 15:12:42 +02:00
scrawl
dd5f4947d7 Add a TODO comment 2014-09-09 05:05:20 +02:00
scrawl
56cd0da522 Fix potential infinite recursion when an area effect spell is reflected (Fixes #1896) 2014-09-09 04:44:14 +02:00
MiroslavR
5ac2788a15 Feature #1545: Allow to select the player in the console 2014-09-09 04:36:17 +02:00
MiroslavR
21eb25706c Don't pursue the player for their crimes when they are a werewolf 2014-09-09 04:15:54 +02:00
scrawl
cb916594d9 Always show tooltips for dead actors 2014-09-09 02:12:44 +02:00
scrawl
d2ef0d362c Implement vanilla distance threshold for AI processing (Bug #1876) 2014-09-09 01:52:48 +02:00
scrawl
f18d4b4ac4 Don't show crosshair tooltips for actors in combat 2014-09-09 00:47:26 +02:00
scrawl
780a48cd1e Don't greet dead actors in AiWander 2014-09-09 00:43:12 +02:00
scrawl
c54ab2e846 Don't allow talking to creatures that are in combat 2014-09-09 00:39:38 +02:00
scrawl
a9847c9453 Fix creature attacking flag not being reset after the attack starts (Fixes #1889) 2014-09-09 00:27:25 +02:00
scrawl
457b96a8af Reset bounty and crime immediately when going to jail (Fixes #1892) 2014-09-09 00:00:55 +02:00
scrawl
628600a0a5 Make PlaceItem place the item in the player's current worldspace 2014-09-08 23:57:16 +02:00
scrawl
3007af44ea Revert "Don't trigger CellChanged events when crossing exterior cell borders (Fixes #1874)"
This reverts commit 0c67ff9ed0.
2014-09-08 20:52:15 +02:00
scrawl
6b06ab23aa Don't play sound for torches with OffDefault flag (Fixes #1884) 2014-09-08 15:31:47 +02:00
scrawl
8b0cb239a9 Ignore text keys for zero-length animations (Fixes #1876)
This fixes an issue where the Riekling's attack animation would trigger *two* hits on each swing. It has the "min hit" and "hit" keys at the same time, so the MinHitToHit segment a zero-length animation. This caused problems as the "hit" text key will be encountered twice; once when playing the "max attack to min hit" segment and once when playing the "min hit to hit" segment.
2014-09-08 15:23:35 +02:00
scrawl
07d827c907 Ignore invalid input in numeric EditBox (Fixes #1885) 2014-09-08 15:22:33 +02:00
cc9cii
785d2c7cc9 Remove incomplete implementation to support planar formats. Make libswresample a prerequisite. 2014-09-08 15:24:39 +10:00
scrawl
fe0c9ec9b7 Change priorities in World::searchPtr
Fixes performance bottleneck of scripts searching through all Containers in all active cells every frame. Can be observed near cell (2,-6)
2014-09-07 19:09:23 +02:00
scrawl
adbc50366b Use random attack strength for creatures (Bug #1876)
Determining the attack strength from the time the wind-up animation was held will not work properly, as most creatures don't have this animation.

This fixes another balancing issue with Rieklings (they were previously using an attack strength of 1 every time).
2014-09-07 18:55:59 +02:00
scrawl
b6635c7964 Move eventDone out of WindowBase 2014-09-07 18:55:59 +02:00
scrawl
271c921cf8 Add missing confirmation dialog for deleting map notes 2014-09-07 18:55:59 +02:00
scrawl
6e2673daf3 Remove an unneeded include 2014-09-07 18:55:59 +02:00
scrawl
d6bc50c492 Remove an unused member variable 2014-09-07 18:55:59 +02:00
scrawl
31b31115af Fix AI not using Restore Health effect when it is complemented by unnecessary restore magicka/fatigue effects (e.g. in sc_purityofbody) 2014-09-07 18:55:59 +02:00
scrawl
0c67ff9ed0 Don't trigger CellChanged events when crossing exterior cell borders (Fixes #1874) 2014-09-07 18:55:59 +02:00
cc9cii
f616000afb More fix based on code review. 2014-09-07 21:17:34 +10:00
MiroslavR
b574131b06 Unset selected spell after selecting enchanted item in the spell window (Fixes #1878) 2014-09-07 12:42:11 +02:00
cc9cii
c396149f23 Code review fix. 2014-09-07 20:35:32 +10:00
Marc Zinnschlag
16aa55dcde Merge remote-tracking branch 'miroslavr/master' 2014-09-07 10:22:07 +02:00
MiroslavR
931e778b4d Initialize mHasMovedInXY in CharacterController 2014-09-06 21:31:48 +02:00
Rohit Nirmal
e315a72582 Remove extra semicolons at the end of some lines. 2014-09-06 13:04:52 -05:00
MiroslavR
007404e17f Merge branch 'master' of github.com:OpenMW/openmw 2014-09-06 14:54:59 +02:00
MiroslavR
b1a449a0b9 Fix wolfrun sound playing all the time when running is default 2014-09-06 05:52:47 +02:00
MiroslavR
57f7ef1db4 GUI: update/clear force-hidden window status 2014-09-06 03:13:35 +02:00
MiroslavR
c1cc66985d Werewolf: only NPCs should have modified fight and react to your transformation 2014-09-06 03:09:11 +02:00
scrawl
f274d5a627 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-09-05 17:18:36 +02:00
scrawl
282c93ccc5 Handle death in actor update rather than instantly (Fixes #1866) 2014-09-05 17:17:45 +02:00
cc9cii
6d12374ace Move windows platform specific files into a common directory. 2014-09-05 22:36:33 +10:00
Marc Zinnschlag
86995adc4a Merge remote-tracking branch 'cc9cii/Bug-No-1655' 2014-09-05 09:00:12 +02:00
MiroslavR
9e0d5dc28a Werewolf: can't sleep in beds anymore, actors will attack you on sight, and if you are seen transforming, you will be marked for death 2014-09-05 01:58:57 +02:00
cc9cii
e0e561a105 Add icon to windows exe 2014-09-05 07:17:31 +10:00
cc9cii
7ae8d04c47 Arrgh... silly typo 2014-09-04 19:07:19 +10:00
cc9cii
c6cad5adc5 Make cmake more reliably detect libswresample 2014-09-04 18:55:10 +10:00
cc9cii
801b9446b7 Support for ubuntu/debian. Can easily be reverted if not required. 2014-09-04 07:58:46 +10:00
Marc Zinnschlag
71a2424500 Merge remote-tracking branch 'miroslavr/master' 2014-09-03 17:58:54 +02:00
cc9cii
093c7f8882 Moved format conversion to audio_decode_frame() 2014-09-03 22:52:03 +10:00
cc9cii
1e72cf4cdc More refactoring, remove more #ifdef guards and fix repeat samples for planar formats. 2014-09-03 18:13:43 +10:00
scrawl
628d57f18c Merge branch 'master' of https://github.com/OpenMW/openmw 2014-09-03 04:55:24 +02:00
scrawl
2379c0ada7 Pause frame updates when the window is minimized (Fixes #1868) 2014-09-03 04:54:07 +02:00
MiroslavR
386bb98fd2 Do not attach coin widgets to a box 2014-09-03 03:03:03 +02:00
MiroslavR
5977860e09 Fix broken coin placement in levelup dialog + possible memleak 2014-09-02 22:06:02 +02:00
scrawl
84a0d064cd Fall back to regular death animation if deathknockdown/deathknockout don't exist (Fixes #1870) 2014-09-02 15:14:23 +02:00
cc9cii
5095f729b0 Make travis happy again. 2014-09-02 22:05:54 +10:00
cc9cii
2d6b532ea5 Minimize the use of #ifdef guards for better code legibility. 2014-09-02 21:52:19 +10:00
Marc Zinnschlag
4894699eba Merge remote-tracking branch 'scrawl/master' 2014-09-02 09:04:19 +02:00
scrawl
0eb949c8a7 Don't update ripples when they are not used 2014-09-02 04:29:37 +02:00
cc9cii
f4dd281393 Simplify the use of swr_convert and add #ifdef guards around code that require libswresample. 2014-09-01 21:49:37 +10:00
Marc Zinnschlag
a9df3b53fd restored --new-game switch 2014-09-01 11:55:12 +02:00
MiroslavR
7dfba0ae30 Followers with high fight should not engage in combat with the player 2014-09-01 03:43:53 +02:00
MiroslavR
41c6045986 Realign all parent boxes when autosizedwidgets change size 2014-09-01 03:38:05 +02:00
scrawl
9caff1d800 Don't say Idle voices when player is not in LOS (Fixes #1436) 2014-09-01 02:21:54 +02:00
scrawl
59720b7dc6 Implement MagicItems flag for vendors (Fixes #1861) 2014-09-01 02:10:36 +02:00
scrawl
0da4757ee6 Merge branch 'master' of github.com:scrawl/openmw 2014-09-01 02:04:18 +02:00
cc9cii
0b9d17a81d More cleanup. 2014-09-01 08:04:28 +10:00
cc9cii
fdee660ffb Implemented feedback review comments, removing hard coded values and adding error handling. 2014-09-01 08:02:25 +10:00
cc9cii
68cbb8989e Cleanup comments. 2014-08-31 23:39:17 +10:00
cc9cii
a7371eda4d Now works for both FLT and S16 formats. The output format is hard coded in the MovieAudioDecoder constructor (default S16). 2014-08-31 23:35:05 +10:00
cc9cii
8429dab271 Working version - converts FLTP to FLT. Does not work when converting to S16. 2014-08-31 22:01:08 +10:00
cc9cii
16c165185b Minor cleanup. Tested successfully on windows x64 using ffmpeg-20140823-git-7444cf9-win64-dev which is on libavcodec version 56.0.101. 2014-08-31 13:40:29 +10:00
cc9cii
944f99b23a Initial commit of FLTP format binkaudio support. Converts to FLT format by manually interleaving decoded samples. swresample library is included with a view to use swr_convert() in future versions, but not used in this commit. 2014-08-31 13:20:33 +10:00
Corporama
ccca6db865 Compile fixes for Linux 2014-08-30 23:11:09 +02:00
scrawl
9d6ca9066f Fix summoned creatures not following for non-player summoners 2014-08-30 18:48:28 +02:00
scrawl
180a831e96 Fix typo in combat distance 2014-08-30 18:38:24 +02:00
scrawl
fde6cad24b Reset RefNum when copying a reference to a new cell 2014-08-30 18:27:59 +02:00
scrawl
267cf4e140 Implement ResetActors script instruction (Fixes #1859) 2014-08-30 18:27:32 +02:00
scrawl
58945c557a Add sound for casting enchanted item with insufficent charge (Fixes #1857) 2014-08-30 02:47:35 +02:00
scrawl
a62e40f4ed Add situational AI use of Feather, Dispel and Cure effects 2014-08-29 17:58:32 +02:00
Marc Zinnschlag
2eadff54d4 Merge remote-tracking branch 'rohitnirmal/scan-build-fixes' 2014-08-29 13:40:37 +02:00
Rohit Nirmal
b5eb16b663 Silence some scan-build warnings. 2014-08-28 20:55:32 -05:00
cc9cii
fa0352cd75 fix typo 2014-08-29 10:47:44 +10:00
cc9cii
961b4f0142 Suppress a warning. 2014-08-29 07:48:52 +10:00
scrawl
0be1ac1343 Enable casting of NoMagnitude effects in AI (e.g. summoned creatures) 2014-08-28 21:37:18 +02:00
scrawl
feeb740497 Fix bone not found exception for golden saint spellcasting 2014-08-28 17:02:11 +02:00
scrawl
0f43592237 Another invalid iterator fix 2014-08-28 16:47:54 +02:00
scrawl
1c222a0154 Fix mSelectedEnchantItem cleanup not working for non-player actors 2014-08-28 16:31:06 +02:00
scrawl
f91d639782 Add missing soul trap sound (Fixes #1855) 2014-08-28 16:30:42 +02:00
Marc Zinnschlag
ce3d75bba2 Merge remote-tracking branch 'scrawl/master' 2014-08-28 12:34:08 +02:00
scrawl
253036abee Play VFX_Soul_Trap on successful soul trap 2014-08-28 02:55:36 +02:00
scrawl
f8f4d2dfdb Another invalid iterator fix 2014-08-28 02:14:30 +02:00
scrawl
1a98f8ca93 Invalid iterator fix 2014-08-28 02:09:00 +02:00
scrawl
2e623bac5a Don't attempt to use broken weapons in AI 2014-08-28 02:01:41 +02:00
scrawl
0bdc1b243a Consider weapon ammunition in combat AI (Fixes #1576) 2014-08-28 01:54:32 +02:00
scrawl
f1d72419de Don't equip weapons in autoEquip, AiCombat does that now (Fixes #1451) 2014-08-28 00:59:54 +02:00
scrawl
0fe9612afb Implement basic spellcasting AI (Fixes #961)
Select a weapon to attack with in AiCombat and equip it (Fixes #1609, Fixes #1772)
2014-08-28 00:55:37 +02:00
scrawl
1a96dd0bd5 Remove more MyGUI 3.2.0 specific code 2014-08-27 16:39:13 +02:00
scrawl
c5fa7bf7c2 Minor cleanup 2014-08-26 17:45:28 +02:00
scrawl
4f92044d71 Allow user-created markers on local map (Fixes #1571) 2014-08-26 17:45:23 +02:00
scrawl
17dc01ec44 Require MyGUI version 3.2.1 and remove legacy code (Fixes #1528) 2014-08-26 17:01:35 +02:00
scrawl
dd77954512 Don't pass key to input binder if it was consumed by text editor (Fixes #1845) 2014-08-26 03:06:30 +02:00
scrawl
dcddd9a07c Use MyGUI clipboard events for MyGUI 3.2.1+ (Fixes #1846)
Note that only <= 3.2.0 and >= 3.2.1 are supported, any SVN version between them might still exhibit duplicate text pasting.
2014-08-26 03:06:30 +02:00
scrawl
10a0e2434e Open inventory when activating an unconscious actor (Fixes #1848) 2014-08-26 03:06:23 +02:00