Capostrophic
b69e812a52
Utilize inventory character preview lighting color fallback settings
2018-04-22 22:37:27 +03:00
scrawl
d8d26f1de8
Merge pull request #1685
2018-04-22 15:34:31 +00:00
scrawl
ec4e2f0064
Merge pull request #1684
2018-04-22 15:27:31 +00:00
Evgeny Kurnevsky
c025b8f8f3
Remove useless comparison.
2018-04-21 17:10:49 +03:00
Capostrophic
37dc3200d1
Inherit the calling object scale in PlaceAt ( fixes #4308 )
2018-04-20 00:15:26 +03:00
scrawl
5d1b40c5ea
Merge pull request #1678
2018-04-19 12:18:24 +00:00
Capostrophic
8617d0603b
Display a message if a spell the player tries to use via a quick key is missing ( fixes #4391 )
2018-04-18 19:10:46 +03:00
tri4ng1e
d310d36ea3
[Fix] Some PVS-Studio and cppcheck fixes
2018-04-18 12:36:10 +00:00
tri4ng1e
d4d1703bcf
Some PVS-Studio and cppcheck fixes
...
cppcheck:
[apps/esmtool/record.cpp:697]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1126]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1138]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/niftest/niftest.cpp:36]: (performance) Function parameter 'filename' should be passed by reference.
[apps/niftest/niftest.cpp:41]: (performance) Function parameter 'filename' should be passed by reference.
[apps/opencs/model/prefs/boolsetting.cpp:25]: (warning) Possible leak in public function. The pointer 'mWidget' is not deallocated before it is allocated.
[apps/opencs/model/prefs/shortcuteventhandler.cpp:52]: (warning) Return value of std::remove() ignored. Elements remain in container.
[apps/openmw/mwstate/quicksavemanager.cpp:5]: (performance) Variable 'mSaveName' is assigned in constructor body. Consider performing initialization in initialization list.
PVS-Studio:
apps/opencs/model/filter/parser.cpp 582 warn V560 A part of conditional expression is always true: allowPredefined.
apps/opencs/view/world/referencecreator.cpp 67 warn V547 Expression '!errors.empty()' is always false.
apps/opencs/view/world/referencecreator.cpp 74 warn V547 Expression '!errors.empty()' is always false.
apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !completed.
apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !error.empty().
apps/opencs/model/tools/pathgridcheck.cpp 32 err V517 The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence. Check lines: 32, 34.
apps/opencs/model/world/refidadapterimp.cpp 1376 err V547 Expression 'subColIndex < 3' is always true.
apps/openmw/mwgui/widgets.hpp 318 warn V703 It is odd that the 'mEnableRepeat' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:318, MyGUI_ScrollBar.h:179.
apps/openmw/mwgui/widgets.hpp 319 warn V703 It is odd that the 'mRepeatTriggerTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:319, MyGUI_ScrollBar.h:180.
apps/openmw/mwgui/widgets.hpp 320 warn V703 It is odd that the 'mRepeatStepTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:320, MyGUI_ScrollBar.h:181
apps/openmw/mwmechanics/actors.cpp 1425 warn V547 Expression '!detected' is always true.
apps/openmw/mwmechanics/character.cpp 2155 err V547 Expression 'mode == 0' is always true.
apps/openmw/mwmechanics/character.cpp 1192 warn V592 The expression was enclosed by parentheses twice: ((expression)). One pair of parentheses is unnecessary or misprint is present.
apps/openmw/mwmechanics/character.cpp 521 warn V560 A part of conditional expression is always true: (idle == mIdleState).
apps/openmw/mwmechanics/pathfinding.cpp 317 err V547 Expression 'mPath.size() >= 2' is always true.
apps/openmw/mwscript/interpretercontext.cpp 409 warn V560 A part of conditional expression is always false: rank > 9.
apps/openmw/mwgui/windowbase.cpp 28 warn V560 A part of conditional expression is always true: !visible.
apps/openmw/mwgui/journalwindow.cpp 561 warn V547 Expression '!mAllQuests' is always false.
apps/openmw/mwgui/referenceinterface.cpp 18 warn V571 Recurring check. The '!mPtr.isEmpty()' condition was already verified in line 16.
apps/openmw/mwworld/scene.cpp 463 warn V547 Expression 'adjustPlayerPos' is always true.
apps/openmw/mwworld/worldimp.cpp 409 err V766 An item with the same key '"sCompanionShare"' has already been added.
apps/openmw/mwworld/cellstore.cpp 691 warn V519 The 'state.mWaterLevel' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 689, 691.
apps/openmw/mwworld/weather.cpp 1125 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1123, 1125.
apps/openmw/mwworld/weather.cpp 1137 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1135, 1137.
apps/wizard/unshield/unshieldworker.cpp 475 warn V728 An excessive check can be simplified. The '(A && B) || (!A && !B)' expression is equivalent to the 'bool(A) == bool(B)' expression.
apps/wizard/installationpage.cpp 163 warn V735 Possibly an incorrect HTML. The "</p" closing tag was encountered, while the "</span" tag was expected.
components/fontloader/fontloader.cpp 427 err V547 Expression 'i == 1' is always true.
components/nifosg/nifloader.cpp 282 warn V519 The 'created' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 278, 282.
components/esm/loadregn.cpp 119 err V586 The 'clear' function is called twice for deallocation of the same resource. Check lines: 112, 119.
components/esm/cellref.cpp 178 warn V581 The conditional expressions of the 'if' statements situated alongside each other are identical. Check lines: 175, 178.
components/esmterrain/storage.cpp 235 warn V560 A part of conditional expression is always true: colStart == 0.
components/esmterrain/storage.cpp 237 warn V560 A part of conditional expression is always true: rowStart == 0.
2018-04-18 12:36:10 +00:00
Andreas Sturmlechner
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
2018-04-17 23:03:56 +02:00
Nelsson Huotari
af558e07a3
implement +6 icons
2018-04-15 12:47:52 +03:00
Nelsson Huotari
69aacdff17
Lamoot's new icon set
2018-04-15 12:35:45 +03:00
Andrei Kortunov
174b3d2249
Reset an inventory filter after reload or a new game start (bug #4392 )
2018-04-13 09:19:49 +04:00
Capostrophic
d9acd19dc0
Merge branch 'master' into illusion
2018-04-09 23:33:11 +03:00
scrawl
0982d2175a
Merge pull request #1473
2018-04-09 20:23:43 +00:00
scrawl
92d0fb2981
Merge pull request #1667
2018-04-09 20:23:38 +00:00
scrawl
35300c04cd
Merge pull request #1671
2018-04-09 20:23:35 +00:00
scrawl
308551ad49
Merge pull request #1644
2018-04-09 20:23:24 +00:00
scrawl
cbddb4a0a9
Merge pull request #1638
2018-04-09 20:23:20 +00:00
Capostrophic
cddc0914c8
Option to charge for all companions travelling ( fixes #4064 )
2018-04-09 19:19:50 +03:00
Thunderforge
fb27f34a32
Add autocomplete to the "Start default character at" field
2018-04-07 21:27:36 -05:00
Capostrophic
77467f17c9
Fix a typo
2018-04-06 00:10:48 +03:00
Andrei Kortunov
27c831959e
Handle OnPCHitMe variable (bug #2703 )
2018-04-03 07:38:19 +04:00
Capostrophic
4f64ba7b7f
Implement sBookSkillMessage GMST
2018-04-02 21:12:38 +03:00
scrawl
c6abec1e51
Merge pull request #1641
2018-04-02 17:53:30 +00:00
scrawl
0071878106
Merge pull request #1642
2018-04-02 17:45:54 +00:00
scrawl
d935e78f93
Merge pull request #1645
2018-04-02 17:39:23 +00:00
scrawl
c610b8acc8
Merge pull request #1649
2018-04-02 17:37:31 +00:00
scrawl
cd9f767e29
Merge pull request #1650
2018-04-02 17:32:40 +00:00
scrawl
8e37f6bf3e
Merge pull request #1656
2018-04-02 17:28:46 +00:00
scrawl
f36adfec5f
Merge pull request #1657
2018-04-02 17:28:12 +00:00
scrawl
80a8ef6d49
Merge pull request #1661
2018-04-02 17:18:39 +00:00
elsid
14daadded7
Add virtual destructors
...
To fix warnings:
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:588:8: warning: delete called on non-final 'NifOsg::ControllerFunction' that has virtual functions but non-virtual destructor
[-Wdelete-non-virtual-dtor]
delete __p;
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:595:4: note: in instantiation of function template specialization
'std::__shared_count<__gnu_cxx::_S_atomic>::__shared_count<NifOsg::ControllerFunction *>' requested here
: __shared_count(__p)
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:1079:17: note: in instantiation of function template specialization
'std::__shared_count<__gnu_cxx::_S_atomic>::__shared_count<NifOsg::ControllerFunction *>' requested here
: _M_ptr(__p), _M_refcount(__p, typename is_array<_Tp>::type())
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr.h:129:25: note: in instantiation of function template specialization 'std::__shared_ptr<NifOsg::ControllerFunction,
__gnu_cxx::_S_atomic>::__shared_ptr<NifOsg::ControllerFunction, void>' requested here
shared_ptr(_Yp* __p) : __shared_ptr<_Tp>(__p) { }
^
/home/elsid/dev/openmw/components/nifosg/nifloader.cpp:242:39: note: in instantiation of function template specialization 'std::shared_ptr<NifOsg::ControllerFunction>::shared_ptr<NifOsg::ControllerFunction, void>' requested here
callback->setFunction(std::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key)));
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/unique_ptr.h:78:2: warning: delete called on non-final 'MWGui::ResponseCallback' that has virtual functions but non-virtual destructor
[-Wdelete-non-virtual-dtor]
delete __ptr;
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/unique_ptr.h:268:4: note: in instantiation of member function 'std::default_delete<MWGui::ResponseCallback>::operator()' requested here
get_deleter()(__ptr);
^
/home/elsid/dev/openmw/apps/openmw/mwgui/dialogue.cpp:58:23: note: in instantiation of member function 'std::unique_ptr<MWGui::ResponseCallback, std::default_delete<MWGui::ResponseCallback> >::~unique_ptr' requested here
PersuasionDialog::PersuasionDialog(ResponseCallback* callback)
^
2018-04-01 21:51:59 +03:00
Capostrophic
baaf65bc2c
Add vanilla enchanted weaponry behavior option, on by default ( fixes #4136 )
2018-03-31 11:46:23 +03:00
Capostrophic
2dca389a3b
Extend magic resistance/weakness to all effects that can be resisted ( fixes #4309 )
2018-03-30 21:18:29 +03:00
Ilya Zhuravlev
fdcfbdbdd1
android: Update for sdl 2.0.8
2018-03-30 12:44:38 -04:00
Capostrophic
e6d9bce519
Implement fWerewolfHealth GMST ( fixes #4142 )
2018-03-30 19:27:18 +03:00
Capostrophic
76f50312f2
Remove a redundant check
2018-03-30 00:02:52 +03:00
bret curtis
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
2018-03-27 20:20:40 +02:00
Capostrophic
2d119e834a
Add vanilla absorb attribute behavior option, on by default ( Fixes #4135 )
2018-03-27 14:27:23 +03:00
Capostrophic
b6a2589e7b
Don't apply harmful spell effects on the player in god mode ( fixes #4264 )
2018-03-27 14:02:14 +03:00
Capostrophic
41f89c84f8
Don't move the player if opposite direction keys are held down at the same time ( Fixes #4233 )
2018-03-25 12:20:48 +03:00
Capostrophic
5a3086b0c6
Auto-detect the actual Morrowind assets path ( Fixes #4336 )
2018-03-23 23:52:08 +03:00
Capostrophic
42b7846f81
Replace a redundant playerAllies check with a boolean ( Fixes #4229 )
2018-03-23 18:45:39 +03:00
Nelsson Huotari
63e34a5575
Typofix: updateCrimePersuit -> ...Pursuit
2018-03-23 14:10:43 +02:00
scrawl
c02920bcd1
Merge pull request #1634
...
Conflicts:
apps/openmw/mwworld/worldimp.hpp
2018-03-20 22:48:20 +00:00
scrawl
f47429d575
Merge pull request #1635
2018-03-20 22:47:36 +00:00
scrawl
ff7f964643
Merge pull request #1636
2018-03-20 22:47:31 +00:00
Andrei Kortunov
fed3e56fc1
Weather manager: get rid of World dependency
2018-03-19 23:08:15 +04:00
Andrei Kortunov
53ef345680
Update magic effect particles after building new animation (bug #2254 )
2018-03-19 10:43:22 +04:00
Andrei Kortunov
a0a30cdbf5
AI: hide torches during bad weather (bug #4334 )
2018-03-19 08:03:53 +04:00
Andrei Kortunov
bd6c7de579
Do not unequip two-handed weapon when equipping torch
2018-03-19 08:03:53 +04:00
RoadTrain
d626d89c49
OpenMW-CS: Fix a typo in startup warning.
2018-03-19 00:50:50 +03:00
Capostrophic
5b49248d6e
Restrict opening doors to bipedal actors ( Fixes #4313 )
2018-03-18 17:24:27 +03:00
scrawl
edb57306b6
Merge pull request #1628
2018-03-16 23:25:29 +00:00
scrawl
17fa1a4d51
Merge pull request #1630
2018-03-16 23:24:19 +00:00
scrawl
7a5748a9f1
Merge pull request #1632
2018-03-16 23:24:05 +00:00
Thunderforge
d42791e260
Moving testing options to Advanced page
2018-03-15 22:11:54 -05:00
elsid
a26483ab26
Fix memory leak
...
There is no delete for TextFormat objects in PageDisplay destructor.
2018-03-13 21:32:59 +03:00
elsid
26df0e6ebd
Remove duplicated include
2018-03-13 21:28:38 +03:00
elsid
2f9b6b536b
Label gtest directories as system
...
To hide all warnings when use custom GTEST_ROOT.
2018-03-13 21:27:14 +03:00
Andrei Kortunov
e0aa5e8e79
Prevent overlapping for journal and books scrolling
2018-03-11 16:19:37 +04:00
Andrei Kortunov
62c04c6758
Unstack soulgem, added via AddSoulGem console command (bug #4351 )
2018-03-09 21:49:27 +04:00
scrawl
e81faf5f2f
Add an option to disable GUI keyboard navigation (Bug #4333 )
2018-03-08 23:39:35 +00:00
scrawl
870c658500
Remove missing souls, remove some runaway exceptions ( Fixes #4111 )
2018-03-08 23:38:04 +00:00
scrawl
7f39dbb129
Merge pull request #1626
2018-03-08 20:52:37 +00:00
Harald H
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
2018-03-08 21:23:24 +01:00
Thunderforge
dfcd243150
Remove the word "interior" from cell not found message
2018-03-07 19:57:54 -06:00
scrawl
96c2b9374f
Merge pull request #1621
2018-03-07 18:12:43 +00:00
scrawl
bf78c18296
Merge pull request #1624
2018-03-07 18:12:32 +00:00
scrawl
148cda254d
Merge pull request #1617
2018-03-07 18:12:26 +00:00
Capostrophic
3b922d810a
Don't use floating point arithmetics for formatted count (Bug #4346 )
2018-03-07 15:36:10 +03:00
Capostrophic
60a663ef58
Account for all possible count values in getCountString (Bug #4346 )
2018-03-06 16:50:38 +03:00
Thunderforge
dcc262ed91
Fixing Skip Menu checkbox not working correctly
2018-03-05 23:10:08 -06:00
Thunderforge
082e166fae
Making "start default character at" field enabled or disabled by the previous checkbox
2018-03-05 21:41:29 -06:00
Thunderforge
da74ca5ce0
Add testing options to the Settings page
2018-03-05 21:26:59 -06:00
Thunderforge
6c3ac834c4
Preventing max quicksaves from being saved to settings.cfg if it is unchanged.
2018-03-05 19:57:19 -06:00
Chris Robinson
01dbac7b15
Don't use a different setting for distant viewing distance
2018-03-04 11:37:57 -08:00
Chris Robinson
41669467ae
Make settings for distant fog parameters
2018-03-04 11:37:57 -08:00
Chris Robinson
4caa7c9674
Workaround older MSVC quirk
2018-03-04 11:37:57 -08:00
Chris Robinson
154cc8c659
Use alternate fog parameters when distant land is enabled
...
This allows the distant land to actually be seen when the user enables it. The
values used are replicated from MGE XE's default settings and should probably
be exposed somewhere.
2018-03-04 11:37:57 -08:00
Chris Robinson
6d557fec8e
Increase the far clip plane when distant terrain is enabled
2018-03-04 11:37:57 -08:00
AnyOldName3
6d29375d5e
Turning on shadows will now force shaders on
2018-03-03 15:50:36 +00:00
AnyOldName3
e46bf28e5f
Add object shadows setting
2018-03-03 15:13:36 +00:00
AnyOldName3
d4b37ad6b1
Apply Scrawl's fix for the local map
2018-03-03 15:06:05 +00:00
Capostrophic
d371bebb33
Prevent items in a container owned by a dead actor from being counted as stolen (Bug #4328 )
2018-03-03 15:57:13 +03:00
Capostrophic
cc0c6ddaa6
Account for empty victimRef (Bug #4328 )
2018-03-03 15:57:03 +03:00
AnyOldName3
d6a7aec971
Make RenderingManager::configureAmbient do what it was intended to.
2018-03-03 01:54:21 +00:00
scrawl
839196e4fa
Force normal polygon mode for the map camera ( Fixes #4235 )
2018-03-03 00:15:57 +00:00
Florian Weber
10fe334247
add more precise float-spinbox and use it for rotations
2018-03-02 15:05:00 +01:00
AnyOldName3
cfad38b869
Make masks consecutive and ordered.
2018-03-01 17:32:45 +00:00
AnyOldName3
6f582f5411
Make indoor shadows do something meaningful.
2018-03-01 17:30:53 +00:00
Thunderforge
b6d9b6f544
Formatting improvement for advanced page
2018-02-27 20:17:43 -06:00
Thunderforge
4292351993
Adding Max Quicksaves setting to Launcher
2018-02-27 20:17:21 -06:00
scrawl
9e9c278527
Merge pull request #1597
2018-02-27 23:48:45 +00:00
AnyOldName3
3fe8dc6309
Remove leftover import
2018-02-27 16:05:11 +00:00
AnyOldName3
d1a2955fa1
Merge upstream
2018-02-27 14:29:14 +00:00
AnyOldName3
f9cf1ac94b
Separate indoor and outdoor shadow casting masks.
2018-02-27 00:13:51 +00:00
AnyOldName3
e233dae1cd
Hook up the new shadow technique
2018-02-26 22:27:09 +00:00
Capostrophic
929fc68160
Consider items with dead owner not stolen (fixes bug #4328 )
2018-02-26 23:21:51 +03:00
AnyOldName3
02d0ee3485
Rename old shadow class to shadow manager
2018-02-26 14:29:31 +00:00
Miloslav Číž
db6107f12f
Merge branch 'master' into screenshot360
2018-02-25 11:25:19 +01:00
scrawl
31d7e6af32
Merge pull request #1608
2018-02-24 16:53:32 +00:00
scrawl
56613d817e
Merge pull request #1612
2018-02-24 16:52:30 +00:00
Capostrophic
089666dd68
Round up displayed encumbrance
2018-02-24 15:13:14 +03:00
Thunderforge
a67373d116
Fixing "Show Enchant Chance" checkbox setting melee info instead
2018-02-19 18:28:04 -06:00
Capostrophic
99360e132f
Only display "new journal entry" message in dialogue if there *is* a new entry
2018-02-18 16:01:50 +03:00
Daniel Vukelich
3bdd989a50
Remove numeric quicksave slot IDs
...
When multiple quicksaves occurred in quick succession, the numeric order
of the saves could not be guaranteed. To prevent players from getting
confused as to why their saves appear out of order, don't number them.
2018-02-13 21:01:15 -05:00
scrawl
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting
2018-02-13 00:40:41 +00:00
scrawl
a708ac488e
Don't call Store::setUp() unnecessarily
...
Fixes a threading issue with ESM::Land store caused by calling setUp() while it's being used.
2018-02-13 00:38:55 +00:00
scrawl
5bb7d76913
Merge pull request #1605
2018-02-10 23:15:26 +00:00
scrawl
899d464b0d
Cap the rain emitter's frame time ( Fixes #4314 )
2018-02-10 23:14:41 +00:00
scrawl
f28024b541
Don't use Activate and Move keys for GUI navigation if bound to mouse buttons ( Fixes #4225 , Fixes #4320 )
2018-02-10 23:11:03 +00:00
Andrei Kortunov
f626a7fcc7
Take in account PC rank during disposition calculation (bug #4322 )
2018-02-10 17:58:30 +04:00
Marc Zinnschlag
2a5a574134
Merge remote-tracking branch 'thunderforge/feature/4054-launcher-advanced-settings-panel'
2018-02-05 13:30:47 +01:00
scrawl
b1b8e31562
Use unique_ptr over new/delete ( Fixes #4305 )
2018-01-30 22:05:16 +00:00
Thunderforge
8b17844781
Replacing Qt5-only method with Qt4-compatible code
2018-01-29 21:14:31 -06:00
Thunderforge
8837046d9c
Adding panel for advanced settings.cfg options
2018-01-28 22:49:49 -06:00
scrawl
89c6b59c30
Merge pull request #1602
2018-01-28 22:35:47 +00:00
AnyOldName3
c3d7c7de21
Prevent first-person meshes disappearing.
2018-01-23 20:13:37 +00:00
AnyOldName3
6ec893b618
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-01-22 15:54:13 +00:00
Ilya Zhuravlev
8d44d3124e
Android: Add callbacks for basic cursor handling.
2018-01-18 21:18:31 -05:00
Ilya Zhuravlev
455f718394
Android: register a virtual controller definition
2018-01-17 23:14:23 -05:00
Daniel Vukelich
3af8f63895
Use unsigned integer types for QuickSave indices
2018-01-17 21:43:30 -05:00
Bret Curtis
588c1df0f0
Merge pull request #1599 from xyzz/android
...
Update android port.
2018-01-16 11:12:21 +01:00
Ilya Zhuravlev
d2121ccd62
Update android port.
2018-01-16 00:11:27 -05:00
Daniel Vukelich
f09fd6795c
Follow openmw style guide
2018-01-14 11:57:11 -05:00
scrawl
2caaa48b91
Workaround to make sure message box remains on top ( Fixes #4298 )
2018-01-14 00:27:53 +00:00
scrawl
e2e48e0a50
Add default value for 'sAnd' GMST ( Fixes #4269 )
2018-01-14 00:27:05 +00:00
scrawl
d9d8de3061
Catch exceptions in updateWindowManager (Bug #4269 )
2018-01-14 00:26:37 +00:00
scrawl
80f7279a4d
Change default installation directory from 'data' to 'basedata' (Bug #3557 )
2018-01-14 00:24:30 +00:00
Daniel Vukelich
97924d97c7
Add the option for multiple quicksave slots
...
With more than 1 quicksave slot, slots will be created each time you
quicksave until the maximum number (configured in settings) of
quicksaves has been reached. After that, the oldest quicksave slot will
be replaced each time you quicksave. Saves are numbered sequentially,
unless the maximum number of slots is 1, in which case it is not numbered.
2018-01-12 20:09:39 -05:00
Andrei Kortunov
eccb49da18
Do not summon the bound bow if there is no suitable ammo
2018-01-11 21:08:30 +04:00
Andrei Kortunov
b995617559
implement rateAmmo() function
2018-01-11 21:08:11 +04:00
scrawl
dd5ebe225b
Merge pull request #1580
2018-01-11 01:54:28 +00:00
scrawl
bba9a8dd91
Don't update off-screen animations
...
Make flying creatures animate in-place when out of processing range
2018-01-11 01:49:35 +00:00
scrawl
1522bda60b
Fix crash in getDistance when invoked before the game starts
2018-01-11 01:48:05 +00:00
scrawl
83726ee06a
Fix Reset Controls button not functioning properly
2018-01-11 01:47:42 +00:00
scrawl
c7f60a6dc8
Merge pull request #1595
2018-01-09 13:48:07 +00:00
scrawl
f6ca7295a6
Revert "Merge pull request #1595 "
...
This reverts commit 7ef7b1a7b19e7e4de0ab
2018-01-09 13:47:57 +00:00
scrawl
7ef7b1a7b1
Merge pull request #1595
2018-01-09 00:42:27 +00:00
scrawl
9e7e4de0ab
Merge pull request #1594
2018-01-09 00:42:20 +00:00
Andrei Kortunov
dba071f881
Remove the 'Screenshot saved' message (bug #4191 )
2018-01-08 13:12:12 +04:00
Thunderforge
bd072b131b
Moving controller file out of the controllers subdirectory
2018-01-02 20:58:43 -06:00
Andrei Kortunov
b277b83810
Display the 'Screenshot saved' message after the screenshot saving (bug #4191 )
2018-01-02 14:52:42 +04:00
Bret Curtis
c3c3fbc68e
overriden -> overridden
2018-01-02 11:42:08 +01:00
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
2018-01-01 22:16:54 -06:00
Miloslav Číž
3b741dc4b7
Revert "Add slider for refraction size in settings window"
...
This reverts commit ee40b41285
2018-01-01 13:28:14 +01:00
scrawl
57257d057f
Remove unintended jump cooldown ( Fixes #4250 )
2017-12-31 23:48:51 +00:00
AnyOldName3
8d4b32166c
Remove outdated comments
2017-12-27 02:35:25 +00:00
AnyOldName3
c3e0398d1c
Add settings
2017-12-27 02:32:17 +00:00
AnyOldName3
f56a117bde
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-12-26 23:52:25 +00:00
AnyOldName3
4de3a361fb
Make shadow maps only cover regions where shadow receivers might be.
2017-12-26 23:18:50 +00:00
scrawl
b8c25e6bff
Use the correct priority of animation sources in getStartTime ( Fixes #4263 )
2017-12-21 14:49:09 +00:00
Marc Zinnschlag
7245b251e8
Merge remote-tracking branch 'drummyfish/cs-cam'
2017-12-19 17:01:13 +01:00
Marc Zinnschlag
93716cecd9
Merge remote-tracking branch 'origin/master'
2017-12-19 17:01:03 +01:00
scrawl
993982628d
Merge pull request #1590
2017-12-18 20:41:12 +00:00
AnyOldName3
b08938485f
Make suspending viewer threads the responsibility of the caller, not the shader manager.
2017-12-17 23:55:19 +00:00
Andrei Kortunov
1a58171e86
Do not allow to sell items from containers with zero capacity (bug #4268 )
2017-12-17 18:09:25 +04:00
AnyOldName3
229cc9696f
Make updating global shader defines update shaders.
2017-12-17 01:57:53 +00:00
Miloslav Číž
01f9d90315
CS: Reorder 3D input menu
2017-12-15 17:22:32 +01:00
Miloslav Číž
13dc1bd41e
CS: Add tooltip to camera-ortho-size preference
2017-12-15 14:56:03 +01:00
Miloslav Číž
1f5feeddb9
CS: Change camera parameter types to int
2017-12-15 14:46:23 +01:00
Miloslav Číž
f2777f7242
CS: Mover object-marker-alpha under Rendering
2017-12-15 14:36:12 +01:00
Marc Zinnschlag
ecf1cea1b7
Merge remote-tracking branch 'drummyfish/cs-cam'
2017-12-15 13:41:54 +01:00
Miloslav Číž
79527b746a
Remove unused variable
2017-12-14 17:29:24 +01:00
Miloslav Číž
b246580c63
Fix orbit camera axis
2017-12-13 20:08:38 +01:00
AnyOldName3
78eb18e55f
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-12-13 12:34:00 +00:00
Andrei Kortunov
ba46473038
Do not skip weather transitions from SetPos script command (bug #3603 )
2017-12-13 10:53:23 +04:00
scrawl
e9ecaf712b
Merge pull request #1584
2017-12-12 20:11:05 +00:00
scrawl
7d62f05f81
Merge pull request #1583
2017-12-12 20:10:59 +00:00
AnyOldName3
617473c7da
Force near plane out further for LiSpSM projection
2017-12-12 18:06:20 +00:00
Andrei Kortunov
0e04a26ef6
Set duration of magic effects from ingredients (bug #4261 )
2017-12-10 16:10:44 +04:00
Andrei Kortunov
c908ad2fba
Do not allow to place actors underground via SetPos (bug #3783 )
2017-12-10 14:38:02 +04:00
Chris Robinson
08e947319a
Restore exception throwing to the decoder
2017-12-09 11:00:56 -08:00
Miloslav Číž
ee40b41285
Add slider for refraction size in settings window
2017-12-09 14:03:56 +01:00
Chris Robinson
06ae61479a
If a sound effect fails to load, substitute silence.
2017-12-08 22:10:09 -08:00
AnyOldName3
0e481a457e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2017-12-08 23:26:08 +00:00
Miloslav Číž
e309dfd234
CS: Rename variables (AppVeyor fix)
2017-12-08 22:06:03 +01:00
scrawl
9cee439e37
Merge pull request #1577
2017-12-08 20:00:58 +00:00
scrawl
1d823d8ae1
Merge pull request #1579
2017-12-08 20:00:26 +00:00
scrawl
b12cd1f5b2
Merge pull request #1581
2017-12-08 20:00:15 +00:00
Miloslav Číž
199e41833f
Merge branch 'master' into cs-cam
2017-12-08 20:56:05 +01:00
Miloslav Číž
d85f8deaa3
CS: Add fixed roll setting, plus ortho fix
2017-12-08 20:51:40 +01:00
Miloslav Číž
1b77e3ed62
CS: Add ortho camera setting
2017-12-08 18:18:27 +01:00
Miloslav Číž
bfad5ebde4
CS: Fix camera orbit control with keys
2017-12-08 17:42:20 +01:00
Chris Robinson
aecf74e7bb
Don't throw exceptions from the audio decoder
2017-12-08 07:00:04 -08:00
Miloslav Číž
5e076ee015
CS: Fix camera orbit with arbitrary roll
2017-12-08 00:19:05 +01:00
Miloslav Číž
cfdc6c788e
CS: Make camera FOV change dynamically
2017-12-08 00:05:50 +01:00
Miloslav Číž
7d36dd68dc
CS: Make orbit camera not change roll
2017-12-07 23:52:05 +01:00
Miloslav Číž
360d786ff2
CS: Add rendering prefs and camera FOV
2017-12-07 23:48:34 +01:00
Andrei Kortunov
744859f327
Take in account armor condition in the armor rating calculation (bug #4246 )
2017-12-07 22:43:32 +04:00
Miloslav Číž
a142a67972
Add default settings for 360 screenshots
2017-12-06 21:16:30 +01:00
Miloslav Číž
b69c16e682
Add setting option to scale water refractions
2017-12-06 20:39:09 +01:00
Allofich
7e87ce8787
Prevent combat on/off cycling for calmed actors
2017-12-06 01:03:24 +09:00
Allofich
e0c54b3f39
Stop guards trying to arrest player when calm
...
(Fixes #3863 )
2017-12-05 23:53:02 +09:00
Andrei Kortunov
a28cc37501
Do not sell ingredients from organic containers
2017-12-05 10:24:58 +04:00
Andrei Kortunov
29b2308b2c
Do not display cyrillic soft/hard signs in the journal index
2017-12-04 22:42:17 +04:00
Andrei Kortunov
b6ae7f3cc8
Do not add greetings to the journal index (bug #4342 )
2017-12-04 22:42:10 +04:00
scrawl
ff1226c96b
Merge pull request #1575
2017-12-03 22:22:29 +00:00
Andrei Kortunov
8decd35607
Fixes crash on quickload from the container menu (bug #4239 )
2017-12-03 21:49:13 +04:00
Miloslav Číž
37aa761283
Change spherical screenshot filtering to nearest
2017-12-01 21:47:26 +01:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
2017-11-29 22:37:50 +00:00
scrawl
47a5229eed
Merge pull request #1564
2017-11-29 22:10:36 +00:00
scrawl
59bfd670c0
Merge pull request #1571
2017-11-29 22:04:41 +00:00
Grigorii Latyshev
2abb1a2ec2
Added checkMagicka parameter
2017-11-28 23:35:54 +01:00
Grigorii Latyshev
9fe5a4d236
Revert condition changes
2017-11-28 23:35:46 +01:00
Grigorii Latyshev
dab72b45db
Move mana reducing code back
2017-11-28 23:34:05 +01:00
Andrei Kortunov
b9d9660efd
Update music state in the menu mode (bug #3664 )
2017-11-28 20:49:48 +04:00
Andrei Kortunov
f7f8dfaf2a
AiWander: do not allow flying/swimming creatures to use pathgrid
2017-11-28 18:03:13 +04:00
scrawl
9920779a7b
Merge pull request #1543
2017-11-27 21:21:54 +00:00
scrawl
c50b18b3bb
Move PathgridGraph out of CellStore
...
By definition this is not 'Mutable state of a cell' and does not belong in CellStore.
This change should improve startup times (graph is now loaded on demand) and edits to 'pathgrid.hpp' no longer cause the entirety of OpenMW to be rebuilt.
2017-11-27 21:20:31 +00:00
scrawl
5fe68ab062
Merge pull request #1419
2017-11-27 21:13:11 +00:00
scrawl
fee2e946d1
Merge pull request #1565
2017-11-27 21:13:09 +00:00
Kyle Cooley
eb23367175
Fix rendering depth/order issues
2017-11-26 17:39:57 -05:00
Grigorii Latyshev
ce32462358
Move code to apps/openmw/mwmechanics/spellcasting.cpp, move reduce mana code to CastSpell::cast(const ESM::Spell*)
2017-11-26 13:58:04 +01:00
Andrei Kortunov
dea7d0beff
Do not interrupt swim and sneak idle animations during attack (bug #4122 )
2017-11-26 09:54:12 +04:00
Kyle Cooley
c8f79ea838
Adjust rotation markers
2017-11-25 20:46:14 -05:00
scrawl
88ec6179ff
Merge pull request #1566 from akortunov/guifixes
...
Set default values for class and birthsign select menus
2017-11-25 22:58:40 +00:00
Andrei Kortunov
55db3c2712
Set default values for class and birthsign select menus (bug #4226 )
2017-11-25 11:35:29 +04:00
Grigorii Latyshev
32096ae0cc
Fix displayed spell success chance in God Mode
2017-11-25 01:47:18 +01:00
scrawl
665ca5b2d5
Merge pull request #1558 from akortunov/rusjournal
...
Cyrillic journal index (bug #2485 )
2017-11-24 23:17:28 +00:00
scrawl
8226c8dc92
Merge pull request #1560 from akortunov/guifixes
...
Fix the Topics button position if the Tribunal is not installed
2017-11-24 23:16:33 +00:00
scrawl
f5c075b188
Merge pull request #1563 from drummyfish/throwfix
...
Make thrown projectiles rotate (#4216 )
2017-11-24 23:15:54 +00:00
Grigorii Latyshev
a7c953b318
Display 0 chance for spell if player does not have enought magic energy
2017-11-24 15:06:07 +01:00
Miloslav Číž
4373fea21e
Correct projectile rotation
2017-11-23 20:27:22 +01:00
Miloslav Číž
d0a299caab
Rotate thrown projectiles around the bb center
2017-11-23 20:02:38 +01:00
Miloslav Číž
38bda3bd71
Do not save thrown state for projectiles
2017-11-23 18:00:10 +01:00
Andrei Kortunov
94c0e3ed10
Move toUpper() from StringUtils to the JournalViewModel
2017-11-23 19:37:45 +04:00
Andrei Kortunov
a8bf4cdd98
Remove redundant include
2017-11-23 19:29:40 +04:00
Miloslav Číž
3dbcda6686
Make use of mEffectAnimationTime for projectile rotation
2017-11-23 15:14:15 +01:00
Miloslav Číž
2b9a0a7732
Save new projectile state
2017-11-23 12:11:26 +01:00
Andrei Kortunov
4f190bf7f4
Do not show carriage return characters (bug #3696 )
2017-11-23 14:58:20 +04:00
Andrei Kortunov
4d384889af
Fix the Topics button position if the Tribunal is not installed
2017-11-23 10:14:45 +04:00
Miloslav Číž
de42aa9d03
Make thrown projectiles rotate
2017-11-23 00:32:22 +01:00
AnyOldName3
4612597877
Switch to insert_or_assign semantics when adding shadow defines to the global shader defines.
2017-11-22 20:54:39 +00:00
AnyOldName3
98cd9fc144
Add preliminary support for global shader defines.
2017-11-22 20:07:07 +00:00
Andrei Kortunov
86a17b1e3e
Get rid of the redundant Utf8Stream when during journal index creation
2017-11-22 09:06:54 +04:00
Andrei Kortunov
3571f7f413
Remove getEncoding() from WindowManager
2017-11-22 08:32:38 +04:00
Andrei Kortunov
5f41f7c48d
Clean code up a bit
2017-11-21 13:03:38 +04:00
Andrei Kortunov
ba91cd658b
Convert topic name to Unicode
2017-11-21 12:31:23 +04:00
Andrei Kortunov
f0ca3eabd3
Merge from upstream master
2017-11-21 09:39:54 +04:00
Andrei Kortunov
a83a43e376
Determine when need to use the Cyrillic journal index
2017-11-21 09:32:35 +04:00
scrawl
719255c5c6
Merge pull request #1557 from akortunov/journalfix
...
[Feedback needed] Handle 128px Tx_menubook_topics textures
2017-11-20 23:07:18 +00:00
Andrei Kortunov
ce5bdd6361
Split the JournalBooks::createTopicIndexBook()
2017-11-20 22:25:53 +04:00
Andrei Kortunov
a391990f2a
Provide multibyte toLower() and single chars comparator
2017-11-20 21:30:46 +04:00
Andrei Kortunov
4dcaf040e6
A Russian journal index
2017-11-20 19:37:24 +04:00
Andrei Kortunov
60d0c83cca
Handle 128px Tx_menubook_topics textures
2017-11-20 17:39:28 +04:00
Miloslav Číž
ea2bbce68a
Fix memory leak in WindowManager
2017-11-18 19:27:09 +01:00
AnyOldName3
0f6f097cf2
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-11-17 18:24:08 +00:00
Miloslav Číž
df61a30259
preincrement
2017-11-16 23:20:24 +01:00
Miloslav Číž
ddbf6c162f
use linear filtering for the cubemap
2017-11-16 22:43:41 +01:00
Miloslav Číž
fc507c66f7
remove no longer needed stuff
2017-11-16 22:17:00 +01:00
Miloslav Číž
3ae5310567
use loading screen to freeze the screen
2017-11-16 22:08:33 +01:00
Miloslav Číž
2b5f147545
allow non-power-of-2 sized cubemaps
2017-11-16 20:06:34 +01:00
scrawl
36f4f0ef85
Don't increase simulationTime while the game is minimized ( Fixes #4211 )
2017-11-16 18:48:49 +00:00
Miloslav Číž
902862aa8b
display confirming message for all screenshots
2017-11-16 13:50:10 +01:00
Miloslav Číž
bccff768ff
select closest power of 2 resolution for the cubemap
2017-11-16 13:41:09 +01:00
Miloslav Číž
56c74fb96f
add scene switch node
2017-11-16 12:46:46 +01:00
Miloslav Číž
1a4f351e3d
move camera freeze code
2017-11-16 12:17:52 +01:00
scrawl
cf40d19d7d
Merge pull request #1551 from thegriglat/abs
...
Change abs to std::abs
2017-11-15 17:34:59 +00:00
scrawl
35d68f038d
Update dialogue topics list after result script is run
...
Regression from 0.42.
2017-11-15 17:20:40 +00:00
scrawl
60fba7acd8
Fix reorder warning
2017-11-15 17:20:08 +00:00
scrawl
c36d250044
Parse dialogue text for keywords after the resultscript runs ( Fixes #4210 )
2017-11-15 17:20:06 +00:00
scrawl
7c5d2a1ac4
Update dialogue topics list after result script is run
...
Regression from 0.42.
2017-11-15 17:20:06 +00:00
Miloslav Číž
af38d3a47d
get rid of sphericalscreenshot class
2017-11-15 17:01:16 +01:00
Miloslav Číž
226fb9c26b
render cubemaps in OGL coordinates
2017-11-15 16:07:01 +01:00
Miloslav Číž
1c3d45f641
dirty 360 screenshot GPU setup
2017-11-15 15:20:59 +01:00
Miloslav Číž
823218bb61
freeze screen during screenshot taking
2017-11-14 18:23:12 +01:00
Grigorii Latyshev
6e4f6c4bd5
Change abs to std::abs
2017-11-13 21:36:55 +01:00
scrawl
a7fd27f413
Merge pull request #1544 from rexelion/archerrangefix
...
use fProjectileMaxSpeed for ranged weapons distance (fixes #4192 )
2017-11-11 22:30:59 +00:00
scrawl
98b4f9c596
Merge pull request #1549 from akortunov/itemmodels
...
Item models reworking
2017-11-11 22:12:07 +00:00
scrawl
dc016059c3
Disable Activate key when textinput is active (Bug #4151 )
2017-11-11 22:00:18 +00:00
scrawl
3b9e1e8c1b
Make movement keys not function in text input mode
2017-11-11 22:00:09 +00:00
Miloslav Číž
1ab854446c
remove unused include
2017-11-11 17:21:01 +01:00
Andrei Kortunov
8c0dcd8b2b
Do not track a nearest actor during combat and pursue (bug #4179 )
2017-11-11 19:46:59 +04:00
Miloslav Číž
511a5686da
planet mapping adjustment
2017-11-11 15:10:54 +01:00
Miloslav Číž
4fc532d873
reference screenshot settings only from one place
2017-11-11 14:32:28 +01:00
Miloslav Číž
d71d984cfa
more unused stuff cleanup
2017-11-11 14:14:24 +01:00
Miloslav Číž
525f8b4d8e
get rid of special key for 360 screenshot
2017-11-11 13:51:42 +01:00
rexelion
f0649849b8
changed variable name to be more descriptive
2017-11-11 12:00:23 +00:00
Andrei Kortunov
9943bd4d74
AiWander fast forwarding improvements (bug #3638 )
2017-11-11 15:31:06 +04:00
Andrei Kortunov
03f129b53c
remove redundant allowedToInsertItems() function from ItemModel
2017-11-11 11:58:22 +04:00
Andrei Kortunov
99517d83ea
Bound items detection refactoring
2017-11-11 11:58:22 +04:00
Andrei Kortunov
a02124f884
Handle item owners during pickpocketing
2017-11-11 11:58:18 +04:00
scrawl
f1aeb416ec
Disable Activate key when textinput is active (Bug #4151 )
2017-11-10 22:54:53 +00:00
scrawl
b06512a60d
Fix error message that referred to the wrong file (Bug #4159 )
2017-11-10 22:51:32 +00:00
scrawl
1afbf99f74
Make movement keys not function in text input mode
2017-11-10 22:51:31 +00:00
Miloslav Číž
1f49612ca3
enable water effects for 360 screenshots
2017-11-10 19:18:16 +01:00
Miloslav Číž
319ed2f9b8
disable 360 screenshots in vanity/preview mode
2017-11-10 15:23:44 +01:00
Miloslav Číž
497b33e403
small corrections
2017-11-10 14:28:09 +01:00
rexelion
69a56eaea3
don't initialise rangeAttackOfTarget
2017-11-10 10:44:53 +00:00
Miloslav Číž
9ab3a0c44b
set cubemap width differently
2017-11-10 11:16:25 +01:00
Miloslav Číž
5baff05bac
add cubemap mapping
2017-11-10 10:50:28 +01:00
Miloslav Číž
5a07d135ae
add settings for cubemap size
2017-11-10 10:34:46 +01:00
Kyle Cooley
1cd539bad2
Fix render order for markers
2017-11-10 02:06:06 -05:00
Andrei Kortunov
3694b6ec90
Move onClose() check to item models
2017-11-10 10:58:43 +04:00
Andrei Kortunov
ac33ff9482
Move onDropItem() check to item models
2017-11-10 10:58:43 +04:00
Andrei Kortunov
3604b73d60
Move onTakeItem() to item models
2017-11-10 10:58:40 +04:00
Kyle Cooley
556117f6e6
Update marker transparency when changed.
2017-11-10 01:56:06 -05:00
Miloslav Číž
43c49e2f31
delete accidentally commited files
2017-11-09 23:12:23 +01:00
Miloslav Číž
1b184d8716
correct player mask
2017-11-09 23:09:13 +01:00
Miloslav Číž
e54c0a90fa
fix mirrored spherical screenshots
2017-11-09 21:14:02 +01:00
Miloslav Číž
d763e9fe46
add settings for spherical screenshots
2017-11-09 20:25:29 +01:00
Kyle Cooley
de214db8d4
Use configured transparency.
2017-11-09 13:45:32 -05:00
Kyle Cooley
197ea95646
Prevent arrows for move/scale markers from intersecting.
2017-11-09 13:04:46 -05:00
Miloslav Číž
8f32114025
segfault fix
2017-11-09 18:26:27 +01:00
Miloslav Číž
d4fd08a63f
save 360 screenshots in the configured directory
2017-11-09 16:49:46 +01:00
Miloslav Číž
1b97a541f4
make a new action for 360 screenshot
2017-11-09 16:06:29 +01:00
rexelion
983c33c4c8
don't use a pointer for ActionWeapon
2017-11-09 14:23:26 +00:00
Miloslav Číž
f60840754f
disable water effects for spherical screenshots
2017-11-09 14:44:42 +01:00
AnyOldName3
548c42b5fd
Disable over-zealous shadows in the character preview.
2017-11-08 13:38:30 +00:00
AnyOldName3
64d5d0fd66
Prevent the local map from being considered to be shadowed.
2017-11-08 13:30:13 +00:00
Miloslav Číž
5698d70806
small planet mapping
2017-11-08 12:58:27 +01:00
Miloslav Číž
5f36518181
spherical mapping
2017-11-08 09:15:45 +01:00
AnyOldName3
e201e359a9
Move Shadow to Components
2017-11-08 01:44:49 +00:00
AnyOldName3
1a30a917af
Merge upstream/master
2017-11-08 01:31:38 +00:00
AnyOldName3
2e7951c83f
Remove unused mask
2017-11-08 01:28:10 +00:00
AnyOldName3
aa31cbba4f
Attempt (and fail) to make the local map show without unwanted shadow
2017-11-08 01:20:52 +00:00
scrawl
41ecbdbe6c
Add missing WaitDialog::clear() ( Fixes #4196 )
2017-11-08 00:56:05 +00:00
AnyOldName3
c3616ca78b
Merge branch 'osgshadow-test-vdsm-sky-method-two' into osgshadow-test-vdsm
2017-11-08 00:35:54 +00:00
scrawl
9ecdcc187f
Clarify a warning message refers to inventory objects
2017-11-08 00:26:09 +00:00
scrawl
95b3c1181a
Update shader with a non-color tracking material when equipment is changed during chameleon/invisibility effects ( Fixes #4190 )
2017-11-08 00:24:52 +00:00
scrawl
e42bd71081
Add missing WaitDialog::clear() ( Fixes #4196 )
2017-11-08 00:24:04 +00:00
AnyOldName3
25432146f7
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-11-07 22:08:21 +00:00
Miloslav Číž
4761a3d98b
dirty cylindrical projection
2017-11-07 22:13:05 +01:00
AnyOldName3
3403205231
Use three shadow maps per light
2017-11-07 20:34:48 +00:00
Miloslav Číž
3be9e2ee95
make spherical screenshot class
2017-11-07 19:47:36 +01:00
rexelion
cab0002461
Backing up distance is now dependent on opponents's weapon range; don't back up from ranged oponents
2017-11-07 17:57:23 +00:00
AnyOldName3
3106159721
Turn off all shadow texture units for the sky now it is possible for there to be more than one
2017-11-07 16:40:32 +00:00
AnyOldName3
09b02c307a
Merge from base branch
2017-11-07 16:34:51 +00:00
Miloslav Číž
5afe02505b
hide player in first person 360 screenshot
2017-11-07 16:12:31 +01:00
Miloslav Číž
ce55d7c2f5
basic cubemap rendering
2017-11-07 15:02:01 +01:00
Miloslav Číž
7feba7e498
basic setup for 360 screenshots
2017-11-07 13:07:11 +01:00
rexelion
a1d9f11b04
use fProjectileMaxSpeed for ranged weapons distance
2017-11-07 11:43:21 +00:00
Kyle Cooley
492b99b008
Transparent object markers
2017-11-07 00:41:27 -05:00
AnyOldName3
56fa33af66
Enable parallel split shadow maps
2017-11-07 00:32:04 +00:00
scrawl
801f2d42d5
Merge pull request #1537 from drummyfish/guardfix
...
Check the real distance to target in AIPursue (issue #4184 )
2017-11-05 23:24:59 +00:00
Miloslav Číž
f98a821482
fix possible bug in aipursue
2017-11-05 23:46:15 +01:00
scrawl
87c79d7102
Merge pull request #1536 from rexelion/knockoutfix
...
Wait a few seconds before getting up (fixes #3884 )
2017-11-05 20:27:54 +00:00
scrawl
45993d3da2
Merge pull request #1529 from drummyfish/animfix
...
Stop character landing animation when turning (issue #4177 )
2017-11-05 20:24:24 +00:00
Miloslav Číž
430d01a39a
additional animation refactor
2017-11-05 20:19:47 +01:00
rexelion
de7a7d842b
mTimeUntilWake is initialised in the constructor
2017-11-05 18:30:34 +00:00
scrawl
e6303c578c
Merge pull request #1530 from rexelion/curseitemfix
...
Trigger OnActivate when item is picked up through the inventory (Issue #3726 )
2017-11-05 15:35:39 +00:00
AnyOldName3
7a03ad6558
Switch to a tidier way of disabling the correct texture unit
2017-11-05 14:46:03 +00:00
AnyOldName3
26fe47b9a2
Merge branch 'osgshadow-test-vdsm' into osgshadow-test-vdsm-sky-method-two
2017-11-05 14:39:41 +00:00
AnyOldName3
3f63ebce77
Theoretically, at least, fix everything (except hte sky issue which is resolved in another branch)
2017-11-05 14:37:36 +00:00
rexelion
48ec680f23
use game time instead of real time
2017-11-04 19:37:20 +00:00
Miloslav Číž
f34223fce9
check the real distance to target in aipursue
2017-11-04 20:02:21 +01:00
rexelion
ab66034ed1
use uniform_int_distribution instead of rand()
2017-11-04 02:15:56 +00:00
rexelion
ee2f3db9a8
fixed randomness
2017-11-04 01:31:15 +00:00
rexelion
8c2cc0f42f
break invisibility first
2017-11-04 00:44:16 +00:00
rexelion
bcbfa5fe1e
prevent activation, leave the rest to the script
2017-11-04 00:38:33 +00:00
rexelion
de83ad0116
use real time; wait random number of seconds
2017-11-04 00:24:09 +00:00
AnyOldName3
d0587a3ad5
Clean up the debug hud now it's working.
2017-11-03 14:33:06 +00:00
AnyOldName3
b0c0c88201
Merge branch 'osgshadow-test-vdsm' into osgshadow-test-vdsm-sky-method-two
2017-11-03 00:44:47 +00:00
rexelion
5b8610b34b
knocked out characters wait some time before getting up
2017-11-01 23:44:50 +00:00
AnyOldName3
ce0e937e8d
Attempt to force the sky to not accept the default shadow shader or shadow texture.
2017-11-01 18:22:59 +00:00
rexelion
a9e5e19482
OnActivate is triggered when the item is picked up
2017-10-31 22:33:26 +00:00
scrawl
ceaf0ee409
Enable shadow casting for terrain
...
Add a check to TerrainDrawable to make sure shadows are only drawn once, not once per blending pass
2017-10-31 21:21:05 +01:00
scrawl
8141ee47d5
Fix shader compile error
2017-10-31 20:22:14 +01:00
scrawl
d0866d1b3c
Revert change to node mask that appears to not serve any purpose
2017-10-31 20:21:54 +01:00
Miloslav Číž
ff1265c0e7
refactor jump animation
2017-10-31 14:22:24 +01:00
AnyOldName3
1d4b8656d1
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-10-30 22:40:40 +00:00
rexelion
e8743f3f79
check the presence of OnActivate using the SuppressActivate flag instead of looking for keywords
2017-10-30 21:16:25 +00:00
AnyOldName3
ab669a434e
Update the shadow frustrum bounds properly
2017-10-30 19:54:54 +00:00
Miloslav Číž
3c65bdaf14
weapon cycle fix
2017-10-30 18:05:45 +01:00
Miloslav Číž
7bc512974f
use mcurrentjump instead of custom attrib
2017-10-30 15:26:38 +01:00
rexelion
4e6f53d6f1
item added to the player and OnActivate is triggered when the inventory is closed
2017-10-29 11:45:17 +00:00
rexelion
1ee5dcff77
added a function to determine if a script contains OnActivate
2017-10-28 20:56:08 +01:00
Miloslav Číž
5c8f491441
move animation disabling code to a better place
2017-10-28 18:46:52 +02:00
Miloslav Číž
f9c396e0ea
stop landing animation when turning
2017-10-28 15:48:07 +02:00
Miloslav Číž
03401bb5df
remove redundant condition
2017-10-27 20:19:20 +02:00
AnyOldName3
ef8a7d1cb9
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-10-26 23:40:05 +01:00
AnyOldName3
cf54b4a130
Prevent debug HUD geometry from being culled erroneously.
2017-10-26 20:38:36 +01:00
scrawl
f9397ce933
Merge branch 'master' into openmw-43
2017-10-25 14:17:06 +00:00
Alexander "Ace" Olofsson
3e51c9e6b3
Missed the OpenCS config file
2017-10-24 23:23:55 +02:00
scrawl
4a7be0ffda
Don't reset journal index to a lower value ( Fixes #4172 )
2017-10-24 20:02:35 +00:00
scrawl
4437a72e47
Merge pull request #1519 from drummyfish/rainfix
...
fix rain ripple regression (bug #4169 )
2017-10-24 15:31:16 +00:00
Miloslav Číž
3731e20228
fix rain ripple regression
2017-10-24 14:12:41 +02:00
scrawl
0c6ef17fb5
Add explicit variant of 'OnActivate'
2017-10-23 23:33:06 +00:00
scrawl
e564dd842e
Refactor dialogue responses to make sure messages from scripts are printer afterwards, not before the dialogue response ( Fixes #4166 )
...
Don't delete Link objects prematurely (Fixes #4171 )
2017-10-23 23:33:06 +00:00
scrawl
2a0b2c4e24
Hide modal window before deleting it ( Fixes #4168 )
2017-10-23 23:33:05 +00:00
scrawl
8b19a8b7f6
Merge pull request #1513 from lukago/feature4082b
...
Feature #4082 : use many ingredients/potions instantly
2017-10-22 20:51:14 +00:00
scrawl
3d0094bd2e
Fix behavior of 'journal' command when invoked with already seen entry
2017-10-22 20:50:15 +00:00
scrawl
768da57da2
Fix dialogue topics displayed in lower case
2017-10-22 20:50:15 +00:00
lukago
b6cb3b445c
use getIndex to handle other windows, nullsafe fixes
2017-10-21 23:34:57 +02:00
AnyOldName3
1c6e23f660
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-10-21 18:36:37 +01:00
scrawl
bb4ffb7743
Merge pull request #1514 from akortunov/ringfix
...
Do not replace an equpped ring of the same value
2017-10-21 13:35:55 +00:00
scrawl
075a7fee20
Merge pull request #1515 from akortunov/guifixes
...
Fix a 'Good Beast' companion window
2017-10-21 13:35:29 +00:00
scrawl
5b2fe01375
Merge pull request #1508 from AnyOldName3/shut-up-travis
...
Mark worldimp functions as override to stop distracting Travis CI war…
2017-10-21 13:34:48 +00:00
Andrei Kortunov
eaff7e30aa
Fix a 'Good Beast' companion window
2017-10-21 16:56:21 +04:00
Andrei Kortunov
e64f14b7ce
Do not replace an equpped ring of the same value
2017-10-20 23:05:12 +04:00
AnyOldName3
e24b76fb5e
Merge branch 'master' into osgshadow-test-vdsm
2017-10-20 18:18:38 +01:00
lukago
a3225364ff
refactor, use dragItem method
2017-10-19 17:43:27 +02:00
AnyOldName3
03fc3353b9
Tidy up indentation 2
2017-10-19 16:34:50 +01:00
AnyOldName3
f3e6b26e6b
Tidy up indentation
2017-10-19 16:34:11 +01:00
scrawl
9be27193a3
Merge pull request #1512 from Rhiyo/patch-1
...
fixed new clothing replacing old clothing of same value
2017-10-19 14:54:27 +00:00
lukago
43f94a8890
simplify drag and drop on avatar for potions and ingredients
2017-10-19 16:50:04 +02:00
AnyOldName3
2a90dff388
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-10-19 15:06:49 +01:00
Marc Zinnschlag
0b163f0a50
Merge remote-tracking branch 'aesylwinn/forceNewProject'
2017-10-19 14:44:30 +02:00
Marc Zinnschlag
bdabace7e2
Merge remote-tracking branch 'aesylwinn/LLmerge'
2017-10-19 14:24:58 +02:00
Rhiyo
d9fe3aac99
fixed new clothing replacing old clothing of same value
...
Found on the bug http://bugs.openmw.org/issues/4165 .
In original Morrowind, new clothing of the same value wouldn't replace old clothing. Tested with common and expensive clothing by selling to merchants and using the AddItem console command in original Morrowind.
In OpenMW, before this change, new clothing of the same value would replace old clothing, tested with the same methods used above.
2017-10-19 22:46:08 +10:30
Kyle Cooley
6d8666d80d
Force new project file when creating new project
2017-10-18 20:21:44 -04:00
AnyOldName3
2abff22c08
Make MWWorld::World final to enable compiler optimisations
2017-10-18 13:48:31 +01:00
AnyOldName3
7440cf37bc
Remove redundant virtual keywords implied by override keywords
2017-10-18 13:37:37 +01:00
AnyOldName3
69da89be39
Mark a method I missed out the first time as override
2017-10-18 13:05:04 +01:00
scrawl
33ceddc58b
Merge pull request #1506 from akortunov/swimanimations
...
Use SwimTurnLeft/Right animations correctly
2017-10-18 10:03:30 +00:00
scrawl
21a705fb75
Merge pull request #1507 from AnyOldName3/data-local-fix
...
Fix the loading of 'data-local' lines which I broke
2017-10-18 09:59:43 +00:00
scrawl
7328de6c50
Merge pull request #1505 from drummyfish/master
...
Make snow create water ripples (fixes #4156 )
2017-10-18 09:59:21 +00:00
AnyOldName3
2aad5bed7a
Mark worldimp functions as override to stop distracting Travis CI warnings and prevent future typos
2017-10-18 05:06:09 +01:00
AnyOldName3
43e9e955c8
Do the same for the CS
2017-10-18 02:04:48 +01:00
AnyOldName3
1f77f9654b
Strip quotes from the data-local setting if present (because for whatever reason it's a string, not a boost::filesystem::path)
2017-10-18 01:42:11 +01:00
Andrei Kortunov
4d4d247565
Use SwimTurnLeft/Right animations correctly
2017-10-17 23:26:55 +04:00
Miloslav Číž
a7cad65aab
fix water shader switching bug
2017-10-17 10:00:01 +02:00
Miloslav Číž
8a1e0e74fd
update uniform from one place
2017-10-17 09:59:53 +02:00
Miloslav Číž
797e407269
make snow create water ripples
2017-10-17 09:59:53 +02:00
Miloslav Číž
da47653625
move rain intensity uniform to water node
2017-10-17 09:59:45 +02:00
Kyle Cooley
6d7a24224b
Add documentation.
2017-10-16 12:52:13 -04:00
AnyOldName3
654bd401fb
Switch openmw-cs to the escape versions of option types
2017-10-16 15:38:17 +01:00
scrawl
03554b2f4b
Fix some style issues flagged by cppcheck
2017-10-15 17:06:58 +02:00
scrawl
64d02f577e
Fix missing null check
2017-10-15 17:06:58 +02:00
scrawl
624046c558
Fix unused event handler
2017-10-15 17:06:58 +02:00
scrawl
bbf9b0c0a7
Merge pull request #1503 from akortunov/regressions
...
Handle Trespassing crime differently from Theft
2017-10-15 09:08:52 +00:00
scrawl
97ec38affb
Merge pull request #1492 from drummyfish/master
...
fix rain/snow moving with player (issue #2698 )
2017-10-15 09:04:48 +00:00
Andrei Kortunov
8f255a6b72
Handle Trespassing crime differently from Theft (bug #4158 )
2017-10-15 11:03:02 +04:00
Miloslav Číž
af6eeddbe5
use operator instead of drawcallback
2017-10-15 00:04:14 +02:00
Miloslav Číž
65977b910e
wrap weather around in all directions
2017-10-14 21:42:27 +02:00
Miloslav Číž
380a5799dd
use bbox as wrap range & apply to all particle systems
2017-10-14 21:42:19 +02:00
Miloslav Číž
38bfa64100
transform weather particles to world space
2017-10-14 21:42:11 +02:00
Miloslav Číž
8114126a62
make use of renderinfo
2017-10-14 21:41:59 +02:00
Miloslav Číž
33a1459b11
search for particle system by class name
2017-10-14 21:41:47 +02:00
Miloslav Číž
b95c9ba483
rain independent from camera plus wrap-around
2017-10-14 21:40:28 +02:00
Kyle Cooley
11eae16645
Get rid of duplicate function, fix flag checking
2017-10-14 15:09:12 -04:00
Kyle Cooley
d27071f06a
Fix LTEX import bug.
2017-10-14 13:18:54 -04:00
Kyle Cooley
98c38ad7d1
Merge cleanup.
2017-10-14 13:18:31 -04:00
Kyle Cooley
6d9d98c02c
Merge Land/LandTextures
2017-10-14 11:32:42 -04:00
scrawl
548af6dbfb
Fix jail screen fading
2017-10-14 14:03:16 +00:00
scrawl
f3ca9832b0
Merge pull request #1500 from akortunov/extraspell
...
Implement ExtraSpell magic effect
2017-10-14 14:01:49 +00:00
Andrei Kortunov
30b05b557b
ExtraSpell magic effect: a basic implementation
2017-10-14 16:55:00 +04:00
AnyOldName3
737563875a
Remove superfluous - sign and switch to other debug shader
2017-10-14 01:13:45 +01:00
AnyOldName3
147455626e
Merge OpenMW/master
2017-10-13 21:39:15 +01:00
AnyOldName3
ef7102899a
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-10-13 21:26:58 +01:00
scrawl
09d7681254
Merge pull request #1499 from lukago/bug4155
...
Bugfix #4155 : NPCs don't equip a second ring in some cases
2017-10-13 19:35:03 +00:00
glbwsk
83a5c7c3d8
removed unnecessary comments, added gitignore for clion cmake
2017-10-13 20:32:52 +02:00
AnyOldName3
be50ed7387
Use a test image guaranteed to exist.
2017-10-13 18:27:32 +01:00
AnyOldName3
26a7b48d69
Attempt to make a VDSM work, and also to set up a debug HUD, but without success.
2017-10-13 18:19:29 +01:00
scrawl
548e90a7bc
Set cursor active when moving by controller
2017-10-13 16:22:44 +00:00
glbwsk
ff9cb22a58
npc swap cheaper ring during auto equip
2017-10-13 15:16:07 +02:00
glbwsk
e6e482ea98
added some comments for autoEquip
2017-10-13 14:47:26 +02:00
glbwsk
a25903b075
fixed autoequiping rings by npc - now checks if right hand is free
2017-10-13 14:39:44 +02:00
scrawl
479f9535b4
Allow training window exit()
2017-10-08 20:38:20 +00:00
scrawl
9cde3e4408
Merge pull request #1495 from akortunov/regressions
...
Add showsInInventory() check to the ContainerItemModel
2017-10-08 14:09:59 +00:00
Andrei Kortunov
ea3729790f
Add showsInInventory() check to the ContainerItemModel
2017-10-08 09:20:07 +04:00
AnyOldName3
b94bbe00cb
Merge remote-tracking branch 'upstream/master' into osgshadow-test
2017-10-08 00:18:02 +01:00
Kyle Cooley
b14404e9cc
Fix region colors
2017-10-06 20:05:06 -04:00
scrawl
7021d354c6
Merge pull request #1493 from akortunov/regressions
...
Regression fixes
2017-10-06 16:21:16 +00:00
scrawl
2805781542
Fix a crash when exit() already hides the window ( Fixes #4148 )
2017-10-06 16:18:57 +00:00
Andrei Kortunov
ad27e0f945
Fix owned tooltip in the spellwindow
2017-10-06 11:38:27 +04:00
Andrei Kortunov
e2afd3690c
Remove item by id from InventoryStore
2017-10-06 10:54:25 +04:00
scrawl
842a42ee66
Fix non-top level Windows accepting key focus
2017-10-05 18:41:02 +02:00
scrawl
8c0790580a
Add screen fading for exterior cell transitions
2017-10-05 18:41:02 +02:00
scrawl
cd437f094d
Fix exiting savegamedialog with 'esc' when no game is running
2017-10-05 18:35:09 +02:00
scrawl
d94235e3a7
Update the saves list/preview image when character selection changes to make it more convenient to flip through characters with the keyboard
2017-10-04 16:00:39 +00:00
scrawl
12510efab7
Fade screen out during loading screen (when travelling)
2017-10-04 16:00:38 +00:00
scrawl
a4737d8417
Use MyGUI frame events for ScreenFader
2017-10-04 16:00:38 +00:00
scrawl
e4f0f7157a
Fix pinned windows not being updated
2017-10-04 16:00:37 +00:00
scrawl
49a0922f1b
Remove 'visibility mask' gui feature which did not end up being useful
2017-10-04 16:00:37 +00:00
scrawl
7c68ed04b2
Don't require modal windows to be removed in the same order they were added
2017-10-04 16:00:37 +00:00
scrawl
b5c9977a7b
Merge pull request #1489 from akortunov/guifixes
...
Use an "owned crosshair" feature for items in containers
2017-10-04 15:59:43 +00:00
Andrei Kortunov
1cb7ed5db1
Use owned tooltips for items in containers correctly
2017-10-04 12:13:45 +04:00
scrawl
433028e8d7
Fix GUI regressions
2017-10-03 22:07:56 +00:00
Marc Zinnschlag
dd17f70068
Merge remote-tracking branch 'aesylwinn/landrecords'
2017-10-03 13:32:02 +02:00
AnyOldName3
0568c93b39
Add specific shadow source files to MWRender
2017-10-03 03:40:23 +01:00
AnyOldName3
ba1e2cab2f
Merge remote-tracking branch 'upstream/master' into osgshadow-test
2017-10-03 03:00:15 +01:00
Kyle Cooley
2f5449a68c
Remove now unnecessary overrides.
2017-10-02 16:13:40 -04:00
Kyle Cooley
137ea872d3
Hide base land textures.
2017-10-02 15:56:22 -04:00
scrawl
b24fd77ea2
Merge pull request #1488 from akortunov/equipfix
...
AI: Autoequip armor when bound armor spell expires
2017-10-01 16:06:26 +00:00
scrawl
302e3c8b3d
Merge pull request #1486 from akortunov/pickpocketfix
...
Fix some issues with pickpocketing (bug #4131 )
2017-10-01 16:05:38 +00:00
Andrei Kortunov
21b6bd176f
AI: Autoequip armor when bound armor spell expires
2017-10-01 17:11:30 +04:00
Andrei Kortunov
c5fcb9684e
Improve owned crosshair feature behaviour
2017-09-30 21:29:02 +04:00
Andrei Kortunov
b8fd530ee1
Do not speak with unconscious creatures
2017-09-30 21:20:38 +04:00
Andrei Kortunov
f26206b630
Make unconscious actors do not speak and do not track targets
2017-09-30 20:55:42 +04:00
Andrei Kortunov
3ebb18ce18
Make unconscious actors do not report about crimes
2017-09-30 20:35:29 +04:00
Andrei Kortunov
34895157f9
Consider taking items from unconscious NPC as a theft
2017-09-30 20:22:26 +04:00
Andrei Kortunov
04452b0949
Use a pickpocket crime instead of theft when pickpocketing was failed
2017-09-30 20:11:53 +04:00
scrawl
3c62a8c5c2
Fix console selected object persisting on a new game
2017-09-30 15:40:47 +00:00
scrawl
097b9d90bc
Fix travel service not showing
2017-09-30 15:40:47 +00:00
Kyle Cooley
dfcbee3ab1
Ignore case when comparing textures, also add new textures to lookup map.
2017-09-30 00:04:52 -04:00
scrawl
77ddaa869b
Merge pull request #1484 from drummyfish/master
...
fix rain ripple bug
2017-09-29 22:53:48 +00:00
Andrei Kortunov
03daf2b9e3
Fix a failed assert in the getCell() check during a new game start
2017-09-29 22:28:09 +04:00
Miloslav Číž
4999c667b6
fix rain ripple bug
2017-09-29 19:56:16 +02:00
scrawl
5b10e3128e
Use first resolution in fullscreen if current is not supported ( Fixes #4113 )
2017-09-29 14:58:25 +00:00
scrawl
64e27c032b
Merge pull request #1481 from scrawl/keyfocus
...
WindowManager overhaul & improved keyboard support
2017-09-28 22:34:05 +00:00
scrawl
05348ab7ed
Merge pull request #1483 from drummyfish/master
...
water shader improvements plus rain ripple effect (#452 )
2017-09-28 22:31:13 +00:00
scrawl
7bb0a76df2
Fix tooltips showing when cursor isn't visible
2017-09-28 19:42:16 +02:00
Miloslav Číž
8416feaf5b
link rain water ripple effect to actual rain
2017-09-28 19:04:31 +02:00
scrawl
14c9e858c8
Check to make sure button is enabled
2017-09-28 17:00:07 +00:00
scrawl
6ec66fa95f
Restore keyfocus to goodbye when selecting a topic
2017-09-28 16:57:55 +00:00
scrawl
e5d1fd022f
Merge pull request #1479 from akortunov/physics
...
Make physics framerate configurable
2017-09-27 22:31:00 +00:00
scrawl
0ae009eb21
Hide message box before deleting it
...
Fixes a crash when closing the game window during the 'plugin mismatch' dialog. Modal windows have to be hidden before they are deleted to prevent a dangling pointer in WindowManager.
2017-09-27 22:19:42 +02:00
scrawl
d53e7f8a3c
Remove redundant code
...
Already worked around in WindowBase::setVisible
2017-09-27 22:07:49 +02:00
scrawl
0deda69a27
Fix wrong skin for levelup attribute values
2017-09-27 22:04:36 +02:00
scrawl
e9d81fdf5a
Fix being able to escape interactive messageboxes
2017-09-27 22:00:20 +02:00
scrawl
db650df416
Fix 'blocking' messageboxes not handling key focus properly
2017-09-27 21:41:22 +02:00
scrawl
a0f5e32113
Fix 'new game' from the main menu not removing menu afterwards
2017-09-27 21:38:15 +02:00
scrawl
0240a6c38b
Fix controls window regression
2017-09-27 21:30:12 +02:00
Andrei Kortunov
668a947210
Inherit owner, if an item is in container (regression #4128 )
2017-09-27 20:00:41 +04:00
scrawl
2d873a13ac
Merge pull request #1469 from drummyfish/master
...
water shader improvements (partially fixes #3365 )
2017-09-27 13:14:22 +00:00
scrawl
0ee57effcc
Make 'Delete game' button not accept keyfocus, to prevent accidents
2017-09-27 12:56:12 +00:00
scrawl
c7a82704c6
Fix key focus resets in SaveGameDialog
2017-09-27 12:56:11 +00:00
scrawl
74e806d974
Additionally use movement keys (default WASD) to navigate GUI buttons
2017-09-27 12:56:10 +00:00
scrawl
3d2ad2d339
Include cleanup
2017-09-27 12:56:09 +00:00
scrawl
87311d86b5
Fix what looks like a copy/paste error
2017-09-27 12:56:08 +00:00
scrawl
7a3fbfb34a
Slightly improve journal window keyboard navigation
2017-09-27 12:56:05 +00:00
scrawl
05814c0929
Add key focus handling for WaitDialog
...
Default is 'until healed'. Up/Down arrows change the hour slider and implicitely change the button to 'Wait'.
2017-09-27 12:56:03 +00:00
scrawl
8964fc93d6
Fix dialogue window not being exited properly
2017-09-27 12:56:02 +00:00
scrawl
7a64098da3
Avoid rebuilding the dialogue topics pane unnecessarily
...
Also retaining key focus.
2017-09-27 12:56:02 +00:00
scrawl
22929e53fa
Don't ignore my own advice
...
Can't wait until MyGUI 3.2.2 is a build dependency, then we can use key focus events to handle the SDL text input.
2017-09-27 12:55:58 +00:00
scrawl
1714271a76
Improve KeyboardNavigation to better handle modal windows
...
It's no longer possible to cycle to widgets that aren't part of the current modal window.
The window manager will remember the focused widget of a modal window on a limited basis (it'll be discarded when a different modal window opens).
2017-09-27 12:55:58 +00:00
scrawl
41fe16013b
Select first widget if we can't find the current widget
2017-09-27 12:55:55 +00:00
scrawl
475ac46f3e
Workaround keyfocus issues in current versions of MyGUI
2017-09-27 12:55:54 +00:00
scrawl
010a7ea5b3
Fix tooltip widgets being set to accept key focus
2017-09-27 12:55:52 +00:00
scrawl
2514cc5cc8
Workaround key focus being reset in BookWindow when next/prev are hidden
2017-09-27 12:55:50 +00:00
scrawl
fce9a14986
Hide the mouse cursor until it's used
2017-09-27 12:55:48 +00:00
scrawl
09e93319f5
Restrict the 'fake mouse movement' workaround to where it's actually required ( Fixes #3978 )
2017-09-27 12:53:52 +00:00
Andrei Kortunov
62177ebb30
Move physics framerate from setting to environment variable
2017-09-26 21:23:15 +04:00
scrawl
9b91ea5d34
Exit drag-and-drop if dragged item is deleted ( Fixes #3097 )
2017-09-26 16:51:19 +02:00
Andrei Kortunov
6062cd4b9c
Make physics framerate configurable
2017-09-26 17:15:58 +04:00
Miloslav Číž
cde2c13900
make water depth independent of view frustum
2017-09-26 14:14:28 +02:00
scrawl
2ce79e07a4
Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways.
...
- Fix memory leaks in DialogueWindow
- Fix Link objects being deleted from their own event handler
2017-09-25 23:38:28 +02:00
scrawl
476bec41c5
Remove redundant code
2017-09-25 23:27:01 +02:00
scrawl
c5613e384e
Remove duplicate disposition code
2017-09-25 21:30:03 +02:00
scrawl
e8c6a3b225
Fix crash in dialogue filter if local variables are not configured
...
This could happen e.g. by 'some_npc_in_remote_cell->forcegreeting'
2017-09-25 21:21:51 +02:00
scrawl
36c192a1dd
Undo the console portion of 84657271c7 because it results in the console forgetting its object on opening
2017-09-25 21:15:38 +02:00
scrawl
717e68fab2
Remove redundant resetHistory argument
2017-09-25 19:58:34 +02:00
scrawl
e14573fa8c
Add missing null check
2017-09-25 19:53:42 +02:00
scrawl
19e07fad30
Remove redundant Services enum
2017-09-25 19:52:20 +02:00
scrawl
f8ffd85146
Topic passed to keywordSelected() no longer has to be lower case
...
Remove redundant mDialogueMap
2017-09-25 19:03:38 +02:00
scrawl
b7752ec52d
Make TradeWindow not depend on DialogueWindow
2017-09-25 18:07:49 +02:00
scrawl
82a211ba03
Fix duplicate code
2017-09-25 17:47:30 +02:00
scrawl
d78e822833
Add 'delay' argument for screen fading operations
2017-09-25 00:47:10 +02:00
scrawl
c035548f37
Make Tab work if selected widget is marked as not needing keyfocus
2017-09-25 00:47:09 +02:00
scrawl
ad8d0c5302
Use keypad to control the camera
2017-09-25 00:47:09 +02:00
scrawl
94b538ac82
Fix crash due to not calling WindowModal::onClose()
2017-09-25 00:47:08 +02:00
scrawl
ca3b08b852
Make Activate key accept GUI buttons
2017-09-25 00:47:08 +02:00
scrawl
67dc4e019a
Make Enter on trade window price attempt the trade
2017-09-25 00:47:07 +02:00
scrawl
8ae7e4c958
Make Enter on a name edit accept the dialog
2017-09-25 00:47:07 +02:00
scrawl
843106fc61
Handle the wait progress bar as part of the GUI mode
2017-09-25 00:47:06 +02:00
scrawl
9ed1b16553
Extend code that detects whether a key was consumed by the GUI ( Fixes #4016 )
2017-09-25 00:47:05 +02:00
scrawl
0e57f1317b
Remove redundant setVisible(false)
2017-09-25 00:47:05 +02:00
scrawl
331192f2d6
Improve keyboard navigation of book/scroll windows
2017-09-25 00:47:04 +02:00
scrawl
d58ff4a736
Remove obsolete Container GUI keyboard handling
2017-09-24 19:08:16 +02:00
scrawl
c0d8bef82f
Call changeInputMode() from updateVisible()
2017-09-24 19:08:16 +02:00
scrawl
222defc6d8
Extend HUD::clear()
2017-09-24 19:08:16 +02:00
scrawl
f6c227b966
Reset screen faders in clear()
...
Fixes a black screen when loading a game while waiting/resting.
2017-09-24 19:08:15 +02:00
scrawl
d10985e481
Remove unneeded window pointers
2017-09-24 19:08:15 +02:00
scrawl
f67dbc8aa0
Remove redundant update function
2017-09-24 19:08:15 +02:00
scrawl
e7d2a8a4dc
Call clear() for every window
2017-09-24 19:08:15 +02:00
scrawl
c6c01870ec
Call onResChange for every window
2017-09-24 19:08:15 +02:00
scrawl
2b03bc0c56
Call WindowBase::onFrame() for every active window
2017-09-24 19:08:15 +02:00
scrawl
ba7ae2663f
Use a generic container to delete windows
2017-09-24 19:08:15 +02:00
scrawl
32f9c8058a
Remove redundant RestBed gui mode
2017-09-24 19:08:14 +02:00
scrawl
9ead331741
Fix pinned windows showing in other GUI modes
2017-09-24 19:08:14 +02:00
scrawl
65a707348c
Make Tab select the first widget if none is selected
2017-09-24 19:08:14 +02:00
scrawl
5f440a29bd
Remember key focus per GUI mode
...
Among other things, this will remember the focused button in the container window, allowing quick looting of multiple containers.
2017-09-24 19:08:14 +02:00
scrawl
35110fb2f8
Remove unused and slightly broken custom button titles in ConfirmationDialog
2017-09-24 19:08:14 +02:00
scrawl
ad4b91131f
toggleGui renamed to toggleHud, remove unused variable
2017-09-24 19:08:14 +02:00
scrawl
be19f51013
Adjust some more windows to be keyboard friendlier
2017-09-24 19:08:14 +02:00
scrawl
4fff2e2e34
Refactor exitCurrentGuiMode
2017-09-24 19:08:13 +02:00
scrawl
20766fb508
Associate open/close sounds with the GUI mode
2017-09-24 19:08:13 +02:00
scrawl
531e7ac586
Allow drag-and-drop to be cancelled (Esc or Inventory key)
2017-09-24 19:08:13 +02:00
scrawl
269094ba8d
Restore the previous key focus widget when exiting modal dialog
2017-09-24 19:08:13 +02:00
scrawl
bbafe1e456
Remove redundant player cell variable
2017-09-24 19:08:13 +02:00
scrawl
84657271c7
Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window
2017-09-24 19:08:12 +02:00
scrawl
3820416277
Refactor the unholy mess that is WindowManager::updateVisible
...
GUI modes are now defined in a general and extensible way. The next commits are going to take advantage of this.
2017-09-24 19:08:12 +02:00
scrawl
01391b7eed
Rename WindowBase's open/close to onOpen/onClose
2017-09-24 19:08:12 +02:00
scrawl
5482ad0482
Fix tab completion in console to not cycle key focus
2017-09-24 19:08:11 +02:00
scrawl
c203a0774a
Adjust some layouts to take better advantage of keyboard navigation
2017-09-24 19:08:11 +02:00
scrawl
c11fe6788f
Add basic keyboard navigation for the GUI
...
(Shift)Tab cycles, arrow keys move to the next button in that direction, Enter/Space accepts.
Note: Unless MyGUI is hacked to bits, clicking on an empty space will annoyingly reset the key focus. Not sure how to deal with that yet.
The visual highlight for selected buttons requires MyGUI commit 632d007429d0bf0c7d7f6c5db4a08353a63dd839 or later to appear (to be released in 3.2.3).
2017-09-24 19:08:11 +02:00
scrawl
e7ad012977
Pass repeat key events to the GUI
...
For example, one can scroll to the last element in a list by holding down the 'Down Arrow' key.
2017-09-24 19:08:11 +02:00
scrawl
b22fedf4ae
Check 'sYes' in addition to 'sOk' for message box's default keyfocus
2017-09-24 19:08:11 +02:00
Andrei Kortunov
7d703a13a3
Fix a crash in the World::isUnderwater() if the cell is empty
2017-09-24 16:28:05 +04:00
Andrei Kortunov
9b04a7c1e6
Fix idle animations playing
2017-09-24 16:26:41 +04:00
scrawl
2a14af2e27
Merge pull request #1474 from akortunov/swimanimations
...
Implement missing swim animations
2017-09-23 23:33:37 +00:00
scrawl
22222f07ae
Merge pull request #1475 from akortunov/wanderfix
...
AiWander: reset spawn position, if an actor was moved to another cell
2017-09-23 23:10:35 +00:00
scrawl
2494c22d66
Merge pull request #1470 from MiroslavR/convertmprj
...
ESS-Importer: Convert magic projectiles
2017-09-23 22:55:56 +00:00
Andrei Kortunov
91adfc9fc0
AiWander: reset spawn position, if an actor was moved to another cell (bug #4010 )
2017-09-23 20:59:06 +04:00
MiroslavR
b5f5268ff3
Clean up faraway projectiles
2017-09-23 18:54:17 +02:00
Andrei Kortunov
a57f6ac2af
Fix a typo in attack animation name
2017-09-23 08:25:58 +04:00
Kyle Cooley
1fe1ec63c4
Fix Qt4 build
2017-09-22 23:33:50 -04:00
Kyle Cooley
3981f79d38
Change flag for base land textures
2017-09-22 22:59:50 -04:00
Kyle Cooley
054e6a780e
Use map for texture lookup.
2017-09-22 22:43:45 -04:00
Kyle Cooley
4921e7f5c1
Get rid of reinterpret cast.
2017-09-22 22:42:09 -04:00
Andrei Kortunov
bcad431cc5
Implement SwimTurnLeft/Right animations
2017-09-22 16:07:00 +04:00
Andrei Kortunov
1c6cfad3cc
Implement SwimHit animation
2017-09-22 15:49:42 +04:00
Andrei Kortunov
3eb1308c0d
Implement SwimKnockdown/out animations
2017-09-22 15:26:35 +04:00
Andrei Kortunov
6260bb1366
Implement SwimAttack1-3 and SwimDeathKnockDown/Out animations
2017-09-22 14:51:06 +04:00
scrawl
0e648222b8
Merge pull request #1446 from akortunov/takeallfix
...
Do not allow to equip a replacement, when take all items from a dead corpse
2017-09-22 09:14:21 +00:00
Miloslav Číž
8df79625e8
fix water shader
2017-09-22 10:53:02 +02:00
Andrei Kortunov
4580024d76
Unequip all items from dead corpse when take all items (bug #4095 )
2017-09-22 12:32:47 +04:00
Miloslav Číž
16d9773c6c
fix water shader artifacts at shores
2017-09-21 22:25:36 +02:00
scrawl
75c047a6e0
Merge pull request #1472 from akortunov/equipfix
...
Do not play draw weapon animation when equip a new weapon
2017-09-21 13:05:14 +00:00
Andrei Kortunov
5da532a36c
Do not play draw weapon animation when equip a new weapon (bug #4056 )
2017-09-21 10:48:52 +04:00
scrawl
f004622530
Fix global map arrow/button not showing for a split second when the window is opened for the first time
2017-09-20 22:24:20 +00:00
scrawl
fa364726b8
Merge pull request #1468 from akortunov/itemsorting
...
Improve item sorting in inventory and containers
2017-09-20 22:22:56 +00:00
scrawl
7dec773ea9
Fix global map arrow/button not showing for a split second when the window is opened for the first time
2017-09-20 23:03:14 +02:00
MiroslavR
f15de6d3ca
ESS-Importer: Convert magic projectiles ( Closes #2320 )
2017-09-20 18:58:56 +02:00
Andrei Kortunov
771f58ce58
Remove unwanted warnings
2017-09-20 19:47:14 +04:00
Miloslav Číž
566fa6c118
Merge branch 'master' of git://github.com/OpenMW/openmw
2017-09-20 16:39:31 +02:00
Miloslav Číž
2346c5338e
increase water fudge to get rid of artifacts
2017-09-20 16:34:27 +02:00
scrawl
5ebb43a422
Merge pull request #1467 from akortunov/guifixes
...
Restack soulgems when use SoulTrap
2017-09-20 14:15:49 +00:00
Andrei Kortunov
9d826b2deb
Improve item sorting in inventory and containers
2017-09-20 11:57:00 +04:00
Andrei Kortunov
9342a0254f
Restack soulgems when use SoulTrap
2017-09-20 10:44:24 +04:00
AnyOldName3
99f6a1b8e1
Switch to LispSM
2017-09-19 23:44:37 +01:00
scrawl
26e3de1025
Merge pull request #1464 from akortunov/guifixes
...
Fixed padding of MessageBox buttons
2017-09-19 20:16:09 +00:00
scrawl
5688257837
Merge pull request #1462 from kcat/master
...
Minor animation fixes
2017-09-19 20:15:47 +00:00
scrawl
ed5b6320f3
Merge pull request #1463 from akortunov/getdetected
...
Allow to use GetDetected without a reference
2017-09-19 20:15:16 +00:00
Andrei Kortunov
2806a35a61
Fixed padding of MessageBox buttons
2017-09-18 23:09:38 +04:00
Andrei Kortunov
65d8e2ff5d
Allow to use GetDetected without a reference (bug #3110 )
2017-09-18 21:46:57 +04:00
Chris Robinson
917a3b5dff
Avoid creating temp strings when looking for an animation stop key
2017-09-18 01:41:05 -07:00
Chris Robinson
b770c1493f
Don't spam about missing animations
2017-09-18 01:28:40 -07:00
Chris Robinson
074be7d7c6
Remove a function from the sound manager interface
2017-09-18 01:28:39 -07:00
Marc Zinnschlag
e6caacec04
Merge remote-tracking branch 'plutonicoverkill/pref-pane-width'
2017-09-18 10:19:21 +02:00
Kyle Cooley
50d9d9f78f
Get rid of some templates, exceptions instead of assert, and other small changes.
2017-09-17 20:29:51 -04:00
scrawl
d294d7e284
Fix possible fall damage when switching from falling to flying
2017-09-17 23:16:49 +00:00
scrawl
00034192dc
Fix player Ptr in RenderingManager not being updated on cell changes
...
Noticed that 'setpos' wasn't working in the console with the player selected.
2017-09-17 23:07:17 +00:00
scrawl
fcb815f2c7
Move fall height reset into PhysicsSystem ( Fixes #4049 )
...
To avoid using onGround before it's actually set.
2017-09-17 23:06:51 +00:00
scrawl
a560841705
Merge pull request #1460 from AnyOldName3/invalid-death-count-cleaning
...
Check death counts are for valid actors before loading them
2017-09-17 14:42:56 +00:00
scrawl
242d085da0
Merge pull request #1455 from kcat/master
...
Print sound init info and preload sound buffer info
2017-09-17 13:24:15 +00:00
scrawl
c39c29722b
Merge pull request #1459 from akortunov/cyclingfix
...
Cycle only through weapons which player can equip
2017-09-17 13:17:41 +00:00
AnyOldName3
0be7e2a5a5
Fix really obvious flaw with ignored records not being skipped that I missed
2017-09-17 14:16:17 +01:00
Andrei Kortunov
10a0136b4a
Cycle only through weapons which can be equipped by player (bug #4104 )
2017-09-17 17:14:50 +04:00
AnyOldName3
5a5cb1a160
Check death counts are for valid actors before loading them
2017-09-17 14:09:29 +01:00
Andrei Kortunov
3fb3c4c20f
Add scrollbar to a birth effect lists (bug #4105 )
2017-09-17 14:06:01 +04:00
PlutonicOverkill
5e60fb7c10
Fix preferences pane width
2017-09-17 21:09:28 +12:00
Chris Robinson
41bb35655b
Avoid an extra call to get the buffer size
2017-09-16 16:25:32 -07:00
Chris Robinson
5c53ee42a1
Prepare all Sound_Buffers when retrieving the first one
2017-09-16 16:25:32 -07:00
Chris Robinson
4b448c74d2
Use range-for loops instead of for_each
2017-09-16 16:25:32 -07:00
Chris Robinson
1e729e8da9
Avoid more explicit loops
2017-09-16 16:25:32 -07:00
Chris Robinson
9dbb713b7c
Print a bit more information for sound initialization
2017-09-16 16:25:32 -07:00
Chris Robinson
acd6d9cd72
Try opening the default device fallback in OpenAL_Output
2017-09-16 16:25:32 -07:00
scrawl
f594eda574
Reset attackStrength when starting a new attack ( Fixes #3935 )
2017-09-16 23:04:54 +00:00
scrawl
5dd2e871c8
Merge pull request #1450 from kcat/master
...
Sound improvements
2017-09-16 15:59:13 +00:00
scrawl
820e0e9195
Merge pull request #1453 from MiroslavR/convertproj
...
ESS-Importer: Convert ballistic projectiles
2017-09-15 20:53:08 +00:00
scrawl
a8c287b692
Merge pull request #1447 from akortunov/stancechangefixes
...
Clear player fields upon reload (bug #2639 )
2017-09-15 20:48:28 +00:00
Andrei Kortunov
44738e1141
Clear player fields upon reload (bug #2639 )
2017-09-15 22:39:56 +04:00
Chris Robinson
d68e1581ee
Use an std::array for the OpenAL stream buffers
2017-09-15 05:40:20 -07:00
Chris Robinson
780e82480d
Make the PlayMode and PlayType enums scoped
...
Also shorten them by putting them in the MWSound namespace
2017-09-15 02:36:59 -07:00
Chris Robinson
0c1ad7c74e
Replace a few more explicit loops
2017-09-15 02:36:46 -07:00
Chris Robinson
1e123a22e1
Avoid some explicit loops
2017-09-14 16:56:46 -07:00
Chris Robinson
3757571d46
Set HRTF when initializing the device
2017-09-14 16:00:43 -07:00
Chris Robinson
c17edfd547
Don't be so throw-happy in the sound manager
2017-09-14 16:00:43 -07:00
Chris Robinson
abe80f5868
Move the soundlist when updating a Ptr instead of copying
2017-09-14 16:00:43 -07:00
Chris Robinson
605c937572
Ensure 3D sources are spatialized
...
Standard OpenAL does not spatialize non-mono sounds, although the game has some
stereo sounds meant to play in 3D. The desired behavior can be achieved with
the AL_SOFT_source_spatialize extension.
2017-09-14 16:00:43 -07:00
Chris Robinson
6f57233ba1
Avoid copying the same Ptr with each iteration
2017-09-14 16:00:42 -07:00
Chris Robinson
edfba68eb5
Apply reverb and a low-pass filter when underwater
...
This replaces the pitch-shift effect when available.
2017-09-14 16:00:42 -07:00
Chris Robinson
27eeaf90d0
Use unordered_map for the music playlist and sound buffer caches
2017-09-14 16:00:42 -07:00
Chris Robinson
033303b911
Properly update the near water sound volume
2017-09-14 16:00:42 -07:00
Chris Robinson
0b720cd90c
Set the appropriate meter/unit scale for sound
2017-09-14 16:00:41 -07:00
Chris Robinson
c790fedd3f
Load an effect and filter for underwater
2017-09-14 16:00:41 -07:00
Chris Robinson
3d37cb3cf6
Load EFX functions when available
2017-09-14 16:00:41 -07:00
Chris Robinson
c5a3fb7ccd
Simplify checking for near water sfx change
...
Rather than checking every frame you're near the water, only check when the
current cell changed (the sfx will only change when moving between interior and
exterior). It also doesn't need to look through all playing sounds, as it's a
local one not attached to a Ptr.
2017-09-14 16:00:41 -07:00
Chris Robinson
617c05f557
Make Sound and Stream sibling types
...
To avoid being able to accidentally cast a Stream* to a Sound*, or vice-versa.
2017-09-14 16:00:40 -07:00
Chris Robinson
9e45f6d05f
Make a note that stopTrack needs to be called for a stopping track
2017-09-14 16:00:40 -07:00
Chris Robinson
9e7a49f66e
Include alext.h to get OpenAL extension definitions
2017-09-14 16:00:40 -07:00
Chris Robinson
1fe60dd8e2
Replace some shared_ptrs with pointers to deque entries
2017-09-14 16:00:30 -07:00
MiroslavR
a66d310a1d
ESS-Importer: Fix uninitialized paid crime ID
2017-09-15 00:21:02 +02:00
MiroslavR
6e869c3123
ESS-Importer: Convert ballistic projectiles (Feature #2320 )
2017-09-15 00:07:19 +02:00
Bret Curtis
e517ad3f7b
add ktx support for splashscreens
2017-09-14 10:06:36 +02:00
Bret Curtis
dff0a766a8
adding 3 more extensions
2017-09-13 15:30:22 +02:00
Bret Curtis
b26887ef9b
add support for png and dds splashscreens to begin with.
2017-09-13 13:52:05 +02:00
AnyOldName3
a5397e5f2d
Merge master
2017-09-11 22:26:46 +01:00
scrawl
bd667c3847
Merge pull request #1435 from AnyOldName3/cmake-vs-debugging-dir
...
If CMake supports it, sets the debugger working directory for Visual …
2017-09-11 10:30:50 +00:00
scrawl
00ae9a01a1
Merge pull request #1445 from akortunov/guifixes
...
Allow to add levelup a description for levels > 20
2017-09-11 10:28:09 +00:00
scrawl
407640322d
Merge pull request #1439 from akortunov/resistfix
...
Take in account elemental shields for GetResist and SetResist script commands
2017-09-11 10:27:47 +00:00
Marc Zinnschlag
9a8a4c744f
Merge remote-tracking branch 'capostrophic/controlplus'
2017-09-11 10:46:34 +02:00
Andrei Kortunov
7760e4514c
Allow to add levelup a description for levels > 20
2017-09-10 22:47:34 +04:00
scrawl
7688696765
Merge pull request #1437 from Capostrophic/nodemapfix
...
Use constant nodeMap during part updating in creature animation
2017-09-10 18:15:20 +00:00
Andrei Kortunov
c6fd75bf42
Take in account elemental shields for GetResist and SetResist script commands (bug #4093 )
2017-09-10 22:05:58 +04:00
Capostrophic
97ff24b8d6
Change ctl to ctrl in OpenMW-CS shortcut manager
2017-09-10 20:48:09 +03:00
scrawl
618ec6dcdd
Merge pull request #1440 from akortunov/guardfix
...
Allow guards to attack fighting creatures only in fAlarmRadius range
2017-09-10 17:06:14 +00:00
Andrei Kortunov
661232222f
Allow guards to attack fighting creatures only in fAlarmRadius range
2017-09-10 15:26:48 +04:00
Capostrophic
9503d61866
Use const nodeMap in creature animation
2017-09-09 23:22:16 +03:00
Kyle Cooley
25d4a0370f
Changes to land data access in tables, also update Land once per frame in scene view.
2017-09-09 15:37:52 -04:00
Kyle Cooley
d030b595f8
Fix potential segfault, cleanup, get rid of warnings.
2017-09-09 11:48:13 -04:00
Kyle Cooley
72cb405de2
Some bug fixes, changes to land load code.
2017-09-08 21:03:52 -04:00
AnyOldName3
a9b95596bc
Add a missed trailing new line.
2017-09-08 22:21:00 +01:00
AnyOldName3
8c74f16247
Restore trailing new lines to shrink PR
2017-09-08 22:20:04 +01:00
AnyOldName3
5ce34f1cbf
Move new behaviour into macro to reduce code duplication
2017-09-08 22:17:42 +01:00
MiroslavR
1e585ac71a
Log a warning in case of missing bookart instead of showing a pink rectangle ( Fixes #3826 )
2017-09-08 22:50:07 +02:00
Kyle Cooley
2eacc2f093
Changes to land creation, add ability to specifically clear terrain cache
2017-09-08 14:37:03 -04:00
AnyOldName3
3c0ec0d6d0
If CMake supports it, sets the debugger working directory for Visual Studio
2017-09-08 17:26:46 +01:00
Andrei Kortunov
ac2f20f983
Update a disposition bar when a dialogue widget is disabled, but visible
2017-09-08 19:42:06 +04:00
Kyle Cooley
ab607f3028
Tweaks to land loading, land cloning, terrain signals, placeholder land update handling
2017-09-08 00:51:46 -04:00
scrawl
8f1c8759e4
Merge pull request #1432 from akortunov/alchemyfix
...
Update alchemy effects after every created potion (#4079 )
2017-09-07 20:51:42 +00:00
Andrei Kortunov
dc0313a36f
Use base skill value when calculating rank requirements
2017-09-07 21:06:10 +04:00
Andrei Kortunov
7559d25317
Update alchemy effects after every created potion ( #4079 )
2017-09-06 15:11:47 +04:00
Kyle Cooley
99e90ef808
Cleanup. Also modify ltex index generation.
2017-09-05 19:29:07 -04:00
Kyle Cooley
97d0fd756a
LTEX importing
2017-09-04 19:31:09 -04:00
Kyle Cooley
5c3e90da88
Fix includes
2017-09-04 15:14:42 -04:00
Kyle Cooley
d3014cf394
Temporary fix for adding new lands, cloned lands will still reference old data though
2017-09-04 15:13:45 -04:00
Kyle Cooley
90c485104a
Land creator
2017-09-04 01:06:58 -04:00
Kyle Cooley
7cc95a11a4
Add more land table columns
2017-09-03 20:00:19 -04:00
Kyle Cooley
30ba1d4c25
Move touch command to creator, to allow customization and not break abstraction
2017-09-03 17:01:16 -04:00
Thunderforge
e0ffc94f3e
Fix OpenMW-CS internal name
2017-09-02 18:07:12 -05:00
scrawl
4c5992a0d5
Warn if removing a node fails
2017-09-01 21:42:35 +00:00
scrawl
132ac6001b
Fix bug of Animation::mSkeleton not being assigned
...
This bug resulted in deactivating a Skeleton not working properly for creatures (that are out of processing range), therefore reduced performance.
2017-09-01 21:42:34 +00:00
scrawl
7a79ebb713
Merge pull request #1428 from akortunov/stancechangefixes
...
[Feedback needed] Stance switching changes, part II
2017-09-01 21:42:08 +00:00
Andrei Kortunov
7f5f5458d4
Reset player attack animation when unequip weapon or tool
2017-09-01 18:03:23 +04:00
Andrei Kortunov
a5b01fefec
Allow to interrupt an attack, if attack button is held
2017-09-01 14:28:21 +04:00
Andrei Kortunov
0d7279ea2a
Fixes a regression with bound weapons equipping (bug #4050 )
2017-09-01 08:59:05 +04:00
Kyle Cooley
1d480015b4
Add ability to touch records, LAND records in particular
2017-08-31 22:09:49 -04:00
Kyle Cooley
9e41f1340a
Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture
2017-08-31 22:09:49 -04:00
Kyle Cooley
5d14a2afcc
Initial LTEX/LAND tables
2017-08-31 22:09:49 -04:00
scrawl
a8005c33d9
Revert unintended change to mOnGround variable that was somehow introduced with 38a2de3c51
2017-08-31 21:58:12 +00:00
Andrei Kortunov
1aaa8a76c5
Allow to play only one copy of given sound at time (bug #3647 )
2017-08-31 16:14:48 +04:00
Andrei Kortunov
91dcd5bc6e
Do not allow to unequip weapon from inventory during attack
2017-08-31 13:28:09 +04:00
Andrei Kortunov
6f22d819c5
Do not allow to switch weapon to probe or lockpick during attack
2017-08-31 12:36:54 +04:00
scrawl
8c6a8ca48d
Respect the framelimit in all cases ( Fixes #3531 )
...
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
2017-08-30 21:26:30 +00:00
scrawl
dc53573de4
Merge pull request #1405 from akortunov/stancechangefixes
...
Do not allow player to change weapon/spell during attack or spellcast
2017-08-29 23:11:23 +00:00
scrawl
43fda6cf07
Merge pull request #1423 from akortunov/spellpriority
...
Combat AI: use effective cast cost when rate enchanted weapon
2017-08-29 22:38:36 +00:00
Andrei Kortunov
73d5efabee
Display negative values on fatigue progress bar
2017-08-29 18:53:21 +04:00
Andrei Kortunov
8003dbee12
Combat AI: use effective cast cost when rate enchanted weapon
2017-08-29 16:40:55 +04:00
Andrei Kortunov
fb45995a41
Do not allow player to change weapon/spell during attack or spellcasting (bug #2445 )
2017-08-29 15:53:23 +04:00
scrawl
4fba157d3b
Implement releaseGLObjects for cached resources
2017-08-26 19:29:12 +00:00
Harry
86ae2ae395
Improved shuffle ( #1412 )
2017-08-25 20:08:49 +00:00
AnyOldName3
1578fcbec7
Escape content file names before sending them to the GUI
2017-08-25 10:05:56 +00:00
Marc Zinnschlag
91f674bb6f
Merge remote-tracking branch 'aesylwinn/master'
2017-08-25 10:24:17 +02:00
Kyle Cooley
a8576d78ad
Change default topic info values
2017-08-24 13:51:53 -04:00
Kyle Cooley
42b948dffe
Fix pathgrid segfault
2017-08-23 11:35:26 -04:00
AnyOldName3
e2623d21ab
Merge remote-tracking branch 'upstream/master' into osgshadow-test
2017-08-23 13:33:22 +01:00
Marc Zinnschlag
f4110a72cc
Merge remote-tracking branch 'aesylwinn/fixvideotable'
2017-08-23 11:24:51 +02:00
Kyle Cooley
157ecb166c
Fix wrong folder name
2017-08-23 00:02:02 -04:00
scrawl
30665b743d
Merge pull request #1416 from akortunov/guifixes
...
Display large journal entries correctly
2017-08-22 20:37:46 +00:00
scrawl
aa95cb3d91
Merge pull request #1406 from Aesylwinn/reloadassets
...
Editor: Asset Reloading
2017-08-22 20:17:30 +00:00
Andrei Kortunov
0177fe6602
Display large entries in journal correctly
2017-08-22 23:26:06 +04:00
Kyle Cooley
d3d04171f9
Fix seg fault, undo changes BsaArchive
2017-08-22 15:06:56 -04:00
Andrei Kortunov
e799cbdb51
Combat AI: allow only one summoned creature at time
2017-08-22 09:18:49 +04:00
Kyle Cooley
8c4b12a603
VFS changes, one VFS and resource system per document.
...
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
2017-08-21 22:31:19 -04:00
Kyle Cooley
979b0d7211
Code cleanup and more cache clearing
2017-08-21 18:58:38 -04:00
Kyle Cooley
3b9326d238
Clear terrain cache and reload terrain
2017-08-20 22:34:41 -04:00
Kyle Cooley
d4a722067d
Reload water
2017-08-20 20:55:56 -04:00
Kyle Cooley
d7744e8b16
A bit of cleanup
2017-08-20 19:07:23 -04:00
scrawl
f0dea8b8e6
Revert "Implement a Fisher-Yates shuffle on background music"
2017-08-20 20:20:27 +00:00
Kyle Cooley
5950b26912
Update scene assets
2017-08-19 19:36:45 -04:00
scrawl
dbb8a5c959
Merge pull request #1401 from h313/master
...
Implement a Fisher-Yates shuffle on background music
2017-08-19 22:48:24 +00:00
Kyle Cooley
742bd00ec6
Clear cached resources
2017-08-19 15:26:46 -04:00
Harry
2a85c5f011
Implement a Fisher-Yates shuffle on background music
...
This fixes sometimes getting repetitive background music
2017-08-19 14:48:00 -04:00
Andrei Kortunov
65d05ee1cd
Get only text from clipboard (bug #4025 )
2017-08-19 15:32:17 +04:00
Andrei Kortunov
e0bb9c089b
Revert commit 67d59bead5 (a better
...
implementation found)
2017-08-19 15:24:06 +04:00
Kyle Cooley
d31ed83b54
Preliminary asset reloading
2017-08-19 03:43:31 -04:00
scrawl
2611377081
Merge pull request #1350 from akortunov/deathanimationfix
...
Do not allow to loot fighting actors during death animation (bug #3528 )
2017-08-18 22:04:12 +00:00
scrawl
f277007b49
Merge pull request #1404 from akortunov/ownedcrosshair
...
Owned crosshair feature improvements [discussion]
2017-08-18 20:21:23 +00:00
Andrei Kortunov
7c80ddc9de
Owned crosshair improvements (bug #2789 )
2017-08-18 17:08:15 +04:00
Andrei Kortunov
641a6cd842
Added a delay before summoned creature corpse despawning
2017-08-18 11:58:28 +04:00
Capostrophic
6c8c883dc0
Making knownEffect aware that there can be more than 4 potion effects
2017-08-18 00:47:28 +03:00
scrawl
b73ed5ccac
Merge pull request #1391 from akortunov/aifollow
...
AiFollow: add a threshold when turning to target
2017-08-17 20:17:11 +00:00
Andrei Kortunov
d8d47f081b
AiFollow: add a threshold when turning to target
2017-08-17 22:52:34 +04:00
scrawl
c231d20413
Merge pull request #1362 from akortunov/spellpriority
...
Combat AI: use WhenUsed enchantments [Feedback needed]
2017-08-16 21:23:57 +00:00
scrawl
306b58349e
Merge pull request #1387 from akortunov/movementfix
...
Check actual movement for GetPCRunning and GetPCSneaking [Feedback needed]
2017-08-16 20:50:49 +00:00
scrawl
d1161819bf
Merge pull request #1396 from akortunov/dispelfix
...
Dispel only effects from spells
2017-08-16 20:49:40 +00:00
Andrei Kortunov
bc7353f100
Check animation state for GetPCRunning and GetPCSneaking
2017-08-16 20:30:47 +04:00
Andrei Kortunov
67d59bead5
Get only text from input fields (bug #4025 )
2017-08-16 15:03:04 +04:00
Andrei Kortunov
1e983604db
Dispel only effects from spells (bug #3995 )
2017-08-15 09:35:29 +04:00
scrawl
8acf0ba633
Merge pull request #1394 from akortunov/followerattackfix
...
Prevent followers from attacking player if crime was reported
2017-08-14 22:19:46 +00:00
scrawl
24eaced7d2
Merge pull request #1395 from akortunov/tradeconfiscatefix
...
Confiscate an item when you try to sell it to its owner
2017-08-14 22:18:42 +00:00
Andrei Kortunov
ec64034160
Confiscate stolen item/gem when enchanting
2017-08-14 19:29:34 +04:00
Andrei Kortunov
7a5645b35d
Prevent followers from attacking player if crime was reported
2017-08-14 18:42:19 +04:00
Andrei Kortunov
f84eb68b3d
Confiscate an item when you try to sell it to its owner (bug #3944 )
2017-08-14 11:31:17 +04:00
Kyle Cooley
249c1ae95a
Fix orbit camera jumping back to old position
2017-08-13 19:26:32 -04:00
scrawl
1bdcecc32e
Merge pull request #1390 from akortunov/referencecheck
...
Do not make target reference unavailable on cell change
2017-08-12 18:48:52 +00:00
Andrei Kortunov
3f159960b7
Restored pickpocket and werewolf check
2017-08-12 21:18:05 +04:00
scrawl
b6aaa2f2be
Merge pull request #1389 from akortunov/autosave
...
Create autosave when waiting
2017-08-12 16:50:30 +00:00
Andrei Kortunov
b3b7d6aa9f
Do not make target reference unavailable on cell change (bug #3898 )
2017-08-12 09:36:09 +04:00
Andrei Kortunov
c542ae6875
Create autosave when waiting (bug #1452 )
2017-08-12 09:06:31 +04:00
scrawl
0f983144a4
Merge pull request #1383 from akortunov/guifixes
...
Enable transparency for interactive messageboxes and tooltips in game mode
2017-08-10 21:55:24 +00:00
Thunderforge
f41a4bb937
Changing "New Installation" to "Retail CD/DVD" for clarity
2017-08-09 00:20:49 -05:00
Andrei Kortunov
56f5a5dee3
Added transparency to 'owned' tooltip
2017-08-08 22:57:39 +04:00
scrawl
af9db74010
Merge pull request #1377 from LennyPenny/master
...
Fade out music before change occurs
2017-08-08 17:34:50 +00:00
Andrei Kortunov
4cc8afd25d
Add transparency for tooltips in game mode
2017-08-08 20:38:15 +04:00
Andrei Kortunov
6cb3c83248
Add transparency for interactive messageboxes in game mode
2017-08-08 20:36:50 +04:00
Lennart Bernhardt
546352dbe3
avoid starting sound updates more than necessary
2017-08-08 03:31:01 +02:00
Lennart Bernhardt
7b8278ae45
remove redundant mMusicFader variable
2017-08-08 03:17:40 +02:00
scrawl
551045e4cc
Merge pull request #1370 from Siimacore/data_files_loc_fix
...
Correcting https://bugs.openmw.org/issues/3906 .
2017-08-07 18:52:54 +00:00
scrawl
cd4525cf25
Merge pull request #1372 from akortunov/guifixes
...
Journalbook layout fixes
2017-08-07 18:49:13 +00:00
Andrei Kortunov
ab391f17db
Fixes regression in spell school detection (bug #4007 )
2017-08-07 12:12:57 +04:00
Andrei Kortunov
dd919b9f2c
Do not allow to loot fighting actors during death animation (bug #3528 )
2017-08-07 09:55:50 +04:00
scrawl
ba72eb77f4
Merge pull request #1374 from akortunov/guardfix
...
Disable AiPursue package for player's followers
2017-08-06 21:11:08 +00:00
scrawl
7f5b615295
Merge pull request #1375 from MiroslavR/missing-import
...
Add missing include for isatty function
2017-08-06 21:10:11 +00:00
spycrab
632d39ca76
Allow starting at an (unnamed) exterior cell using --start (Feature #3941 )
2017-08-06 22:31:07 +02:00
Lennart Bernhardt
60a7d3d6e0
Fade out music before change occurs
2017-08-06 20:10:56 +02:00
MiroslavR
393f4ab758
Add missing include for isatty function ( Fixes #4002 )
2017-08-06 13:02:22 +02:00
Andrei Kortunov
72ce118d02
Disable AiPursue package for player's followers
2017-08-05 12:38:26 +04:00
Andrei Kortunov
cf7a6232d0
Combat AI: use WhenUsed enchantments
2017-08-05 12:18:38 +04:00
scrawl
fe8437ae10
Merge pull request #1371 from akortunov/journalfix
...
Do not allow to use journal in a main menu
2017-08-04 21:45:44 +00:00
Jake Westrip
63343b6241
Ensure jail does not decrease a skill past zero
2017-08-05 06:15:15 +10:00
Andrei Kortunov
23bda7613b
Do not allow to use journal in a main menu (bug #3991 )
2017-08-04 07:31:41 +04:00
Siimacore
c920d083e4
Correcting https://bugs.openmw.org/issues/3906 .
2017-08-03 23:15:26 +02:00
scrawl
a78f254883
Merge pull request #1368 from akortunov/tradefix
...
Trade window improvements
2017-08-03 21:09:57 +00:00
scrawl
a63b9e33fd
Merge pull request #1369 from akortunov/tauntfix
...
Take in account a temporary disposition in isAggressive check (bug #3…
2017-08-03 21:01:03 +00:00
Andrei Kortunov
56a30d7aec
Journalbook layout fixes
2017-08-03 20:27:14 +04:00
Andrei Kortunov
d1489f5b42
Take in account a temporary disposition in isAggressive check (bug #3987 )
2017-08-03 19:18:31 +04:00
Andrei Kortunov
35beede065
Restock items after trade deal instead of trade window opening
2017-08-03 18:41:13 +04:00
Andrei Kortunov
487e72fd23
Play Up sounds instead of Down ones in trade window (bug #3982 )
2017-08-03 18:39:59 +04:00
elsid
748f5225a9
Copy PathFinder::mPath back value when pass to MWMechanics::AiPackage::pathTo as dest
...
May become dangling reference because method may remove all elements from mPath.
2017-08-02 11:35:53 +03:00
scrawl
0d58a77f86
Merge pull request #1291 from MiroslavR/respawn_crash
...
Prevent respawned references from being added to the scene twice
2017-08-01 14:38:46 +00:00
Andrei Kortunov
604f9ee323
Split weapons and spells rating code from combat actions
2017-08-01 09:05:35 +04:00
MiroslavR
d24286273b
Prevent respawned references from being added to the scene twice in certain cases ( Fixes #3864 )
2017-08-01 00:11:14 +02:00
Andrei Kortunov
b7cfb1aaf4
Fixed DamageHealth and AbsorbHealth effects applying
2017-07-31 23:05:19 +04:00
scrawl
eac2e52841
Merge pull request #1329 from akortunov/priorityfix
...
Combat AI: make default spell priority calculation formula close to vanilla
2017-07-31 18:21:47 +00:00
scrawl
fde6e29628
Merge pull request #1326 from akortunov/spellpriority
...
Combat AI improvements [feedback needed]
2017-07-31 17:51:51 +00:00
scrawl
333648c975
Merge pull request #1324 from akortunov/doorfix
...
Improved doors detection
2017-07-31 17:42:53 +00:00
Andrei Kortunov
10eb6ec75f
AI: Check angle between actor and door
2017-07-31 19:28:02 +04:00
scrawl
9ac409e61c
Merge pull request #1287 from akortunov/spellsorting
...
Spellbuying menu improvements
2017-07-31 09:43:47 +00:00
scrawl
43279c49b5
Go back to index when selecting 'cancel' on topics list
2017-07-30 23:51:44 +02:00
scrawl
4b51fd23e0
Merge pull request #1356 from akortunov/guifixes
...
Add missing journal sounds (bug #3974 )
2017-07-30 21:36:04 +00:00
Andrei Kortunov
99b5f21a46
Add missing journal sounds (bug #3974 )
2017-07-29 19:41:46 +04:00
Allofich
dae19412f2
Fix problem with animations not looping
...
Fixes #3804
2017-07-29 20:54:11 +09:00
scrawl
631d79f1c8
Merge pull request #1346 from akortunov/aibreathe
...
AiBreathe AI package (feature #1374 )
2017-07-28 20:50:04 +00:00
scrawl
4c2487d55f
Merge pull request #1353 from akortunov/restfix
...
Update effects during rest (bug #3679 )
2017-07-28 20:46:14 +00:00
Andrei Kortunov
920021c61b
Update effects during rest (bug #3679 )
2017-07-28 16:50:52 +04:00
Marc Zinnschlag
6001e04e51
Merge remote-tracking branch 'rcutmore/bug-3148'
2017-07-27 16:29:44 +02:00
Andrei Kortunov
6ab36c0539
Spellbuying menu improvements
2017-07-27 13:20:18 +04:00
Rob Cutmore
3f2cd9b669
Editor: Do color to int conversion in ColorEditor
2017-07-26 19:56:54 -04:00
Rob Cutmore
c7241c692f
Editor: Do int to color conversion in ColorEditor
2017-07-26 19:43:37 -04:00
scrawl
1792886f1e
Merge pull request #1344 from julianko/dialogue_performance
...
Fix dialogue window performance
2017-07-26 22:05:45 +00:00
Julian
d7aa2a882d
improve dialogue window performance
2017-07-26 18:58:27 +02:00
scrawl
d3be4769ea
Merge pull request #1347 from akortunov/encumberancefix
...
Fixed encumberance check (bug #3963 )
2017-07-26 16:20:16 +00:00
Rob Cutmore
3fb7c42845
Editor: Use colour field for cell map colour
2017-07-25 19:11:47 -04:00
Rob Cutmore
0082f5a2dc
Editor: fix handling of colour columns
...
Colours are stored as ints in the backend but the conversion from
QColor to int was broken.
2017-07-25 19:11:47 -04:00
Andrei Kortunov
548814bfbc
Added AiBreathe package (feature #1374 )
2017-07-25 10:58:04 +04:00
Andrei Kortunov
325ea10594
Fixed encumberance check (bug #3963 )
2017-07-25 10:28:33 +04:00
Andrei Kortunov
3ba0a336b7
Move spell magicka cost calculation to standalone function
2017-07-24 21:11:59 +04:00
Marc Zinnschlag
cfc5cdd309
Merge remote-tracking branch 'plutonicoverkill/highlight-occurence-fix'
2017-07-24 09:18:24 +02:00
PlutonicOverkill
16be1e1a84
Fix occurrence highlighting preferences panel
2017-07-23 20:29:42 +12:00
Andrei Kortunov
337f0f876d
Fade screen in on a new game start
2017-07-23 11:04:58 +04:00
scrawl
9bc24ab629
Fix character preview zNear/zFar not being autocomputed as intended (Bug #3955 )
2017-07-22 00:38:27 +02:00
scrawl
5c11266a46
Fix character preview item selection
2017-07-22 00:06:43 +02:00
scrawl
c9f8a220dc
Update the tooltip when the focusObject is set
2017-07-20 20:59:36 +02:00
scrawl
0e2e23e9f8
Remove tooltip object as part of WindowManager::clear
2017-07-20 20:59:09 +02:00
scrawl
7f634514a8
Fix the viewport of the character preview being set a frame ahead due to a threading issue
2017-07-19 17:43:15 +02:00
scrawl
20606a2aff
Add 'prediction time' setting for cell/terrain pre-loading
2017-07-19 16:44:37 +02:00
scrawl
ac78d01b2b
Terrain: use the main camera's viewpoint for intersection tests
...
Fixes lag spikes caused by intersection tests loading/unloading terrain pages.
2017-07-19 13:11:44 +02:00
scrawl
a629d48df6
Update the facedObject after the camera is updated
2017-07-19 13:05:51 +02:00
scrawl
2c7ce26fb7
Merge pull request #1336 from akortunov/evadefix
...
Combat AI: avoid enemy hits when casting Self-ranged spells
2017-07-16 20:05:21 +00:00
Andrei Kortunov
98f161c7fd
Combat AI: avoid enemy hits when casting Self-ranged spells ( fixes #3922 )
2017-07-16 22:38:23 +04:00
scrawl
2c95f40640
Merge pull request #1333 from akortunov/guidistortionfix
...
Disable sound distortion for GUI actions and PlaySound command [discussion]
2017-07-16 18:28:03 +00:00
Andrei Kortunov
2b22d10ebc
Spellview fixes
2017-07-16 13:14:19 +04:00
Andrei Kortunov
9179a019df
Quick keys menu fixes
2017-07-16 13:11:34 +04:00
Andrei Kortunov
5be1c81913
Fixed Close button handler in EditEffectDialog ( fixes #3956 )
2017-07-15 14:03:36 +04:00
Andrei Kortunov
dca8317083
Disable sound distortion for player actions in GUI mode
2017-07-15 10:59:08 +04:00
Andrei Kortunov
3b163ce6ce
Disable sound distortion for PlaySound script command
2017-07-15 10:58:19 +04:00
scrawl
ada85aa1ee
Merge pull request #1331 from akortunov/guidistortionfix
...
Prevent GUI sounds distortion
2017-07-14 19:55:33 +02:00
Andrei Kortunov
54b4d93f79
Added a special function for GUI sounds playing
2017-07-10 15:48:00 +04:00
Andrei Kortunov
37952c9a79
Added door detection based by ray casting
2017-07-03 22:08:29 +04:00
scrawl
951c4e12e0
Fix crash introduced by commit 1d8a9ff622 ( Fixes #3940 )
2017-06-30 00:52:02 +02:00
Andrei Kortunov
143fdae6fe
Make spell priority calculation close to vanilla (bug #3937 ).
2017-06-28 14:02:51 +04:00
Andrei Kortunov
7fcb22b867
Do not show empty journal entries ( fixes #3891 )
2017-06-27 15:54:16 +04:00
scrawl
8d17565efd
Fix joystick binding for an action being discarded when default for another action is loaded (Bug #3900 )
2017-06-25 14:44:17 +02:00
scrawl
903e59f495
Don't reset idle time when there is no camera movement ( Fixes #3902 )
2017-06-25 13:08:55 +02:00
scrawl
44e2089098
Don't play 'menu click' sound for right clicks ( Fixes #3919 )
2017-06-25 12:52:59 +02:00
scrawl
534c81976c
Add missing cell update for physics system ( Fixes #3917 )
2017-06-25 12:47:57 +02:00
scrawl
62f0ba6045
Merge pull request #1279 from Allofich/position
...
Fix actors not returning to their wander locations
2017-06-20 00:57:44 +02:00
scrawl
73fbaae97f
Merge pull request #1325 from jordan-ayers/bugfix/3684-restock-soul-gems
...
Adjust restock calculations to ignore filled soul gems. (Bug #3684 )
2017-06-20 00:39:39 +02:00
scrawl
41fb17f39b
Revert "Correcting https://bugs.openmw.org/issues/3906 "
...
This reverts commit b0abed00e5
2017-06-20 00:36:06 +02:00
Andrei Kortunov
1a8f2bfc11
Combat AI: select target by priority
2017-06-16 16:11:12 +04:00
Andrei Kortunov
a2be73295b
Combat AI: take in account enemy weapon resistance
2017-06-16 13:33:42 +04:00
Andrei Kortunov
62b24eb078
Combat AI: do not use range weapons under water
2017-06-16 12:20:31 +04:00
Jordan Ayers
b277bd782e
Adjust restock calculations to ignore filled soul gems.
...
Bug #3684
2017-06-15 21:59:13 -05:00
Allofich
4f08084e79
Make stationary actors return to position on load
...
Also makes wandering actors resume their previous destination when an interrupting combat or pursuit ends.
(Fixes #3656 )
2017-06-15 18:33:50 +09:00
Allofich
028762a7dc
Make guards that are attacked try to arrest player
...
(Fixes #3706 )
2017-06-15 01:47:10 +09:00
scrawl
cd1821c464
Merge pull request #1322 from Siimacore/wizardthreadfix
...
Stopping the thread in the wizard that prevented it to stop correctly
2017-06-13 19:48:06 +02:00
scrawl
53264f34b3
Merge pull request #1321 from akortunov/spellpriority
...
Use mRange to check spell range instead of mArea.
2017-06-13 17:06:47 +02:00
Allofich
42402976e3
Fixes for building in MSVC
2017-06-13 19:38:12 +09:00
Siimacore
6af470ff03
Stopping the thread in the wizard that prevented it to stop correctly
2017-06-13 12:00:55 +02:00
Andrei Kortunov
87939bf3b1
Use mRange to check spell range instead of mArea.
2017-06-13 11:02:40 +04:00
scrawl
f7969fb178
Merge pull request #1317 from Siimacore/master
...
Correcting https://bugs.openmw.org/issues/3906
2017-06-12 23:47:07 +02:00
scrawl
dd3f612e88
Merge pull request #1316 from akortunov/doorfix
...
Doors usage improvements
2017-06-12 23:34:40 +02:00
scrawl
80eb2ea35d
Merge pull request #1313 from akortunov/spellpriority
...
Make combat AI to do not cast target spells under water
2017-06-12 23:32:35 +02:00
scrawl
6d90f5a9a5
Merge pull request #1312 from akortunov/guifixes
...
Split greeting from topic response
2017-06-12 23:19:45 +02:00
Andrei Kortunov
e9d0bf7c12
Added missed return statement
2017-06-11 15:06:44 +04:00
Andrei Kortunov
9fdfb2a83f
Spell priority: make AI do not cast target spells when enemy is under water
2017-06-11 10:13:00 +04:00
Siimacore
b0abed00e5
Correcting https://bugs.openmw.org/issues/3906
2017-06-10 21:36:35 +02:00
Andrei Kortunov
cab51d26cc
Doors: small key search optimizations
2017-06-10 22:33:14 +04:00
Andrei Kortunov
188424d5d3
Allow AI to use keys to open doors
2017-06-10 22:31:17 +04:00
Bret Curtis
dbf149f9b2
gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now
2017-06-10 00:51:19 +02:00
Andrei Kortunov
4600f24e27
Playing sound when AI is opening a door
2017-06-09 22:52:40 +04:00
Bret Curtis
c781d1f8ed
purge unnecessary imports
...
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
2017-06-09 19:08:53 +02:00
Bret Curtis
d799954ca0
replace and purge boost::math::gcd and other non-used headers
2017-06-09 19:08:53 +02:00
Bret Curtis
154d7cffa2
replace and purge boost::function
2017-06-09 19:08:53 +02:00
Bret Curtis
d48b829b45
replace and purge boost::lexical_cast
2017-06-09 19:08:53 +02:00
Bret Curtis
98752a9702
replace boost::bind
2017-06-09 19:08:53 +02:00
Bret Curtis
b7c27e5e96
remove boost/tuple
2017-06-09 19:08:53 +02:00
Bret Curtis
d97aa9152b
remove more unused imports, including boost headers
2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c
purge the rest of boost::shared and any other boost related things that no longer are required
...
put boost system back in, clean others up
revert Qt
add back boost fstream
2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
2017-06-09 19:08:53 +02:00
Bret Curtis
07f75e1104
replace boost::shared_ptr in extern and components
2017-06-09 19:08:53 +02:00
Bret Curtis
c8b67221d7
use nullptr instead of NULL
2017-06-09 16:49:25 +02:00
Ewan Higgs
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
2017-06-09 16:49:25 +02:00
Andrei Kortunov
3190f28710
Spell priority: make AI do not cast target spells under water
2017-06-09 10:23:46 +04:00
Andrei Kortunov
4bb9622c21
Handle greetings differently from responses
2017-06-08 22:40:31 +04:00
scrawl
59eb0aba7d
Merge pull request #1310 from akortunov/guifixes
...
Removed empty space before dialogue entry (bug #3892 )
2017-06-07 21:55:45 +02:00
Andrei Kortunov
c2962ced90
Removed empty space before dialogue entry (bug #3892 )
2017-06-04 23:20:43 +04:00
scrawl
172cc65be9
Merge pull request #1308 from akortunov/spellpriority
...
Spell priority: dispel usage improvements
2017-06-04 12:49:53 +02:00
Andrei Kortunov
00402b7154
Removed unused variable
2017-06-04 14:09:23 +04:00
scrawl
70e02f4c28
Merge pull request #1306 from Nialsy/master
...
Fixed quickload with menus open
2017-06-04 11:18:49 +02:00
Andrei Kortunov
f4a187a9c2
Move a setting to show enchanting success chance from GUI to Game section
2017-06-03 23:03:24 +04:00
Andrei Kortunov
9a1ba1e559
Show success chance when self-enchanting (Feature #3492 )
2017-06-03 14:39:15 +04:00
Andrei Kortunov
42f3c73c75
Spell priority: dispel usage improvements
2017-06-03 13:16:44 +04:00
Nicholas
f6f07f5497
clear mGoToJail flag on load
2017-06-02 13:33:47 -05:00
scrawl
9fd0d54a35
Merge pull request #1289 from akortunov/newrepair
...
Improved repair and recharge widgets
2017-05-31 22:47:38 +02:00
Andrei Kortunov
f6c3d4935e
Spell priority: feather and burden
2017-05-31 19:23:44 +04:00
Andrei Kortunov
10d4cb15ad
Improved repair widget
2017-05-31 19:11:49 +04:00
Andrei Kortunov
1164c3f16e
Improved recharge widget
2017-05-31 19:11:49 +04:00
Andrei Kortunov
6c21e4ed31
Spell priority: ignore some effects useless in battle
2017-05-31 18:41:41 +04:00
scrawl
2638327593
Merge pull request #1303 from akortunov/guifixes
...
Character generation layout fixes
2017-05-31 15:25:41 +02:00
scrawl
a1661af864
Merge pull request #1301 from akortunov/tooltips
...
Tooltips layout fixes
2017-05-29 00:13:34 +02:00
Andrei Kortunov
46c8842808
Fixed enchant points calculations formula
2017-05-26 23:42:11 +04:00
Andrei Kortunov
f17badb3cd
Makes cells cache size configurable
2017-05-25 13:09:40 +04:00
scrawl
f9cdc2da94
Merge pull request #1293 from akortunov/spellpriority
...
aicombataction.cpp: implement some spell priority TODO's
2017-05-21 21:18:10 +02:00
MiroslavR
98daf4f043
Merge pull request #1296 from akortunov/jumpfatiguefix
...
Fixed jump fatigue loss formula (bug #3843 )
2017-05-21 11:47:58 +02:00
scrawl
8cd8eab9dd
Merge pull request #1294 from akortunov/constenchantfix
...
Swap enchant type when purge selected soulgem (bug #3878 )
2017-05-20 23:44:14 +02:00
Andrei Kortunov
4f41c44cd6
Swap enchant type when clean selected soulgem widget ( fixes #3878 )
2017-05-20 18:30:11 +04:00
Marc Zinnschlag
6906e35ac0
Merge remote-tracking branch 'origin/master'
2017-05-12 14:48:03 +02:00
PlutonicOverkill
5ec97811d8
Don't switch pages when right-clicking on list
2017-05-12 20:22:18 +12:00
PlutonicOverkill
7281e8b888
Remove C++11 features
2017-05-12 12:48:25 +12:00
PlutonicOverkill
cd75c5618c
Move context menu code to PageBase
2017-05-11 19:46:51 +12:00
PlutonicOverkill
16f8341de3
Prevent context menu appearing for modifier settings
2017-05-10 21:24:12 +12:00
PlutonicOverkill
c2f427f48d
Prevent context menu appearing when right-clicking shortcut setting
2017-05-10 20:43:52 +12:00
PlutonicOverkill
646ff72cdc
Add a more elegant way of showing the context menu
2017-05-10 20:27:50 +12:00
PlutonicOverkill
bd9f657603
Show context menu when user clicks on empty space
2017-05-10 19:51:43 +12:00
PlutonicOverkill
30af92f575
Fix pointer initialisation bug
2017-05-09 20:58:32 +12:00
PlutonicOverkill
4879405097
Add reset context menu for key binding pages
2017-05-09 19:58:34 +12:00
PlutonicOverkill
3545cfa00a
Rewrite feature to reset options to default
2017-05-09 19:50:16 +12:00
Allofich
315ad54b29
Don't make NPCs or player speak while underwater
...
(Fixes #3851 )
2017-05-08 19:55:54 +09:00
Andrei Kortunov
de14e9811d
Fixed Travis CI build
2017-05-08 11:16:03 +04:00
PlutonicOverkill
f30d1a3075
Revert everything
2017-05-08 17:24:28 +12:00
scrawl
48c764a580
Update test
2017-05-07 23:31:06 +02:00
scrawl
813af876f6
Use a partial binary search in isReservedName ( Fixes #3835 )
2017-05-07 23:28:56 +02:00
scrawl
109bc3cb59
Merge pull request #1281 from akortunov/purgefix
...
Make InventoryStore::purgeEffect() purge all effects with argument ID instead only first
2017-05-07 21:08:30 +02:00
scrawl
796d2c59ca
Merge pull request #1282 from MiroslavR/noenv_player_vo
...
Do not apply underwater effects to player's voice
2017-05-07 21:07:19 +02:00
PlutonicOverkill
a9760ec805
Fix indenting
2017-05-07 17:07:58 +12:00
PlutonicOverkill
d8a711f89f
Fix tabs
2017-05-07 17:05:50 +12:00
PlutonicOverkill
477af73ad6
Missed another one
2017-05-07 17:00:26 +12:00
PlutonicOverkill
418aeb65f1
Remove unneeded dependencies
2017-05-07 16:58:15 +12:00
PlutonicOverkill
5fca37d0c8
Forgot to remove debugging code
2017-05-07 16:54:38 +12:00
PlutonicOverkill
dff3828710
Keep the settings page in sync with the real settings
2017-05-07 16:51:11 +12:00
PlutonicOverkill
64879c03e4
Add option to reset settings to default
2017-05-06 20:18:31 +12:00
Marc Zinnschlag
a2e863e7dd
Merge remote-tracking branch 'origin/master'
2017-05-03 14:31:21 +02:00
Andrei Kortunov
4d927439ca
Spell priority: item wearing check when disintegrate weapon/armor
2017-05-03 11:13:35 +04:00
Andrei Kortunov
d598809ac6
Spell priority: check spell resistance, check if actor is already has a non-magnitude effect
2017-05-03 10:35:56 +04:00
PlutonicOverkill
829560719e
Make name highlighting more consistent and only for variable names
2017-05-02 17:28:42 +12:00
Andrei Kortunov
1520a4d7db
Levelup menu layout fixes
2017-05-01 20:48:39 +04:00
Andrei Kortunov
26ec467df0
Tooltips: faction, magic effects layout fixes
2017-05-01 10:00:51 +04:00
Andrei Kortunov
987677db75
Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes
2017-04-30 22:39:05 +04:00
MiroslavR
d24bcbac15
Do not apply underwater effects to player's voice ( Fixes #3850 )
2017-04-30 18:51:49 +02:00
Andrei Kortunov
6331cc6ab9
Tooltips: level, race, class, specialization layout fixes
2017-04-30 19:45:36 +04:00
scrawl
9f1527b7da
Merge pull request #1272 from akortunov/guifixes
...
Service menus layout fixes
2017-04-30 12:27:21 +02:00
PlutonicOverkill
95f60d2bb3
Merge branch 'master' into mark-variable
2017-04-28 20:15:48 +12:00
PlutonicOverkill
cbb2b8b119
Add setting so feature can be turned off
2017-04-28 19:57:49 +12:00
PlutonicOverkill
a8e7628e83
Enable highlighting when cursor is placed over a name (script editor)
2017-04-28 19:28:05 +12:00
Marc Zinnschlag
7919c4d672
Merge remote-tracking branch 'plutonicoverkill/master'
2017-04-28 08:40:07 +02:00
PlutonicOverkill
e685de0f84
Fix script editor undo/redo context menu actions
2017-04-27 19:48:01 +12:00
PlutonicOverkill
6063d8e31b
Fix existing context menu in script editor
2017-04-27 16:31:45 +12:00
Andrei Kortunov
f484ef8ffb
Fixed jump fatigue loss formula ( fixes #3843 )
2017-04-26 18:28:59 +04:00
Andrei Kortunov
bba822c014
Purge all effects with same ID instead only first ( fixes #3839 )
2017-04-26 17:18:06 +04:00
Marc Zinnschlag
61e6b0d03c
improved ScriptErrorTable handling of script errors that don't have line/column associated with them (also avoiding a segfault)
2017-04-26 15:03:30 +02:00
PlutonicOverkill
3d1e640388
Add setting to change keyboard shortcut and fix another crash
2017-04-26 19:42:03 +12:00
PlutonicOverkill
1f699552f7
Fix infinite recursion bug in uncommentSelection()
2017-04-26 15:49:39 +12:00
PlutonicOverkill
61e374fdfc
Implement commentSelection() and uncommentSelection()
2017-04-25 19:12:18 +12:00
PlutonicOverkill
83ff7d162c
Add comment/uncomment actions to the context menu
2017-04-25 16:12:59 +12:00
MiroslavR
eada8c6822
Fix wrong incrementation in InventoryStore::visitEffectSources ( Fixes #3838 )
2017-04-23 18:05:41 +02:00
Andrei Kortunov
c2706ac3e7
Merchant repair and travel window scroll fix
2017-04-23 09:15:25 +04:00
scrawl
0e37e71ea2
Merge pull request #1266 from akortunov/handsfallbackfix
...
Improved hands bodyparts selection fallback
2017-04-23 00:36:48 +02:00
Andrei Kortunov
4544caf7f3
Improved bodypart select fallback ( fixes #2594 )
2017-04-22 22:23:10 +04:00
MiroslavR
0737d6cb72
Merge pull request #1270 from Allofich/scriptfix
...
Check for NULL before running voice dialogue scripts
2017-04-22 01:58:20 +02:00
Allofich
f34e35eb19
Check for NULL before running voice scripts
...
(Fixes #3834 )
2017-04-22 07:51:31 +09:00
scrawl
8fbf9dc597
Merge pull request #1253 from akortunov/pinned
...
Remember "pinned" windows across game restarts
2017-04-21 18:44:47 +02:00
Andrei Kortunov
2b3b6d558f
Move updatePinnedWindows() function to private section
2017-04-21 19:37:09 +04:00
Andrei Kortunov
f986e3fafa
Remove unused code
2017-04-21 18:39:01 +04:00
Allofich
143ee387cc
Add enabled check to animation script commands
...
(Fixes #3793 )
2017-04-21 23:27:24 +09:00
scrawl
fc56fc0b81
Merge pull request #1265 from akortunov/develop
...
Use "sLevel" GMST instead of hardcoded text in load game menu
2017-04-21 15:30:15 +02:00
scrawl
2c879ddbbf
Merge pull request #1264 from Allofich/script
...
Run scripts for voiced dialogue
2017-04-21 15:26:09 +02:00
Andrei Kortunov
e717d046f2
Escaped class name string
2017-04-21 17:21:57 +04:00
scrawl
1956602aa2
Merge pull request #1262 from Allofich/warnings
...
Fix more warnings
2017-04-21 14:34:36 +02:00
Andrei Kortunov
f67ec9c9ce
Use sLevel GMST instead of hardcoded text in load game menu
2017-04-21 09:40:25 +04:00
Andrei Kortunov
6c1e3a0618
Merged from upstream master
2017-04-21 08:48:22 +04:00
Allofich
ff3cb18d4f
Fix shadowing warnings
2017-04-21 11:06:18 +09:00
Allofich
60c67bc327
Run scripts for voiced dialogue
...
(Fixes #3787 )
2017-04-21 10:39:11 +09:00
scrawl
c2240e3af1
Call the WindowManager::updatePlayer after the startup script is run
2017-04-21 00:51:13 +02:00
scrawl
1ffb9e1bf3
Remove renderWorldMap()
2017-04-21 00:50:22 +02:00
scrawl
bfdde0262f
Merge pull request #1260 from akortunov/levitationfix
...
Purge existing levitation effects when levitation is disabled (fixes #3766 )
2017-04-21 00:25:09 +02:00
Allofich
ff3e307059
Pass parameters by const reference
2017-04-20 23:47:03 +09:00
Andrei Kortunov
90d90b6d81
Fixed dynamic stats tooltips in review menu
2017-04-20 17:24:34 +04:00
Andrei Kortunov
39682d616c
Merge branch 'master' of https://github.com/OpenMW/openmw into guifixes
2017-04-20 17:20:20 +04:00
Allofich
2e5fd74db0
Fix invalid iterator warning
2017-04-20 19:30:35 +09:00
scrawl
df3b4fe6a5
Merge pull request #1259 from Allofich/warnings
...
Fix a few Cppcheck warnings
2017-04-19 20:32:40 +02:00
Andrei Kortunov
f0f1df3a96
Properly clear inventory
2017-04-19 20:54:09 +04:00
Allofich
e87d2aa1af
Remove unused function
2017-04-20 01:47:30 +09:00
Allofich
60a2625b89
Add parentheses to clarify calculations
2017-04-20 01:38:21 +09:00
scrawl
30081393a6
Add InventoryWindow::clear() as part of world cleanup
2017-04-19 18:28:49 +02:00
Allofich
f299f26720
Remove unused variable
2017-04-20 01:22:33 +09:00
Allofich
5a00b239ac
Reduce scope of variables
2017-04-20 01:22:30 +09:00
Allofich
c655875584
Change mWaterEnabled from float to bool
2017-04-20 01:09:52 +09:00
Andrei Kortunov
04eb4ea6b6
Check for disabled levitation ( fixes #3766 )
2017-04-19 18:38:25 +04:00
scrawl
50f3794d12
Merge pull request #1258 from akortunov/drownfix
...
Fixed drowning widget initialization with non-default "fHoldBreathTime" GMST value
2017-04-19 16:08:55 +02:00
Andrei Kortunov
3c4c47d1e6
Reduced scope of fHoldBreathTime variable
2017-04-19 15:52:15 +04:00
Andrei Kortunov
c3fd327bb2
Fixed drowning widget initialization
2017-04-19 08:48:16 +04:00
scrawl
f90e5081f9
Merge pull request #1257 from akortunov/chargen
...
Chargen menus fixes
2017-04-18 22:23:30 +02:00
Andrei Kortunov
aac78d29a4
Service menus layout fixes
2017-04-16 20:30:20 +04:00
Andrei Kortunov
c93cf822c7
Reviewmenu: read name, race, class and birthsign from player stats (fixes bug #2628 )
2017-04-14 23:21:20 +04:00
Andrei Kortunov
fb0c4700a4
Save a proto gender in racemenu
2017-04-14 23:19:48 +04:00
scrawl
f63b1e81cd
Merge pull request #1228 from akortunov/master
...
Options to show hidden weapon parameters
2017-04-14 20:01:08 +02:00
scrawl
532b26bf3c
osgShadow experiment
2017-04-14 15:35:41 +02:00
scrawl
17125e6c4d
Merge pull request #1256 from Allofich/equip
...
Adjustments to RemoveItem behavior
2017-04-14 01:08:29 +02:00
Andrei Kortunov
dc036e96d4
fixed magicka calculation on chargen (bug #3694 )
2017-04-13 18:30:36 +04:00
Allofich
6e405aed8c
Adjustments to RemoveItem behavior
...
(Fixes #3796 )
2017-04-13 22:33:13 +09:00
scrawl
8d8f293a65
Merge pull request #1246 from akortunov/develop
...
Menu improvements
2017-04-12 23:57:00 +02:00
scrawl
d8943d911c
Merge pull request #1254 from Allofich/warning
...
Remove unnecessary line
2017-04-12 23:49:29 +02:00
Allofich
470988f9ef
Minor changes to getActorsSidingWith
2017-04-13 04:45:44 +09:00
Andrei Kortunov
c3d49d5ca5
Fixed inventory crash and skipmenu launch
2017-04-12 22:57:32 +04:00
Allofich
6272e1c674
Cache allies found while iterating engageCombat
...
(Fixes #3814 )
2017-04-13 02:02:38 +09:00
Allofich
5020d03c78
Remove unnecessary line
2017-04-12 22:59:28 +09:00
Andrei Kortunov
72a16dc78b
Merge branch 'master' into pinned since added PR #1250
2017-04-12 13:17:06 +04:00
Andrei Kortunov
506cc47c9d
Add option to show reach and attack speed for melee weapons
2017-04-12 09:12:25 +04:00
scrawl
993860a4b1
Merge pull request #1250 from resilar/mapbutton
...
Hide WorldButton when in game mode
2017-04-11 21:34:53 +02:00
scrawl
8f335b3484
Merge pull request #1245 from akortunov/tgm
...
Vanilla-like tgm
2017-04-11 21:34:44 +02:00
Andrei Kortunov
95ce7637f3
Adds persisted pin (feature #2834 , bug #2489 )
2017-04-10 10:18:00 +04:00
scrawl
1cd901d113
Merge pull request #1248 from akortunov/missedsound
...
Adds missing recharge and repair sounds
2017-04-09 21:33:12 +02:00
Rob Cutmore
0ff56677f6
Remove unused code
2017-04-06 19:56:18 -04:00
Rob Cutmore
84bad9316d
Editor: flag orbit camera for re-initialization
...
After swapping cells the orbit cam controller needs to be
re-initialized to properly center on the new cell.
2017-04-06 19:40:26 -04:00
Rob Cutmore
f7664d4bb9
Editor: reset camera after cell drag and drop
...
When replacing a viewed cell via drag and drop the camera position is
not updated to better view the new cell. This flags the camera position
as not being set so a better default is set.
2017-04-04 18:54:58 -04:00
def
785b3c3d01
Hide WorldButton when in game mode
2017-04-03 09:40:12 +03:00
Andrei Kortunov
31bd70f334
Added missed recharge and repair sounds
2017-04-02 23:19:43 +04:00
Marc Zinnschlag
ab8294b281
Merge remote-tracking branch 'rcutmore/bug-2838'
2017-03-31 16:47:26 +02:00
Andrei Kortunov
df5a43363a
Confirmation dialogs size fix
2017-03-30 17:05:56 +04:00
Rob Cutmore
343f2cb81d
Editor: add creator for body parts
...
Added creator subclass for body parts to allow adding first person
parts. IDs for first person body parts are expected to end with ".1st".
2017-03-30 08:20:43 -04:00
scrawl
3c9f3a0f7f
Merge pull request #1242 from Allofich/warnings
...
Fix AppVeyor warnings
2017-03-29 07:28:00 +02:00
scrawl
6a745cb2cc
Fix text colorMode (Bug #3815 ) and render bin
2017-03-29 07:10:55 +02:00
Andrei Kortunov
edadcb338c
Savegame dialog improvements
2017-03-27 23:10:57 +04:00
scrawl
9e7ade4ba4
Merge pull request #1244 from akortunov/develop
...
MyGUI vertical alignment
2017-03-27 20:14:09 +02:00
Allofich
db2f97f308
Fix shadowing warning
2017-03-27 20:22:20 +09:00
Andrei Kortunov
7d09a5d644
Progress bars vertical alignment
2017-03-27 13:33:28 +04:00
scrawl
a036a98fd0
Merge pull request #1243 from akortunov/develop
...
Journal improvements
2017-03-27 02:56:35 +02:00
scrawl
b064dd29cc
Fix reset of blend function (Bug #3811 )
2017-03-27 02:51:23 +02:00
Andrei Kortunov
658ab5e941
Minor journal improvements
2017-03-26 22:56:36 +04:00
scrawl
2a74f79bf1
Merge pull request #1240 from Allofich/follow
...
Adjust AI follow distances
2017-03-26 20:35:11 +02:00
Allofich
6253a5218e
Adjust AI follow distances
...
(Fixes #3225 )
2017-03-27 03:31:25 +09:00
scrawl
0a061d45b7
Merge pull request #1239 from akortunov/projectilefix
...
Disable explosion effect for 0-range projectiles (bug #3730 )
2017-03-26 20:30:43 +02:00
Rob Cutmore
77bf1efc1a
Editor: Fix labels for creator user inputs
2017-03-26 09:14:32 -04:00
Rob Cutmore
8d4441bb5e
Editor: document subclasses without ID checks
...
- Removes ID validation for PathgridCreator.
- Adds comments explaining why ID validation isn't used in some cases.
2017-03-26 09:05:05 -04:00
Andrei Kortunov
14b59e0e4b
Vanilla-like tgm ( fixes #3798 )
2017-03-25 22:40:11 +04:00
Andrei Kortunov
860b556713
Disables explosion effect for 0-range projectiles ( fixes #3730 )
2017-03-25 19:53:24 +04:00
MiroslavR
da6b28eb40
Fix selling success chance ( Fixes #3802 )
2017-03-25 15:21:16 +01:00
scrawl
97dbd07ed2
Merge pull request #1236 from akortunov/guifixes
...
Minor GUI fixes
2017-03-25 13:36:58 +01:00
Andrei Kortunov
7bd0c74aa8
Fixes mWatchedTimeToStartDrowning initialization (fixes bug #3801 )
2017-03-25 14:15:16 +04:00
Andrei Kortunov
e383e4d023
Disabled hit overlay for damage/absorb mana/fatigue spells
2017-03-25 14:10:19 +04:00
scrawl
373bd78cf3
Merge pull request #1233 from akortunov/guifixes
...
Vanilla style drowning widget
2017-03-24 18:10:11 +01:00
Andrei Kortunov
b89fdcfd27
Vanilla style drowning widget (partially fixes bug #3801 ).
2017-03-24 09:41:18 +04:00
scrawl
338592b99b
Don't clear the animation queue when turning (Bug #3581 )
...
Otherwise, the turnAnimationThreshold would make it difficult to estimate when we can start playing the animation.
2017-03-23 20:05:06 +01:00
scrawl
a5d7b36c28
Don't clear idle animation when movement ends (Bug #3581 )
...
This caused problems when AiWander tried to start an idle animation in the frame after movement stops.
2017-03-23 20:05:05 +01:00
scrawl
c611ddba8d
Remove stray term
2017-03-23 20:05:05 +01:00
scrawl
f230df3d1c
Merge pull request #1232 from akortunov/tooltipfix
...
Tooltip maximum width cap
2017-03-23 17:12:36 +01:00
Andrei Kortunov
1a47b9727b
Changed tooltip maximum width (bug #3800 )
2017-03-23 14:31:01 +04:00
scrawl
02c6c1897e
Merge pull request #1230 from Allofich/stats
...
Change bounds behavior of stat script commands
2017-03-22 20:22:45 +01:00
scrawl
7075a3a99b
Merge pull request #1231 from Allofich/tooltips
...
Show names on combat actors when RMB GUI is active
2017-03-22 20:21:58 +01:00
Allofich
5282556ae0
Show names on combat actors when RMB GUI is active
...
Fixes (#3797 )
2017-03-22 20:04:29 +09:00
Allofich
57aeec59d5
Change bounds behavior of stat script commands
...
Fixes (#3776 )
2017-03-22 15:17:44 +09:00
Rob Cutmore
3714c2a0f2
Editor: add ID validator to pathgrid input
2017-03-21 08:14:04 -04:00
Rob Cutmore
207695e094
Editor: switch input for pathgrid creator
...
Switched from QComboBox to DropLineEdit for pathgrid creator input.
This allows the input the use auto-complete and be a drop target from
the cells table.
2017-03-21 07:58:01 -04:00
Rob Cutmore
0dcb6a9bd4
Editor: update pathgrid creator input on changes
...
When data changes the cell input for pathgrid creator is repopulated
with valid choices. This handles the case where a cell is added or
removed, and also when a cell's pathgrid is added or completely
removed.
2017-03-18 10:20:16 -04:00
Rob Cutmore
491fd3d0be
Editor: set combo box events for pathgrid creator
...
- Handles when combo box should automatically gain or lose focus.
- Checks user input when combo box selection changes.
2017-03-18 09:20:14 -04:00
Rob Cutmore
95d164a6e6
Editor: use combo box when creating pathgrids
...
Instead of using QLineEdit for user input, use a QComboBox populated
with valid choices. This prevents user from being able to create a
pathgrid for a non-existent cell.
2017-03-18 07:49:46 -04:00
Andrei Kortunov
1286754fb3
Add a new option to show arrow damage (feature #2923 )
2017-03-18 08:07:36 +04:00
Andrei Kortunov
eb81ab5b24
Disables weapon and spells cycling in GUI mode (bugs #2409 , #2483 , #2645 )
2017-03-15 17:07:25 +04:00
scrawl
e987fe85d0
Add abort flag to TerrainPreloadItem
2017-03-14 21:28:57 +01:00
scrawl
42e9891504
Fix issues caused by loading multiple views into the same terrain View
2017-03-14 20:27:55 +01:00
scrawl
97ed999097
Fix cleanup issue
2017-03-14 20:02:22 +01:00
scrawl
c22fde2bcd
Preload terrain while reading savegame
2017-03-14 19:27:56 +01:00
scrawl
9371100fde
Reuse the intersection visitor and set a traversal number to allow the terrain component to manage its view more efficiently
2017-03-14 19:27:56 +01:00
scrawl
59bf100907
Fill exteriorPositions in preloadFastTravel
2017-03-14 19:27:56 +01:00
scrawl
03c07d3bd5
Remove old code
2017-03-14 19:27:56 +01:00
scrawl
86e75f0987
Preload terrain even when cell preloading is disabled
2017-03-14 19:27:56 +01:00
scrawl
d055dc25bf
Add custom traversal for local map camera to avoid loading terrain nodes that are exactly outside the border to another cell
2017-03-14 19:27:56 +01:00
scrawl
6ccb6009ee
Use the View-based preloading for TerrainGrid as well
2017-03-14 19:27:56 +01:00
scrawl
3c29e2dbeb
Refactor ownership of terrain views
2017-03-14 19:27:56 +01:00
scrawl
28fd492711
Don't use terrain LOD for the map camera
2017-03-14 19:27:56 +01:00
scrawl
e7a0878c10
Add CompositeMapRenderer info to the stats panel
2017-03-14 19:27:56 +01:00
scrawl
ec0b743123
Revert "Change ordering of LocalMap nodes to make sure they are traversed before the CompositeMapRenderer."
...
This reverts commit 7d72c70c93ee3c0cc3d00d37b22c339d0103cd19.
2017-03-14 19:27:56 +01:00
scrawl
4549196b31
Use the new way of terrain preloading in CellPreloader/Scene
2017-03-14 19:27:56 +01:00
scrawl
1c15686353
Remove non required use of WorkQueue
2017-03-14 19:27:56 +01:00
scrawl
19d516cbda
Use the QuadTreeWorld based on distant terrain setting now that it sort of works.
2017-03-14 19:27:56 +01:00
scrawl
4dbd224249
Hide the terrain in non-exterior cells
2017-03-14 19:27:56 +01:00
scrawl
c684860e3b
Change ordering of LocalMap nodes to make sure they are traversed before the CompositeMapRenderer.
2017-03-14 19:27:55 +01:00
scrawl
2d549d088e
Get the world size from the ESM::Land store
2017-03-14 19:27:55 +01:00
scrawl
14225a42c6
Remove unused pointer to IncrementalCompileOperation
2017-03-14 19:27:55 +01:00
scrawl
5eff286c71
Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps.
2017-03-14 19:27:55 +01:00
scrawl
e323b2fa7b
Use the SceneManager's ShaderManager
2017-03-14 19:27:55 +01:00
scrawl
0fc465da59
Store the min/max height in LandData
2017-03-14 19:27:55 +01:00
scrawl
051c17a184
Make reportStats const
2017-03-14 19:27:55 +01:00
scrawl
5fb854036d
Use a forward declaration to avoid having to workaround Qt MOC
...
Don't think that guard was still needed, but a forward declaration is better anyways.
2017-03-14 19:27:55 +01:00
scrawl
80a0398f9d
Load LandData into the LandObject to avoid threading conflicts when the same data is being loaded by two threads
2017-03-14 19:27:55 +01:00
scrawl
2c68ed4fb4
Remove no longer required use of UnrefQueue as the new resource manager will naturally clear the cache from the worker thread
2017-03-14 19:27:55 +01:00
scrawl
35d53acc65
Factor out terrain chunk loading/caching into a new resource manager
2017-03-14 19:27:55 +01:00
scrawl
9a3a64f0c4
Add resource manager for ESM::Land to allow data to be unloaded when no longer required
2017-03-14 19:27:55 +01:00
scrawl
b898315962
cellpreloader: abort all tasks first before waiting
2017-03-14 19:27:55 +01:00
scrawl
5f76317807
Wait for completion of CreateMapItem on exit to avoid potential threading issue
2017-03-14 19:27:55 +01:00
scrawl
804f873649
terrain: factor out texture caching into a separate class
2017-03-14 19:27:55 +01:00
scrawl
ccfebdd2c3
Set the underwater fog relative to default view distance
2017-03-14 19:27:44 +01:00
scrawl
fe439e7bbf
Add missing default material state for character preview
2017-03-14 05:02:31 +01:00
scrawl
37c71c15f2
Remove redundant state
2017-03-14 04:57:36 +01:00
scrawl
4c9bbce1e2
Fix node mask being reset
2017-03-14 01:01:50 +01:00
MiroslavR
a8517c34eb
Code style
2017-03-13 13:57:05 +01:00
scrawl
a556475fae
Explicitely set the user data type to avoid const/non-const mismatch
2017-03-13 02:48:23 +01:00
scrawl
5de5be77f3
Fix Ptr/ConstPtr userdata mismatch (Bug #3784 )
2017-03-13 02:48:23 +01:00
Mitchell Schwitzer
421b92ae05
fix styling & add missing lines regarding max proficency
2017-03-12 17:24:43 -07:00
Mitchell Schwitzer
f31e5ba85e
fix display maximum proficency reached
2017-03-12 17:02:07 -07:00
Mitchell Schwitzer
7960d5a9a7
fix skill progress bar v2
...
both widgets display their own progess indicator. it was being set for
value (when you hovered over the level of your skill, eg the "5" in
"Acrobatics 5"), but not for the name.
this fixes that, but the progress information is being stored/displayed
by two different widgets for one skill
2017-03-12 16:52:29 -07:00
Mitchell Schwitzer
465b7361e1
fix skill window update
...
invoke winMgr->updateSkillArea() in mechanicsmanagerimp.cpp after looping
over ESM::Skill::SkillEnum if any updates have occurred.
2017-03-12 15:18:02 -07:00
scrawl
809f5cd01b
Fix bad override
2017-03-08 01:28:56 +01:00
MiroslavR
af1fe64408
GetSoundPlaying called on an equipped item now also looks for sounds played by the equipping actor ( Fixes #3781 )
2017-03-07 19:00:09 +01:00
scrawl
4123398cbc
Change no-grab setting to respect the value given
2017-03-04 21:48:31 +01:00
scrawl
7eb48ea83b
Don't wrap mouse to window bounds when the gamepad axis did not move and fix off-by-one error
2017-03-04 21:48:31 +01:00
scrawl
42a04de37c
Fix a crash that occurred when a carried light fails to be attached.
2017-03-04 21:48:31 +01:00
scrawl
2776727794
Allow gamepad and mouse/keyboard to be used at the same time ( Fixes #3093 )
2017-03-04 21:48:31 +01:00
scrawl
29556a1802
More consistent wording of errors/warnings
...
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.
An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.
The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.
Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
2017-03-04 21:48:31 +01:00
scrawl
1692b7f38e
Merge pull request #1209 from dhustkoder/master
...
Added ConstContainerStoreIterator (Task #3092 )
2017-03-02 18:36:21 +01:00
scrawl
2873c10284
Clean the object root of StateSets and hidden nodes
2017-03-01 03:09:32 +01:00
scrawl
4e0011bfc8
Improve NPC loading performance by caching the cleaned objectRoot
2017-03-01 03:00:49 +01:00
Rafael Moura
6c2ce2b2a1
Porting more ContainerStoreIterator usage to const version #4
...
removed const_cast revision
2017-02-28 19:11:00 +00:00
Rafael Moura
7fa2703715
Porting more ContainerStoreIterator usage to const version #3
2017-02-28 14:31:51 +00:00
Rafael Moura
18a4b64f1a
Porting more ContainerStoreIterator usage to const version #2
2017-02-27 21:50:10 +00:00
scrawl
0772a03e98
Print the object ID that animateCollisionShapes did not find the node for
2017-02-27 00:41:27 +01:00
scrawl
d4781d419f
Merge pull request #1220 from MiroslavR/tcl_collision
...
Fix actors colliding with noclipping player
2017-02-26 23:27:40 +01:00
Rafael Moura
05cc69f6f1
Porting more ContainerStoreIterator usage to const version
2017-02-26 21:24:51 +00:00
scrawl
6f4c03aa32
Avoid retrieving setting every frame
2017-02-26 17:34:24 +01:00
MiroslavR
498a3d450b
Fix actors colliding with noclipping player
2017-02-26 04:28:28 +01:00
scrawl
75677f03e7
Remove SceneManager::notifyAttached
2017-02-24 02:58:41 +01:00
scrawl
afa39d121f
Fix 'part has no parent' warning caused by destructing in the wrong order
2017-02-24 02:58:41 +01:00
scrawl
a55604c549
Avoid unnecessary AABB update when actor position has not changed
2017-02-24 02:58:41 +01:00
scrawl
fb073e5c14
Avoid unnecessary AABB update for rotationally invariant collision shapes
2017-02-24 02:58:41 +01:00
scrawl
5198fc897d
Fix collision glitch caused by Bullet AABB not being updated when an actor moves without turning
2017-02-24 02:58:41 +01:00
scrawl
25ca89b560
Avoid redundant allocations in Store::search
2017-02-23 23:28:50 +01:00
scrawl
732212070d
crashcatcher: complain when launching gdb fails
2017-02-23 23:28:49 +01:00
Marc Zinnschlag
765401531d
Merge remote-tracking branch 'origin/master'
2017-02-23 09:03:31 +01:00
scrawl
d163228199
Fix updatePtr
2017-02-22 21:02:34 +01:00
scrawl
00d4fea91c
Derive Animation from osg::Referenced to allow the UnrefQueue to delete it
2017-02-22 15:27:20 +01:00
scrawl
a5247394dc
(Re)set the inventory listener outside of the Animation class
2017-02-22 15:08:22 +01:00
scrawl
8f79fa3d72
Add resource statistics panel opened with F4
2017-02-22 14:28:45 +01:00
scrawl
b40ca9b60a
Set the window rectangle on the Viewer's EventQueue
2017-02-22 01:49:54 +01:00
scrawl
0fbd29ccb8
Use additive alpha blending on the character preview
2017-02-21 18:29:18 +01:00
scrawl
e38221edc9
Set character preview's simulationTime to 0 to avoid flickering lights
2017-02-21 18:25:25 +01:00
scrawl
a45335ffc3
Do not reduce magicka in god mode
2017-02-21 16:33:18 +01:00
scrawl
eefe1ed1a8
Fix being affected by Silence in god mode
2017-02-21 15:48:45 +01:00
FedeWar
e9076088ca
Another tab fix
2017-02-21 11:51:11 +01:00
FedeWar
4e7f7cf84f
Fixed tabs
2017-02-21 11:49:04 +01:00
FedeWar
370c12e78a
Verification results are ordered by Type in alphabetical order.
2017-02-21 11:15:53 +01:00
scrawl
b9740fd2a1
Fix btHeightFieldTerrainShape triangle layout to match rendering
2017-02-21 04:47:11 +01:00
scrawl
3f27c8cc97
Always print context for script warnings to remove the need for verbose option
...
(Fixes #2813 )
2017-02-21 04:32:59 +01:00
scrawl
9728a6967e
Reset fall height when teleporting ( Fixes #2629 )
2017-02-20 20:27:05 +01:00
scrawl
05ad0dca34
Use ActionTeleport in COE/COC commands
2017-02-20 20:26:45 +01:00
scrawl
7e02bb7348
Preload summoned creature models before the spell is cast
2017-02-20 19:58:00 +01:00
scrawl
22482b7eec
Don't use xmesh.nif over mesh.nif for classes that don't make use of the separated keyframes
2017-02-20 19:04:02 +01:00
Rafael Moura
9963601484
Porting code to ConstContainerStoreIterator #1
2017-02-19 15:18:35 +00:00
scrawl
481c440698
Print OSG version on startup
2017-02-19 13:26:45 +01:00
scrawl
e4741db069
Merge pull request #1213 from Allofich/equip
...
Change AI equip logic
2017-02-19 10:47:19 +01:00
MAtahualpa
fb8a2093cd
Replace "Female" check box with a combo box, part 2/2 ( fixes #3757 )
...
Replaces the "Female" check box in BodyPart records with a "Gender" combo box. This is the second of two related fixes, the first one covering NPC records.
Related issue:
- Fixes #3757 : Editor: Replace "Female" check box in BodyPart records with "Gender" combo box (https://bugs.openmw.org/issues/3757 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several BodyPart records.
2017-02-18 15:40:07 +01:00
Rafael Moura
ecbde7b11e
Added ConstContainerStoreIterator
...
using base template for ContainerStoreIterators
less template arguments for ContainerStoreIteratorBase
2017-02-18 13:47:18 +00:00
Allofich
bc60421615
Change NPC equip logic to be more like original
...
(Bug #3754 )
2017-02-18 21:59:09 +09:00
Marc Zinnschlag
bef0b1f1d6
Merge remote-tracking branch 'matahualpa/openmw-cs_gender'
2017-02-18 09:57:09 +01:00
scrawl
f2174ee9f4
Merge pull request #1217 from Allofich/follow
...
Fix loading 0-duration Follow and Escort packages
2017-02-17 21:10:15 +01:00
scrawl
cb142f01e4
Merge pull request #1215 from MiroslavR/armor_rating
...
Fix incorrect calculation of armor rating
2017-02-17 18:52:07 +01:00
Allofich
3897c49e30
Fix loading 0-duration Follow and Escort packages
...
(Fixes #3755 )
2017-02-18 01:55:50 +09:00
MAtahualpa
520e82ed4f
Fix for commit "affc0eb..." in PR 1216 ( fixes #3756 )
...
Fixed use of tab character.
2017-02-17 17:54:38 +01:00
MAtahualpa
affc0eb37f
Replace "Female" check box with a combo box, part 1/2 ( fixes #3756 )
...
Replaces the "Female" check box in NPC records with a "Gender" combo box. This is the first of two related fixes, the second one covering BodyPart records.
Related issue:
- Fixes #3756 : Editor: Replace "Female" check box in NPC records with "Gender" combo box (https://bugs.openmw.org/issues/3756 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC records.
2017-02-17 17:05:46 +01:00
Marc Zinnschlag
79956e4b49
Merge remote-tracking branch 'origin/master'
2017-02-17 08:54:19 +01:00
MiroslavR
f883951d75
Fix incorrect calculation of armor rating (Bug #3754 )
2017-02-17 03:11:37 +01:00
Allofich
621d3e56cf
Fix Clang and OS X Travis CI warnings
2017-02-17 02:08:39 +09:00
MAtahualpa
dab8b328c4
Replace light emitter check boxes with a combo box ( fixes #3752 )
...
Replaces the four emitter check boxes in Light records with an "Emitter Type" combo box.
Related issue:
- Fixes #3752 : Editor: Replace emitter check boxes in Light records with "Emitter Type" combo box (https://bugs.openmw.org/issues/3752 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Light records. Please note that this fix also prevents users from erroneously assigning two or more emitter types at the same time. (I don't know which one would prevail in that case.)
2017-02-16 12:48:47 +01:00
MAtahualpa
7be46eb1f0
Fix for commit "d4972ab..." in PR 1208 ( fixes #3751 )
...
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.
Fix:
- corrected false logic operation in refidadapterimp.cpp
- corrected names of the used flags
2017-02-16 00:08:38 +01:00
MAtahualpa
d4972ab166
Replace "Xyz blood" check boxes with a combo box ( fixes #3751 )
...
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.
Related issue:
- Fixes #3751 : OpenMW-CS: Replace "Xyz Blood" check boxes in NPC and Creature records with "Blood Type" combo box (https://bugs.openmw.org/issues/3751 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC and Creature records. Please note that this fix also prevents users from erroneously assigning two blood types at the same time. (I don't know which one would prevail in that case.)
2017-02-15 23:06:36 +01:00
scrawl
f10edb71cc
Add environment variable for disabling IncrementalCompileOperation
2017-02-15 21:01:25 +01:00
scrawl
c4a89065a2
Preload VFX of spells selected by AI actors
2017-02-15 21:01:25 +01:00
scrawl
57b585570a
Preload magic effect visuals of the player's selected weapon/spell
2017-02-15 21:01:25 +01:00
Marc Zinnschlag
e46fb1770c
Merge remote-tracking branch 'matahualpa/openmw-cs_booktype'
2017-02-15 19:47:39 +01:00
MAtahualpa
2c34a8706b
Replace "Scroll" check box with a combo box ( fixes #3748 )
...
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.
Related issue:
- Fixes #3748 : OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
2017-02-15 18:59:55 +01:00
MAtahualpa
607bd8b853
Replace "Scroll" check box with a combo box ( fixes #3748 )
...
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.
Related issue:
- Fixes #3748 : OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
2017-02-14 11:48:37 +01:00
scrawl
183c46b0ef
Fix summoning effects
2017-02-14 07:58:16 +01:00
scrawl
a495b9b884
Fix wasteful allocations in Store<Land>::search
2017-02-14 07:58:16 +01:00
scrawl
72c6b11cf8
Move global map render to the worker thread
2017-02-14 07:58:16 +01:00
scrawl
026a05718f
Construct the WorkQueue in Engine
2017-02-14 07:58:16 +01:00
scrawl
ddd6605608
Move WNAM out of LandData to avoid redundant (de)allocations on startup
2017-02-14 07:58:16 +01:00
scrawl
325bf66653
Return const Land in ESMStore
2017-02-14 07:58:16 +01:00
Marc Zinnschlag
93c5630e02
Merge remote-tracking branch 'matahualpa/openmw-cs_tablecontents'
2017-02-13 10:06:08 +01:00
MAtahualpa
2d1af3ee4a
Update record.cpp
...
This should be the last instance of "mSkillID". Let's see what Travis says about it...
2017-02-12 20:55:50 +01:00
scrawl
051b4038d9
Merge pull request #1203 from Allofich/magic
...
Make AI not go hostile when absorbing/reflecting
2017-02-12 17:18:10 +01:00
MAtahualpa
c46eadae90
Update actionread.cpp
...
*grrr* Forgot to change the latter "mSkillID" in line 47...
2017-02-12 17:17:33 +01:00
scrawl
cdf65ef681
Merge pull request #1201 from Allofich/hit
...
Prevent AI actors from hitting unintended targets
2017-02-12 16:25:52 +01:00
scrawl
342c25dffa
Fix weather sounds playing at full volume before fading in
2017-02-12 15:44:33 +01:00
Allofich
72c3ee0a3d
Make AI not go hostile when absorbing/reflecting
2017-02-12 23:14:09 +09:00
MAtahualpa
7bc65ce05b
Update actionread.cpp
...
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
2017-02-12 13:52:11 +01:00
MAtahualpa
347fb1ff4b
Update converter.hpp
...
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
2017-02-12 13:51:36 +01:00
MAtahualpa
c5dcfe0794
Update refidadapterimp.cpp
...
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
2017-02-12 13:50:58 +01:00
MAtahualpa
6587880171
Update refidcollection.cpp
...
Makes Book records display skill IDs instead of attribute IDs for teached skills.
Related issue:
- Bug #3746 : OpenMW-CS: Book records show attribute IDs instead of skill IDs for teached skills entry.
2017-02-12 13:03:37 +01:00
Allofich
6b53541571
Prevent AI actors from hitting unintended targets
...
(Fixes #3254 )
2017-02-12 19:51:19 +09:00
scrawl
9fa8e88366
Revert "Don't create a CharacterController for objects with no animations"
...
This reverts commit cce42b6e9d
2017-02-12 10:22:11 +01:00
scrawl
03a10f217a
Catch exceptions in AiSequence::execute
2017-02-11 17:53:11 +01:00
scrawl
5a12407436
Revert "Rearranged check for better performance"
...
This reverts commit 332ceb51a2
2017-02-11 17:53:11 +01:00
scrawl
f2d4f290cc
traceDown fix
2017-02-11 17:53:11 +01:00
Allofich
e047679595
Fix trying to access stats on non-actors
2017-02-11 19:59:42 +09:00
scrawl
332ceb51a2
Rearranged check for better performance
2017-02-10 06:48:03 +01:00
scrawl
8752ae9c6a
Fix include
2017-02-10 06:28:23 +01:00
scrawl
bbcba57495
Disable hitAttemptActorId saving code for now
2017-02-10 06:26:32 +01:00
scrawl
2ea0db1d1a
Merge pull request #1198 from Allofich/combat
...
Make combat engagement logic more like vanilla
2017-02-10 06:20:04 +01:00
scrawl
dd54887783
Fix node mask of CharacterPreview being reset
2017-02-10 03:31:37 +01:00
scrawl
6ecc008813
Fix an issue uncovered by the last commit related to changing actor position without properly moving the actor
2017-02-10 02:43:49 +01:00
scrawl
cf7b0098ed
Slightly increase backoff value
2017-02-10 02:05:12 +01:00
scrawl
b3d5c2bd7f
Use the actor's collision shape in findGround()
...
The cylinder base is no longer appropriate as of the change to capsules.
This also works around a bug when tracing a small cylinder/box shape apparently introduced with bullet 2.86.
2017-02-10 02:00:52 +01:00
scrawl
67e4a7e37b
Change some osg::clone's to direct copy constructor to avoid dynamic_cast overhead
2017-02-09 04:51:20 +01:00
scrawl
3f3d00ffc9
Add CellPreloader::clear to avoid potential dangling CellStore pointer and to more aggressively clear preload state from a previous game
2017-02-09 04:03:38 +01:00
scrawl
0be86f69bc
Write the player object first to increase the chance of preloading the player cells in time
2017-02-09 03:55:10 +01:00
scrawl
1d8a9ff622
Preload player cell as soon as the player is read from the savegame
...
Giving the worker thread something to do while the rest of the savegame is parsed.
2017-02-09 03:47:36 +01:00
scrawl
d141b98f0c
Add base animations to preloadCommonAssets
2017-02-09 03:32:40 +01:00
scrawl
066aa2e60e
Always run preloadCommonAssets even when the menu is skipped
...
Move to before the content files are loaded so we can do preloading in parallel with content file loading
2017-02-09 03:16:36 +01:00
scrawl
c68f662c9a
Predict player movement when preloading cells to better handle moving at high speed
2017-02-09 01:34:42 +01:00
scrawl
a46593fa74
Add PreloadItem::abort() to avoid no longer required cells from blocking the work thread
2017-02-09 01:08:07 +01:00
scrawl
d62c4259bd
CellPreloader: load the terrain first to match the order in the main thread
2017-02-09 01:07:27 +01:00
scrawl
d1e86d22ca
Check which local map textures actually need to be updated
...
On a typical exterior cell transition, we'll save 3 of 9 map renders. When moving back and forth between 2 cells, we can even reuse 6 of 9.
2017-02-08 22:20:57 +01:00
scrawl
43d9f3d5c7
Update bullet debug drawer even when the game is paused so the collision mesh will show instantly even when the console is up
2017-02-08 18:53:24 +01:00
scrawl
249fe9077b
Handle 'tcb' command as an alias for 'tcg'
2017-02-08 18:51:07 +01:00
scrawl
206e2bf975
Fix camera rotation not being set after save game load (regressed with 1eb3384043)
2017-02-08 04:42:15 +01:00
scrawl
35bb467c7a
Fix inverted setting of variable
2017-02-07 05:28:06 +01:00
Allofich
5d2090684a
Store mHitAttemptActorId in save files
2017-02-07 01:26:26 +09:00
Allofich
25c64dbb0f
Make combat engagement logic more like vanilla
...
(Fixes #2678 , Fixes #3705 )
2017-02-07 01:25:12 +09:00
scrawl
5a939418fc
Add missing avcodec_close ( Fixes #3741 )
2017-02-06 15:49:13 +01:00
scrawl
91939c4687
Switch actors to capsule shapes now that the jumping bug is gone ( Fixes #2116 , Fixes #2909 )
...
The culprit was - surprise, surprise - d39d4f2619
2017-02-06 05:40:49 +01:00
scrawl
03aa270551
Construct PhysicActor as on ground by default to avoid a jumping animation from playing in the first frame after a savegame load
2017-02-06 05:23:00 +01:00
scrawl
bc29a99a53
Fix broken timer
2017-02-06 05:10:40 +01:00
scrawl
d39d4f2619
Revert a problematic and performance costly workaround that should never have been applied and is no longer required as of the last commit.
2017-02-06 04:52:41 +01:00
scrawl
541fbb4792
Movement solver: add usage of 'on slope' flag to improve handling of steep slopes
...
Previously we were handling 'on slope' synonymously with 'in air' which caused some odd effects.
Practical changes:
- Sliding down a slope no longer applies fall damage.
- Fixed a climbing exploit that would allow climbing steep slopes with repeated use of the Jump function.
2017-02-06 04:50:58 +01:00
scrawl
cce42b6e9d
Don't create a CharacterController for objects with no animations
2017-02-06 03:43:08 +01:00
scrawl
fe0cf5be05
StatsWindow: don't rebuild all skill widgets when one skill changes
2017-02-06 02:40:35 +01:00
scrawl
e7b6ea4e3f
Add cycle weapon/spell actions to the list of controller actions ( Fixes #3613 )
2017-02-05 20:23:49 +01:00
scrawl
3065600a86
Skip expensive visitEffectSources call if no summoned creatures or summon effects are active
2017-02-05 02:26:28 +01:00
scrawl
ee4073541c
Animation: cache getVelocity()
2017-02-05 02:26:28 +01:00
scrawl
a2cede8f34
Add timer for updateEquippedLight
2017-02-05 02:26:28 +01:00
scrawl
1eb3384043
Avoid rotating by zero in CharacterController
2017-02-05 02:26:28 +01:00
scrawl
7201cf5fe2
ItemWidget: skip setImageTexture if the icon has not changed
2017-02-05 02:26:27 +01:00
scrawl
1447bfa215
Improve scene loading performance by creating collision objects with the correct rotation right away instead of adjusting it later
2017-02-04 15:12:01 +01:00
scrawl
884d306bf3
Throw exception when told to use 0 threads
2017-02-04 05:58:12 +01:00
scrawl
2db7292bcb
Add new setting for the number of preloading worker threads
...
If you have CPU cores to spare, consider setting 2 or 3. Up to about 3 threads, preloading performance seems to increase in a linear fashion, but with 4 or more threads I/O bottlenecks and synchronization overhead starts to show.
2017-02-04 02:59:28 +01:00
scrawl
eaeba4138b
Move the deletion of PreloadItem to the worker thread
2017-02-04 02:36:44 +01:00
scrawl
33e654f94d
Add explicit handling of most commonly used nodes to NodeVisitors to avoid excessive virtual function calls
2017-02-04 02:16:26 +01:00
scrawl
83a9435167
Fix unnecessary use of CopyFramebufferToTextureCallback when loading is too fast for a loading screen to be displayed
2017-02-03 23:39:39 +01:00
scrawl
767eba941f
Speed up finding of attachment node by using the cached nodeMap
2017-02-03 23:15:37 +01:00
scrawl
a76d693627
Speed up ControllerVisitor by skipping sub graphs that have no ChildrenRequiringUpdateTraversal()
2017-02-03 23:10:14 +01:00
scrawl
c58fc6d276
Improve performance of loading screen by not recomputing the bounding sphere of the entire scene after each loading step
2017-02-03 22:29:38 +01:00
scrawl
0be811c519
Update the resource cache every second instead of every frame
...
A dry run takes about ~1.5ms. Even though it's all done in the worker thread, the locks used can stall loading operations that are about to happen in other threads, and just in general this CPU load is unnecessary.
2017-02-03 03:44:30 +01:00
scrawl
6d8c414071
Set osgViewer ReleaseContextAtEndOfFrameHint to false for better performance when in SingleThreaded mode
...
The flag is normally set to off by default when using Viewer::run() - however since we're using our own frame loop, we have to unset the flag ourselves
2017-02-02 22:16:59 +01:00
scrawl
c5f8ff6e0e
Add names to several nodes for debugging purposes
2017-02-02 21:49:52 +01:00
scrawl
625c5040ce
Fix build
2017-02-01 15:49:20 +01:00
scrawl
1808b8567e
Add 'small feature culling pixel size' setting specifically for water RTTs, by default set higher than the one in [Camera]
2017-02-01 06:00:14 +01:00
scrawl
fcb4129aee
Add 'small feature culling pixel size' setting
2017-02-01 06:00:14 +01:00
scrawl
960d4a96c3
Reduce the number of osg::Material state by setting the default state on the graph root
2017-02-01 06:00:14 +01:00
scrawl
34deb6e7b1
Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes
2017-02-01 06:00:14 +01:00
MiroslavR
d97e9cfe7e
Fix InterpreterContext::updatePtr updating mLocals to the implicit ref's locals when interpreting a targeted global script ( Fixes #3738 )
...
The interpreter context of a targeted global script would point to the target's locals instead of the global script instance's locals when the target changed cell during script execution. Credit to scrawl for the solution.
2017-01-29 13:29:53 +01:00
MiroslavR
c64351b3e8
ESS-import: player is no longer disabled (Bug #3246 )
2017-01-21 03:39:51 +01:00
scrawl
cc19b4bd8a
Fix door rotation order in collision case (Bug #3707 )
2017-01-19 02:19:44 +01:00
scrawl
45fb4f04b1
Update reference of the interpreter context when an Activate results in a take action ( Fixes #3727 )
2017-01-18 21:57:50 +01:00
scrawl
70c5f64caa
Fix mLocals not being updated in InterpreterContext::updatePtr
2017-01-18 21:55:58 +01:00
scrawl
c6822b9eb6
Merge pull request #1192 from damiel/water_refactor
...
Added refactoring of shader handling from visvalda's fog shader
2017-01-16 18:26:28 +01:00
Martin-Kevin Neumann
5a8efa1649
added refactoring of shader handling from visvalda's fog shader
2017-01-15 14:17:22 +01:00
NeveHanter
e82d542d89
Merge remote-tracking branch 'upstream/master' into bugfix-3617
2017-01-15 09:49:45 +01:00
NeveHanter
811e9ad9f3
Fixed bug https://bugs.openmw.org/issues/3617 by allowing touch and target enchantments from ranged weapons and their projectiles to explode even when colliding with non-activable objects, terrain, water slab or when shoot underwater.
...
Also allowed projectiles to fly through the dead bodies as in vanilla.
2017-01-15 09:49:25 +01:00
Allofich
f2240dde9c
Allow command spells to work when cast by AI on AI
...
(Fixes #3723 )
2017-01-15 01:56:22 +09:00
Allofich
e825010107
Apply command spell effects on impact
...
Command spells should apply their effects, including taking an actor out
of combat, every time a spell successfully hits, even if a previous
command effect is still active.
2017-01-15 01:53:22 +09:00
Allofich
a46c4de918
Stop combat when adding an AI package to an actor
...
(Fixes #3722 )
2017-01-15 01:53:22 +09:00
scrawl
b87abb0456
Reset activation flags when an object is copied ( Fixes #3671 , Fixes #3719 )
2017-01-14 15:29:36 +01:00
scrawl
69ce9f32bc
Activate/OnActivate fix (Bug #3712 )
2017-01-14 00:10:43 +01:00
scrawl
73aa07b81b
Merge pull request #1189 from Allofich/attack
...
Match best attack selection to vanilla behavior
2017-01-11 18:36:10 +01:00
Allofich
2322ab3125
Don't make Command spells cancel AI packages
...
(Fixes #3649 )
2017-01-12 00:07:22 +09:00
Allofich
c10585fb07
Match best attack selection to original MW
...
(Fixes #3721 )
2017-01-11 22:22:46 +09:00
MiroslavR
f1f9209814
Creatures now auto-equip shields ( Fixes #3704 )
2017-01-08 20:52:04 +01:00
Allofich
5e992a0342
Fix attempting to access NPC stats on creatures
2017-01-06 02:58:24 +09:00
Assumeru
1a073ca642
Fix teleportation being unreachable
2017-01-03 22:02:23 +01:00
Allofich
eee49b7ea7
Make dispel an instant effect again ( Fixes #3695 )
2017-01-02 17:35:50 +09:00
scrawl
80c008906b
Fix texture coordinates
2017-01-02 04:50:33 +01:00
scrawl
48a23d61b2
Mask out water in global map overlay
2017-01-02 04:01:04 +01:00
scrawl
7b5f3e3cdc
Fix crash in ProjectileManager when a sound id fails to play or is not found
2017-01-01 21:34:31 +01:00
scrawl
708009eac4
Merge pull request #1158 from logzero/move3
...
[RFC] Movement solver experiments
2017-01-01 20:44:41 +01:00
scrawl
212e85e810
Merge pull request #1174 from Allofich/combat
...
Adjustments to AI combat engaging and disengaging
2017-01-01 19:36:09 +01:00
scrawl
da3815f5a6
Merge pull request #1179 from Armada651/fix-audio-cutoff
...
OpenAL_Output: When a source is finished, rewind it instead of stopping it.
2017-01-01 19:13:32 +01:00
logzero
dbf0fa6766
Skip stepping if movement tracer hits actor.
2016-12-31 10:57:06 +01:00
Marc Zinnschlag
dedd95f52a
Merge remote-tracking branch 'miroslavr/save-cleanup'
2016-12-29 08:37:59 +01:00
Jules Blok
e9d8ff532f
OpenAL_Output: When a source is finished, rewind it instead of stopping it.
...
This works around a bug in the MacOS OpenAL implementation.
2016-12-29 01:03:13 +01:00
MiroslavR
c9dd63af8d
Merge pull request #1171 from NeveHanter/travel-followers-cost
...
Implemented "paying" for travelling followers
2016-12-26 22:34:39 +01:00
NeveHanter
8568cd049f
Removed "less" character from the documentation by the requested opportunity.
2016-12-26 21:46:43 +01:00
Allofich
54fa921dad
Change some AI combat engagements to not need LOS
2016-12-26 22:42:46 +09:00
Allofich
6fa0354a17
Make AI attack player also if it attacks follower
2016-12-26 22:42:45 +09:00
Allofich
5a6ea4e84e
Cleanup
2016-12-26 22:42:44 +09:00
Allofich
e10c4d8814
Stop combat between AI when canFight is false
2016-12-26 22:42:42 +09:00
Allofich
e8c7ad2f4b
Change environment check to canFight check
...
Instead of just checking that combatants are in compatible environments,
allow combat if in attack range using canFight. Together with previous
commit, fixes #3690 .
2016-12-26 02:14:01 +09:00
Allofich
588442b6cc
Make enemies start combat with player followers
...
Recreates vanilla behavior of enemies starting combat with player
followers and escorters. (Fixes #3691 )
2016-12-26 02:13:54 +09:00
logzero
a5360483bb
Back off slightly when we are touching something.
...
This can reduce the amount of movement solver failures significantly.
I've observed a drop of 8 iteration cases by almost factor of ten.
2016-12-25 15:34:43 +01:00
logzero
00f3bfba27
Use tracer hit height to skip stepping up in movement solver.
2016-12-24 23:07:44 +01:00
MiroslavR
c2b491cd70
ESSImporter: Convert last known exterior cell ( Fixes #3693 )
...
+ some research
2016-12-24 18:30:39 +01:00
logzero
ab1724d3db
Compare new velocity to the original velocity.
...
Using old velocity seems awkward,
probably a copypaste/refactoring bug.
2016-12-24 12:38:23 +01:00
logzero
e58de5e410
Remove superfluous velocity reflection in movement solver.
...
The slide projection negates the reflection effect.
Just to be sure I've compared the resulting vectors
with and without reflection at runtime.
2016-12-24 12:29:09 +01:00
NeveHanter
ff4aba2a6e
Moved duplicated code to common ActionTeleport static method and reordered travel price calculations
2016-12-23 21:27:29 +01:00
MiroslavR
5f234f8952
Dialogue: "PC Rank" condition now uses speaker's faction if "PC Faction" is not given ( Fixes #3689 )
2016-12-23 19:03:59 +01:00
MiroslavR
87fd011a28
Clean-up saves by dropping references with invalid RefNums ( Fixes #1956 )
2016-12-22 20:48:58 +01:00
scrawl
cf496287f7
Silence static analysis warnings
2016-12-22 14:43:54 +01:00
logzero
50fd913058
Refactor stepMove function into a Stepper object
...
to be able to reuse up stepper results
for successive movement solver iterations.
This can reduce the number of convex casts
almost by half in some cases.
2016-12-21 19:02:42 +01:00
logzero
4f6e65e481
Apply sliding upward check to new velocity.
...
This helps to capture the case where new velocity
only differs in the z component (normal pointing up).
TODO: Find a better way to handle the normal pointing up case.
2016-12-21 19:02:42 +01:00
logzero
0b08802910
Integrate MinStep move attempt into stepMove.
...
This can save 1 to 3 convex casts per iteration.
2016-12-21 19:02:41 +01:00
logzero
25a0219e4d
Use cosine of max slope angle for walkable slope checks in movement solver.
2016-12-21 19:02:41 +01:00
logzero
561e0cbbf9
Use squared length for distance checks in movement solver.
2016-12-21 19:02:40 +01:00
scrawl
dc1f788cff
Use osg::PI over M_PI
2016-12-21 16:49:37 +01:00
NeveHanter
15cd3c178b
Clamp price multiplication to 1, as it resulted in player alone traveling at no fee.
2016-12-20 21:23:55 +01:00
NeveHanter
8902bb5b13
Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith
2016-12-20 12:38:51 +01:00
MiroslavR
cd13570230
ESSImporter: Import mark location
2016-12-18 04:37:59 +01:00
scrawl
6140768783
Enable waterCollision after moving the player above water ( Fixes #3672 )
2016-12-17 23:21:33 +01:00
Aussiemon
2f66b91ac5
Added check to prevent attempted wandering of empty paths
2016-12-16 15:18:28 -07:00
scrawl
913a8fe1bd
Merge pull request #1160 from Aussiemon/actorupdatecollision
...
[Do not merge yet] Added check before attempting to remove actor's collision object
2016-12-16 20:46:00 +01:00
Aussiemon
b794aa7c2f
Helper methods for updateCollisionMask(), prevent water collision being removed twice, remove Bullet 2.8.5 methods
2016-12-16 12:22:07 -07:00
scrawl
f8690dcd20
Set the drag-and-drop state after initiating the drag, not before ( Fixes #3134 )
2016-12-16 20:16:59 +01:00
scrawl
cca75499ee
Clear the Skeleton's bone cache when a node is added/removed ( Fixes #3663 )
2016-12-16 20:09:20 +01:00
Marc Zinnschlag
34389e15cd
Merge remote-tracking branch 'origin/master'
2016-12-16 12:28:22 +01:00
Marc Zinnschlag
827c78a4cd
added text column to ref id table (books)
2016-12-16 12:28:09 +01:00
Leon Krieg
12c8c3276a
Disable NPC collision only when death animation has finished ( #3666 )
2016-12-15 19:33:14 +01:00
Leon Krieg
739cd5ba45
Fixed more spelling mistakes
2016-12-15 13:09:40 +01:00
Aussiemon
7c2a088b34
Added check before removing water collision object from world
2016-12-14 20:13:23 -07:00
Aussiemon
e30dfb13d3
Added check before attempting to remove actor's collision object from world
2016-12-14 19:05:30 -07:00
Leon Krieg
c7b4b2cdd7
Fixed multiple spelling mistakes
2016-12-14 16:39:33 +01:00
scrawl
8bdd5d1131
Merge pull request #1151 from Aussiemon/projectilelightsfix
...
Update to implementation of projectile lights
2016-12-14 14:33:09 +01:00
mrohrlach
71e74f5a93
Moved projectile light calculation to separate method
2016-12-13 18:04:20 -07:00
MiroslavR
76ee5845ac
Fix swish sound ID and play swish sound effects for all creatures ( Fixes #3653 )
2016-12-11 19:35:53 +01:00
MiroslavR
8c97ac269d
Remove item shadows properly ( Fixes #3652 )
2016-12-10 22:22:41 +01:00
mrohrlach
f0f78c9d64
Slight adjustments to disintegration fix
2016-12-09 19:55:26 -07:00
mrohrlach
9624d8aade
Added new method and variable to track float remainders of disintegration effections
2016-12-09 19:48:56 -07:00
mrohrlach
f5da179a90
Removed two more bad casts
2016-12-09 18:15:40 -07:00
mrohrlach
3b0c791892
Removed bad casts and unnecessary comments
2016-12-09 18:10:06 -07:00
scrawl
876d9c6a84
Merge pull request #1148 from Allofich/aicombat
...
Require line of sight for AI attacks
2016-12-06 20:02:39 +01:00
Allofich
a6dae51d87
Require line of sight for AI attacks ( Fixes #3646 )
2016-12-07 01:35:30 +09:00
Allofich
6816e935f1
Fix fortify maximum magicka expiration ( Fixes #3648 )
2016-12-06 21:00:03 +09:00
mrohrlach
c2e5f24e98
Tidying up
2016-12-04 16:31:11 -07:00
mrohrlach
ef5cf76ad8
Implemented retrieval of effect colors for lights, made recommended changes
2016-12-04 16:11:21 -07:00
mrohrlach
e1deb8b1d4
Merge branch 'master' of https://github.com/openmw/openmw
2016-12-04 16:09:22 -07:00
mrohrlach
3816d0f6dc
Changed light values to better match vanilla. Still need to pull diffusion properties from spells
2016-12-03 19:44:52 -07:00
mrohrlach
099e79edbe
Changed a line that did not need to be changed apparently
2016-12-03 19:12:25 -07:00
mrohrlach
61097d93b9
Replaced tabs with spaces (oops)
2016-12-03 19:09:03 -07:00
mrohrlach
49ce80346c
Changed methods slightly to ensure non-magic projectiles do not receive lights
2016-12-03 15:42:24 -07:00
mrohrlach
83945cf280
Added reasonable approximation of magic bolt lights
2016-12-03 15:24:21 -07:00
Kurnevsky Evgeny
28639c3b2f
Crash fix when item is disabled before it casts spell.
2016-12-03 17:13:31 +03:00
scrawl
908cc699ce
Merge pull request #1141 from MiroslavR/water-sounds
...
Implement water sounds
2016-12-02 14:40:22 +01:00
scrawl
e0afd6d0f7
Movement solver: performance improvement for the minimum stepping distance check, no need to waste time doing a second stepMove if we did not hit a slope or the step was already large enough to begin with.
2016-12-02 02:25:05 +01:00
MiroslavR
c34d85ffc2
Implement water sounds ( Closes #451 )
2016-11-28 21:34:58 +01:00
ShadowRadiance
354a89e3bc
Slowfall now reduces momentum based on magnitude when jumping
...
(Allows Constant Effect Slowfall to work as in MW)
2016-11-26 06:27:11 -05:00
scrawl
5297d7b5be
Merge pull request #1137 from nikolaykasyanov/osx-structure
...
[macOS] Move all resources files inside application bundles (fixes #3566 )
2016-11-25 02:51:32 +01:00
Nikolay Kasyanov
ea888519c7
[macOS] Set OpenMW working dir to <bundle>/Contents/MacOS
2016-11-23 22:32:54 +01:00
Nikolay Kasyanov
db69342b5d
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
2016-11-23 22:32:54 +01:00
scrawl
762460f042
Use negative count when restocking item to ensure that its properly tracked ( Fixes #3635 )
2016-11-22 22:42:04 +01:00
MiroslavR
46a3244107
Fix thrown weapon sources being used to apply on strike enchantments ( Fixes #3634 )
2016-11-22 18:18:20 +01:00
scrawl
b6d02d9b14
Fix order of operations when undoing werewolf transformation of an NPC
2016-11-22 16:37:49 +01:00
scrawl
c326564e20
Merge pull request #1136 from Allofich/deletespell
...
Allow deleting spells that have the "always succeeds" flag
2016-11-20 19:23:25 +01:00
scrawl
16a913c549
Add emission of water ripple particles for water-walking actors ( Fixes #3608 )
2016-11-20 18:47:12 +01:00
Allofich
c82df2553c
Allow deleting spells that have the "always succeeds" flag ( Fixes #3627 )
2016-11-21 02:26:02 +09:00
scrawl
385db50f2d
Merge pull request #1131 from Allofich/waterwalking
...
Make water walking mechanics closer to original MW
2016-11-20 17:19:15 +01:00
MiroslavR
c1e52bbcf7
Fix -Wmismatched-tags clang warning
2016-11-20 15:10:37 +01:00
Allofich
0e429ae41d
Make water walking mechanics closer to original MW
2016-11-20 22:21:33 +09:00
scrawl
f51e06bc47
Recreate shaders if necessary when the NpcAnimation is rebuilt
...
This fixes certain equipment losing the 'invisibility' effect after a view-mode switch with shaders enabled. Because the initial build of shaders done by the resource manager is not aware of the override state in the NpcAnimation's object root, we have to build new shaders here.
2016-11-19 23:53:22 +01:00
scrawl
e823cbf018
Fix incorrect priority of animation sources (Bug #3626 )
2016-11-19 23:53:22 +01:00
MiroslavR
8f91732b09
Show starting abilities, powers and spells in stat-review window ( Fixes #2410 )
2016-11-19 21:51:19 +01:00
MiroslavR
7e5ba4d435
Fix default values of some GMSTs
2016-11-17 19:43:02 +01:00
scrawl
9d125bcaa2
Merge pull request #1129 from PhillipAnd/phillipand-cmake-fix
...
Fix various build issues with Visual Studio environment
2016-11-17 18:25:23 +01:00
scrawl
2368382ea5
Fix upside down rain particle texture
2016-11-17 17:52:20 +01:00
MiroslavR
5e46121046
Implement fleeing AI ( Closes #1118 )
2016-11-16 20:15:25 +01:00
Phillip Andrews
c18fc113e5
Changed missing library dependencies to simple fix
2016-11-14 00:01:22 -06:00
Phillip Andrews
aeaedbc57a
Moved install commands to target-specific cmakelists so that all configurations work.
2016-11-13 22:49:01 -06:00
Phillip Andrews
59eba1dede
Changed tabs to spaces, oops
2016-11-13 16:59:36 -06:00
Phillip Andrews
86b4673539
Removed math constants in openmw-cs, which are apparently not going to be used
2016-11-13 16:43:07 -06:00
Phillip Andrews
a1225ff4ec
Additional MSVC library dependencies
2016-11-13 14:34:12 -06:00
Phillip Andrews
1861302dbd
Include various libraries for Visual Studio environment
2016-11-13 14:27:59 -06:00
scrawl
02b9e81f89
Merge pull request #1127 from Allofich/warnings
...
Fix shadowing warnings
2016-11-13 20:49:26 +01:00
MiroslavR
175cfd4dff
Fix overloaded virtual function warning
2016-11-13 17:22:50 +01:00
Allofich
3420121c3f
Fix shadowing warnings
2016-11-13 23:20:51 +09:00
Allofich
fee39afe38
Don't allow resting on water with water walking
2016-11-13 19:50:33 +09:00
scrawl
f0d5cf7afb
Merge pull request #1112 from Assumeru/waterwalking
...
Move actors out of the water if there's room for them. Fixes #1138
2016-11-10 19:02:51 +01:00
Assumeru
05cc258ed3
Start trace from collision object origin
2016-11-10 15:38:14 +01:00
Assumeru
99bc4f733f
Trace up to waterlevel + halfextent
2016-11-09 18:03:10 +01:00
scrawl
92d42ef49b
Merge pull request #1123 from Allofich/warnings
...
Fix dereference of null pointer warning
2016-11-07 22:22:32 +01:00
Allofich
c7313606f5
Fix dereference of null pointer warning
2016-11-07 22:39:20 +09:00
MiroslavR
e80636f0ca
Improve performance of repairing/recharging ( Fixes #2493 )
2016-11-06 11:01:46 +01:00
Nikolay Kasyanov
3adf4cb97f
Link OpenMW with libz on macOS
2016-11-05 12:18:22 +01:00
Nikolay Kasyanov
0115a3a874
Revert "Link OpenMW with libz on macOS"
...
This reverts commit 0c4dd05118
2016-11-05 12:11:04 +01:00
Nikolay Kasyanov
0c4dd05118
Link OpenMW with libz on macOS
2016-11-05 12:09:47 +01:00
scrawl
d8b506155e
Merge pull request #1118 from MiroslavR/resize-perf
...
Fix horrible performance when resizing/moving the settings window
2016-11-04 20:24:27 +01:00
Nikolay Kasyanov
5d4734c02e
Use local path from configuration manager to load openmw.cfg in launcher
2016-11-01 21:27:35 +01:00
MiroslavR
5cd04af3fa
Fix horrible performance when resizing/moving the settings window
...
Resize widgets instead of reconstructing them.
2016-11-01 16:37:00 +01:00
scrawl
e0f613661e
Fix char -> int, fix shadowing warning
2016-10-30 20:10:33 +01:00
scrawl
cac8de0b29
Merge pull request #1116 from Allofich/paused
...
Don't update ripple simulation when paused
2016-10-30 19:26:56 +01:00
scrawl
e5cb7306c3
Merge pull request #1115 from Allofich/conversion
...
Fix narrowing conversion warning
2016-10-30 19:26:51 +01:00
Allofich
19db070fca
Don't update ripple simulation when paused
2016-10-31 01:19:38 +09:00
Allofich
68ed264f40
Fix narrowing conversion warning
2016-10-31 00:53:17 +09:00
Allofich
125e94ef0e
Fix shadowing warnings
2016-10-31 00:39:31 +09:00
Assumeru
25d64989b3
Check if the actor still exists /first/
2016-10-26 11:04:54 +02:00
Assumeru
a72cd896ca
Move actors out of the water if there's room for them. Fixes #1138
2016-10-25 19:26:17 +02:00
MiroslavR
cd9de94c0c
Import teleporting and levitation disabled state from vanilla savegames ( Fixes #3420 )
2016-10-20 14:38:18 +02:00
MiroslavR
f3ce0840be
Import controls state from vanilla savegames
2016-10-20 02:14:36 +02:00
MiroslavR
301dd77efb
Save controls state ( Fixes #3598 )
2016-10-20 02:12:01 +02:00
MiroslavR
407abc605f
Fix auto-equipping of blunt weapons
2016-10-19 22:37:45 +02:00
scrawl
9c549a85ce
Merge pull request #1108 from MiroslavR/autoequip-weap
...
Auto-equip weapons
2016-10-19 20:45:47 +02:00
MiroslavR
76ddd9bebb
Add a setting for merchant auto-equipping prevention
2016-10-19 02:22:49 +02:00
scrawl
a7d4928593
Properly handle moved references in respawning code ( Fixes #3600 )
2016-10-18 23:51:45 +02:00
MiroslavR
1d3008594d
Autoequip weapons ( Fixes #3562 )
2016-10-18 13:57:35 +02:00
MiroslavR
14240cf7a2
Fix autoEquip to better match vanilla ( Fixes #3590 )
2016-10-16 17:27:17 +02:00
scrawl
1d58733880
Merge pull request #1104 from MiroslavR/missing-weather-states
...
Import base weather states before loading region modifiers
2016-10-15 22:17:20 +02:00
Allofich
ccacad51be
Fix shadowing warnings
2016-10-16 01:34:54 +09:00
MiroslavR
7b59eda13a
Import base weather states before loading region modifiers ( Fixes #3594 )
2016-10-15 17:34:03 +02:00
scrawl
9e63c3ce63
Merge pull request #1103 from Allofich/warnings
...
Fix shadowing warnings
2016-10-14 21:18:12 +02:00
scrawl
5ccbabc27d
Fix build against bullet with profiler disabled ( Fixes #3592 )
2016-10-14 21:00:35 +02:00
Allofich
1c54f54ab8
Fix shadowing warnings
2016-10-15 00:12:46 +09:00
scrawl
2ed0277839
Merge pull request #1102 from Allofich/spells
...
Change several spell effects from instant to non-instant
2016-10-13 21:36:14 +02:00
scrawl
9d2e0124dc
Revert "Fix the cell changed flag no longer being reset after the player dies"
...
This reverts commit d7acec74fd
2016-10-13 17:44:03 +02:00
Allofich
610f36f47b
Set magic effects that don't support variable durations to use duration of 1
2016-10-14 00:13:08 +09:00
Allofich
1c2e04747d
Remove stray line
2016-10-13 23:38:21 +09:00
Allofich
675bd09462
Change several instant effects to be non-instant ( Fixes #2054 )
2016-10-13 23:38:21 +09:00
scrawl
db09858f59
Don't allow the player to activate objects when dead
2016-10-13 14:42:10 +02:00
scrawl
454d1ffaef
Make the cell change check during actor update more robust
2016-10-13 14:39:58 +02:00
scrawl
d7acec74fd
Fix the cell changed flag no longer being reset after the player dies
2016-10-13 14:38:35 +02:00
scrawl
612c3e995f
Add drop shadow to ItemWidget ( Fixes #3545 )
2016-10-13 01:42:50 +02:00
scrawl
15046c961b
Merge pull request #1101 from MiroslavR/ignored-light-sources-fix
...
Ignored light sources fix
2016-10-12 01:11:37 +02:00
MiroslavR
611d02ad43
Remove unused code
2016-10-11 22:16:17 +02:00
MiroslavR
1906d96064
Non-player actors emitting light from a non-portable light item should be illuminated ( Fixes #3588 )
2016-10-11 22:15:51 +02:00
MiroslavR
53b006eccb
OpenMW-CS: Recognize special faction ID "FFFF" (no faction) during topic info verification ( Fixes #3564 )
2016-10-11 19:36:44 +02:00
scrawl
3dce155d96
Fix uninitialized variable
2016-10-11 14:50:13 +02:00
MiroslavR
8be8c7ca66
OpenMW-CS: Fix verification of "Not Local" info conditions (Bug #3564 )
2016-10-11 02:55:17 +02:00
MiroslavR
14468262a7
Fix "Not Local" dialog test to also test variable value instead of just its existence ( Fixes #3577 )
2016-10-11 02:53:43 +02:00
scrawl
95a67bf0c2
Disable OSG 3.5.5 thread affinity setting in the scenewidget due to the interference with QT threads
...
Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
2016-10-10 18:23:06 +02:00
scrawl
530fb61ad0
Use OpenThreads instead of boost thread
...
This should allow OpenMW to work better with git versions of openscenegraph. OSG dev version 3.5.5 added the setting of thread affinity for the main thread. The problem is that in the boost/standard threading libraries, the affinity of a thread is inherited by any further threads launched from that thread, leading to these threads always running on the same core as the main thread unless you tell them not to.
With OpenThreads, the default affinity of a thread is none, no matter what parent thread it was launched from.
So, when using custom threading with OSG 3.6+, we have these options:
1. explicitely tell OSG to *not* set the thread affinity
or 2. explicitely set the thread affinity of additional threads created (possible with boost, but not possible with std::thread)
or 3. use OpenThreads
or 4. accept the suboptimal performance of non-OSG threads (in OpenMW's case the sound streaming & video threads) running on the same core as the main thread
This patch opts for 3.)
Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
2016-10-10 18:23:06 +02:00
scrawl
ae2036fa85
Merge pull request #1097 from Allofich/persuasion
...
Don't let intimidate bring disposition below 0 (Fixes #3584 )
2016-10-09 20:20:43 +02:00
Allofich
028db21c8a
Don't let disposition at end of dialogue be below 0 ( Fixes #3584 )
2016-10-10 02:20:24 +09:00
scrawl
1893617ec9
Improvements to ignored light list setting
...
The pointer to the LightListCallback is now stored in the Animation, which eliminates the need for dynamic_cast. Also, when the object root is recreated, the previously used LightListCallback will be reused, so we no longer need the objectRootReset() notifier.
Finally, there was a bug when saving and reloading the game, the getIgnoredLightSources() were not being set, as the ActorAnimation constructor completes before the NpcAnimation sets the ObjectRoot. This was solved by creating the LightListCallback in advance in the Animation constructor.
2016-10-08 23:59:28 +02:00
MiroslavR
11565b5966
Make actors with non-portable lights in inventory glow ( Closes #2042 , #3338 )
2016-10-08 23:17:12 +02:00
scrawl
50bcb65ee0
Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms
2016-10-08 19:20:24 +02:00
scrawl
6615330430
Fix use of UnrefQueue in removeObject
2016-10-08 16:41:17 +02:00
scrawl
3019d70986
Use 'default icon' for items with no icon specified
2016-10-08 16:05:20 +02:00
scrawl
37bfa88b2d
Merge pull request #1094 from Allofich/alchemy
...
Fix reversed use of alembics and retorts
2016-10-06 19:02:24 +02:00
Allofich
498976775a
Fix reversed use of alembics and retorts
2016-10-07 01:38:50 +09:00
scrawl
73b6c34a23
Merge pull request #1092 from Allofich/warnings
...
Fix shadowing warnings
2016-10-06 17:50:26 +02:00
Allofich
53e94b7c3f
Fix shadowing warnings
2016-10-06 23:33:52 +09:00
Allofich
df03b32205
Coverity fixes
2016-10-05 23:32:26 +09:00
scrawl
721062a4bd
Merge pull request #1089 from Allofich/bound
...
Corrections for bound equipment
2016-10-04 18:34:27 +02:00
Allofich
506d0e8e54
Correction to display of 0-weight tooltips
2016-10-04 23:02:45 +09:00
Allofich
160da0b149
Treat 0-weight armor as light armor in some respects
2016-10-04 23:02:25 +09:00
MiroslavR
a05649e1d5
Use loop fallback for movement animations ( Fixes #3578 )
2016-10-03 22:36:56 +02:00
sandstranger
5230bf6528
disable using shaders for gles1 and Android
2016-10-03 20:31:08 +04:00
scrawl
44dffe55ab
Merge pull request #1083 from Allofich/onhit
...
Make AI response to spell hits more like original MW
2016-10-02 14:06:51 +02:00
scrawl
3d76ba5a7c
Merge pull request #1086 from Allofich/warnings
...
Fix shadowing warnings
2016-10-02 14:03:02 +02:00
Allofich
6ec37b5cfb
Fix shadowing warnings
2016-10-02 17:48:54 +09:00
Allofich
e78f02aaf2
Consider reflected/absorbed hostile spells as assaults
2016-10-02 16:08:24 +09:00
MiroslavR
210c02d98e
Fix interactive ID validity checks in TypesetBookImpl
2016-10-01 21:07:17 +02:00
Allofich
a81a04e6d0
Remove unused line
2016-10-02 01:11:01 +09:00
Allofich
fa17784722
Change breaks to continues
2016-10-02 00:54:01 +09:00
scrawl
140be70a90
Merge pull request #1082 from Gladdy/master
...
Fix for segmentation fault on entering a cell
2016-10-01 16:42:47 +02:00
scrawl
b170efb9fa
Merge pull request #1084 from Allofich/water
...
Don't let water-only creatures prevent resting
2016-10-01 16:14:19 +02:00
Allofich
a2e174a40f
Don't let water-only creatures prevent resting
2016-10-01 22:15:31 +09:00
Allofich
266ec1aadc
Make AI response to spell hits more like original MW
2016-10-01 21:38:17 +09:00
Marc Zinnschlag
e918474a94
Merge remote-tracking branch 'rcutmore/bug-3277'
2016-09-30 09:37:45 +02:00
Rob Cutmore
8f47ed17df
Show nested tables only when they are editable
2016-09-29 20:42:44 -04:00
Martijn Bakker
45ffdbb284
fixed a segmentation fault when entering a cell which contains someone already attacking you
2016-09-30 00:40:13 +01:00
scrawl
85c7d014d3
Use a shader to render the simple water, ensuring that fog is applied per pixel ( Fixes #2716 )
2016-09-28 21:10:44 +02:00
Rob Cutmore
b59694c4f0
Set tooltip for read-only nested tables
2016-09-25 06:31:28 -04:00
Marc Zinnschlag
eaeaae3243
Merge remote-tracking branch 'aesylwinn/FixRefIdData'
2016-09-25 09:33:28 +02:00
scrawl
4791fadb9a
Merge pull request #1078 from MiroslavR/hidden-items
...
Do not show uncarriable lights in item views
2016-09-24 23:27:23 +02:00
Aesylwinn
b899d43a33
Allow base plugins to overwrite referencables made in other base plugins.
2016-09-24 16:45:08 -04:00
scrawl
dc07885d25
Merge pull request #1069 from Allofich/combat
...
Add unarmed attack selection to chooseBestAttack()
2016-09-24 18:38:10 +02:00
MiroslavR
52e00f5fef
Do not show uncarriable lights in item views
2016-09-24 18:01:31 +02:00
Rob Cutmore
829345257c
Allow disabled nested tables to be scrollable
2016-09-24 10:36:00 -04:00
Allofich
0582f2d918
Adjust touch spell/telekinesis interaction
2016-09-23 21:44:49 +09:00
Allofich
0c603e986d
Don't play touch spell explosions on non-activatable statics
2016-09-23 03:25:24 +09:00
Allofich
eecf412b85
Recreate vanilla-like behavior for telekinesis and touch spells
2016-09-23 01:16:03 +09:00
Allofich
04c13ffab3
Add unarmed attack selection to chooseBestAttack()
2016-09-22 00:45:54 +09:00
scrawl
8379291f70
Merge pull request #1072 from Allofich/range
...
Give "on touch" spells same range as vanilla MW
2016-09-21 17:39:44 +02:00
Allofich
37cc4e9efe
Don't play area vfx for 0-area touch spells that hit non-actors
2016-09-22 00:14:08 +09:00
Allofich
563ae479e8
Give "on touch" spells same range as vanilla MW
2016-09-21 23:34:32 +09:00
scrawl
c6ef26ba4b
Merge pull request #1070 from mrcheko/pathfinding
...
fix using potion as weapon
2016-09-20 22:58:54 +02:00
mrcheko
229cb4b386
remove dynamic_cast to ActionPotion
2016-09-20 23:00:00 +03:00
mrcheko
48765f2ff2
fix using potion as weapon
2016-09-19 23:43:26 +03:00
scrawl
718178bfe9
Merge pull request #1066 from MiroslavR/setinvisible
...
Don't use base invisibility magnitude for setting alpha
2016-09-19 15:35:12 +02:00
Allofich
7e3cca6d37
Vfx after Divine/Almsivi intervention should be attached to player
2016-09-19 22:20:16 +09:00
Allofich
d1157b3e10
Use correct vfx for teleport spells
2016-09-19 18:12:30 +09:00
MiroslavR
744667e163
Don't use base invisibility magnitude for setting alpha ( Fixes #3555 )
2016-09-19 00:05:50 +02:00
scrawl
cd4b182091
Merge pull request #1051 from Allofich/textures
...
Use spell effect particle textures
2016-09-18 22:37:14 +02:00
Allofich
a8e9f2df67
Cleanup
2016-09-19 05:20:04 +09:00
scrawl
30d5c7488d
savegamedialog: don't reset the character selection scrollbar when a character is deleted
2016-09-18 19:26:41 +02:00
scrawl
8520b97b37
Merge pull request #1062 from stil-t/master
...
apps/wizard: (trivial) fix misplaced arguments in installFile for installFiles
2016-09-17 18:09:51 +02:00
scrawl
7bd445fb83
Don't crash if FontManager::getByName returns NULL ( Fixes #3552 )
2016-09-17 17:21:35 +02:00
Mikhail Korolev
7e2fe77836
apps/wizard: (trivial) fix misplaced arguments in installFile for installFiles
2016-09-15 19:03:07 +03:00
scrawl
7bbdeb5f85
Merge pull request #1061 from MiroslavR/nameless-actors
...
Allow activating actors without a name
2016-09-15 17:51:14 +02:00
MiroslavR
f323f231db
Allow activating actors without a name ( Fixes #3551 )
2016-09-15 16:47:50 +02:00
Allofich
5aad1d81f4
Remove no longer used parameter
2016-09-15 23:41:20 +09:00
MiroslavR
55e670c5fe
Fix animation state not saving
...
References with animation state changed but otherwise identical to their content file counterparts
were previously considered unchanged and thus dropped while saving.
2016-09-15 16:11:54 +02:00
Allofich
322a0ba8bb
Initialize speed for magic projectiles
2016-09-14 21:39:44 +02:00
Allofich
7eb62b5d3a
Initialize speed for magic projectiles
2016-09-15 01:44:53 +09:00
Allofich
dc8ff5e49b
Play all sfx and use particle textures for permanent enchantments
2016-09-15 00:27:08 +09:00
Allofich
527bbd5243
Change size_t to int for consistency
2016-09-15 00:09:40 +09:00
Allofich
01774c656c
Fix for blood effect texture overrides
2016-09-14 23:28:57 +09:00
Allofich
a033ba3bd2
Override spell textures by NiTexturingProperty
2016-09-14 23:03:04 +09:00
scrawl
1362264561
Fix warning
2016-09-13 02:49:19 +02:00
scrawl
65dc12cdd6
Remove unused parameter
2016-09-13 02:48:36 +02:00
scrawl
feaf3652a5
Merge pull request #1055 from mrcheko/pathfinding
...
prevent running in circles around path points
2016-09-13 02:47:49 +02:00
scrawl
3cd73d0fc3
Merge pull request #1058 from Allofich/onhit
...
Don't play blood effects for completely resisted hits
2016-09-13 02:47:43 +02:00
Allofich
34851349de
Pass hitPosition by const reference
2016-09-13 00:59:56 +09:00
Allofich
bce0166931
Don't play blood effects for resisted hits
2016-09-12 22:46:32 +09:00
Allofich
3bbde312b9
Remove unneeded code
2016-09-12 19:54:06 +09:00
Allofich
3f6543860a
Make creatures use fHandToHandReach
2016-09-11 00:01:20 +09:00
Allofich
c98d4e0473
Allow dodging for bipedal creatures
2016-09-10 23:56:31 +09:00
Allofich
7bc4535c0d
Make NPCs dodge according to target's weapon reach
2016-09-10 23:30:46 +09:00
mrcheko
72786fef9d
prevent running in circles around path points
...
addresses http://bugs.openmw.org/issues/2229
2016-09-09 23:57:19 +03:00
Allofich
368828b217
Update TODO comments
2016-09-10 01:38:05 +09:00
Allofich
f31342894a
Put simpler condition first
2016-09-09 00:03:38 +09:00
Allofich
bca477ca8a
Apply particle textures like original engine does
2016-09-08 23:59:23 +09:00
Allofich
85349da26c
Add comments
2016-09-08 23:58:00 +09:00
Allofich
502a758eff
Use particle texture for "hit" effects
2016-09-08 23:58:00 +09:00
Allofich
fe3a033642
Use particle textures for spell projectiles
2016-09-08 23:56:54 +09:00
Allofich
02610828c1
Don't play area vfx for non-area spells on actors.
2016-09-08 02:07:01 +09:00
Allofich
88d992a020
Create area effect visual for non-area spells
2016-09-08 00:05:45 +09:00
Marc Zinnschlag
03a35c38df
add missing item when executing the Equip instruction
2016-09-06 16:33:26 +02:00
Marc Zinnschlag
48c257b939
Merge remote-tracking branch 'aesylwinn/ContentNumberFix'
2016-09-06 15:48:05 +02:00
scrawl
05e4542d33
Merge pull request #1048 from mrcheko/pathfinding
...
Pathfinding unification v2
2016-09-06 13:19:18 +02:00
mrcheko
aa441f2648
AiPackage: fix path recalc on cell change
...
AiTravel: remove unneeded code
2016-09-06 01:11:10 +03:00
mrcheko
a22fc43947
aiwander: reset path on cell change
...
remove redundant mIsWanderDestReady var
2016-09-05 15:18:34 +03:00
Marc Zinnschlag
b8fa555260
Merge remote-tracking branch 'aesylwinn/RandomFixes'
2016-09-05 11:10:34 +02:00
scrawl
fbc9b90ebe
Cleanup
2016-09-05 00:04:11 +02:00
scrawl
8677a6f803
Merge pull request #1044 from Allofich/magic
...
Changes to multi-effect spells
2016-09-05 00:03:10 +02:00
Allofich
c617e90755
Fix for loading projectile speed
2016-09-05 05:41:24 +09:00
Allofich
f8270f6bd5
Consolidations and cleanup for multi-effect spells
2016-09-05 05:30:51 +09:00
Allofich
dbd7c038b2
Add loading code for multi-effect projectiles
2016-09-05 03:45:13 +09:00
Allofich
c6cd1f813b
Attach projectiles to nodes of multi-effect bolts
2016-09-05 02:59:33 +09:00
Allofich
5a0d3feb98
Use C++ int-to-string conversion
2016-09-05 02:52:44 +09:00
Allofich
a36f7babc1
Double scaling of spell explosions
2016-09-05 02:18:57 +09:00
Allofich
60384399ee
Fix errors and warnings
2016-09-05 01:39:18 +09:00
Allofich
f49ebee56a
Play sounds for multi-effect projectile
2016-09-04 23:57:06 +09:00
Allofich
37f07f7435
Combine into one multi-effect magic projectile
2016-09-04 22:35:29 +09:00
Allofich
10842462c7
Send lists of models and sounds to launchMagicBolt
2016-09-04 17:42:27 +09:00
Allofich
96e1726e4d
Fix warnings
2016-09-04 17:42:27 +09:00
Allofich
ecec7d8215
Fix spells having explosions for wrong range type
2016-09-04 17:42:27 +09:00
Allofich
c4d77b6a8b
Casting animation comes from the first effect
2016-09-04 17:42:27 +09:00
Allofich
3300ef5db7
Don't apply projectile effects multiple times
2016-09-04 17:42:27 +09:00
Allofich
f36e5ef403
Use last effect of spell for hand effect color
2016-09-04 17:42:27 +09:00
Allofich
f6c3a62b3e
Use average speed for multiple spell projectiles
2016-09-04 17:42:27 +09:00
Allofich
f1a18027f2
Shoot projectiles of spells with multiple effects
2016-09-04 17:42:27 +09:00
Allofich
446c0a4fa8
Play all of a spell's casting effects
2016-09-04 17:42:27 +09:00
Allofich
b4577fe751
Allow multiple spell hit sounds on single target
2016-09-04 17:42:27 +09:00
scrawl
7859e378df
Merge pull request #1045 from Allofich/attack
...
Fix AI melee attack
2016-09-04 00:22:59 +02:00
Aesylwinn
fab7549b42
Fix windows path issue in editor debug run.
...
- The problem was caused by spaces in the data directory
2016-09-03 17:49:49 -04:00
Aesylwinn
ee432690e6
Make it easier to place objects in the scene editor.
...
This fix allows objects to be dropped onto the ground, and prevents
objects from being selected through the ground.
2016-09-03 17:37:13 -04:00
Allofich
5c2bc515fe
Remove overridden code in aicombat
2016-09-04 02:13:09 +09:00
mrcheko
0775ed75ea
fix zero div in getXAngleToDir
2016-09-03 17:50:06 +03:00
Allofich
0d63d75bb0
Remove no longer used parameter
2016-09-03 22:40:24 +09:00
Allofich
286e4bb98f
Remove attacktype movement
2016-09-03 21:16:59 +09:00
scrawl
bdf55927e1
Merge pull request #1041 from Allofich/waterwalking
...
Don't allow casting Water Walking in deep water
2016-09-02 02:57:22 +02:00
Allofich
154dcc942c
Let NPCs use attack type regardless of movement
2016-09-01 22:43:33 +09:00
Marc Zinnschlag
316cf40f12
Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation'
2016-09-01 11:51:34 +02:00
Allofich
b99c2c54d8
Allow Water Walking on non-submerged creatures
2016-09-01 03:53:53 +09:00
Aesylwinn
c0d53a2557
Fix CellRefs being teleported from interior to exterior cells.
2016-08-31 11:02:04 -04:00
Allofich
22b11c5947
Move Water Walking check into checkEffectTarget()
2016-08-31 23:56:31 +09:00
Allofich
f25c65260c
Limit sMagicinvalidEffect to self-cast spells
2016-08-31 17:22:45 +09:00
Allofich
6c3cad238b
Use castByPlayer bool
2016-08-31 17:18:23 +09:00
Aesylwinn
b2ddd3c259
Initialize with correct content file number instead of correcting at save stage.
2016-08-30 16:42:38 -04:00
Allofich
a6216d883f
Don't allow casting Water Walking in deep water
2016-08-31 04:37:50 +09:00
Aesylwinn
3ae2fc17c6
Fix some issues with content file numbers in the editor.
...
1. Change content numbers to be relative to the plugin when saving.
2. Initialize the indices in the MasterData part of a plugin header.
2016-08-29 18:06:56 -04:00
Allofich
9e1bfde46f
Add comment
2016-08-26 02:42:56 +09:00
Allofich
67bd882bc7
Disable current idle when an action is taken
2016-08-25 23:42:09 +09:00
Allofich
6190ff1f0d
Update idle if current idle finishes playing
2016-08-25 21:45:56 +09:00
Allofich
f4cc5d0399
Sometimes play 1st-person weapon idle to Stop key
2016-08-25 21:34:45 +09:00
Allofich
7db31ab58a
Correct telekinesis glow length
2016-08-24 01:21:15 +09:00
scrawl
346f5a19a3
Merge pull request #1029 from Allofich/anim
...
Improvements for playgroup and loopgroup
2016-08-23 14:14:36 +02:00
Allofich
9b0e5d6b59
Loop mid-animation idles when loading a save game
2016-08-23 19:50:56 +09:00
scrawl
0fd810707e
Remove unused stopLooping()
2016-08-22 23:33:26 +02:00
scrawl
b0dc625b18
Run setLoopingEnabled after the anim queue is updated
2016-08-22 23:33:24 +02:00
scrawl
719e884b7c
Remove duplicate code
2016-08-22 23:25:00 +02:00
scrawl
0c9882956a
Add AnimState::shouldLoop()
2016-08-22 23:25:00 +02:00
scrawl
6450c9be27
Simplify condition
2016-08-22 23:22:58 +02:00
Allofich
bf9dc45b2b
Emulate vanilla animation loops more closely
2016-08-23 01:42:36 +09:00
mrcheko
612c7f1a2f
Revert "Revert "Merge pull request #993 from mrcheko/pathfinding""
...
This reverts commit 3732979eec
2016-08-19 22:15:26 +03:00
Aesylwinn
91fd966146
Fix some issues detected by coverity for the editor.
2016-08-18 12:42:35 -04:00
Allofich
b332a13b4e
Don't restart looped animations on repeated calls
2016-08-18 23:23:38 +09:00
Marc Zinnschlag
2fef8948f1
Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale'
2016-08-18 09:13:43 +02:00
scrawl
dda5bfbc9f
CharacterPreview no longer depends on osgViewer
2016-08-16 22:47:45 +02:00
scrawl
8bfcf259a3
LocalMap no longer depends on osgViewer
2016-08-16 22:37:44 +02:00
scrawl
b2ae45f0eb
Remove unneeded setGraphicsContext() calls
2016-08-16 19:33:09 +02:00
scrawl
0209c70583
Improve performance by skipping update if transform is unchanged
2016-08-16 17:50:59 +02:00
scrawl
4751e0e953
Improve performance of animateCollisionShapes by caching the node path
2016-08-16 17:50:59 +02:00
scrawl
8a4722cb84
Revert "animateCollisionShape checks if the shape is really animated"
...
This reverts commit cbf344663f
2016-08-16 17:50:59 +02:00
scrawl
3ef9b3f44d
Merge pull request #1025 from Allofich/anim
...
Use loopfallback for idle animation groups
2016-08-16 16:30:55 +02:00
Aesylwinn
7125775648
Change free axis rotation.
2016-08-15 15:07:43 -04:00
Allofich
c05782581e
Account for all instances of play()
2016-08-16 02:52:55 +09:00
Allofich
6163c7bb03
Use loopfallback for idle animation groups
2016-08-16 01:15:26 +09:00
scrawl
641005b317
Remove Camera's children before removing the Camera
...
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
2016-08-15 18:12:46 +02:00
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
2016-08-15 16:36:48 +02:00
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
2016-08-15 15:59:02 +03:00
Aesylwinn
3e4ac0c662
Potential fix for context sensitive select mode issues.
2016-08-14 14:43:29 -04:00
scrawl
71f786ff84
Delete the WorkQueue first
...
Fixes a potential crash on exit.
2016-08-14 18:10:29 +02:00
scrawl
3732979eec
Revert "Merge pull request #993 from mrcheko/pathfinding"
...
This reverts commit 5190275b37d7845012bf
2016-08-14 18:04:33 +02:00
scrawl
c3340ec143
Merge pull request #1022 from Allofich/anim
...
Make loopgroup loop correct number of times
2016-08-14 17:02:38 +02:00
scrawl
1edcea2ff5
Merge pull request #1023 from psi29a/small_fixes
...
small fixes
2016-08-14 16:49:26 +02:00
scrawl
30b549124e
Fix use-after-free
2016-08-14 16:42:29 +02:00
scrawl
c65492193c
Use osg::clone
2016-08-14 16:41:44 +02:00
scrawl
0fbc0d0da7
Attempt to silence warning
2016-08-14 16:41:17 +02:00
Bret Curtis
0547d4b937
clang says that these must be in the MWWorld namespace
2016-08-14 16:17:09 +02:00
scrawl
8c44334409
Merge pull request #1021 from Allofich/weight
...
Corrections to tooltip displays of zero-weight items
2016-08-14 15:14:58 +02:00
scrawl
2f6075329b
Clang warning fixes
2016-08-14 15:10:50 +02:00
Allofich
a381a15b19
Make loopgroup loop correct number of times
2016-08-14 21:57:06 +09:00
Allofich
7bf04b5014
Allow showing value of zero-weight lights
2016-08-14 21:15:22 +09:00
Allofich
502a26a7ff
Use getWeightString() to avoid casting to int
2016-08-14 19:38:53 +09:00
Allofich
4f5d676b4e
Allow weight tooltips for gold and keys if not 0
2016-08-14 19:32:43 +09:00
Allofich
caf025f93d
Don't show 0 weight tooltips except for potions
2016-08-14 19:27:59 +09:00
Allofich
cf7278f8ae
Don't show weight tooltip for 0-weight equipment
2016-08-14 18:37:41 +09:00
Allofich
ee2702087c
Make zero-weight boots play light boot footsteps
2016-08-14 17:27:47 +09:00
scrawl
f3f02fe154
Merge pull request #1019 from Allofich/bound
...
Don't allow re-casting of bound equipment spells
2016-08-13 21:02:32 +02:00
Allofich
d617651307
Don't allow re-casting of bound equipment spells
2016-08-14 02:05:23 +09:00
Aesylwinn
101c3cc90d
Rotate around center of selection.
2016-08-12 17:12:10 -04:00
Aesylwinn
571969cd65
Scale from center of selection.
2016-08-12 17:11:37 -04:00
MiroslavR
ddbfe0c944
Fix disabled door markers appearing on the map ( Fixes #3348 )
2016-08-12 03:14:36 +02:00
Aesylwinn
388917df89
Base editor rotate/scale commit.
2016-08-10 19:31:34 -04:00
Allofich
cb9bb92b26
Play locked sounds on locked objects instead of actors
2016-08-10 21:31:14 +09:00
Allofich
83b715734f
Move part of addGlow() to addSpellCastGlow()
2016-08-10 02:52:43 +09:00
Allofich
1c76c93ed8
Use raw pointer to node in glowupdater
2016-08-10 01:35:22 +09:00
Allofich
67f31d948e
Add removeTexture method
2016-08-10 01:11:14 +09:00
Allofich
4b9aff7a03
Glowupdater fix when using shaders
2016-08-10 00:43:14 +09:00
Allofich
9b2cb2fb8c
Cleanups
2016-08-10 00:25:33 +09:00
Allofich
775162ccdf
Rewrite spell glow implementation
2016-08-09 22:56:53 +09:00
Allofich
cad41599cf
Fix travis build error and warnings
2016-08-09 22:56:53 +09:00
Allofich
1910128e9c
Don't remove uniform when spell glow ends
2016-08-09 22:56:53 +09:00
Allofich
35c14bb9bb
Minor rewrite, make "open" spells play glow effect
2016-08-09 22:56:53 +09:00
Allofich
e132b52a69
Handle spell glows within updatecallback
2016-08-09 22:56:53 +09:00
Allofich
123c626f2d
Add glow when using telekinesis on doors
2016-08-09 22:56:53 +09:00
Allofich
57138b416e
Fix spell glows to only run one at a time
2016-08-09 22:56:53 +09:00
Allofich
3841a8fb40
Make non-actors glow when they cast spells
2016-08-09 22:56:53 +09:00
Allofich
dca7b4beb7
Make non-actors also play spell casting sounds
2016-08-09 22:56:53 +09:00
Marc Zinnschlag
a563a9d336
added missing Q_OBJECT
2016-08-09 10:21:37 +02:00
Marc Zinnschlag
96fd9263bf
Merge remote-tracking branch 'aesylwinn/FixNullGlobalVariable'
2016-08-09 10:17:26 +02:00
Aesylwinn
448c9d5a5b
Fix globals not being initialized with a valid type.
2016-08-09 00:17:41 -04:00
scrawl
0bbd715f65
Fix the cloned StateSet not being assigned
2016-08-09 01:13:19 +02:00
scrawl
5190275b37
Merge pull request #993 from mrcheko/pathfinding
...
Pathfinding unification
2016-08-09 00:41:03 +02:00
Aesylwinn
0963adb2f4
Fix pointer being deleted twice.
2016-08-08 14:36:50 -04:00
scrawl
46538b9438
Merge pull request #1011 from devnexen/master
...
Mainly making compilable under OpenBSD.
2016-08-07 20:34:03 +02:00
mrcheko
e2cd87fcc7
fix veritcal aiming
2016-08-07 19:23:08 +03:00
Marc Zinnschlag
aa1ed9b172
Merge remote-tracking branch 'aesylwinn/RenderWater'
2016-08-07 17:03:58 +02:00
scrawl
7b557af885
Merge pull request #1007 from MiroslavR/save-anim-state
...
Save scripted animation state
2016-08-06 20:39:32 +02:00
David Carlier
83bab29e4b
Mainly making compilable under OpenBSD.
...
Renaming one resource file as the space led to issue for qt/moc.
2016-08-06 19:00:27 +01:00
Aesylwinn
16d0580ce8
Fix struct/class mismatch.
2016-08-05 15:39:08 -04:00
Aesylwinn
1f32f1eef5
Add water texture.
2016-08-05 14:55:40 -04:00
Aesylwinn
9454f4f2e7
Use shared water geometry + state generation,
...
Fix water position and render bin,
Fix passed cell parameter being ignored
2016-08-05 13:49:44 -04:00
Aesylwinn
5753f52b47
Move water mesh + simple state generation to components library.
2016-08-05 13:25:05 -04:00
Aesylwinn
3904a24e6c
Add missing include.
2016-08-05 00:30:28 -04:00
Aesylwinn
5674e0da24
Render water in editor.
2016-08-04 23:01:43 -04:00
LohikaarmeHAV
19c74a4d6e
Part two
2016-08-03 20:39:46 +03:00
LohikaarmeHAV
7309be8592
First part
2016-08-03 20:20:55 +03:00
lohikaarme
e8ef5c233f
Miss info
2016-08-03 14:24:21 +03:00
lohikaarme
0592d1cdcf
Commnent?
2016-08-03 14:22:25 +03:00
MiroslavR
b65f379b7f
Save scripted animation state ( Fixes #1931 , #2150 , #3393 )
2016-08-03 03:52:35 +02:00
lohikaarme
48bcde8cc9
...
2016-08-02 15:41:52 +03:00
LohikaarmeHav
b0cf276cfc
hups
2016-08-02 15:27:40 +03:00
LohikaarmeHav
7cd991107c
Nah
...
Preview seem to not like removing mCamPositionSet and I have do other things.
2016-08-02 15:26:12 +03:00
LohikaarmeHav
c6bc30d6a8
Forgot to remove line and add comment.
2016-08-02 14:27:19 +03:00
LohikaarmeHav
2e6f80688c
Removed debug
2016-08-02 14:10:08 +03:00
LohikaarmeHav
c6ec473280
Camera reset now every time cell object->view is pressed.
2016-08-02 13:46:43 +03:00
scrawl
3374630e7b
Merge pull request #1008 from Internecine/bug3451-invalid-enchantments
...
Fixes Bug 3451 - Invalid Enchantment IDs
2016-08-02 10:14:59 +02:00
Internecine
90735d226d
Replaced Store::find usage with Store::search to remove exception handlers.
2016-08-02 11:43:41 +12:00
Marc Zinnschlag
f32d0121fc
Merge remote-tracking branch 'aesylwinn/KeyConfigAndShortcuts'
2016-08-01 09:57:11 +02:00
Internecine
14165352f6
Added exception handlers when trying to retreive enchantment and magic effect data.
2016-08-01 13:16:42 +12:00
Aesylwinn
f73d60cc73
Make scene controls use configurable speed modifier.
2016-07-31 16:28:03 -04:00
Aesylwinn
bf2ab4ed45
Change the way modifiers are handled so they can be shared.
2016-07-31 16:07:17 -04:00
Aesylwinn
faea33b888
Revert "Change scene controls to more closely match blender as requested"
...
This reverts commit bc7ae70f0b
2016-07-31 05:54:13 -04:00
Aesylwinn
bc7ae70f0b
Change scene controls to more closely match blender as requested
...
in the forums.
2016-07-30 09:53:45 -04:00
Aesylwinn
1cce085fa2
Remove unused headers.
2016-07-29 16:35:43 -04:00
Aesylwinn
2f97d6cffb
Move tool tip processing to ShortcutManager,
...
Process cell arrow tooltip,
Fix cell arrows not being added when cell is added
2016-07-29 16:02:46 -04:00
Aesylwinn
d7a83d80a2
Change some key binding defaults.
2016-07-29 15:00:58 -04:00
Aesylwinn
3475b83e90
Clean up modifier/shortcut class and handle focus out event,
...
Improve shortcut labels,
Adjust menu titles and remove menu navigation (can conflict with
shortcuts)
2016-07-29 15:00:35 -04:00
Aesylwinn
96a3c278fd
Added shortcuts for loading a cell relative to the camera,
...
Removed Ctl+V binding for "Verify" because that is associated
with paste.
2016-07-27 21:40:53 -04:00
Aesylwinn
65201badf6
Add custom page for key bindings.
2016-07-27 19:15:24 -04:00
mrcheko
293a0f768c
use real distance to target to determinate 'ready to attack' state
2016-07-27 23:43:32 +03:00
LohikaarmeHav
f142f9bf86
wtf
2016-07-27 21:37:52 +03:00
Aesylwinn
b685c0ce6c
Add ability to clear shortcut/modifier setting with right click.
2016-07-27 14:07:53 -04:00
Aesylwinn
12db6d2114
Add modifier setting.
2016-07-27 13:53:33 -04:00
Marc Zinnschlag
63fd1e8df7
Merge remote-tracking branch 'origin/master'
2016-07-27 15:49:11 +02:00
Aesylwinn
b204758be1
More shortcuts.
2016-07-27 01:53:21 -04:00
Aesylwinn
3f7f75cc9d
Exclude keys not compatible with qt 4
2016-07-27 00:44:34 -04:00
Aesylwinn
3edc77a32b
Remove QShortcut usage,
...
Add a lot of shortcuts,
Remove debug messages
2016-07-27 00:24:16 -04:00
Aesylwinn
08af82e1bd
Switched to an interactive method for key input,
...
Redid text representation for shortcuts
2016-07-26 21:22:31 -04:00
AnyOldName3
20f73f4a32
Relocate escape-related code to new files escape.hpp and escape.cpp.
2016-07-27 00:58:31 +01:00
Aesylwinn
05888e7925
Updated more tool tips to show shortcut configs.
2016-07-25 22:43:37 -04:00
Aesylwinn
8c5fddf150
Fix pathgrid selection mode not being removed from toolbar.
2016-07-25 20:49:28 -04:00
Aesylwinn
051aec2729
Added methods to keep text mentioning shortcuts up to date,
...
fixed potential issue with widget relationship tracking,
hopefully got rid of signed/unsigned errors (Qt4/5 issue)
2016-07-25 20:49:09 -04:00
Aesylwinn
f251c3867d
Redesigned shortcut handler to be capable of dealing with child and
...
parent widgets. This should be the final design change. Also, some
various bug fixes.
2016-07-23 21:23:02 -04:00
Aesylwinn
acdb636935
Qt4 protected signal workaround and signed/unsigned mismatch.
2016-07-22 02:41:00 -04:00
Aesylwinn
455d227f3c
Changed shortcut design to allow a configurable second output. Also
...
re-added shift for temporarily changing camera speed.
2016-07-22 01:58:17 -04:00
MiroslavR
4a3529488b
Fix possible reference duplication when the refID is modified by a plugin (Bug #3471 )
2016-07-22 03:58:23 +02:00
MiroslavR
dafe184220
Fix moved references disappearing when modified by a plugin
2016-07-22 02:12:03 +02:00
MiroslavR
d790747389
Implement deletion of moved references (Bug #3471 )
2016-07-22 01:59:02 +02:00
Aesylwinn
1b5273f2b7
Finally re-added rendering stats, refactored some functions
...
to better fit new input structure, removed unneeded shortcut
declarations in headers, and changed the cell marker
interaction to use primary/secondary select instead of
shift + primary/secondary edit.
2016-07-20 15:00:00 -04:00
AnyOldName3
59639e3988
Make it build again (but remove the new functionality).
2016-07-20 15:16:53 +01:00
Aesylwinn
faa84e0a35
- Further extended usage of new shortcut class
...
- Refactored camera classes to take advantage of Qt's reference counting
- Removed some of the old implementation
2016-07-20 08:25:11 -04:00
Aesylwinn
d8fa3fd1de
Added orbit "center on selection" shortcut.
2016-07-20 08:25:11 -04:00
Aesylwinn
e8626e588a
Changes in shortcut design.
...
- Handle input in centralized class for potential conflict resolution.
- Remove wrapper class for QShortcut; it should be unnecessary.
- Added customizable shortcut usage to orbit camera mode.
2016-07-20 08:25:11 -04:00
Aesylwinn
3fa4fdb839
Remove use of c++11 feature and add some missing headers.
2016-07-20 08:25:11 -04:00
Aesylwinn
40297701d0
Base key config/shortcut implementation
2016-07-20 08:25:11 -04:00
AnyOldName3
95d2c7ea5c
Attempt to unescape characters when constructing file paths, introducing compilation errors.
2016-07-20 02:48:57 +01:00
Marc Zinnschlag
c17e1ca24a
Merge remote-tracking branch 'anyoldname3/ignore-hash-test'
2016-07-19 16:19:28 +02:00
MiroslavR
19a8800d4d
Fix camera distance not getting reset to max value ( Fixes #3473 )
2016-07-17 19:52:12 +02:00
mrcheko
203804ff15
fix AiPackage repeating
2016-07-16 19:08:49 +03:00
mrcheko
59a1a6d117
checkWayIsClear: remove PATHFIND_CAUTION_DIST check
2016-07-16 19:07:48 +03:00
AnyOldName3
f1b5ad5804
Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings.
2016-07-12 17:09:57 +01:00
AnyOldName3
e6f78ae5b7
Switch indentation to spaces to remain consistent with the rest of the project
2016-07-12 01:06:57 +01:00
mrcheko
b4e94e2aae
Merge remote-tracking branch 'upstream/master' into pathfinding
...
# Conflicts:
# apps/openmw/mwmechanics/aipackage.cpp
# apps/openmw/mwmechanics/aipackage.hpp
2016-07-12 00:45:01 +03:00
AnyOldName3
1a0642f1db
Make it work by realising that what boost::program_options calls validation is what any sane person would regard as parsing
2016-07-11 22:33:15 +01:00
mrcheko
8d4f0660ce
fix hardcoded melee attack ranges
2016-07-12 00:17:43 +03:00
AnyOldName3
195dd27780
Resolve obvious runtime error revealing more subtle one
2016-07-11 22:05:38 +01:00
AnyOldName3
fbe6dc9704
Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++
2016-07-11 21:33:36 +01:00
Allofich
c57d177f1c
Trim unneeded code
2016-07-12 04:17:08 +09:00
AnyOldName3
2a9b12bb3f
Fix an issue preventing compilation, revealing another that doesn't make much sense.
2016-07-11 14:15:35 +01:00
AnyOldName3
c1ffc9e776
Remove a compilation error and set up framework to remove the others
2016-07-11 01:59:16 +01:00
AnyOldName3
e17e354e84
Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors
2016-07-11 01:16:32 +01:00
scrawl
2329812988
Merge pull request #995 from Allofich/traps
...
Trap and lock fixes
2016-07-10 17:19:36 +02:00
scrawl
67d3571fac
Fix activation distance in third person mode
2016-07-10 17:10:19 +02:00
mrcheko
05794505c8
travis build fix
2016-07-10 17:25:50 +03:00
Allofich
599e6708ec
Allow using keys to open trapped objects of lock level 0
2016-07-10 23:08:11 +09:00
Allofich
cabe038a97
Make lockpick and probe sounds 3d positional
2016-07-10 22:08:42 +09:00
Allofich
249918612d
Play trap disarm sound when key used on trapped object
2016-07-10 22:06:35 +09:00
Allofich
d4e656ceaf
Play trap activation sound on trapped object, not actor
2016-07-10 21:39:53 +09:00
mrcheko
f57858b750
Merge remote-tracking branch 'upstream/master' into pathfinding
...
# Conflicts:
# apps/openmw/mwmechanics/aiactivate.cpp
2016-07-10 14:36:48 +03:00
MiroslavR
b0fcad4cb8
Don't stack effects for scrolls of the same type ( Fixes #3466 )
2016-07-10 03:49:09 +02:00
MiroslavR
75a66ced20
Fix actors lacking turning animations while in first person mode
2016-07-10 01:48:54 +02:00
mrcheko
d2fe6fe857
Merge remote-tracking branch 'refs/remotes/origin/master' into pathfinding
...
# Conflicts:
# apps/openmw/mwmechanics/aiactivate.cpp
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/aicombat.hpp
# apps/openmw/mwmechanics/aifollow.cpp
# apps/openmw/mwmechanics/aipackage.cpp
# apps/openmw/mwmechanics/aipackage.hpp
# apps/openmw/mwmechanics/aiwander.cpp
# apps/openmw/mwmechanics/aiwander.hpp
2016-07-09 22:59:54 +03:00
MiroslavR
dc0bc5b68c
Implement Face instruction (Feature #1424 )
2016-07-09 02:16:47 +02:00
scrawl
6f376bd499
Merge pull request #983 from Allofich/telekinesis
...
Don't allow telekinesis on actors or teleport doors
2016-07-08 23:47:43 +02:00
Allofich
7a0f9a7989
Clean up, remove unnecessary code changes
2016-07-09 02:24:08 +09:00
Allofich
53ceefa46a
Allow some telekinesis on teleport doors
2016-07-09 01:08:00 +09:00
Allofich
4e54338ce0
Implement and use getDistanceToFacedObject()
2016-07-08 23:28:49 +09:00
Allofich
0e5c3f781f
Only allow trap distance check to apply to player
2016-07-07 22:10:38 +09:00
Allofich
7de3afaa7d
Cleanups
2016-07-07 21:57:00 +09:00
Allofich
cb621939fd
Streamline trap code
2016-07-07 21:56:54 +09:00
Allofich
35a23c3b49
Implement and use new method allowTelekinesis()
2016-07-07 21:54:31 +09:00
Allofich
8014f37879
Avoid duplicate code
2016-07-07 21:54:30 +09:00
Allofich
538209b0a2
Change variable to mRatio and initialize it
2016-07-07 21:54:29 +09:00
Allofich
e25e698978
Fix telekinesis check for activators
2016-07-07 21:54:29 +09:00
MiroslavR
80f2ae0ca7
Apply magic effects while waiting/sleeping
2016-07-06 00:20:23 +02:00
MiroslavR
41484432b4
Player's death now interrupts waiting/sleeping
2016-07-06 00:15:25 +02:00
MiroslavR
d4e29e3e0c
Clear projectiles on non-incremental time advances
2016-07-06 00:11:58 +02:00
mrcheko
0793e4a80e
refactor pathfinding code in AiWander: use AiPackage::pathTo, reuse AiPackage::ObstacleCheck
2016-07-05 21:38:41 +03:00
Allofich
c1236f4113
Simplified code
2016-07-04 20:25:25 +09:00
Allofich
c02695e56d
Cleanups and fixes
2016-07-04 16:06:16 +09:00
Allofich
199607423b
Use iMaxActivateDist for AI actors that use Activate packages
2016-07-04 16:06:16 +09:00
Allofich
64d298d2b5
Use raycast distance when player activates trapped object
2016-07-04 16:06:15 +09:00
Allofich
64d53a2314
Avoid double raycasts when using getFacedObject
2016-07-04 16:06:04 +09:00
Allofich
574e40db5e
Don't allow telekinesis on activators
2016-07-04 01:50:47 +09:00
scrawl
343dccdbcc
Merge pull request #980 from scrawl/voice_fix
...
Voice fix
2016-07-02 21:55:46 +02:00
scrawl
d96e49c04a
Do not set change flag when running forEach on an empty cell
2016-07-02 20:44:14 +02:00
scrawl
8f62ea2e80
Fix for "RigGeometry rendering with no skeleton" errors
2016-07-02 20:19:55 +02:00
scrawl
b9b73d7b12
Replace "sys::default" with ESM::CellId::sDefaultWorldspace
2016-07-02 19:48:11 +02:00
scrawl
96757a3b7c
Fix non-predefined cells not being saved correctly
2016-07-02 19:43:08 +02:00
MiroslavR
c8b61cb234
Cache magic effects in MWMechanics::Spells
2016-07-02 12:50:00 +02:00
MiroslavR
700dde116e
Show remnant corprus effects in magic window
2016-07-02 05:17:24 +02:00
MiroslavR
54f52f7bae
Implement effect removal for abilities ( Fixes #3455 )
2016-07-01 18:50:28 +02:00
scrawl
252b27f0ef
Remove getEyePos()
2016-07-01 15:04:59 +02:00
Allofich
b29e9e9c77
Don't allow telekinesis on actors or teleport doors
2016-07-01 02:27:20 +09:00
MiroslavR
72d2daae90
Fix InventoryStore::purgeEffect being reverted by the next recalculation of mMagicEffects
2016-06-29 22:54:11 +02:00
scrawl
528de956da
Merge pull request #981 from Allofich/magicka
...
Fix timing of some magicka calculations
2016-06-29 20:42:18 +02:00
Allofich
2290346296
Fix timing of some magicka calculations
2016-06-30 02:59:09 +09:00
scrawl
5eb6c548d7
Merge pull request #965 from kpp/find_tinyxml
...
Find tinyxml
2016-06-28 02:51:51 +02:00
scrawl
509e5dfe4d
Include cleanup
2016-06-27 22:10:30 +02:00
scrawl
4699a8098b
Include fix
2016-06-27 21:51:18 +02:00
scrawl
1739351b7a
Remove now unused Sound_Decoder::rewind()
2016-06-27 21:38:04 +02:00
scrawl
dc1b010cf0
Don't analyze the loudness for sounds that don't need it
2016-06-27 21:37:13 +02:00
scrawl
965aaebbdb
Analyze the loudness data as the stream is decoded for playback
...
Instead of getting the loudness data for the whole file in advance, we now get it piece by piece as the sound is streamed.
The benefit is that we need to decode the audio just once instead of twice.
We no longer need to rewind() the stream when the first decoding is done, this should hopefully fix bug #3453 .
2016-06-27 21:32:54 +02:00
scrawl
fc293aa048
Merge pull request #978 from Allofich/fatigue
...
Fix update of fatigue display
2016-06-27 17:05:05 +02:00
scrawl
5d9f611869
Merge pull request #979 from MiroslavR/master
...
Show correct class image in level-up dialog
2016-06-27 16:58:50 +02:00
Allofich
1602eb3de8
Fix so that keepPlayerAlive() will not run twice
2016-06-27 21:43:49 +09:00
Allofich
19a20a6871
Fix update of fatigue display
2016-06-27 21:17:06 +09:00
MiroslavR
7244809c4a
Remove redundant part of condition
2016-06-26 15:17:52 +02:00
Marc Zinnschlag
594444a85a
Merge remote-tracking branch 'aesylwinn/MultipleDeletion'
2016-06-26 08:11:43 +02:00
MiroslavR
0db3af1b89
ESSImporter: load specialization increases
2016-06-26 03:28:13 +02:00
MiroslavR
dfc62c99b4
Show correct class image in level-up dialog ( Fixes #3443 )
2016-06-26 03:22:58 +02:00
Allofich
dc468dd139
Fix magicka and fatigue calculations from fortifying attributes
2016-06-25 19:21:49 +09:00
Allofich
5d3aebd04b
Update disposition check between persuasion attempts
2016-06-22 01:47:09 +09:00
terrorfisch
be25e2ba75
Make NPCs use both hands in weaponless combat.
2016-06-20 10:24:51 +02:00
Allofich
b1be3596dc
Cleanup of #include statements
2016-06-18 10:56:28 +09:00
Allofich
4a38fb8650
Use namespace block in aiactivate
2016-06-17 20:59:37 +09:00
scrawl
f549b5fb7a
Add missing include
2016-06-17 04:34:31 +02:00
scrawl
c18de84798
Fix a crash that could occur when two or more plugins move a deleted ref to another cell ( Fixes #3446 )
2016-06-17 02:27:49 +02:00
scrawl
3ce63c3f6e
Merge pull request #967 from Allofich/AIPackageFixes
...
AI package cleanups
2016-06-16 20:22:51 +02:00
Allofich
c2b51112f2
AI package cleanups
2016-06-16 17:17:56 +09:00
scrawl
693d3cea4a
Float to surface fix
2016-06-15 19:38:04 +02:00
scrawl
b5cb11ff07
Split refreshCurrentAnims into multiple functions
2016-06-15 03:14:44 +02:00
scrawl
372f2e2f18
Merge pull request #962 from Allofich/AIPackageFixes
...
Duration fixes for Follow and Escort
2016-06-14 20:47:32 +02:00
Allofich
3bebbab78e
Duration fixes for Follow and Escort
2016-06-15 02:11:30 +09:00
scrawl
3ec4ee6290
Make a copy of map key to work around it being invalidated ( Fixes #3329 )
2016-06-13 02:06:44 +02:00
Roman Proskuryakov
28c63aea72
Uses FindTinyXML to find package
2016-06-12 21:40:02 +03:00
Roman Proskuryakov
edb41b5b08
Rewrites FindLIBUNSHIELD using LibFindMacros
...
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
2016-06-12 14:44:04 +03:00
scrawl
4acfe1a7e4
Move cleanupSummonedCreature to the mechanics manager (Bug #3439 )
2016-06-12 02:43:33 +02:00
scrawl
910ad76e29
Remove spell effects when a summoned creature expires (Bug #3439 )
2016-06-12 00:41:13 +02:00
scrawl
b7e45b046d
When a summoned creature dies, wait for its death animation to complete before removing it (Bug #3439 )
2016-06-12 00:40:55 +02:00
scrawl
a825882c6b
Process death events at the end of the death animation ( Fixes #1873 )
2016-06-12 00:04:50 +02:00
scrawl
37afe966cf
Update comment
2016-06-11 21:25:40 +02:00
scrawl
b6230bd31f
Reject weather dialogue conditions when in an interior cell ( Fixes #3437 )
2016-06-11 18:26:20 +02:00
scrawl
844cbc5a14
Add isNullAction() method to fix compiler warning
2016-06-11 18:26:20 +02:00
scrawl
7a30ef5cc1
Do not consider actors following the player as hostiles
2016-06-11 18:26:20 +02:00
Marc Zinnschlag
148f2c9539
Merge remote-tracking branch 'aesylwinn/QTimerFix'
2016-06-11 11:26:14 +02:00
scrawl
a85932a62b
Ignore the collision box offset when launching projectiles ( Fixes #3201 )
2016-06-10 23:47:01 +02:00
scrawl
c6601ab2ab
Do not use the collision box offset for combat hit tests ( Fixes #3201 )
2016-06-10 23:47:01 +02:00
scrawl
8fcc1911d9
Use fCombatDistance as the creature attack range
2016-06-10 23:47:01 +02:00
Aesylwinn
f6c3b44cfb
Fix QTimer not being stopped in right thread
2016-06-10 12:10:14 -04:00
Daniel Pettersson
943d9d97dc
Slowfall now stops momentum when jumping
2016-06-10 15:22:12 +02:00
scrawl
a00e4de5c3
Fix another bug related to vanity mode toggle
2016-06-10 01:44:32 +02:00
scrawl
c47a679ac9
Fix queueing of vanity mode toggle (Bug #3421 )
2016-06-10 01:39:37 +02:00
scrawl
ce91637cf9
Do not use/assign the camera distance in first person mode ( Fixes #3421 )
2016-06-10 01:05:43 +02:00
scrawl
166cced22f
Merge pull request #957 from svaante/master
...
Added 1.5 bonus for ranged weapons when weapons are rated
2016-06-10 00:01:05 +02:00
scrawl
a14f1bc222
Merge pull request #954 from Allofich/AIWanderDuration
...
Improve duration calculations in Wander AI
2016-06-09 23:46:37 +02:00
Aesylwinn
ae50300053
Add ability to remove multiple rows in subrecords.
2016-06-09 15:42:40 -04:00
Allofich
55ac1fab68
Change Wander duration to run on a counter
2016-06-10 04:36:18 +09:00
Daniel Pettersson
256439f884
Added 1.5 bonus for ranged weapons when weapons are rated
2016-06-09 21:23:36 +02:00
Marc Zinnschlag
3dce406829
Merge remote-tracking branch 'aesylwinn/FixFocus'
2016-06-09 08:57:05 +02:00
scrawl
abcd2219e8
Ignore the calling actor in getEnemiesNearby / getActorsFighting
2016-06-08 22:13:21 +02:00
Aesylwinn
2f39a6e20d
Fix camera input not being reset when focus for widget is lost.
2016-06-08 13:25:47 -04:00
Marc Zinnschlag
447ba08be5
Merge remote-tracking branch 'aesylwinn/FixTracking'
2016-06-08 09:23:35 +02:00
scrawl
165f048792
Do not count dead NPCs as observers ( Fixes #3434 )
2016-06-07 22:01:44 +02:00
Aesylwinn
7657684dad
Fix mouse tracking to fix tooltip behavior. Also hide tooltips
...
when the mouse is moved.
2016-06-07 13:22:39 -04:00
scrawl
12eea9ed69
Remove magic number in getMaxActivationDistance
2016-06-07 15:18:36 +02:00
Marc Zinnschlag
b079db7913
Merge remote-tracking branch 'aesylwinn/EditPathgrid'
2016-06-07 08:35:16 +02:00
scrawl
8fb8c2bae5
Fix "part has no parents" warning message caused by nodes being destroyed in the incorrect order
2016-06-07 02:43:25 +02:00
scrawl
f417d7780a
Fix the enemy nearby check (Bug #3423 )
2016-06-07 01:55:34 +02:00
scrawl
dfc2f3469a
Don't play music if no playlist is set
2016-06-07 01:36:09 +02:00
scrawl
f64bc3c7ef
Pass the victim to commitCrime on pickpocket detection ( Fixes #3424 )
2016-06-06 23:50:22 +02:00
scrawl
9eab3b1728
Fix crash in race dialog when no head or hair are available
2016-06-06 01:04:14 +02:00
scrawl
a45643f150
Merge pull request #949 from Allofich/master
...
Fix return values for AITravel
2016-06-05 21:16:28 +02:00
Allofich
065d6a391d
Don't repeat sequences of only one non-wander AI
2016-06-06 04:12:49 +09:00
scrawl
2ee414abe4
Merge pull request #943 from kpp/find_bullet
...
Find bullet
2016-06-05 16:02:34 +02:00
Aesylwinn
3409d8a922
Change pathgrid node movement to be visually consistent, some
...
renaming
2016-06-04 12:38:17 -04:00
Ben Shealy
5085afa3d7
Moved mechanics code from MWGui::TradeWindow to MWMechanics::Trading
2016-06-04 12:28:47 -04:00
scrawl
3645b3357e
Fix improper assignement of spawn point in placeAt for non-actors (Bug #3417 )
2016-06-02 21:24:19 +02:00
scrawl
ab2089bbf3
Throw an exception if placeAt is passed an invalid direction parameter
2016-06-02 21:19:02 +02:00
scrawl
2ce1da688f
ESS-Import: fix handling of first person camera state (Bug #3416 )
2016-06-02 16:26:17 +02:00
Roman Proskuryakov
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
2016-05-31 07:18:37 +03:00
Aesylwinn
83c86cd1be
Implement context-select functionality.
2016-05-29 13:26:48 -04:00
Aesylwinn
b83f522ecd
Changes to color scheme, slight change to drag indicator,
...
change tooltip description.
2016-05-29 13:26:29 -04:00
Allofich
bce66c629a
Change editor-placed AI packages to cycle
2016-05-29 17:34:40 +09:00
scrawl
496cb85b01
Do not cancel Ai packages when on loading ( Fixes #3409 )
...
This piece of code was an attempt to fix up save games made before commit d3b76b7006
2016-05-28 20:27:05 +02:00
Aesylwinn
90620081c7
Fix handling of deleted pathgrids.
2016-05-27 13:15:35 -04:00
Aesylwinn
bded4f86f0
Remove connection number check
2016-05-27 13:13:49 -04:00
scrawl
d487007167
Remove debug code
2016-05-27 17:43:36 +02:00
scrawl
e396e6f2ea
Adjust the eye level for line of sight checks ( Fixes #3407 )
2016-05-27 17:42:17 +02:00
Aesylwinn
ded8862e9d
Insert nested rows after selected row, or at start if none selected.
2016-05-26 22:44:02 -04:00
Aesylwinn
d0ef95a1e1
Make adjustments to pathgrid modification code.
2016-05-26 22:13:47 -04:00
Aesylwinn
564d0db68c
Move pathgrid abstraction handling to save code.
2016-05-26 22:11:27 -04:00
Aesylwinn
239727531f
Revert "Fix data corruption issues."
...
This reverts commit 6199663bd8
2016-05-25 22:53:17 -04:00
Aesylwinn
9a567b3712
Revert "Fix editor undo for nested data."
...
This reverts commit 774e1497b6
2016-05-25 22:52:41 -04:00
Aesylwinn
ec90da731c
Redo slight change to pathgrid editing controls, lost in revert
2016-05-25 22:52:02 -04:00
Aesylwinn
bb81e89c08
Revert "Cleanup and slight change to pathgrid editing controls."
...
This reverts commit cc4655e9c7
2016-05-25 22:48:43 -04:00
scrawl
a2153a6213
Remove outdated comment
2016-05-25 21:41:05 +02:00
scrawl
5d4f58c828
Fix being unable to activate objects when scripts are disabled
...
The if statement was a leftover of the previous activate implementation and is no longer needed.
2016-05-25 21:37:56 +02:00
Aesylwinn
cc4655e9c7
Cleanup and slight change to pathgrid editing controls.
...
Now that there is a drag indicator, it is easy to tell if an
operation is active or not.
2016-05-24 18:19:05 -04:00
Aesylwinn
5eaaed05fc
Improve mouse pick culling.
2016-05-24 17:31:00 -04:00
scrawl
3f1df4caa6
Don't auto-equip ammunition ( Fixes #3401 )
2016-05-24 13:21:43 +02:00
Aesylwinn
18897348d7
Fix weapon values not being properly set in editor.
2016-05-24 01:12:46 -04:00
Aesylwinn
774e1497b6
Fix editor undo for nested data.
2016-05-23 15:51:36 -04:00
Aesylwinn
6199663bd8
Fix data corruption issues.
...
- Point connection count not being set
- Nested undo not restoring table (for pathgrid scene editing, editor
nested undo is still broken)
2016-05-21 18:59:43 -04:00
Aesylwinn
799ed300ea
Use cell coordinates class, fix undo description.
2016-05-21 14:36:07 -04:00
scrawl
703dba902b
Set the shader path in OpenCS
2016-05-20 00:40:59 +02:00
Aesylwinn
b86250036c
Add ability to add pathgrids.
2016-05-19 18:33:15 -04:00
scrawl
44dd67ee0f
Fix a potential crash for lights without a model that have "off by default" flag set
2016-05-19 22:35:25 +02:00
scrawl
a9561f738a
Move RemoveParticlesVisitor to animation.cpp
2016-05-19 22:35:17 +02:00
scrawl
0efbdb25ee
Improve const-correctness in Animation
2016-05-19 22:30:14 +02:00
scrawl
3749821809
Choose a random death animation for actors that start the game as dead ( Fixes #3397 )
2016-05-19 21:40:05 +02:00
Aesylwinn
1781aaaa27
Drag indicator.
2016-05-18 12:17:26 -04:00
Aesylwinn
e8e915bcde
Share selection functionality with instance editing mode.
2016-05-18 10:46:25 -04:00
Aesylwinn
ae0d2c3b9c
Refactor edit mode. Remove essentially duplicate function.
2016-05-17 21:24:16 -04:00
Aesylwinn
13c2161b27
Fix memory leak, remove empty if statement, change dynamic_cast
...
to static_cast
2016-05-17 16:14:23 -04:00
Aesylwinn
5a7ebab694
Fix forward declaration.
2016-05-16 23:06:36 -04:00
Aesylwinn
9d02286592
Remove unused forward declaration.
2016-05-16 22:17:03 -04:00
Aesylwinn
a3363bc098
Fix and simplify pathgrid update handling, only recreate geometry
...
once per frame, and a few naming changes.
2016-05-16 21:06:55 -04:00
Aesylwinn
d2d22e2f23
Clamp node positions in exterior cells.
2016-05-16 19:03:40 -04:00
Aesylwinn
cd3b96b3e8
Change interaction mask back to original and place required masks in
...
PathgridMode.
2016-05-16 17:59:52 -04:00
Aesylwinn
aea2380c2b
Add raytrace to dragCompleted. Implement node drag connection,
...
node and edge removal, and some fixes.
2016-05-16 17:25:02 -04:00
Aesylwinn
6fbc10dbba
Add ability to get cell, pathgrid, and ability to add nodes.
...
Also missing include.
2016-05-16 17:20:07 -04:00
Aesylwinn
9f7c8d559c
Add focus requirement for context menu.
2016-05-16 17:16:15 -04:00
Aesylwinn
f0bbe2c633
Add context menu for pathgrid editor.
2016-05-16 17:06:40 -04:00
Aesylwinn
8b6cb73369
Add ability to invert selection.
2016-05-16 17:03:00 -04:00
Aesylwinn
55656d68ef
Cleanup, put duplicated code in function
2016-05-16 17:00:58 -04:00
Aesylwinn
da6a742beb
Add control description to tooltip.
2016-05-16 16:50:02 -04:00
scrawl
b0180cb6b4
Fix current region check (Bug #3391 )
2016-05-16 02:05:02 +02:00
scrawl
3b31e8f66e
Do not set AiPackageDone flag for non-Aipackages ( Fixes #3392 )
2016-05-14 19:19:37 +02:00
Aesylwinn
f8b43b2a64
Rename cryptic variables.
2016-05-13 12:55:35 -04:00
Aesylwinn
32ba5bf8b8
Initial pathgrid editting, support for selection and movement.
2016-05-12 19:35:49 -04:00
Aesylwinn
9645d0cc8a
Pass more mouse pick information in scene view editor.
2016-05-12 18:21:43 -04:00
scrawl
fcbcc004a3
Don't use unordered_map
2016-05-11 02:35:17 +02:00
scrawl
78bac93021
Merge pull request #940 from kpp/find_ffmpeg
...
Find ffmpeg
2016-05-10 17:41:30 +02:00
scrawl
59cfcb38e2
Scale the sunlight specular color by weather's GlareView value ( Fixes #3375 )
2016-05-10 17:39:57 +02:00
Roman Proskuryakov
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
2016-05-10 12:43:54 +03:00
Marc Zinnschlag
64fdc5a21a
Merge remote-tracking branch 'rcutmore/bug-3331'
2016-05-09 09:18:48 +02:00
scrawl
3584e59402
Fix incorrect parameter to changeCell ( Fixes #3388 )
2016-05-08 18:59:41 +02:00
scrawl
a7e6219091
Merge pull request #939 from kpp/rewrite_esm_name_t
...
Rewrite ESM::NAME_T
2016-05-08 13:15:05 +02:00
Rob Cutmore
547d783eac
Editor: Remove overridden configureCreateCommand
...
StartScriptCreator was incorrectly overriding configureCreateCommand.
This caused issues trying to edit an uneditable column while adding a
new record.
2016-05-08 06:09:40 -04:00
Rob Cutmore
e6863c8f79
Editor: Undo editable column check in record add
2016-05-08 06:05:52 -04:00
Marc Zinnschlag
b4e341e1e2
Merge remote-tracking branch 'aesylwinn/RenderPathgrid'
2016-05-08 10:15:12 +02:00
Roman Proskuryakov
5ae1864062
Add unit tests for ESM::FIXED_STRING
2016-05-07 23:27:33 +03:00
Roman Proskuryakov
d5dfa89060
Rewrite NAME_T into FIXED_STRING.
2016-05-07 23:27:33 +03:00
Roman Proskuryakov
d7046878a8
Fix uninitialized values in MWMechanics::AiCombat
2016-05-07 20:41:47 +03:00
Rob Cutmore
307f04f827
Editor: Fix issue adding start script (Bug #3331 )
...
Updated to verify column is editable when adding a new record.
2016-05-06 08:04:15 -04:00
Michał Moroz
40cc6a4164
Changed AiSequence::stack to push_back lower priority packages instead of push_front (Bug #3384 )
2016-05-04 13:55:36 +02:00
Aesylwinn
14ae232938
Remove now unnecessary factory class.
...
It was originally used for storing normals, but that functionality
was removed.
2016-05-03 16:13:23 -04:00
Aesylwinn
1f902ff069
Remove code duplication.
2016-05-03 16:13:11 -04:00
Rob Cutmore
b129ff9672
Editor: Add PathgridCreator to find duplicate IDs
2016-05-03 07:24:33 -04:00
Rob Cutmore
c9ada852aa
Undo including pathgrids in ID check
2016-05-03 06:19:47 -04:00
Aesylwinn
642b1d0273
Add mask.
2016-05-03 03:29:39 -04:00
Aesylwinn
8d95b63180
Add pathgrid rendering to opencs
2016-05-02 22:10:43 -04:00
Aesylwinn
5cac882123
Replace game version of pathgrid rendering with component.
2016-05-02 22:10:17 -04:00
Aesylwinn
7fbcc47b15
Add pathgrid modified signals.
2016-05-02 22:08:49 -04:00
Aesylwinn
933504dbd0
Revert "Pathgrid rendering v2"
...
This reverts commit 4dee9604bb
2016-05-02 15:37:08 -04:00
Rob Cutmore
5580f803fd
Editor: Prevent duplicate pathgrids (Bug #3342 )
2016-05-02 07:28:32 -04:00
Aesylwinn
4dee9604bb
Pathgrid rendering v2
2016-05-02 06:29:56 -04:00
scrawl
2ca7415708
Handle DialInfo::mFactionLess (Bug #3380 )
2016-05-01 00:10:50 +02:00
scrawl
93b2f09224
Workaround for some AI functions being incorrectly handled as AI packages (Bug #3378 )
2016-04-29 18:07:35 +02:00
Marc Zinnschlag
57101c1b19
added namespace and include to previous commit
2016-04-26 15:42:11 +02:00
Alexander Kjäll
32123aec2b
made logarithm function for calculating column widths in the output be more generic
2016-04-25 20:04:48 +02:00
scrawl
5edfe8c41c
Reduce the wander fast forward overcrowding offset ( Fixes #3370 )
2016-04-23 22:47:42 +02:00
Marc Zinnschlag
091e1bf25d
improved scene element visibility buttons
2016-04-23 13:54:19 +02:00
Marc Zinnschlag
f0778e22dd
Merge remote-tracking branch 'origin/master'
2016-04-18 09:42:18 +02:00
Marc Zinnschlag
9d906a99a8
Merge remote-tracking branch 'rcutmore/bug-3286'
2016-04-18 09:40:13 +02:00
scrawl
c64b8ab297
Merge pull request #928 from Salgat/bug-1320
...
AiWander - Creatures in cells without pathgrids do not wander (Bug #1320 )
2016-04-17 18:10:47 +02:00
Austin Salgat
be16857f96
Fix wrong height being used for water detection
2016-04-17 10:46:09 -05:00
Rob Cutmore
e6ab3a4ba9
Remove unused CSVWorld::ScriptEdit::setMonoFont
2016-04-17 06:57:02 -04:00
Rob Cutmore
30493545f1
Update script editor tab width on font change
2016-04-17 06:54:31 -04:00
Austin Salgat
e9157e9200
Fix idle animation and Fix water creature manual wandering
2016-04-16 20:38:58 -05:00
Rob Cutmore
25d9b77d10
Add setting for script editor tab width
2016-04-16 20:43:10 -04:00
Austin Salgat
3dec10c686
Update variable to prevent underflowing
...
While not an issue presently, the variable may be used in the future in a way that could create issues if it underflows.
2016-04-16 17:51:13 -05:00
Austin Salgat
84179c262f
Update manual wandering to prevent actor from leaving/entering water
...
Water creatures will stay in the water, while land creatures will stay on land when wandering.
2016-04-16 16:39:13 -05:00
Austin Salgat
fc03216d48
Refactor to reuse existing obstacle detection
2016-04-16 12:14:00 -05:00
Austin Salgat
34726c24d9
Fix mDistance being reset prematurely
...
This was causing wandering without pathgrids to become disabled for most wandering units. Additionally, wandering now behaves the same for both NPCs and creatures.
2016-04-15 21:56:41 -05:00
scrawl
d784a77f4c
Set the default player cell in the StateManager ( Fixes #3269 )
2016-04-15 00:49:36 +02:00
Austin Salgat
92b352989a
Add logic for NPC wandering without pathgrids
2016-04-13 20:48:08 -05:00
Austin Salgat
c02881a4f8
Fix creatures not wandering
2016-04-12 21:16:55 -05:00
scrawl
8cf91e32fa
ESSImport: Correctly handle item stacks (XIDX tag). ( Fixes #3340 )
2016-04-12 21:39:05 +02:00
scrawl
ba3f4f122a
Account for the stack count in HasSoulGem (Bug #3340 )
2016-04-12 21:39:05 +02:00
scrawl
4854d6b093
Set the TalkedToPc flag for voiced dialogue ( Fixes #3346 )
2016-04-12 21:39:05 +02:00
scrawl
d15901b454
Merge pull request #927 from Salgat/bug-2981
...
When waiting, NPCs can go where they wouldn't go normally (Bug #2981 )
2016-04-12 00:55:20 +02:00
Austin Salgat
38f5a225ea
Refactor PathFinder functions to be useable by AiWander
...
This avoids having to duplicate the distanceSquared and getClosestPoint functions.
2016-04-10 20:44:08 -05:00
Austin Salgat
96231e17f0
Fix wandering NPCs going off pathgrid
...
If multiple pathgrids exist in the same cell, sometimes an NPC would port to a different pathgrid that was nearby. This is an issue since it allowed them to do things like travel through walls to inaccessible areas. Now they will only wander along the closest connected pathgrid.
2016-04-10 20:21:18 -05:00
scrawl
b2dc18e1aa
Merge pull request #926 from bentsherman/master
...
Allow +/- buttons in trade window to decrease offer to 0
2016-04-10 00:05:29 +02:00
Ben Shealy
8703609649
Allow +/- buttons in trade window to decrease offer to 0
2016-04-09 17:49:21 -04:00
Marc Zinnschlag
a5bc561c7d
Merge remote-tracking branch 'origin/master'
2016-04-08 09:35:39 +02:00
Rob Cutmore
a3903d374f
Update script editor tab width (Bug #3286 )
2016-04-07 07:47:47 -04:00
Bret Curtis
2c90b0b78d
fix a few spelling mistakes
2016-04-07 11:55:49 +02:00
Aesylwinn
7d89c82f08
Revert "Fix indentation."
...
This reverts commit 9a495042cc
2016-04-06 10:23:12 -04:00
Aesylwinn
8c35836883
Fix misnamed identifier.
2016-04-06 03:12:10 -04:00
Aesylwinn
85005626b1
Replace usage of deprecated function.
2016-04-06 03:11:51 -04:00
Aesylwinn
94d4fb0686
Add check for region weather chances to verifier.
2016-04-06 03:11:28 -04:00
Aesylwinn
9a495042cc
Fix indentation.
2016-04-06 02:39:33 -04:00
Aesylwinn
5e38fcac36
Add ability to edit region weather probabilities.
2016-04-06 02:18:19 -04:00
Marc Zinnschlag
f2b2a760b3
Merge remote-tracking branch 'origin/master'
2016-04-05 09:06:04 +02:00
Marc Zinnschlag
60509875e8
Merge remote-tracking branch 'aesylwinn/editor_camera'
2016-04-05 08:54:23 +02:00
Aesylwinn
b111febfc9
Add pitch constraint for first person camera.
2016-04-04 20:56:13 -04:00
Aesylwinn
e07687ee01
Add button for camera mouse inversion in user preferences, and separate the
...
sensitivity settings for orbit and free cameras.
2016-04-04 18:42:57 -04:00
Aesylwinn
e127c691e2
Cleanup, remove some unused includes
2016-04-03 18:23:06 -04:00
Aesylwinn
ec25998b12
Cleanup, use setTraversalMask instead of setNodeMaskOverride
2016-04-03 18:19:20 -04:00
Aesylwinn
0ef7c778e0
Cleanup, isModified was a remnant of an old design and is only used in the first person camera mode.
2016-04-03 17:26:34 -04:00
Aesylwinn
6c471349f0
Add context menu for orbit camera.
2016-04-03 16:32:07 -04:00
Aesylwinn
4ef9981544
Add ability to set orbit camera center outside of class.
2016-04-03 16:30:50 -04:00
scrawl
79c8f69b24
Clear the class selected / race selected flags when starting a new game ( Fixes #3326 )
2016-04-03 20:23:28 +02:00
Aesylwinn
02f991c63e
Cleanup, fix comment
2016-04-02 14:02:56 -04:00
Aesylwinn
99e9017242
Cleanup, externalize mask used to pick center
2016-04-02 13:59:57 -04:00
Aesylwinn
a4cc891383
Cleanup, move setup to CameraController class
2016-04-02 13:36:12 -04:00
Aesylwinn
efa2ec21ff
Cleanup, no need to inherit and override osg::ComputeBoundsVisitor
2016-04-02 13:14:46 -04:00
Marc Zinnschlag
1bb23b6c77
Merge branch 'move'
2016-04-02 10:08:27 +02:00
Marc Zinnschlag
8f699b5d39
avoid creating move tags for instances that exist only in the currently edited content file
2016-04-02 10:08:03 +02:00
Aesylwinn
1e30891891
Broaden selection mask for getting scene bounds if nothing is found.
2016-03-31 23:54:20 -04:00
Aesylwinn
7d9dddfa38
Place camera farther away, improves preview camera placement.
2016-03-31 23:34:47 -04:00
scrawl
cf62d860b2
Fix the adjustPlayerPos parameter not being respected in all cases
2016-03-30 01:54:03 +02:00
scrawl
e1dda9675d
Add "preload instances" setting, disabling this may help if you are low on memory.
2016-03-30 00:13:37 +02:00
scrawl
2162d9ed02
Restore key focus to the save list when the deletion confirmation messagebox is accepted
...
Gives me an idea for a new MyGUI feature - per-window widget focus as it is usually the case in other GUI toolkits.
2016-03-29 01:29:55 +02:00
scrawl
02016f4c56
Don't reset the save list when deleting a save ( Fixes #3279 )
2016-03-29 01:26:55 +02:00
scrawl
7a962fd8c5
Properly escape the keybinding labels (Bug #3281 )
...
A certain key name ("#") was being interpreted as a MyGUI markup code.
2016-03-29 01:13:17 +02:00
scrawl
5cda89c15d
Don't attempt to preload more exterior cells than the cache can hold (Bug #3273 )
2016-03-29 00:50:30 +02:00
scrawl
83f1ab6d25
Add a time threshold to the removing of preloaded cells when the maximum cache size is reached (Bug #3273 )
2016-03-29 00:50:21 +02:00
scrawl
4ac276b06c
Update the resource cache every frame (Bug #3273 )
...
Not much of a point in limiting this to cell loadings, since the update is done from a background thread and should be fairly cheap anyway if there's nothing to unload.
2016-03-29 00:50:13 +02:00
scrawl
2f8be401cc
Add the unref work items to the front of the workqueue (Bug #3273 )
...
Ensures that memory still gets freed even if the workqueue is overloaded.
2016-03-29 00:27:56 +02:00
Aesylwinn
09bce73c33
Fix starting distance not being correctly set.
2016-03-26 14:42:33 -04:00
Aesylwinn
08d055ca23
Allow setting precision of double preferences. Also increase precision of camera sensitivity.
2016-03-26 14:35:03 -04:00
Aesylwinn
35ff4ec4b1
Normalize default camera controls so that is appears as if the camera is
...
the object being moved. Also, allow mouse inversion for secondary movement.
2016-03-26 14:15:07 -04:00
Marc Zinnschlag
eba8b4a518
Merge remote-tracking branch 'rcutmore/feature-3250'
2016-03-26 11:34:25 +01:00
Marc Zinnschlag
3e0347a9ed
Merge remote-tracking branch 'rcutmore/fix-editor-tab-order'
2016-03-26 11:33:23 +01:00
Aesylwinn
fbe9177f5d
Better center picking for the Orbit Camera.
2016-03-26 00:51:19 -04:00
Aesylwinn
a0fb242bf8
Slight improvement to camera placement.
2016-03-25 23:47:05 -04:00
Aesylwinn
bee8977e45
Add camera control customization options.
2016-03-25 22:19:44 -04:00
Aesylwinn
dede171886
Fix the secondary navigation method for OrbitCameraController.
2016-03-25 21:35:34 -04:00
Aesylwinn
3c83128abc
Add more customization.
2016-03-25 20:47:18 -04:00
Aesylwinn
3a676fc456
Revert "Create a visual representation of the center of the orbit camera."
...
This reverts commit 2c894acd98
2016-03-25 18:20:04 -04:00
Rob Cutmore
1b4c124fe8
Create record on Return key press (Feature #3250 )
...
Updated to create record when Return key is pressed while input has
focus. Record is only created if input has been validated (i.e. Create
button is enabled).
2016-03-25 12:13:55 -04:00
Rob Cutmore
29078619aa
Fix editor tab order when adding record
2016-03-25 06:28:11 -04:00
scrawl
e71aa53574
Don't allow playing a sound/soundgen key more than once at the same time on the same object ( Fixes #2689 )
2016-03-24 19:26:12 +01:00
scrawl
5bd8ef247d
Do not adjust the player position when loading a savegame ( Fixes #2089 )
2016-03-24 17:18:08 +01:00
scrawl
92c2a10de4
Fall back to 'warrior' for not found class images ( Fixes #3228 )
2016-03-24 16:52:16 +01:00
Marc Zinnschlag
1774f6d9bf
moved ref num assingment from instance creation to save procedure
2016-03-24 11:12:05 +01:00
scrawl
157c11398d
Add terrain parallax mapping
2016-03-22 21:46:15 +01:00
scrawl
e381957105
Don't assume that class ID and name are equal
2016-03-21 11:51:34 +01:00
scrawl
90cc1de46c
Do not list custom made classes in the pick class dialog
2016-03-21 11:46:25 +01:00
scrawl
b332704df7
Switch hand-to-hand attack types randomly when "always use best attack" is turned on ( Fixes #3259 )
2016-03-19 18:03:59 +01:00
Aesylwinn
342d31de76
More fixes to the orbit manipulator
2016-03-18 16:56:40 -04:00
Aesylwinn
2903271331
Correct the center position for the orbit camera controller
2016-03-18 16:07:15 -04:00
Aesylwinn
2c894acd98
Create a visual representation of the center of the orbit camera.
...
For debugging purposes.
2016-03-18 16:06:35 -04:00
Aesylwinn
c8bae38a8e
Remove trackball mode
2016-03-18 14:53:10 -04:00
Aesylwinn
7009355baf
Remove unused variable
2016-03-18 14:46:53 -04:00
Aesylwinn
4374f69a60
Reduce mouse sensitivity
2016-03-18 14:43:13 -04:00
Aesylwinn
2b72a04e7a
Update 1st person up axis ASAP.
2016-03-18 14:02:55 -04:00
Aesylwinn
999869da24
Position camera above, near, and looking at the scene.
2016-03-18 14:02:24 -04:00
Aesylwinn
fcccacc0fa
Define a constant for the World Up vector
2016-03-18 13:57:48 -04:00
Marc Zinnschlag
589fb1031b
Merge remote-tracking branch 'pi03k/bug_3248'
2016-03-18 07:32:57 +01:00
scrawl
a6e23d03d3
Don't clamp disposition twice, clamping is already done inside getDerivedDisposition
2016-03-18 00:42:22 +01:00
scrawl
102f9719f7
Remove some garbage
2016-03-18 00:39:27 +01:00
scrawl
79eb2d20e0
Cleanup
2016-03-18 00:39:19 +01:00
scrawl
12ec90f9e7
Change default argument, fix GetDisposition
2016-03-18 00:38:02 +01:00
scrawl
bc5adfa4fe
Merge pull request #913
2016-03-18 00:31:55 +01:00
scrawl
30402f75e3
Use xbase_anim_female as the base skeleton for female NPCs ( Fixes #3258 )
2016-03-18 00:24:38 +01:00
scrawl
2b38d10449
Always add xbase_anim
2016-03-18 00:17:05 +01:00
pi03k
629a558e7b
Fix for bug 3248
2016-03-17 22:34:45 +01:00
Aesylwinn
59f59a3385
Fix indentation
2016-03-14 00:45:36 -04:00
Aesylwinn
08fe914ba1
Preliminary editor camera
2016-03-14 00:45:18 -04:00
Aesylwinn
2cff2cd643
Remove unnecessary override.
2016-03-14 00:45:08 -04:00
Aesylwinn
9ed2cf6581
Fix callback being skipped
2016-03-14 00:44:56 -04:00
Aesylwinn
ebdc212886
Moved selectNavigationMode to SceneWidget class, centralized camera selection.
2016-03-14 00:44:46 -04:00
Aesylwinn
9afb0e0f90
Input restructuring.
2016-03-14 00:42:15 -04:00
Aesylwinn
f4f7afb53b
Removed now unnecessary installation of event filter.
2016-03-14 00:41:57 -04:00
Aesylwinn
38059593a7
Removed workaround for OSG input handling in RenderWidget.
2016-03-14 00:41:04 -04:00
scrawl
50acdf3e47
Move createCharacter inside the try block
2016-03-14 00:03:02 +01:00
scrawl
a0cc9de088
Make the creation of save file directories even more explicit
2016-03-14 00:00:11 +01:00
scrawl
b7b7c0612d
Make getCurrentCharacter create argument explicit
2016-03-13 23:48:44 +01:00
scrawl
7463c0c353
Addition to last commit, don't create a save directory on death
2016-03-13 23:48:22 +01:00
scrawl
426a6fdcc2
Don't create the save directory on loading a game
...
This prevents empty directories being created when loading a save file outside of the saves directory with the --load-savegame switch.
2016-03-13 23:42:08 +01:00
scrawl
d7c7bb850b
ToggleAI cleanup
2016-03-12 20:32:42 +01:00
Marc Zinnschlag
d5067201d0
Merge branch 'move'
2016-03-12 13:27:00 +01:00
Marc Zinnschlag
900378a31e
changed 'not implemented' warning message for object movement
2016-03-12 13:26:33 +01:00
Marc Zinnschlag
d6b8033b46
handle cell transitions when moving objects
2016-03-12 13:19:51 +01:00
Marc Zinnschlag
5c587fe93e
Merge remote-tracking branch 'scrawl/cs_waterlevel'
2016-03-12 08:07:38 +01:00
scrawl
d840c7d5eb
Slightly tweak the spawn point heuristics
...
Fixes an issue with hlaalu building exits
2016-03-11 22:48:28 +01:00
scrawl
97526284f5
Allow setting the water level of an interior cell with sky ( Fixes #3244 )
2016-03-11 22:10:59 +01:00
Marc Zinnschlag
fa9689c5e7
delay command execution until call to Object::apply has finished (avoids cutting off the branch we are sitting on)
2016-03-11 14:04:47 +01:00
Marc Zinnschlag
6a2fe564ef
Merge branch 'master' into move
2016-03-11 12:47:33 +01:00
scrawl
85bd4f52f0
Improve occlusion query geometry rendering
2016-03-11 00:09:46 +01:00
scrawl
93ec289b1d
Improve setting of occlusion query state
2016-03-10 23:18:20 +01:00
scrawl
14e1911820
Fix memory leaks
2016-03-10 20:38:14 +01:00
scrawl
f898bf493f
Don't use Geodes
2016-03-10 13:17:01 +01:00
scrawl
137dde7cf8
Include cleanup
2016-03-10 12:59:17 +01:00
ae-g-i-s
c9791c5c1a
Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves ( fixes #3233 )
2016-03-08 21:30:28 +01:00
ae-g-i-s
2f1c6c740c
Revert "Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() ( Fixes #3233 )"
...
This reverts commit 000597236e
2016-03-08 20:41:39 +01:00
ae-g-i-s
9585a12fb1
Merge remote-tracking branch 'upstream/master' into enable-unbounded-disposition-check
2016-03-08 20:40:47 +01:00
Marc Zinnschlag
b2181fae20
safer handling of command macros
2016-03-08 10:48:44 +01:00
scrawl
3e6cf17665
Warn about cellrefs with an empty refId (Bug #3238 )
2016-03-07 22:44:03 +01:00
scrawl
d0aba0d9ee
Catch exceptions thrown during reference loading (Bug #3238 )
2016-03-07 21:28:50 +01:00
ae-g-i-s
000597236e
Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() ( Fixes #3233 )
2016-03-06 18:29:32 +01:00
scrawl
0fc65db6bb
Remove parts before setting the new object root
2016-03-06 11:34:15 +01:00
scrawl
0df975a4d7
Properly detach nodes in CopyRigVisitor ( Fixes #3234 )
2016-03-06 11:33:07 +01:00
scrawl
60a12b3dee
Use MyGUI's castType function
2016-03-05 20:00:51 +01:00
scrawl
763f647412
Add ItemModel::allowedToInsertItems
2016-03-05 19:53:24 +01:00
scrawl
373c1e7602
Assign the PageDisplay on initialization
2016-03-05 19:48:01 +01:00
scrawl
5ea7446eeb
Change a dynamic_cast to static_cast
2016-03-05 19:41:45 +01:00
scrawl
c085e503c6
Pass the btCollisionObject as const
2016-03-05 16:09:56 +01:00
scrawl
004f0d37d5
Fix the projectile launch position for spells cast from objects ( Fixes #3235 )
2016-03-05 15:56:54 +01:00
scrawl
910e41e3c4
Allow an Object to be specified as ignore parameter for castRay
2016-03-05 15:56:19 +01:00
Marc Zinnschlag
b5005f7812
keep sub mode over mode changes
2016-03-05 11:41:42 +01:00
Marc Zinnschlag
a63453846b
properly clear drag mode at the end of a drag
2016-03-05 11:14:08 +01:00
Marc Zinnschlag
51a4e3fa7d
properly abort drags from outside the worldspace widget (code was leaving unclean dragging flags behind)
2016-03-05 10:56:54 +01:00
Marc Zinnschlag
70745487f3
cancel instance move on editing lock becoming active
2016-03-05 10:44:46 +01:00
Marc Zinnschlag
b1fb64bf68
added missing drag mode resets
2016-03-04 16:25:30 +01:00
Marc Zinnschlag
dd564daba0
do not start move drags while the document is locked for editing
2016-03-04 16:24:02 +01:00
Marc Zinnschlag
1726393963
cancel instance move on edit mode change
2016-03-04 15:31:50 +01:00
Marc Zinnschlag
25effc4222
cancel instance move on sub mode change
2016-03-04 15:30:28 +01:00
Marc Zinnschlag
1240e0c716
cancel instance move on drag abort
2016-03-04 15:19:26 +01:00
scrawl
76b47c6d5d
PlaceAt: don't correct spawn points for non-actors
2016-03-04 12:25:22 +01:00
scrawl
16dca126dd
PlaceAt: don't use actor's X/Y rotation
2016-03-04 12:22:13 +01:00
Marc Zinnschlag
d57021b23c
some code simplification
2016-03-04 12:02:45 +01:00
Marc Zinnschlag
c2a8be9048
confine move marker drags to a single axis
2016-03-04 12:00:05 +01:00
Marc Zinnschlag
4cd24715cb
Merge remote-tracking branch 'pi03k/bug_2570'
2016-03-04 09:41:21 +01:00
Marc Zinnschlag
563f44b823
Merge remote-tracking branch 'origin/master'
2016-03-03 12:13:11 +01:00
pi03k
128508882a
Changed some zeros to NULLs in view.cpp
2016-03-03 11:46:56 +01:00
pi03k
3bfab9c2c9
extracted creation of scroll area to separate method
2016-03-03 11:46:56 +01:00
pi03k
9539925f3e
Fixed typo in updateSubViewIndices. Changed 0 to NULL for pointers.
2016-03-03 11:46:56 +01:00
pi03k
bf9aa2e131
Extracted resizing of window's width to separate method
2016-03-03 11:46:56 +01:00
Marc Zinnschlag
9c1b4c671d
Merge remote-tracking branch 'aesylwinn/cell_borders'
2016-03-03 11:04:51 +01:00
Aesylwinn
9d985d883b
added grid icon
2016-03-02 20:45:04 -05:00
Aesylwinn
fa1bd72bc0
fix usage of deprecated function
2016-03-02 15:48:05 -05:00
Aesylwinn
7fb6807e65
cell border markers
2016-03-02 15:02:06 -05:00
scrawl
3d6323f13a
Force-enable hasWater() for exterior cells ( Fixes #3222 )
2016-03-02 17:02:30 +01:00
scrawl
67c8faec75
Infinite loop fix
2016-03-02 13:20:23 +01:00
scrawl
08f06c6c2d
Fix a crash that could occur with actors that define 'bip01 spine1' but do not define 'bip01 spine2' ( Fixes #3223 ).
2016-03-01 16:58:39 +01:00
Marc Zinnschlag
a19ac72215
render marker
2016-03-01 15:48:34 +01:00
Marc Zinnschlag
6f619ea85f
Merge branch 'master' into move
...
Conflicts:
apps/opencs/view/render/object.cpp
2016-03-01 12:17:53 +01:00
Marc Zinnschlag
c1f4448547
Merge remote-tracking branch 'origin/master' into createfix
2016-03-01 11:35:28 +01:00
scrawl
2821f46a18
Corpse clearing fix
2016-03-01 11:31:08 +01:00
Marc Zinnschlag
e4f341d4ba
Merge remote-tracking branch 'origin/master' into createfix
2016-03-01 11:21:25 +01:00
Marc Zinnschlag
7d8bd56e11
create new records with basic data in the same step without updates inbetween ( Fixes #3207 )
2016-03-01 11:21:06 +01:00
scrawl
87871d7d54
Don't add RotateController to an uncontrolled node
2016-02-29 20:23:19 +01:00
scrawl
36bb255bc0
Use safePlaceObject in spawnRandomCreature
2016-02-29 17:30:38 +01:00
scrawl
7485abe5c3
Use safePlaceObject for summoned creature spawning
2016-02-29 17:27:07 +01:00
scrawl
be62ae758a
Fall back to sides first
2016-02-29 17:26:52 +01:00
scrawl
6df71f6250
Factor out safePlaceObject function
2016-02-29 17:19:22 +01:00
scrawl
11f00e3aa9
Rename safePlaceObject to placeObject
2016-02-29 17:05:18 +01:00
scrawl
be2f20f564
PlaceAt: attempt to select a safe spawn location ( Fixes #2515 , Fixes #1384 , Fixes #2925 )
2016-02-29 16:54:00 +01:00
scrawl
04d51d5871
Always update the ingredient icons ( Fixes #3220 )
2016-02-29 13:25:09 +01:00
scrawl
27577ce765
Add ESM::Land::DEFAULT_HEIGHT
2016-02-28 16:49:18 +01:00
scrawl
fc3de3302e
Create a collision shape for the default terrain
2016-02-28 16:47:41 +01:00
scrawl
84e9d346ef
Remove duplicate include
2016-02-28 16:47:33 +01:00
Marc Zinnschlag
ebaeabc962
Merge remote-tracking branch 'scrawl/respawn'
2016-02-28 10:19:14 +01:00
scrawl
3a2dccad4b
Implement 'Show' script instruction
2016-02-27 13:40:53 +01:00
scrawl
f2f601b958
Implement corpse clearing ( Fixes #2363 )
2016-02-27 13:20:50 +01:00
scrawl
c3ef387208
Vanilla-compatible creature/NPC respawning ( Fixes #2369 , Fixes #2467 )
2016-02-27 12:53:07 +01:00
Marc Zinnschlag
290da132b1
Merge remote-tracking branch 'scrawl/activate'
2016-02-26 16:03:50 +01:00
Rob Cutmore
d60786b5da
Do not show cell markers for interior cells
2016-02-26 07:42:05 -05:00
scrawl
a97eae864d
Fix the ObstacleCheck time step ( Fixes #3211 )
2016-02-26 13:15:41 +01:00
scrawl
f99cd15f00
Vanilla-compatible activate / onActivate ( Fixes #1629 )
...
See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
2016-02-26 13:08:35 +01:00
Marc Zinnschlag
01497ac8db
Merge remote-tracking branch 'origin/master'
2016-02-24 13:37:34 +01:00
Marc Zinnschlag
9f14247562
Merge remote-tracking branch 'aesylwinn/topic-info-editor-improvements'
2016-02-24 13:37:16 +01:00
Aesylwinn
1ae402476d
Journal verifier
2016-02-22 17:01:15 -05:00
Aesylwinn
f4ed389496
InfoCondition autocompletion
2016-02-22 15:48:25 -05:00
scrawl
d05603c7fe
Directly apply On Target 'When Strikes' enchantments instead of launching a projectile ( Fixes #3212 )
2016-02-22 19:42:54 +01:00
scrawl
5cdee454ef
Fix degree/radians mixup ( Fixes #3213 )
2016-02-22 19:13:56 +01:00
scrawl
90a99991d1
Use empty() instead of !size()
2016-02-22 19:06:12 +01:00
scrawl
8bd16e4d5a
Don't compute the world matrix multiple times
2016-02-22 18:58:19 +01:00
scrawl
a6621626aa
Don't use multiple parent node paths in CSVRender::Object
2016-02-22 15:22:37 +01:00
scrawl
1c24cba46a
Don't use multiple parental node paths.
2016-02-22 15:13:31 +01:00
scrawl
c5d3e6c993
Disable preloading of levelled lists
2016-02-22 14:31:02 +01:00
Marc Zinnschlag
22e717161a
split object base node into two node (one for position, one for everything else)
2016-02-21 15:19:31 +01:00
scrawl
8f81df2bd3
Cleanup
2016-02-20 20:34:56 +01:00
scrawl
0db7163363
Add specular mapping for terrain
2016-02-20 19:55:08 +01:00
scrawl
f01e8a6950
Add specular mapping for objects
2016-02-20 19:55:08 +01:00
scrawl
5cf2441b10
ShaderVisitor: support automatic recognition of normal maps based on file pattern
...
Introduce new settings 'auto use object normal maps', 'auto use terrain normal maps', 'normal map pattern'
2016-02-20 18:00:43 +01:00
Aesylwinn
20942e6658
Fixes to testing if condition is always or never true
2016-02-19 14:10:47 -05:00
scrawl
6a0ac824bd
Fix terrain error in OpenCS
2016-02-19 15:00:58 +01:00
Aesylwinn
5315866f61
Corrections to condition ranges and several other minor fixes
2016-02-19 03:03:10 -05:00
Aesylwinn
9d392487a9
Fix names to be unique and condition values to be set to 0
2016-02-19 02:59:19 -05:00
scrawl
17c4dfdb62
Use the lowest unused texture unit for the enchanted item glow texture
2016-02-18 23:10:58 +01:00
scrawl
5e12a1b4ef
Add enchanted item glow to the shader
2016-02-18 23:05:44 +01:00
scrawl
268594dcf1
Recreate shader in NpcAnimation::setAlpha
2016-02-18 22:48:53 +01:00
scrawl
1232607385
Remove pointless widget names in settings layout file
2016-02-18 19:41:06 +01:00
scrawl
a73512afb7
Add shader settings to settings.cfg
2016-02-18 19:38:34 +01:00
scrawl
3969675afa
Remove unused settings
2016-02-18 19:38:34 +01:00
scrawl
553408949a
Fix character preview
2016-02-18 19:37:57 +01:00
scrawl
bd279c63f7
Fix fog on water
2016-02-18 19:37:57 +01:00
scrawl
9376811213
Vertex lighting shader
2016-02-18 19:37:57 +01:00
scrawl
044e0a829a
Add fog
2016-02-18 19:37:57 +01:00
scrawl
41e1fd407d
Disable shaders for the sky
2016-02-18 19:37:56 +01:00
scrawl
a9ad1b09e2
Introduce ShaderManager & ShaderVisitor
...
Actual shaders still to be written.
2016-02-18 19:37:56 +01:00
scrawl
e05d975020
Change the way that texture filtering settings are applied at runtime
2016-02-18 19:37:55 +01:00
scrawl
7f89bb273a
Add 'reflect actors' setting for the water shader, default off
2016-02-18 19:36:17 +01:00
scrawl
6fb0022b35
Update preloading settings
...
Disable 'preload fast travel' by default.
Add 'min cache size' and 'max cache size' settings.
Split the 'cache expiry delay' into 'preload cell expiry delay' and 'cache expiry delay'.
2016-02-18 17:47:10 +01:00
Aesylwinn
bdc99048bb
Missing header
2016-02-17 19:01:22 -05:00
Aesylwinn
8668eccd0b
Topic Info verifier with fixes to InfoSelectWrapper class
2016-02-17 15:38:30 -05:00
Aesylwinn
e89609e5b0
Changes to how Info Conditions are edited
2016-02-17 14:15:57 -05:00
scrawl
c4d38bb42d
Fix clang analyzer warnings
2016-02-16 19:17:04 +01:00
Marc Zinnschlag
dececf6c38
instance moving via drag in 3D scenes
2016-02-16 16:02:29 +01:00
Aesylwinn
3f40346636
Implemented a wrapper for DialInfo::SelectStruct
2016-02-15 19:49:54 -05:00
scrawl
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
2016-02-15 15:16:48 +01:00
scrawl
83a9a164bc
Raise the required bullet version to 2.83
...
2.82 appears to have a bug that causes the player to be able to phase through certain objects (bug #1587 ).
2016-02-15 00:33:17 +01:00
Marc Zinnschlag
dad38d901c
Merge remote-tracking branch 'rcutmore/feature-3043'
2016-02-14 17:38:20 +01:00
Marc Zinnschlag
28e3fe837f
Merge remote-tracking branch 'scrawl/osg_34'
2016-02-14 17:31:33 +01:00
Rob Cutmore
25744aaadd
Update cell marker appearance
...
- Added bounding box around marker text. Box is black when cell exists
otherwise it is red.
- Changed format of marker text.
- Changed marker text's pivot point to be at center of text.
2016-02-14 10:28:41 -05:00
Marc Zinnschlag
29c2a99316
Merge remote-tracking branch 'scrawl/physics'
2016-02-13 16:20:48 +01:00
Marc Zinnschlag
d1d7804620
Merge remote-tracking branch 'origin/master'
2016-02-13 10:13:25 +01:00
scrawl
eaf3f5a829
Remove unused arguments
2016-02-13 04:14:05 +01:00
scrawl
796a4a795a
Avoid the 'spiral of death'
2016-02-13 03:09:28 +01:00
scrawl
383524c688
Run physics in fixed timesteps, use the remainder to interpolate between current and previous state
...
Based on http://gafferongames.com/game-physics/fix-your-timestep/
2016-02-13 03:03:34 +01:00
scrawl
d1375cd3a3
Crashcatcher: limit backtrace to a sensible number of stack frames
...
When a stack overflow occurs, trying to print the whole stack would cause the process to hang indefinitely.
2016-02-13 01:35:53 +01:00
scrawl
5824619a95
Clean up includes
2016-02-12 19:28:10 +01:00
scrawl
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
2016-02-12 14:46:45 +01:00
scrawl
48ac0bef3e
Repair save games affected by bug #3080 ( Fixes #3160 )
2016-02-11 16:34:02 +01:00
scrawl
6bfeb118d7
Fix cleanup issue
2016-02-10 19:08:17 +01:00
scrawl
d3808580b0
Rename lightRoot to sceneRoot
2016-02-10 19:07:47 +01:00
scrawl
fb219fea17
Fix respawning of NPCs/creatures when they were moved to a different cell
2016-02-10 19:07:01 +01:00
Marc Zinnschlag
da6dcfc49e
Merge remote-tracking branch 'scrawl/resource'
2016-02-10 16:23:38 +01:00
scrawl
5e876b1379
Add missing include
2016-02-10 15:34:06 +01:00
Rob Cutmore
61b6806a62
Allow toggling of cell markers
2016-02-09 20:23:00 -05:00
scrawl
9f729667fb
Remove debug output
2016-02-09 21:16:11 +01:00
scrawl
0865cea211
Preload terrain
2016-02-09 21:16:11 +01:00
scrawl
596fe56bfd
Make Land::loadData thread safe
2016-02-09 20:21:56 +01:00
scrawl
1457a0de78
Use the UnrefQueue to delete BulletShapeInstances
2016-02-09 19:04:59 +01:00
scrawl
3552b3a82c
Don't create a BulletShapeInstance for actors
2016-02-09 18:51:17 +01:00
scrawl
246566cef4
Preload instances in BulletShapeManager
2016-02-09 18:48:49 +01:00
scrawl
e28dc3e72f
Preload instances in SceneManager
2016-02-09 18:35:26 +01:00
scrawl
ce3cce24a5
Remove unneeded dynamic_cast
2016-02-09 16:39:05 +01:00
scrawl
8ece1885cd
Animation: don't create the NodeMap if we don't need it
2016-02-09 16:39:05 +01:00
scrawl
ae031b23d4
Do not detach NPC parts in destructor
2016-02-09 16:10:42 +01:00
scrawl
d11c2864df
Introduce UnrefQueue to handle the deleting of no longer needed objects in the background thread
2016-02-09 15:45:35 +01:00
scrawl
f6f9eff9a6
Preload levelled creatures
2016-02-09 03:06:00 +01:00
scrawl
6806741d9b
Add settings for disabling the individual preloading types
2016-02-09 01:58:33 +01:00
scrawl
10a3e270a3
Preload fast travel destinations
2016-02-09 01:52:02 +01:00
scrawl
1cda2bf796
Preload sky & water from the main menu
2016-02-09 01:28:13 +01:00
scrawl
f9082502f8
Move construction of WorkQueue to RenderingManager
2016-02-09 01:02:40 +01:00
scrawl
d16450bff2
Fix correctActorModelPath in preloader not being used
2016-02-09 00:28:27 +01:00
scrawl
1b8e82e929
Preload NPC body parts
2016-02-09 00:26:22 +01:00
scrawl
84dcf59c50
Fix preloading of equipment parts that don't separate gender
2016-02-08 22:57:47 +01:00
scrawl
effe022bb2
Move preload model list to MWClass, preload NPC head/hair
2016-02-08 20:52:32 +01:00
scrawl
fc0be77e4c
Preload keyframes
2016-02-08 15:51:31 +01:00
scrawl
ef5de94548
Fix correctActorModelPath
2016-02-08 15:31:09 +01:00
scrawl
e4e313fe12
Remove outdated comment
2016-02-08 14:41:21 +01:00
scrawl
c8054424c9
Preload items equipped by NPCs
2016-02-07 22:37:52 +01:00
Rob Cutmore
a34a08c212
Render cell markers
...
Adds rendering of cell markers. Markers are displayed at center of
cell and contain cell's coordinates.
2016-02-07 13:52:18 -05:00
scrawl
a81b10b415
Make the cache expiryDelay configurable
2016-02-07 19:05:55 +01:00
scrawl
5efaa9817c
Add preloading settings
2016-02-07 18:01:14 +01:00
scrawl
610257cd3a
Preload the exterior cell grid
2016-02-07 07:37:56 -08:00
scrawl
8592166eeb
Preload surrounding cells when preloading an exterior cell destination
2016-02-07 05:27:19 -08:00
scrawl
023c87b215
Preload cell when the player goes near a teleport door. It works!
2016-02-07 05:13:46 -08:00
scrawl
a7b217def2
AI: don't cast fortify effects ( Fixes #3184 )
2016-02-07 01:29:11 +01:00
scrawl
162287b82d
AI combat actions: rename 'target' to 'enemy'
2016-02-07 01:29:11 +01:00
scrawl
94c05c6baa
AI: don't cast useless resist spells ( Fixes #2760 )
2016-02-07 01:29:02 +01:00
scrawl
d3415387a5
AI: take into account success chance when rating a spell
2016-02-07 01:18:20 +01:00
scrawl
d855a13b44
Clear the resource cache from the worker thread
2016-02-07 00:36:31 +01:00
scrawl
6f9ca0f68f
Add basic cell preloader class
...
Not properly in use yet, but seems to be working.
2016-02-07 00:14:13 +01:00
scrawl
df57d4bfba
Use a common base class for resource managers
...
Implement updateCache to delete unreferenced cached objects when they have not been referenced for a while.
2016-02-06 17:22:17 +01:00
scrawl
a72af4a1a3
cout that should be cerr
2016-02-05 23:25:01 +01:00
scrawl
9e5225bb6f
Do not unref a Texture's image data after applying it
2016-02-05 23:21:54 +01:00
scrawl
499beda665
Clear terrain texture cache before applying filter settings
2016-02-05 23:20:13 +01:00
scrawl
9e53e12c70
More renaming of TextureManager -> ImageManager
2016-02-05 23:10:27 +01:00
scrawl
5ee3d1698f
Remove getWarningTexture in favor of getWarningImage
2016-02-05 23:05:43 +01:00
scrawl
f99f403dda
Rename TextureManager to ImageManager
2016-02-05 23:03:53 +01:00
scrawl
6ef848b7c5
Remove TextureManager::getTexture2D
...
Instead use getImage and let the caller create the Texture. Sharing of textures is then handled in post by the SharedStateManager.
This is closer to what the OSG serializer does.
Streamlines the TextureManager and will make it easier to multithread.
2016-02-05 23:01:11 +01:00
scrawl
e8662bea31
Change the way that image origin is converted to OpenGL's lower-left convention
...
Flip the texture coordinates instead of flipping textures.
This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
2016-02-05 21:03:11 +01:00
scrawl
5b972ee777
Move texture filtering settings to SceneManager
...
Practical benefits:
- Filter settings are now applied to native OSG format models. These models do not use TextureManager::getTexture2D since the model itself specifies a Texture.
- The GUI render manager will be able to use its own separate textures, making it easier to turn off filtering for them.
2016-02-05 21:03:10 +01:00
scrawl
c9a67ab423
Do not add scripts from levelled creatures twice (Bug #2806 )
...
Do not insert objects from within a CellStore visitor
2016-02-05 18:29:33 +01:00
scrawl
8e5398d85b
Add missing initializations
2016-02-05 14:35:29 +01:00
scrawl
7d647088ab
Make the local map cell distance configurable
2016-02-05 01:19:45 +01:00
scrawl
bd655c20fd
Refactor local map updates
...
We don't need the delay any more because the rendering itself is part of the normal rendering traversal - so it's delayed anyway.
Don't request maps that we're not actually using (i.e. with cell grid sizes higher than the default 3, we were rendering more maps than the map window could show).
2016-02-05 01:19:45 +01:00
scrawl
300379617e
Accept a const CellStore in findInteriorPositionInWorldSpace
2016-02-05 01:19:45 +01:00
scrawl
41ebf62fb1
Accept a const CellStore in getNorthVector
2016-02-05 01:19:45 +01:00
Marc Zinnschlag
11a4a31bfd
Merge remote-tracking branch 'scrawl/localscripts'
2016-02-04 13:49:43 +01:00
scrawl
69c2c4fcc1
updateMergedRefs before reading MVRF tags ( Fixes #3161 )
2016-02-03 19:13:26 +01:00
scrawl
cc3563359e
Refactor local script iteration ( Fixes #2806 , Fixes #3108 )
...
This should be much safer. Don't use recursion. Don't fail if mIgnore happens to be in the list twice. Don't rely on preconditions / assertions.
2016-02-03 16:16:20 +01:00
scrawl
187d2bccda
Warn about adding a local script twice (Bug #2806 )
2016-02-03 16:09:10 +01:00
scrawl
aa9905b0eb
Do not crash when the water normal map is missing ( Fixes #3179 )
2016-02-03 15:24:28 +01:00
scrawl
74c18f532e
Fix comment
2016-02-03 14:40:59 +01:00
scrawl
5878291064
Fix the path correction for animation sources provided in NPC record ( Fixes #2444 )
2016-02-03 14:40:21 +01:00
scrawl
b9d1d6144a
Don't reveal unknown potion effects in alchemy window ( Fixes #3146 )
2016-02-02 22:50:11 +01:00
scrawl
d3b76b7006
Don't stack Ai packages ( Fixes #3101 , Fixes #3080 , Fixes #2697 )
2016-02-02 22:20:56 +01:00
scrawl
7aeafd3bb9
Revert "Apply the AiTravel maxRange to AiEscort as well ( Fixes #2697 )"
...
This reverts commit 1f543b4d79
2016-02-02 22:08:12 +01:00
scrawl
145756c0a1
Partly revert "Avoid directly iterating the actor map ( Fixes #3173 )"
...
Caused issues when a summoned creature is removed as part of the magic effect update.
Fixes #3178
2016-02-02 15:57:15 +01:00
scrawl
59d2de118f
Avoid directly iterating the actor map ( Fixes #3173 )
2016-02-02 00:50:21 +01:00
scrawl
50ed061154
AiWander: reset mAllowedNodes on cell change ( Fixes #3176 , Fixes #3130 )
2016-02-02 00:41:40 +01:00
scrawl
dda4273349
Actors that start the game as dead do not float to the surface ( Fixes #3177 )
...
This has a minor bug (can you spot it?) that affects the vanilla engine as well, unfortunately not so simple to fix.
2016-02-01 23:18:18 +01:00
scrawl
832eaae27b
Do not apply effects with CasterLinked flag when there is no valid caster
2016-02-01 22:57:08 +01:00
scrawl
c34314ae26
When an actor dies purge all spell effects cast by that actor ( Fixes #3175 )
2016-02-01 22:52:28 +01:00
scrawl
c403a6b113
Don't apply constant magic effects to dead actors ( Fixes #3174 )
2016-02-01 22:30:08 +01:00
scrawl
d12f24c321
Fix typo
2016-02-01 21:01:11 +01:00
Rob Cutmore
d28e7db65c
Fix tooltip spelling errors in WorldspaceWidget
2016-01-31 08:45:05 -05:00
Alexander "Ace" Olofsson
b3e985fca2
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
2016-01-30 07:31:00 +01:00
Alexander "Ace" Olofsson
776c715ccd
Move NoTraverseCallback to mwrender/util.hpp
2016-01-29 23:21:58 +01:00
Rob Cutmore
d43315fe4e
Add script editor line wrapping (Feature #2926 )
...
Adds line wrapping for script editor and associated entry in settings
window. No line wrapping remains the default.
2016-01-28 06:28:31 -05:00
Rob Cutmore
4caf44f061
Remove unused code in apps/opencs/view/world/table files
2016-01-26 07:48:55 -05:00
Marc Zinnschlag
1b7a0e5d64
Merge branch 'buttons'
2016-01-26 11:32:26 +01:00
Marc Zinnschlag
1d0ef97bf6
added select all of same ID item to selection mode button menu
2016-01-26 11:31:37 +01:00
Marc Zinnschlag
d5ef40aeb7
minor improvements to wording of instance selection menu items
2016-01-26 10:51:47 +01:00
scrawl
aec8c38461
Move observer_ptr include where it belongs
2016-01-25 21:03:33 +01:00
scrawl
fc6fe9acfb
Do not crash ModVertexAlphaVisitor when there are no vertex colors
2016-01-25 18:52:20 +01:00
Marc Zinnschlag
a89859aeb7
Merge remote-tracking branch 't6/patch-freebsd'
2016-01-25 16:26:58 +01:00
Marc Zinnschlag
39e1b06101
fixed deletion of objects that are selected (was leaving a node behind)
2016-01-25 16:18:55 +01:00
Marc Zinnschlag
790367b980
fixed object removal via setting state to delete
2016-01-25 16:12:20 +01:00
Marc Zinnschlag
c1f0aa7260
added delete selection item to selection mode button menu
2016-01-25 14:55:02 +01:00
Tobias Kortkamp
0659687bfb
Some fixes for building on FreeBSD
2016-01-25 14:13:16 +01:00
Rob Cutmore
fbca094dda
Fix input validation in StartScriptCreator
2016-01-24 20:15:27 -05:00
Rob Cutmore
b93b97575e
Improve start script creation ( Fixes #3024 )
...
Improved start script creation by updating input to be a drop target
and adding auto-completion.
2016-01-24 11:54:53 -05:00
scrawl
b0431833a1
Fix some defects reported by Coverity CI
2016-01-21 16:08:04 +01:00
scrawl
f0971ee8ad
Implement Fixme script instruction
2016-01-20 04:07:07 +01:00
Alexander "Ace" Olofsson
338f0cf53d
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
2016-01-19 22:11:46 +01:00
scrawl
ce9a18fb87
Merge pull request #879 from jordan-ayers/bugfix/1544
...
Improve Drop Command - Bugfix/1544
2016-01-19 15:02:51 +01:00
Marc Zinnschlag
45e6974266
added select all and clear selection features
2016-01-19 14:25:20 +01:00
Marc Zinnschlag
4a02563708
Merge branch 'master' into buttons
...
Conflicts:
apps/opencs/view/render/instancemode.cpp
2016-01-19 13:59:24 +01:00
Marc Zinnschlag
ecbcd6b171
allow mode buttons to setup the context menu
2016-01-19 12:52:30 +01:00
Marc Zinnschlag
eee972a1a4
added scene tool mode context menu feature
2016-01-19 12:47:11 +01:00
Marc Zinnschlag
0305ae3693
added selection mode UI
2016-01-19 12:17:13 +01:00
Jordan Ayers
5699cf7f09
Barter: Leave unsold projectiles equipped.
2016-01-18 20:00:18 -06:00
Jordan Ayers
1ff49cc637
Improve Drop command behavior. ( Fixes #1544 )
2016-01-18 19:58:19 -06:00
Jordan Ayers
c82d9a1e87
Adjust ContainerStore / InventoryStore to allow partial unequip of items.
2016-01-18 19:56:35 -06:00
Aesylwinn
bbda5fe634
Removed hints from error messages and fixed naming to match conventions
2016-01-18 12:34:33 -05:00
Aesylwinn
1d86f705ba
gmst verifier
2016-01-17 21:55:03 -05:00
Rob Cutmore
08b469c0d0
Remove unused forward declarations in filedialog.hpp
2016-01-17 14:18:49 -05:00
Rob Cutmore
21d13a48fa
Make setup method of MainDialog class private
2016-01-16 06:43:45 -05:00
Marc Zinnschlag
ddb606a9fa
Merge remote-tracking branch 'rcutmore/cleanup-unused-code'
2016-01-16 10:54:16 +01:00
Rob Cutmore
a5411c1ec2
Remove unused code
2016-01-15 20:51:39 -05:00
mrcheko
b304e98568
implement ActionWeapon::getCombatRange (move logic from AiCombat)
2016-01-15 21:49:27 +03:00
scrawl
87beb73970
Correction
2016-01-15 16:34:57 +01:00
scrawl
fbf07133ea
Document usage of node masks
2016-01-15 16:31:24 +01:00
scrawl
18320b2cd0
Move the Button enum to WorldSpaceWidget
2016-01-15 15:49:10 +01:00
scrawl
41c571d4f4
Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
...
Conflicts:
apps/opencs/view/render/instancemode.cpp
2016-01-15 15:46:10 +01:00
Marc Zinnschlag
c1901069be
added instance mode sub-modes
2016-01-15 12:07:25 +01:00
scrawl
4f2a031f4e
Improve error message
2016-01-14 18:34:47 +01:00
scrawl
0b84b3c2cf
Don't crash when region weather chances don't add to 100
...
The invalid weather ID was resulting in out-of-bounds vector access later in the code.
2016-01-14 17:41:39 +01:00
scrawl
091ca9743e
Do not write LandData twice ( Fixes #3140 )
2016-01-14 16:41:50 +01:00
Marc Zinnschlag
e07be2d912
Merge branch 'drop'
2016-01-14 13:36:51 +01:00
Marc Zinnschlag
55627c0853
handling drops into cells that do not exist or are not shown
2016-01-14 13:20:01 +01:00
Marc Zinnschlag
6eba647a9d
added accessor function for cell selection in paged worldspace
2016-01-14 13:19:37 +01:00
Jordan Ayers
2ce2e8a1e7
Add missing OOB slot check to InventoryStore.
2016-01-12 21:35:23 -06:00
scrawl
ef1a1125e0
Fix an error in restocking logic ( Fixes #3131 )
2016-01-12 17:10:23 +01:00
scrawl
4e6a60672d
When a spell explodes on an actor do not apply it to that actor twice ( Fixes #3142 )
2016-01-12 00:40:09 +01:00
scrawl
458a305bff
OpenCS: add lighting mask
2016-01-11 23:14:43 +01:00
scrawl
7f967153ef
OpenCS: create light sources
2016-01-11 23:10:16 +01:00
scrawl
e7bb8878f3
OpenCS: add a mask for particle systems
2016-01-11 23:10:16 +01:00
scrawl
ad2145b463
OpenCS: use a separate enum for the toggle buttons
2016-01-11 23:10:16 +01:00
scrawl
3089aeccc4
Factor out SceneUtil::addLight
2016-01-11 23:10:16 +01:00
scrawl
438b30d6f0
Move configureLight to a separate file
2016-01-11 23:10:16 +01:00
scrawl
fb849014bd
Pass the fallback map to CSMWorld::Data
2016-01-11 23:10:16 +01:00
scrawl
11496b8075
Read fallback settings in OpenCS
2016-01-11 23:10:16 +01:00
scrawl
6546c05428
Move Fallback map to components/
2016-01-11 23:10:16 +01:00
scrawl
f315a4386f
Accept an implicit reference in Journal ( Fixes #3135 )
2016-01-11 23:07:01 +01:00
scrawl
ef20962fc5
Disable fog of war rendering on the HUD map by default
2016-01-11 22:58:08 +01:00
scrawl
ca4e859f61
Remove unused argument
2016-01-11 22:58:01 +01:00
scrawl
4690fd3f22
Change the local map exploration radius to better match the original engine
2016-01-11 22:57:57 +01:00
scrawl
4f8f166f69
Fix GetPcInJail to work as in the original engine
2016-01-11 22:57:25 +01:00
scrawl
190bf15887
SettingsWindow: support auto-updating of slider labels through the layout file
2016-01-11 22:57:16 +01:00
Marc Zinnschlag
5b9d6cce98
made drop distance configurable
2016-01-11 09:03:02 +01:00
Marc Zinnschlag
7dd7be7f0e
make scenes drop target for referenceables
2016-01-10 08:56:15 +01:00
Marc Zinnschlag
466f91db67
Fixed wrong GMST name for newly created game files ( Fixes #3132 )
2016-01-06 13:10:09 +01:00
scrawl
745b29a995
Remove a debugging leftover
2016-01-05 17:01:21 +01:00
scrawl
d9d6228c94
Implement PageDisplay::_updateView ( Fixes #3125 )
2016-01-05 16:54:09 +01:00
scrawl
5952498e9e
Explicitely cast a size_t to int
2016-01-05 16:53:51 +01:00
scrawl
446c714727
Fix a possible memory leak in error case
2016-01-04 20:39:08 +01:00
scrawl
e6619c5306
Rebuild actor animations on resurrection ( Fixes #3124 )
...
A new animation is necessary to set up the correct InventoryStore listener, to get notified of changes like the actor no longer being a werewolf, etc.
2016-01-04 20:27:38 +01:00
scrawl
daa94cc50e
Fix cppcheck warnings
2016-01-03 20:19:38 +01:00
mrcheko
bcb1f4ed05
refactor AiCombat: remove all pathfinding code, adopt new version of
...
AiPackage::pathTo;
fix couple of warnings;
2016-01-03 15:33:52 +03:00
Poncho
b1020dcd42
Use correct direction multipliers during awareness check
2016-01-02 12:24:39 -06:00
scrawl
1905f0bf2d
Add support for placing BodyParts in a cell (Bug #3118 )
2016-01-02 01:30:06 +01:00
scrawl
a9f0f30bb8
Reject conditions testing agaist Choice when not currently in a choice ( Fixes #3117 )
2016-01-01 23:55:52 +01:00
mrcheko
b960b0af93
rewrite pathTo for clearer logic; reapply Scrawl's aifollow threshold
2016-01-01 16:41:45 +03:00
scrawl
0333c40047
Fix typo in SameRace dialogue function (function was inverted, Fixes #3116 )
2016-01-01 02:59:55 +01:00
scrawl
6fde02ea42
LocalScripts: initialize mIter
2016-01-01 02:59:55 +01:00
scrawl
7f7e8c63bf
Correct path to gamecontrollerdb.txt ( Fixes #3112 )
2015-12-31 00:37:47 +01:00
mrcheko
d7d5cc6689
Merge remote-tracking branch 'upstream/master' into pathfinding
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aifollow.cpp
apps/openmw/mwmechanics/aipackage.cpp
apps/openmw/mwmechanics/aipackage.hpp
apps/openmw/mwmechanics/aiwander.cpp
apps/openmw/mwmechanics/pathfinding.hpp
Ogre::Vector3->osg::Vec3f; REACTION_INTERVAL->AI_REACTION_TIME; MakeOgreVec3->MakeOsgVec3
2015-12-29 19:15:40 +03:00
scrawl
63b9b075aa
Do not allow soul trapping the same creature more than once ( Fixes #3102 )
2015-12-26 18:47:22 +01:00
scrawl
0bec6e5fbe
Fix 'failed to find animation' warnings when a spell was equipped before the werewolf transformation
2015-12-26 18:45:09 +01:00
scrawl
6b67911658
Unset DrawState_Spell when becoming a werewolf
2015-12-26 18:26:55 +01:00
scrawl
f052c05018
Move werewolf functions from World to MechanicsManager
2015-12-26 18:23:13 +01:00
scrawl
53334d08a2
Disable Ready Magic and Cycle Weapon/Spell hotkeys for werewolves ( Fixes #3100 )
2015-12-26 18:15:57 +01:00
Alexander "Ace" Olofsson
d3da51bbb2
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
2015-12-26 00:30:51 +01:00
scrawl
a1e163ed20
Correct an error in the timestamp subtracting logic ( Fixes #3105 )
2015-12-26 00:26:13 +01:00
Alexander "Ace" Olofsson
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
2015-12-24 11:27:02 +01:00
Alexander "Ace" Olofsson
2142d0d2d6
Make Qt5 happy
2015-12-24 02:48:00 +01:00
Marc Zinnschlag
2162f21550
Merge branch 'drop'
2015-12-20 10:18:05 +01:00
Aesylwinn
9bd14215d7
Expanded inventory check to creatures and NPCs
2015-12-19 22:02:39 -05:00
Aesylwinn
4c14117761
Added checks to verifier for container inventories
2015-12-19 20:03:00 -05:00
scrawl
db7b80b503
Revert "Accept a ConstPtr in ItemPtr tooltips"
...
This reverts commit 41c8ec56e0
2015-12-19 22:52:35 +01:00
scrawl
2176ac592c
Call updateDialogueGlobals before dialogue starts ( Fixes #3034 )
2015-12-19 21:58:49 +01:00
scrawl
5ac226f519
Another collision mask fix
2015-12-19 17:02:57 +01:00
scrawl
e5d9ee30f4
Add count argument to copyObjectToCell
...
Fixes the gold bug introduced in c9ca5bc946
2015-12-19 16:48:32 +01:00
scrawl
41c8ec56e0
Accept a ConstPtr in ItemPtr tooltips
2015-12-19 16:37:26 +01:00
scrawl
5a7bbbd508
Accept a ConstPtr in ToolTips::setFocusObject
2015-12-19 16:34:26 +01:00
scrawl
32d5dece58
Add count argument to getToolTipInfo
2015-12-19 16:29:07 +01:00
scrawl
0d4729dcd5
Use the const version of CustomData::as*
2015-12-19 16:19:52 +01:00
scrawl
16e3699739
Fix collision mask in castSphere
2015-12-19 16:18:12 +01:00
scrawl
b0894ea20d
Accept a ConstPtr in hasToolTip
2015-12-19 16:15:45 +01:00
scrawl
29d0f448b4
Add const version of World::getAnimation
2015-12-19 16:15:45 +01:00
scrawl
51c77c5045
Accept a ConstPtr in getDoorState
2015-12-19 16:15:45 +01:00
scrawl
7a2ca5580a
Accept a ConstPtr in RippleSimulation
2015-12-19 15:51:41 +01:00
scrawl
53f4b92426
AiEscort do not follow target through doors
...
Testing revealed a problem where the guard on the prison ship would incorrectly follow the player outside. Upon further investigation in vanilla MW, it appears that with AiEscort the actor only follows the target through doors once the AiEscort package has completed, *and* no new AI package is running yet.
2015-12-19 15:15:44 +01:00
scrawl
2c51e7345f
Use a separate collision type for doors ( Fixes #1962 )
2015-12-18 18:32:42 +01:00
scrawl
604b5d24e9
Use a ConstPtr in SoundManager
2015-12-18 18:11:30 +01:00
scrawl
a0fb31e3b1
Accept a ConstPtr in getLOS
2015-12-18 18:03:47 +01:00
scrawl
029d467ea5
Accept a ConstPtr in getItemsOwnedBy, getContainersOwnedBy
2015-12-18 18:00:18 +01:00
scrawl
388aed1748
Accept a ConstPtr in findContainer, collision script functions, getUnderwater functions
2015-12-18 17:56:48 +01:00
scrawl
ed101ad35a
Remove redundant getPlayerAnimation function
2015-12-18 17:44:57 +01:00
scrawl
c9ca5bc946
Accept a ConstPtr in placeObject
2015-12-18 17:42:59 +01:00
scrawl
6c505ca06f
Accept a ConstPtr in getHitContact
2015-12-18 17:38:21 +01:00
scrawl
0796f49c17
Accept a ConstPtr in various physics getters
2015-12-18 17:36:14 +01:00
scrawl
795032621c
Use a ConstPtr for the ActorMap and ObjectMap
2015-12-18 17:30:39 +01:00
scrawl
7a8a7e3dd6
Add const version of getAnimation
2015-12-18 17:21:51 +01:00
scrawl
7a4aac1842
Use a ConstPtr for the PtrAnimationMap
2015-12-18 17:20:29 +01:00
scrawl
553132cb51
Accept a ConstPtr in launchProjectile
2015-12-18 17:13:54 +01:00
scrawl
8f9fc87565
Accept a ConstPtr in LocalScripts::setIgnore
2015-12-18 17:09:11 +01:00
scrawl
1212c07266
Pass a string by reference
2015-12-18 17:08:26 +01:00
scrawl
f35ab12979
Accept a ConstPtr in InventoryStore::isEquipped
2015-12-18 17:06:58 +01:00
scrawl
3856f931db
Accept a ConstPtr in ContainerStore::addNewStack
2015-12-18 17:04:54 +01:00
scrawl
e1c6261fee
Accept a ConstPtr in ContainerStore::getType
2015-12-18 17:03:49 +01:00
scrawl
edde5bd065
Accept a ConstPtr in ContainerStore::stacks
2015-12-18 17:01:21 +01:00
scrawl
04f7a8f8eb
Remove redundant getId function
2015-12-18 16:58:38 +01:00
scrawl
266fbbef48
Accept a ConstPtr in canLock
2015-12-18 16:50:32 +01:00
scrawl
c43f80633a
Accept a ConstPtr in getEnchantmentPoints
2015-12-18 16:48:19 +01:00
scrawl
303521002d
Accept a ConstPtr in adjustScale
2015-12-18 16:46:02 +01:00
scrawl
09bdb0ad4b
Accept a ConstPtr in getServices
2015-12-18 16:44:35 +01:00
scrawl
648ee6e7fb
Accept a ConstPtr in applyEnchantment
2015-12-18 16:43:11 +01:00
scrawl
3c98f8dde3
Accept a ConstPtr in isPersistent
2015-12-18 16:41:37 +01:00
scrawl
3fe3091275
Accept a ConstPtr in isEssential
2015-12-18 16:39:35 +01:00
scrawl
4a47fc32fa
Accept a ConstPtr in getBloodTexture
2015-12-18 16:39:08 +01:00
scrawl
2bd8d60e9f
Accept a ConstPtr in getPrimaryFaction, getPrimaryFactionRank
2015-12-18 16:33:54 +01:00
scrawl
2ac92012e8
Accept a ConstPtr in isClass
2015-12-18 16:29:30 +01:00
scrawl
5b082be79f
Accept a ConstPtr in getBaseGold
2015-12-18 16:28:20 +01:00
scrawl
da7ebfde99
Accept a ConstPtr in copyToCell
2015-12-18 16:27:18 +01:00
scrawl
954186fe1e
Accept a ConstPtr in canFly, canSwim & canWalk
2015-12-18 16:27:18 +01:00
scrawl
b09bdd6af5
Accept a ConstPtr in isBipedal
2015-12-18 16:27:18 +01:00
scrawl
92a3acfa56
Accept a ConstPtr in getBaseFightRating
2015-12-18 16:12:35 +01:00
scrawl
d120f76031
Accept a ConstPtr in getSound
2015-12-18 16:11:03 +01:00
scrawl
d77f785cbc
Accept a ConstPtr in get*SoundId
2015-12-18 16:09:54 +01:00
scrawl
dc92fefd2b
Accept a ConstPtr in canBeEquipped, getEquipmentSlots & hasItemHealth
2015-12-18 16:06:31 +01:00
scrawl
e0bb284804
Accept a ConstPtr in getWeight
2015-12-18 16:00:50 +01:00
scrawl
0047a2d330
Accept a ConstPtr in canSell
2015-12-18 15:58:45 +01:00
scrawl
2bc851c7d3
Accept a ConstPtr in getEnchantment
2015-12-18 15:56:45 +01:00
scrawl
beb8805a12
Accept a ConstPtr in getInventoryIcon
2015-12-18 15:53:47 +01:00
scrawl
f258c5c508
Accept a ConstPtr in getModel
2015-12-18 15:51:05 +01:00
scrawl
d9bbd83b09
Accept a ConstPtr in getToolTipInfo
...
Accept a ConstPtr in functions used by getToolTipInfo
2015-12-18 15:47:16 +01:00
scrawl
d3d6a69eea
Merge pull request #862 from scrawl/const
...
ConstPtr
2015-12-18 15:20:34 +01:00
scrawl
bc50587e71
Remove comment
2015-12-18 14:33:15 +01:00
Marc Zinnschlag
102397067c
added interface for per edit-mode drop handling
2015-12-18 14:04:53 +01:00
Marc Zinnschlag
37a72d1ea6
reject unsuitable drops to WorldspaceWidget earlier
2015-12-18 12:38:45 +01:00
scrawl
b2add6470b
Missing include fix
2015-12-18 02:58:38 +01:00
scrawl
1c8244276d
Exception handling improvements (Bug #3090 )
2015-12-18 02:36:34 +01:00
scrawl
a344183247
Comment fix
2015-12-18 02:34:42 +01:00
scrawl
ed3486e816
Improve const-correctness in writeAdditionalState
2015-12-18 00:19:06 +01:00
scrawl
b48445dea7
Accept a ConstPtr in getScript
2015-12-18 00:12:03 +01:00
scrawl
eb51e2838f
Utilize the mHasCustomData flag in writeAdditionalState
2015-12-18 00:07:40 +01:00
scrawl
19d87c78f2
Add CellStore::forEachConst
2015-12-17 23:59:18 +01:00
scrawl
d4eba794c3
Add ConstPtr
2015-12-17 23:34:52 +01:00
scrawl
c9d02c67c0
Remove unneeded const_cast in TerrainStorage
2015-12-17 23:33:47 +01:00
scrawl
2fe2f53b02
Set the changed flag in CellStore::search ( Fixes #3089 )
2015-12-17 22:37:41 +01:00
scrawl
04b6571d7d
Fix logic for scripting access of deleted objects
2015-12-17 20:34:50 +01:00
scrawl
e564c26314
Fix deleted objects being accessible in the Cells cache
2015-12-17 20:18:15 +01:00
scrawl
deb7f3caf6
Print deletion state in ObjectReferenceInfo
2015-12-17 20:17:38 +01:00
scrawl
689dea4cb3
Add instant spell effects to the actor's magic effect list
...
Via http://forum.openmw.org/viewtopic.php?f=2&t=3212&start=20#p36208
2015-12-17 19:49:37 +01:00
scrawl
d6bcb7906d
Fix crash in a warning message
2015-12-17 16:11:20 +01:00
Marc Zinnschlag
6b626c2954
spelling fixes
2015-12-17 13:06:37 +01:00
scrawl
fce43854bc
Fix last commit
2015-12-17 03:50:15 +01:00
scrawl
0a723ab075
Animation: do not assume the object root is a Group
2015-12-17 03:48:11 +01:00
scrawl
31c3324705
Don't assume the emitter node is a Group ( Fixes #3082 )
...
This would be a correct assumption by default, but is no longer true when the NifLoader::optimize() function optimizes the graph.
2015-12-17 03:38:26 +01:00
scrawl
8222c78cf2
Do not filter creature dialogue by NPC-only conditions ( Fixes #3086 )
2015-12-16 01:30:04 +01:00
scrawl
d5a2586f38
LoadingScreen: add support for important labels
...
Used in saveGame so the player can be sure whether or not the game was saved.
Fixes #3074
2015-12-15 21:16:20 +01:00
scrawl
67883feaae
LoadingScreen: ensure values are within progress range
2015-12-15 21:05:35 +01:00
scrawl
625644e917
LoadingScreen: documentation updates
2015-12-15 21:03:56 +01:00
scrawl
152f1d625d
LoadingScreen: remove unused declarations
2015-12-15 20:54:21 +01:00
scrawl
ccbba5e926
LoadingScreen: remove indicateProgress, not used
2015-12-15 20:52:23 +01:00
scrawl
375caf037d
Don't applyInstantEffect when magnitude is zero
2015-12-15 20:46:05 +01:00
scrawl
4af376133b
Don't tick effects when duration is zero
2015-12-15 20:41:00 +01:00
scrawl
6ee7c61667
CSMPrefs: fix deadlock in toColor()
2015-12-15 19:33:28 +01:00
scrawl
4553db7b43
Merge pull request #861 from scrawl/soundcrash
...
Fix crash when running out of sound sources
2015-12-15 18:23:03 +01:00
scrawl
6a749e77f2
Fix crash when running out of sound sources
2015-12-15 15:12:48 +01:00
Marc Zinnschlag
9c7bbd667b
Merge branch 'usersettings'
2015-12-15 14:58:04 +01:00
Marc Zinnschlag
be19da189a
fixed user settings not being saved when last document window is closed while user settings window is still open
2015-12-15 14:56:29 +01:00
Marc Zinnschlag
d6bd2cb1f0
changed name of openmw-cs user settings file
2015-12-15 14:51:25 +01:00
Marc Zinnschlag
c646533448
removed old user settings system
2015-12-15 12:49:55 +01:00
Marc Zinnschlag
67cf260144
final batch of changing over user settings usage to the new system
2015-12-15 12:44:04 +01:00
Marc Zinnschlag
44925e9fc8
fixed records settings (Text Only wasn't updating)
2015-12-15 12:26:08 +01:00
Marc Zinnschlag
591564566c
made user settings access thread-safe
2015-12-15 12:19:48 +01:00
Marc Zinnschlag
ecbd68a19b
third batch of changing over user settings usage to the new system
2015-12-15 10:40:00 +01:00
Chris Robinson
cddea4a99c
Start underwater sound after updating sounds
...
In between the startUpdate/finishUpdate calls, changes are deferred so that
they can happen all at once. This includes starting sounds, so when the
underwater sound is started it will be immediately checked to see if it's
playing. Since it's not yet playing, it'll be seen as stopped and get cleaned
up before ever playing.
2015-12-14 14:05:01 -08:00
Marc Zinnschlag
a3a2c2f476
second batch of changing over user settings usage to the new system
2015-12-14 17:38:33 +01:00
Marc Zinnschlag
346052a67a
Merge remote-tracking branch 'scrawl/containerscript_fix'
2015-12-14 14:19:05 +01:00
scrawl
572786bff2
Instant effects that were added by a permanent ability are applied every frame
...
Via http://forum.openmw.org/viewtopic.php?f=2&t=3212&p=36120#p36121
2015-12-14 03:27:49 +01:00
scrawl
271fcb80c6
Remove container scripts before deleting container
2015-12-14 02:57:55 +01:00
Chris Robinson
8c364cd818
Remove left over declaration
2015-12-13 17:13:36 -08:00
Chris Robinson
12eda97e64
Merge remote-tracking branch 'main/master'
2015-12-13 17:06:04 -08:00
Chris Robinson
f1faeeae3a
Use separate config options for min and mag texture filters
2015-12-13 17:05:19 -08:00
scrawl
2737aabe93
Pc functions apply to creature dialogue ( Fixes #3078 )
2015-12-14 01:52:13 +01:00
Chris Robinson
5c0a847eaf
Combine some duplicate code
2015-12-13 16:51:27 -08:00
scrawl
fb9f5f8fe8
Fix typo
2015-12-14 01:36:53 +01:00
Chris Robinson
b830a413d3
Rename the texture filter options
...
To avoid compatibility issues with upgrading from or downgrading to older
builds.
2015-12-13 16:02:09 -08:00
Chris Robinson
646092ce3a
Add warnings when loading unknown texture options
2015-12-13 15:20:59 -08:00
Chris Robinson
fb6abb53ae
Simplify the in-game texture options
...
This makes it behave like it originally did, although the config options remain
expanded.
2015-12-13 15:02:36 -08:00
Chris Robinson
76bde5ee13
Separate and expand texture filtering options
2015-12-13 11:25:01 -08:00
scrawl
a7e0562e1c
Fix improper handling of multiple AiFollow packages with the same target ( Fixes #3077 )
2015-12-13 17:42:11 +01:00
scrawl
64424e7262
Move keyframe loading out of SceneManager to new KeyframeManager
2015-12-13 15:31:07 +01:00
scrawl
359b0b3772
Rename for clarity
2015-12-12 22:37:23 +01:00
scrawl
18cce3a6f9
Don't reset delete flag when loading reference from a save game ( Fixes #2724 )
2015-12-12 22:34:59 +01:00
scrawl
850092a5e5
Store: be consistent about struct / class usage
...
Don't inherit a struct from a class, and vice versa.
2015-12-12 22:34:59 +01:00
Marc Zinnschlag
cf9fa0e0e9
first batch of changing over user settings usage to the new system
2015-12-12 14:49:16 +01:00
Marc Zinnschlag
0ffe4290fb
workaround for MOC's lack of namespace awareness
2015-12-12 12:05:56 +01:00
Marc Zinnschlag
04a11679fb
added category update function
2015-12-12 11:58:53 +01:00
Chris Robinson
f47f0a996f
Stop the object's old say sound before playing the new one
2015-12-11 15:49:45 -08:00
Chris Robinson
7fc2df153a
Rename stopSound/stopStream to finishSound/finishStream
...
Since they're also used to clean up output resources, not just stopping.
2015-12-11 15:13:14 -08:00
scrawl
cc2315a0de
Minor fix
2015-12-11 16:59:13 +01:00
scrawl
b856460f86
ESMStore: fill mIds in setUp()
2015-12-11 16:55:28 +01:00
scrawl
ed27f0da25
Merge pull request #854 from kcat/master
...
Play NPC voices from the head position
2015-12-11 16:21:06 +01:00
Marc Zinnschlag
3a5238bebc
changed the settingChanged signature to accommodate queued connections
2015-12-11 12:06:20 +01:00
Marc Zinnschlag
8245b9e439
added interface for querying settings
2015-12-11 11:50:06 +01:00
Marc Zinnschlag
31b105ad9e
improved settings layout
2015-12-11 11:32:55 +01:00
Marc Zinnschlag
a907b4ab15
made Setting class non-abstract
2015-12-11 11:22:15 +01:00
Marc Zinnschlag
73ffdd5ac5
added colour settings
2015-12-11 11:15:14 +01:00
Chris Robinson
808f701013
Use the actor's Head position for Say streams
2015-12-10 17:48:45 -08:00
Chris Robinson
a47bdecac7
Add missing include
...
Since Ptr is used directly in the header, a forward declaration isn't good
enough.
2015-12-10 17:47:55 -08:00
Chris Robinson
a00a4bce77
Avoid some unnecessary indirection
2015-12-10 16:33:27 -08:00
scrawl
f1f82af64e
Fix improper swimming animations in first person mode
2015-12-11 01:24:42 +01:00
Marc Zinnschlag
590d6eba9b
added enum settings
2015-12-10 17:33:14 +01:00
Marc Zinnschlag
8050eba83b
added a few comments
2015-12-10 13:33:44 +01:00
Marc Zinnschlag
b0fb6d56f1
added bool settings
2015-12-10 13:28:48 +01:00
Marc Zinnschlag
9ca5a1b647
added double settings
2015-12-10 10:58:38 +01:00
scrawl
9bc6f2d5f6
Fix water ripples
2015-12-09 20:35:51 +01:00
scrawl
57b7cac13f
Merge pull request #850 from MatthewRock/fix-2952-2
...
Fix for bug #2952 : Enchantment Merchant Items reshuffled EVERY time 'barter' is clicked
2015-12-09 20:12:45 +01:00
MatthewRock
ddd4004c95
Fix: remove space
2015-12-09 18:26:33 +01:00
MatthewRock
3b254ad631
Allows the same item to have multiple ancestors
2015-12-09 18:24:35 +01:00
scrawl
a8c287c831
Print detected game controllers to the log file
2015-12-09 14:33:02 +01:00
scrawl
bdae572264
Merge pull request #840 from scrawl/movedrefs
...
Object movement between cells
2015-12-09 14:10:57 +01:00
scrawl
6f98982bc2
Make sure that health is >= 1 when resurrecting the player ( Fixes #2972 )
2015-12-09 01:52:20 +01:00
scrawl
05f1fbf593
WindowManager: explicitely pass the ESMStore
...
Fixes potential crash when the loading screen layout tries to retrieve a GMST value via #{GMST} syntax before the World has been created.
Possibly related to Bug #2854 .
2015-12-09 01:09:09 +01:00
scrawl
a699b4128a
Add isInCell checks to PlaceAt and PlaceItem ( Fixes #2873 )
...
Avoids the game crashing when a script calls these functions before the player has been moved to the starting location.
2015-12-09 00:49:50 +01:00
scrawl
34f48d63f3
Apply spell absorption once per effect ( Fixes #2942 )
2015-12-09 00:35:54 +01:00
scrawl
bc1f7499ab
Do not allow deleting the player object ( Fixes #2982 )
2015-12-09 00:26:39 +01:00
MatthewRock
b0e6a52595
Replace ancestor with parent
2015-12-08 22:45:16 +01:00
MatthewRock
aa721fe1f6
Fix bug 2952 with merchant and levelled items
2015-12-08 22:39:11 +01:00
scrawl
2f9b404094
InstallationPage: properly exit the QThread ( Fixes #2210 )
2015-12-08 21:41:35 +01:00
scrawl
1264651af7
Fix coverity defects
2015-12-08 21:12:05 +01:00
Marc Zinnschlag
c61d717e41
added integer settings
2015-12-08 17:21:58 +01:00
scrawl
e69750905a
Fix gcc warning about function casts
2015-12-08 16:51:50 +01:00
scrawl
bd68ebac62
GetEffect fix
2015-12-08 15:24:02 +01:00
scrawl
3890afd6f5
Merge pull request #843 from kcat/master
...
Add HRTF options and fix an incorrect SoundID
2015-12-08 13:59:15 +01:00
Marc Zinnschlag
c158224314
fixed a faulty include
2015-12-08 12:09:53 +01:00
Marc Zinnschlag
5e40b4d2e8
page switching mechanism
2015-12-08 12:04:45 +01:00
Marc Zinnschlag
0dc3d10112
some simplification
2015-12-08 09:56:42 +01:00
Marc Zinnschlag
071ba3a4df
Merge remote-tracking branch 'scrawl/werewolf'
2015-12-08 09:28:35 +01:00
scrawl
07b064f616
Rename to lowerCaseInPlace
2015-12-07 22:49:15 +01:00
scrawl
e3d3380c8c
Remove return value for in-place toLowerStr
2015-12-07 22:43:08 +01:00
scrawl
4dd4c5394b
Broken lower-casing fix
2015-12-07 22:30:37 +01:00
scrawl
42d68eb7fb
Build fix
2015-12-07 22:29:57 +01:00
scrawl
f875597be5
Don't use tolower()
...
See https://forum.openmw.org/viewtopic.php?f=8&t=3231&p=35968
2015-12-07 21:58:30 +01:00
scrawl
1a654fa451
Reset locale after strftime() call
2015-12-07 21:24:30 +01:00
scrawl
152f415b9a
Change texture coordinates when falling back to player_hit_01
2015-12-07 18:32:58 +01:00
scrawl
998ef36837
Setting fix
2015-12-07 18:04:23 +01:00
scrawl
e520d37c87
Override the field of view for first person meshes ( Fixes #858 , Fixes #3051 )
2015-12-07 16:29:30 +01:00
scrawl
9621b66b78
Move field of view setting to Camera section
2015-12-07 16:23:06 +01:00
scrawl
136a425cec
Use the Werewolf field of view override ( Fixes #3064 )
...
Need to re-run the settings importer for the feature to work.
2015-12-07 16:11:47 +01:00
scrawl
9d4af59860
Don't attempt to create quest log buttons if textures are unavailable ( Fixes #3063 )
2015-12-07 15:33:04 +01:00
scrawl
5981e1cbb3
Don't create the werewolf overlay if its texture is not available
...
Avoiding a warning in the log when Bloodmoon is not installed
2015-12-07 14:41:33 +01:00
scrawl
621347b20f
Remove moved ref handling from listRefs()
...
Not needed since we now load cells when a reference is moved there.
2015-12-07 03:55:26 +01:00
scrawl
1875aa4a18
Restore getNearbyDoor
2015-12-07 03:53:46 +01:00
scrawl
f9dd549bff
Restore FindContainerVisitor
2015-12-07 03:47:40 +01:00
scrawl
1f543b4d79
Apply the AiTravel maxRange to AiEscort as well ( Fixes #2697 )
2015-12-07 00:26:17 +01:00
scrawl
65b5cbe3f7
AiEscortCell complains if no cell was given or cell does not exist
2015-12-06 23:42:58 +01:00
scrawl
965bea45c0
AiEscort makes the actor side with target in fights (Bug #2697 )
...
Also will follow the player through teleport doors.
2015-12-06 23:38:51 +01:00
scrawl
4e678ce6b3
Handle mCellId in AiEscort
2015-12-06 23:38:51 +01:00
scrawl
45a609bc54
Improve PositionCell warning message
2015-12-06 22:37:04 +01:00
scrawl
4b0ecaa0a0
Fix physics bug
2015-12-06 22:10:01 +01:00
scrawl
51b892195b
Restore getReadOnlyDoors()
2015-12-06 21:58:25 +01:00
scrawl
abcf91be5b
Port over more game logic to the visitor pattern
2015-12-06 20:43:50 +01:00
scrawl
9ea475d00c
Port LocalScripts::addCell to new CellStore interfaces
2015-12-06 20:33:22 +01:00
scrawl
a517f4f9ba
Add CellStore::forEachType to help with porting over game logic to the new interfaces
2015-12-06 20:32:39 +01:00
scrawl
0af33b5abd
Throw exception if moveTo() is passed an object not part of *this
2015-12-06 20:05:13 +01:00
scrawl
176a3c16f4
Resolve moved references loaded from a save game
2015-12-06 20:00:24 +01:00
scrawl
671561ea37
Write moved references to the save game file (not resolved on loading yet)
2015-12-06 19:11:25 +01:00
scrawl
2219231230
Missing updateMergedRefs()
2015-12-06 18:46:49 +01:00
scrawl
138957c49a
Special case objects with no refnum
2015-12-06 18:43:52 +01:00
scrawl
5e99a3eda6
Rename CellStore Functor to Visitor
2015-12-06 18:13:04 +01:00
scrawl
2301080c63
Load CellStore when an object is moved there
2015-12-06 18:04:48 +01:00
scrawl
811df1e97b
Pass the ESM reader list to CellStore constructor
2015-12-06 18:03:55 +01:00
Paul Cercueil
0765ff3ba2
mwrender: Add missing includes
...
Those missing includes were causing the build to fail when compiled with
USE_GLES set.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2015-12-06 16:01:21 +01:00
Marc Zinnschlag
b37a2ac09c
user settings categories
2015-12-06 12:06:28 +01:00
Marc Zinnschlag
36ce8f97d7
basic framework for new user settings system
2015-12-06 11:18:31 +01:00
Chris Robinson
91cd6be11b
Use the correct SoundId for NPC "land" sounds
2015-12-05 18:00:28 -08:00
Chris Robinson
c75303b652
Add an option to select and enable HRTF
2015-12-05 17:14:53 -08:00
Marc Zinnschlag
03a0b1fbfd
Merge remote-tracking branch 'origin/master'
2015-12-05 15:41:20 +01:00
scrawl
53158d29b1
stopSound crash fix
2015-12-05 01:54:16 +01:00
scrawl
66bcd2fd68
Write save games to a memory stream first
...
Two motivations for doing this:
- If the user chooses to overwrite existing save file, and there is an exception during the save process, the existing file will not be lost.
- Many small writes to a file are slow. Very slow. Writing to memory first then writing the completed file to disk appears to be ~500% faster.
2015-12-05 01:15:54 +01:00
scrawl
67a6a8f5d4
Make projectiles receive lighting
2015-12-05 00:44:18 +01:00
scrawl
6181594251
Disable freezeOnCull for magic projectile particles
2015-12-05 00:33:01 +01:00
scrawl
a8938589f6
Magic projectiles rotate during flight
2015-12-05 00:33:01 +01:00
scrawl
3f93af4181
Projectiles interact with the water surface ( Fixes #2986 )
2015-12-04 23:28:11 +01:00
scrawl
3dcefd17fc
Fix CellStore::count()
2015-12-04 20:03:14 +01:00
scrawl
3aa53f3cb4
Object cell movement tracker works. Savegame handling is still missing and some game functionality is still stubbed out.
2015-12-04 19:46:02 +01:00
scrawl
64b4926127
Add reference moving logic - untested
2015-12-04 18:29:41 +01:00
scrawl
7a983340bf
Add comment
2015-12-04 18:29:41 +01:00
scrawl
fc449233be
Restore support for inserting objects into a cell
2015-12-04 18:29:41 +01:00
scrawl
0975f60d59
Stub out CellStore::get<T> accessors in preparation of reference movement between cells
2015-12-04 18:29:41 +01:00
Marc Zinnschlag
49b37ce8bf
Merge remote-tracking branch 'scrawl/geteffect'
2015-12-04 10:42:22 +01:00
scrawl
8e9571d155
Double buffer the light StateAttributes and StateSets
...
Fixes a race condition where the position of a light could jump a frame ahead.
2015-12-04 00:06:22 +01:00
scrawl
f22982d251
Merge pull request #835 from sandstranger/opengles1
...
enable opengl es1
2015-12-03 21:25:00 +01:00
scrawl
5f349b9a6e
Support effects with attribute/skill argument in OpGetEffect
2015-12-03 21:12:58 +01:00
scrawl
1ec338f19d
Don't attempt to load external keyframes for non-NIF files
2015-12-03 20:11:28 +01:00
scrawl
795f6d77f2
Cache the Animation's Skeleton
2015-12-03 20:06:00 +01:00
Marc Zinnschlag
e0c9265148
Merge remote-tracking branch 'origin/master'
2015-12-03 15:56:24 +01:00
scrawl
389b168d5f
Restore OpGetWaterLevel to vanilla behaviour
2015-12-03 15:48:27 +01:00
scrawl
d0c6b407b4
Fix isUnderwater checks being off by one for exterior cells
2015-12-03 15:16:50 +01:00
scrawl
86881bcf39
In first person mode, attach sound listener to the camera
2015-12-03 15:16:20 +01:00
sandstranger
238a5824be
add custom new variable fot Qt
2015-12-03 08:54:14 +03:00
Chris Robinson
f19f1c47c8
Fix playing pending voices without a Ptr
2015-12-02 16:09:25 -08:00
Chris Robinson
2face3d0a9
Combine duplicate code
2015-12-02 16:09:25 -08:00
Chris Robinson
1407366e51
Use a premade SoundStream object for the output's streamSound functions
2015-12-02 16:09:25 -08:00
Chris Robinson
2ee3265b66
Use a premade Sound object for the output's playSound functions
2015-12-02 16:09:25 -08:00
Chris Robinson
53718a5ca0
Use a typedef for the sound instance handle
2015-12-02 16:09:25 -08:00
Chris Robinson
3a39a92b93
Keep track of audio tracks
2015-12-02 16:09:24 -08:00
Chris Robinson
2883cdba5c
Initialize the Sound object before modifying the pitch variable
2015-12-02 16:09:24 -08:00
Chris Robinson
a6db96b2d8
Update sound and stream parameters
2015-12-02 16:09:24 -08:00
Chris Robinson
4bd235284b
Rename a couple members to avoid confusion
2015-12-02 16:09:24 -08:00
Chris Robinson
1ce3e7f5b9
Use a separate type for streams
...
They're basically the same, but it's to help avoid accidents with passing non-
streaming sounds to the stream functions, or vice-versa.
2015-12-02 16:09:24 -08:00
Chris Robinson
816015d6e6
Avoid inheriting from Sound for sound types
2015-12-02 16:09:24 -08:00
sandstranger
b0b3192520
delete bad symbol
2015-12-02 22:50:54 +03:00
sandstranger
bd5057aa3c
enable opengl es1
2015-12-02 22:40:04 +03:00
scrawl
3d12b2ca9d
Add NifFileManager to avoid duplicate parsing of the NIFFile in SceneManager and BulletShapeManager.
2015-12-02 14:59:32 +01:00
scrawl
c912310c52
Don't add persuasion results to the journal
2015-12-01 16:16:21 +01:00
scrawl
2327a41826
Fix journal freeze
2015-12-01 16:09:05 +01:00
scrawl
ba5433391f
Merge pull request #831 from ace13/win-fix
...
Fix windows builds
2015-12-01 01:03:16 +01:00
Alexander "Ace" Olofsson
24340bff95
Add a space
2015-11-30 17:47:36 +01:00
Alexander "Ace" Olofsson
6823298516
Different way to solve the type deduction issue
2015-11-30 17:42:25 +01:00
Alexander "Ace" Olofsson
a69e751089
Revert "Fix windows builds"
...
This reverts commit b085c09f86
2015-11-30 17:38:46 +01:00
scrawl
f5f3d18b8e
Add comment
2015-11-30 17:19:27 +01:00
scrawl
576d5111a5
Prefer Intersector::PROJECTION over Intersector::WINDOW
2015-11-30 17:04:45 +01:00
scrawl
14b143231c
Don't crash OpGetTarget when the target disappeared ( Fixes #3048 )
2015-11-30 15:26:43 +01:00
Alexander "Ace" Olofsson
b085c09f86
Fix windows builds
...
Can't instantiate a container (at least with MSVC) without knowing the exact size of the object being stored, forward-declares only work with pointers.
I couldn't see a simple way to remove the forward declare, so pointers and memory management it is.
2015-11-30 13:36:15 +01:00
Marc Zinnschlag
3a81bed001
Merge remote-tracking branch 'origin/master'
2015-11-30 12:12:18 +01:00
Marc Zinnschlag
7cc8fbfb3c
Merge remote-tracking branch 'scrawl/dynamic_cast2'
2015-11-30 12:11:00 +01:00
scrawl
0655abcd8b
Fix some character preview raycasting issues (Bug #2769 )
2015-11-30 05:43:36 +01:00
scrawl
8fb328ef4f
Fix updating of character preview size in InventoryWindow::setGuiMode
2015-11-30 05:43:36 +01:00
scrawl
d2290a8183
Don't crash when Water_SurfaceFrameCount is 0
2015-11-30 00:41:26 +01:00
scrawl
d5a738bd39
Apply 27e669296e (locale-unaware tolower) to more code
...
In particular, the one in VFS::normalizeFilename was affecting cell loading performance.
2015-11-30 00:38:52 +01:00
scrawl
f962ce0bbe
Don't link against unnecessary OSG libraries
2015-11-29 19:56:43 +01:00
scrawl
cd4a1ffd16
Fast version of dynamic_cast for MWClass
2015-11-29 14:26:52 +01:00
Marc Zinnschlag
20a076bdba
Merge remote-tracking branch 'origin/master'
2015-11-29 09:34:41 +01:00
Marc Zinnschlag
6df626ad71
Merge remote-tracking branch 'scrawl/crashcatcher'
2015-11-29 09:23:14 +01:00
scrawl
db71634a2d
Allow replacing of interactive message boxes ( Fixes #3040 )
2015-11-28 19:15:54 +01:00
scrawl
c9bfe01120
Fix applying of weather changes after serving a jail sentence
2015-11-28 17:57:35 +01:00
Marc Zinnschlag
6facce9d13
Merge remote-tracking branch 'origin/master'
2015-11-28 10:02:37 +01:00
Marc Zinnschlag
ff5582e318
Merge remote-tracking branch 'scrawl/ltex'
2015-11-28 09:51:57 +01:00
scrawl
a1fa1b2b2e
Don't attempt to open an empty texture
2015-11-28 06:01:24 +01:00
scrawl
d97dda05c9
Don't attempt to play unset weather sounds
2015-11-28 05:55:36 +01:00
scrawl
93a76e2f56
Revert debce0fb80, use a sleep() to work around the X11 bug
...
Problem with debce0fb80
2015-11-28 05:42:05 +01:00
scrawl
debce0fb80
crashcatcher: show the message box before killing crashed process
...
This change fixes a random X server lock-up that I get about 1 in 10 times when a crash is caught. I'm presuming it's an X server bug since faulty applications shouldn't be able to crash or freeze the X server under any circumstances.
2015-11-28 05:14:30 +01:00
scrawl
35fa1f5865
Not found Land Textures are no longer a fatal error (Bug #3037 )
...
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.
2015-11-27 21:57:24 +01:00
scrawl
4687c4baad
Do not assert() for invalid land data in plugins (Bug #3037 )
...
The resizing of LTEX store to the correct number of plugins was done in the load() method, but the load method won't be called if a plugin contains LAND records but doesn't contain LTEX records. For such plugins the Store<ESM::LandTexture>::search() function would then fail an assertion.
2015-11-27 21:57:15 +01:00
scrawl
5b8fd79b4b
Fix crash when exception is thrown in startNewGame()
2015-11-27 21:38:57 +01:00
scrawl
177a6f4a68
Launcher: ensure to clear previous settings when reloading settings
2015-11-27 20:52:29 +01:00
scrawl
ace4cfc0a8
Fix 'duplicate setting' errors when running installation wizard
2015-11-27 20:32:45 +01:00
scrawl
89783e047b
Fix typo
2015-11-27 19:40:31 +01:00
Chris Robinson
4ee409af84
Load loudness data asynchronously
...
Currently abuses the output audio streams' background processing thread to do
the work, since there's no generalized threaded processing mechanism.
2015-11-27 09:47:14 -08:00
Chris Robinson
0f05ccf72a
Use a non-recursive mutex and properly end the streaming thrread
2015-11-27 08:13:23 -08:00
Chris Robinson
b5ed2e65f8
Add a method to get the sound stream delay
...
This helps avoid a lock during the movie player's read method, since it needs
to sync with the current playback position which would otherwise need to get
the movie decoder's current position.
2015-11-27 06:01:50 -08:00
Chris Robinson
f3c035907c
Rename Sound::update to Sound::applyUpdates
2015-11-27 04:55:17 -08:00
Chris Robinson
9568aa6a84
Use a condition variable to wake up the audio stream thread
...
This should make starting streams a bit more responsive, and allows us to do
more in it that really shouldn't wait for its next wake up.
2015-11-27 04:30:09 -08:00
Chris Robinson
4a078725d4
Play player voices locally
2015-11-27 02:57:44 -08:00
Chris Robinson
449eca4fb4
Properly mark streams as 2D or 3D
2015-11-27 02:36:33 -08:00
Chris Robinson
21bb2e9314
Use a deque for loudness buffers with a map lookup
...
Similar to Sound_Buffer, this allows individual Sound_Loudness objects to
retain a constant pointer when new ones are inserted on to the end.
2015-11-27 02:01:18 -08:00
Chris Robinson
5f8a09df97
Play player sounds (except footsteps) local to the listener
2015-11-27 02:01:18 -08:00
Chris Robinson
82f3651f81
Treat the sound offset as the offset in seconds
2015-11-27 02:01:17 -08:00
Chris Robinson
8b7587f9a6
Track whether a sound is 3D
2015-11-27 02:01:17 -08:00
Chris Robinson
fc912b135f
Avoid unnecessarily friending classes
2015-11-27 02:01:17 -08:00
Marc Zinnschlag
7cc950ed64
Merge remote-tracking branch 'origin/master'
2015-11-27 10:34:22 +01:00
Marc Zinnschlag
b3532b6274
Merge remote-tracking branch 'scrawl/spells'
2015-11-27 10:21:17 +01:00
scrawl
44dd62067e
Remove some unnecessary per-frame store searches
2015-11-27 02:13:56 +01:00
scrawl
783594033a
Optimize MWMechanics::Spells
...
Use pointers as map keys instead of string IDs. Resolves a nasty performance bottleneck on functions like hasCommonDisease() that previously had to look up all contained spells from the ESM store on every call. hasCommonDisease() is called hundreds of times per frame by the AI target update since it's used to calculate target disposition.
The total cost of hasCommonDisease() was 2.7% of the frame loop, now it's negligible.
2015-11-27 01:07:15 +01:00
scrawl
fbee32729a
Cache CellId
...
ESM::Cell::getCellId() was allocating a string on every call. This caused functions dealing with cellIds to be unnecessarily expensive.
For example, World::moveObject spent almost as much time comparing CellIds as it did updating Bullet's AABB after the move. OpGetDistance was by far the most expensive script instruction because it has to compare cellIds.
The total cost of getCellId() relative to the frame loop was about 0.3%.
2015-11-26 23:56:32 +01:00
scrawl
984c455027
Fix Show Owned option affecting tooltips that are not objects ( Fixes #3036 )
2015-11-26 18:23:39 +01:00
scrawl
2ffcc2a2b4
Fix incorrect path encoding handling in debug message
2015-11-26 17:34:22 +01:00
scrawl
bcca1beb69
Merge branch 'configwriter' into HEAD
2015-11-26 17:17:26 +01:00
scrawl
d894d54e41
Improve path conversions
2015-11-26 17:15:28 +01:00
scrawl
84aceedfa2
Add comment
2015-11-26 17:15:12 +01:00
scrawl
325d208b4a
Fix incorrect error message
2015-11-26 17:13:13 +01:00
scrawl
3747843c92
Use QString::toInt instead of atoi
2015-11-26 17:07:20 +01:00
cfcohen
c26463fd91
Should have coded it the way scrawl said, since it's cleaner.
2015-11-26 10:52:20 -05:00
cfcohen
a9c9cc5508
Remove unnecessary copy of mEngineSettings in mInitialSettings.
2015-11-26 10:42:43 -05:00
Chris Robinson
d4238a6d91
Add config options for the sound buffer cache size
...
The cache size is specified with a min/max range, intended to avoid constant
unloading once the limit is reached. This way, buffers can be unloaded down to
a reasonable mimimum, allowing some more buffers to be subsequently loaded
without causing more unloading.
2015-11-26 02:13:37 -08:00
Chris Robinson
8715add72f
Store sound buffers in a deque that's filled in as needed
...
A deque allows existing Sound_Buffer references to remain valid as long as new
ones are back-inserted. These references can be used instead of indices.
2015-11-26 01:26:33 -08:00
cfcohen
046538984c
Fix duplicate filename in what() message. Use newly create cfgError
...
utility function consistently throughout code.
2015-11-26 01:49:14 -05:00
cfcohen
7605912ece
Merge branch 'master' of https://github.com/OpenMW/openmw into config_writer_changes
2015-11-26 00:57:21 -05:00
cfcohen
ad5eaaa705
Update the OpenMW Launcher so that it only writes changed values to
...
the user settings.cfg file. Add a helpful header to the top of new
settings.cfg files. Remove old code involve whitespace management
that didn't work correctly anayway, and doesn't matter since we're not
adding comments to the file. Remove "automatically generated"
comments.
2015-11-25 21:30:04 -05:00
scrawl
8a3ec14bc6
Revert "Merge remote-tracking branch 'sandstranger/opengles'"
...
This reverts commit cc9cab6fd1da856eed95
2015-11-25 19:22:48 +01:00
Marc Zinnschlag
ef68e2aec4
Merge remote-tracking branch 'origin/master'
2015-11-25 19:18:17 +01:00
cfcohen
67c4b17581
Commit files that I thought wre in the previous commit. :-[ I'm
...
accustomed to the hg behavior of commiting all modified files by
default.
2015-11-25 13:17:03 -05:00
Marc Zinnschlag
cc9cab6fd1
Merge remote-tracking branch 'sandstranger/opengles'
2015-11-25 19:15:53 +01:00
cfcohen
18da95e4f8
Make openmw-launcher pass comments through settings.cfg, and reuse the
...
Settings::Manager code to do most of the work. Stop loading both the
global settings-default.cfg and the one in the current directory,
while continuing to prefer the latter one. Cleanup paths slightly and
remove what appears to have been debugging in the launcher settings.
2015-11-25 13:08:53 -05:00
Chris Robinson
8f08ca9cba
Revert "Avoid unsafe sizeof(x)/sizeof(x[0]) constructs for array counting"
...
This reverts commit 0d4fea896c
2015-11-25 06:06:27 -08:00
Chris Robinson
04f885d8cc
Rename mReferences to mUses
2015-11-25 04:24:27 -08:00
Chris Robinson
0d4fea896c
Avoid unsafe sizeof(x)/sizeof(x[0]) constructs for array counting
2015-11-25 04:24:27 -08:00
Chris Robinson
a1bdb544db
Avoid an unnecessary string copy
2015-11-25 04:24:27 -08:00
Chris Robinson
aac903484c
Remove a really unnecessary method
2015-11-25 04:24:26 -08:00
Chris Robinson
73448c72f6
Replace Play_NoTrack with playManualSound3D, and rename the latter
2015-11-25 04:24:26 -08:00
Chris Robinson
caae305ddd
Use a sorted list for unused buffers
...
Helps ensure the buffers being unloaded due to cache limits are not likely to
be needed anytime soon.
2015-11-25 04:24:26 -08:00
Chris Robinson
669b7a2295
Batch update changes together, when possible
...
Certain OpenAL implementations, including Rapture3D, Creative's hardware
drivers, and more recent versions of OpenAL Soft, can batch together changes so
that they all occur at once, avoiding potential discontinuities with one sound
being changed before another, or the listeenr being changed before sounds are.
On other implementaitons, this is a no-op and maintains existing behavior.
2015-11-25 04:24:26 -08:00
Chris Robinson
ea70b0baee
Don't store the buffer in the sound struct
2015-11-25 04:24:25 -08:00
Chris Robinson
fd7d58fe7e
Reset the sound handle back to null after unloading
2015-11-25 04:24:25 -08:00
Chris Robinson
4801661b34
Stop all sounds of the given id
2015-11-25 04:24:25 -08:00
Chris Robinson
8a69f676ec
Remove some duplicate code
2015-11-25 04:24:25 -08:00
Chris Robinson
45628316f8
Remove an unnecessary check
2015-11-25 04:24:25 -08:00
Chris Robinson
574c1923fe
Clear unused buffers after unloading them all
2015-11-25 04:24:25 -08:00
Chris Robinson
5ad772c3b3
Fix streaming sound time
2015-11-25 04:24:25 -08:00
Chris Robinson
3ce6aee98b
Return a decoder from the loadVoice function
2015-11-25 04:24:25 -08:00
Chris Robinson
24f8c78fca
Store sound buffer references by index instead of string
2015-11-25 04:24:24 -08:00
Chris Robinson
f7218f5a25
Use proper mutex mechanisms and don't check al errors in the stream thread
2015-11-25 04:24:24 -08:00
Chris Robinson
f9e18cd966
Prepare all Sound_Buffer objects when one is needed
...
This simply sets up the Sound record data to be used by the sound output. The
actual audio buffers, stored in the Sound_Handle, are still loaded on-demand.
2015-11-25 04:24:24 -08:00
Chris Robinson
6c3953766e
Use separate lists for the sound name and its buffer
...
This should make sound lookup a bit more efficient, especially when an integer
ID can be used.
2015-11-25 04:24:24 -08:00
Chris Robinson
fbfcc4050f
Stream voice clips
...
Voices tend to be a bit long, and not individually replayed often. So it's
better to stream them instead of loading theminto a sound buffer. The loudness
data is very small, though, so that can be kept buffered indefinitely.
2015-11-25 04:24:24 -08:00
Chris Robinson
eee6a19e31
Add a method to stream sounds in 3D
2015-11-25 04:24:24 -08:00
Chris Robinson
f1a1dc8408
Pass relevant sound parameters to the OpenAL_SoundStream constructor
2015-11-25 04:24:24 -08:00
Chris Robinson
83721092f2
Refactor the audio streaming code to be a bit saner
2015-11-25 04:24:23 -08:00
Chris Robinson
16f72886e9
Use separate lists for openal sounds and streams
2015-11-25 04:24:23 -08:00
Chris Robinson
0f33f41d8d
Actually unload sounds when running over
2015-11-25 04:24:23 -08:00
Chris Robinson
22a6811425
Limit the sound buffer cache to 15MB
2015-11-25 04:24:23 -08:00
Chris Robinson
0b2747098c
Keep track of unused sound buffers
2015-11-25 04:24:23 -08:00
Chris Robinson
4073495070
Add some missing sound handling
2015-11-25 04:24:23 -08:00
Chris Robinson
e362896817
Combine some duplicate code
2015-11-25 04:24:23 -08:00
Chris Robinson
febc7b510a
Remove an unneeded method
2015-11-25 04:24:23 -08:00
Chris Robinson
3fdc3c4ea9
Use a separate map for say sounds
...
Also restores lip movement
2015-11-25 04:24:22 -08:00
Chris Robinson
9d0018e1bc
Reorder active sound data to make lookup by Ptr better
2015-11-25 04:24:22 -08:00
Chris Robinson
495e138907
Load sound loudness and store it with the Sound_Buffer
...
Still not used for say yet, though
2015-11-25 04:24:22 -08:00
Chris Robinson
f4c22ec49e
Hold a separate list for voice sound buffers
...
This fixes say. Ideally voices would be streamed, but the loudness/"lip" buffer
extraction should be separated from the buffer loading code.
2015-11-25 04:24:22 -08:00
Chris Robinson
4571218827
Load the sound as needed and pass it directly to the play methods
...
This breaks say sounds, loudness handling, and the cache limit. Fixes are
forthcoming.
2015-11-25 04:24:22 -08:00
Chris Robinson
e2beefd8b5
Store info calculated from the ESM::Sound record
2015-11-25 04:24:22 -08:00
scrawl
edfcb45ad7
Fix crash when onPcEquip script removes the equipped item ( Fixes #3016 )
2015-11-24 22:55:17 +01:00
sandstranger
69acacefff
openmw building on Android with Opengl es
2015-11-23 20:28:35 +03:00
Marc Zinnschlag
da856eed95
Merge remote-tracking branch 'origin/master'
2015-11-23 18:17:36 +01:00
scrawl
3fe38e3556
Remove unused setting
2015-11-23 03:26:21 +01:00
scrawl
71cd57a3b5
Optimize World::getTimeStamp
...
World::getTimeStamp was searching through the globals store on every call. Not a big issue, but slow enough to show up in the profiler.
2015-11-22 23:55:21 +01:00
scrawl
62169a7039
Use a single-precision PositionAttitudeTransform in speed critical places
2015-11-22 19:54:26 +01:00
cfcohen
b507d5da5d
One more tooltip fix. This one in the review dialog with Socucius Ergalla.
2015-11-22 00:50:36 -05:00
Marc Zinnschlag
99500f4021
make initial size of script error panel configurable ( Fixes #2996 )
2015-11-21 14:28:40 +01:00
Marc Zinnschlag
f5c61ee616
remember script error panel height per scriptsubview
2015-11-21 14:19:14 +01:00
Marc Zinnschlag
26640d17eb
do not adjust error panel height if panal was already open
2015-11-21 12:52:32 +01:00
Marc Zinnschlag
1093a53cf9
hide script error list when there are no errors ( Fixes #2867 )
2015-11-21 12:45:11 +01:00
Marc Zinnschlag
b74b274ac0
Removed validator for filenames in OpenMW-CS ( Fixes #2918 )
2015-11-21 12:14:57 +01:00
Marc Zinnschlag
e0e9e7f8c2
adjusted startup warning message for recent improvements regarding loading/saving
2015-11-21 11:56:24 +01:00
Marc Zinnschlag
8da04bf76f
Merge remote-tracking branch 'scrawl/master'
2015-11-21 09:15:46 +01:00
scrawl
1b1d9a7a9c
Fixed another tooltip
2015-11-21 02:05:27 +01:00
cfcohen
cf4f3d9ebc
Correct tooltip for Magicka in stats window.
2015-11-20 14:57:42 -05:00
scrawl
43de13fa99
Do not allow resting on lava
2015-11-20 19:22:31 +01:00
scrawl
2d302aef99
Implement stayOutside script variable
2015-11-20 05:05:43 +01:00
scrawl
27617468c8
Fix the collision shape not updating when scaling an object via script
2015-11-20 03:29:58 +01:00
scrawl
5f143dee2d
Fix lighting incontinuity at nightfall and sunrise
2015-11-20 03:22:35 +01:00
scrawl
61314e1db1
Fix bounding box of bullet debug drawer
2015-11-20 03:04:03 +01:00
scrawl
706b1d4c28
Disable culling of ClipNode
2015-11-20 02:22:37 +01:00
scrawl
cbf344663f
animateCollisionShape checks if the shape is really animated
2015-11-20 00:17:07 +01:00
scrawl
894477849a
Store animated collision objects in a separate container
2015-11-19 23:33:08 +01:00
scrawl
8c268f239e
Set the object node scale before inserting model
...
This fixes initWorldSpaceParticles not taking object scale into account. Still not taking into account object rotation or node animations. Ideally the initWorldSpaceParticles needs to run in an updateCallback.
2015-11-19 15:57:12 +01:00
scrawl
ccc721ba3f
Print the OpenMW version to the logfile
2015-11-19 02:56:42 +01:00
scrawl
f08cfa19ea
Fix SoundManager::isPlaying to consider multiple entries with the same Ptr/id
...
Now it returns true if *any* sounds matching the given Ptr and id are playing. The previous behaviour was causing problems with "zombie" sounds (sounds that have finished playing, but weren't removed from the map yet) making the isPlaying method return false even though there's another legitimately playing sound in the map.
2015-11-19 01:06:51 +01:00
scrawl
a49058721e
Use a contactTest for collision script functions
...
The previous method didn't work for stationary actors. This change fixes the grinder in "Sotha Sil, Dome of Kasia" not registering collisions if the player stands still. (Fixes #1934 )
2015-11-18 21:20:12 +01:00
scrawl
9fce428929
ContactTestResultCallback: do not rely on col1 being the object tested against
...
Unsure why, but in some cases col0 and col1 are swapped.
2015-11-18 20:41:49 +01:00
scrawl
3453353091
AiCombat distance check takes into account collision box ( Fixes #1699 )
2015-11-18 19:00:43 +01:00
Marc Zinnschlag
020b3add94
Merge branch 'openmw-37'
2015-11-17 09:54:49 +01:00
Marc Zinnschlag
5de9a5e840
Merge remote-tracking branch 'origin/openmw-37' into openmw-37
2015-11-17 09:04:07 +01:00
scrawl
e62470d674
Auto-generate the collision shape for native mesh formats
2015-11-17 00:20:15 +01:00
scrawl
8cf57ef6ac
Move BulletShapeManager and BulletShape to resource/
2015-11-17 00:20:15 +01:00
scrawl
eb2f16d682
Support for loading .osg mesh format
2015-11-16 23:26:43 +01:00
scrawl
71d9e7dc52
Read Ambient Loop Sound ID and Rain Loop Sound ID from the INI file
2015-11-16 02:21:45 +01:00
scrawl
e9e12d396d
Merge remote-tracking branch 'upstream/openmw-37' into HEAD
2015-11-15 21:37:32 +01:00
scrawl
0f347eccbf
Flip the origin of global map texture
...
Now it's consistent with the overlay texture.
2015-11-15 21:36:41 +01:00
scrawl
8b7bdcd127
Fix the global map overlay viewport (Bug #3018 )
2015-11-15 21:32:34 +01:00
scrawl
af4923577b
Fix double writing of Dialogue NAME in OpenCS
2015-11-15 16:04:52 +01:00
scrawl
0220e82259
Remove unused SOUND_INPUT_INCLUDES cmake variable.
2015-11-14 17:17:22 +01:00
Alexander "Ace" Olofsson
d2a4175804
Add FFMPEG to include path for OpenMW
...
I'm a bit confused; `mwsound/ffmpeg_decoder.hpp/cpp` requires FFMPEG headers to compile, how did this work in the first place?
2015-11-14 16:02:42 +01:00
Marc Zinnschlag
de98ee0062
Merge remote-tracking branch 'scrawl/esm_rewrite'
2015-11-14 14:25:08 +01:00
Nikolay Kasyanov
014a2fc0e9
OS X: do not override Qt plugin path
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
4dcb1a1b17
OS X: remove QPlastiqueStyle usage
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
4e3bbe01b6
OS X: disable glTexStorage2D because of OSG/driver issue
...
See http://forum.openscenegraph.org/viewtopic.php?p=65276#65276 for the details.
2015-11-14 13:50:01 +01:00
scrawl
0ec56d321a
Remove unneeded using namespace
2015-11-14 03:01:40 +01:00
scrawl
05498ad592
Refactor: InputManager no longer depends on Engine
2015-11-14 03:01:24 +01:00
scrawl
aae1aa3708
Adjust tests to work with esm_rewrite branch.
2015-11-14 00:27:59 +01:00
scrawl
f91aae2350
Tests: add record overwrite test
2015-11-14 00:27:59 +01:00
scrawl
1e817a976f
Tests: add record deletion test
2015-11-14 00:27:59 +01:00
scrawl
771193bae8
Tests: add content_diagnostics_test (requires some data files)
2015-11-14 00:27:59 +01:00
scrawl
38c155c579
Tests: add dialogue_merging_test (requires some data files)
2015-11-14 00:27:59 +01:00
scrawl
d0d8c2eded
Delete empty test
2015-11-14 00:27:59 +01:00
