mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 17:19:56 +00:00
Code Issues Releases Wiki Activity
21869 commits 38 branches 54 tags 122 MiB
Commit graph

11519 commits

Author SHA1 Message Date
Bret Curtis
6a32a4aed0
Merge pull request #1810 from akortunov/weaponfix 
Use fallbacks for missing weapon animations
 2018-08-14 10:29:01 +02:00
Bret Curtis
f7715db25f
Merge pull request #1871 from akortunov/extended_logging 
[Regression] Move cerr initialization out of 'try' block
 2018-08-14 10:26:12 +02:00
Andrei Kortunov
9a5b016293 Move crashcatcher initialization to components 2018-08-14 11:17:05 +04:00
Allofich
fd89fa415a Do modifiers for dynamic stats before attributes 
(Fixes #4231)
 2018-08-13 21:59:27 +09:00
Allofich
2cc1b52baf Drain and fortify fixes for dynamicStats 
(Fixes #3049)
 2018-08-13 21:59:26 +09:00
Bret Curtis
61b34124e2
Merge pull request #1847 from akortunov/extended_logging 
Improve console logging
 2018-08-13 10:19:25 +02:00
Andrei Kortunov
4003fa1296 Keep jailing state for one frame after leaving jail (bug #3788) 2018-08-13 11:10:01 +04:00
Andrei Kortunov
9dfd775bf2 Implement GetPCTraveling console command 2018-08-13 08:30:50 +04:00
Andrei Kortunov
8de3383612 Add zero-duration spells effects to effect list (bug #3533) 2018-08-12 17:25:35 +04:00
Andrei Kortunov
307e0103dc Use fallbacks for missing weapon animations (bug #4470) 2018-08-12 16:14:24 +04:00
Andrei Kortunov
7d6e3673e0 Implement advanced logging system (feature #4581) 2018-08-12 13:38:15 +04:00
Capostrophic
3527f3800e Use the correct spell projectile speed GMST in AI aiming 2018-08-10 21:21:21 +03:00
Marc Zinnschlag
1cfc1f9bdb Merged pull request #1666 2018-08-10 12:23:17 +02:00
Marc Zinnschlag
0aedb3aada Merged puil request #1808 2018-08-10 12:22:13 +02:00
Marc Zinnschlag
24212d58e8 Merged pull request #1861 2018-08-10 12:21:05 +02:00
Andrei Kortunov
cde95979d0 Fix combat engagement for creatures 2018-08-10 09:29:01 +04:00
Andrei Kortunov
780648b584 Do not reset idle animations if we do not have ammo 2018-08-09 16:39:46 +04:00
Andrei Kortunov
df577babe9 Increase priority of 1st-person weapon animations to avoid issues with animation blending 2018-08-09 16:39:20 +04:00
Andrei Kortunov
71bcc11ba5 Apply only crossbow reload animation to upper body 2018-08-09 16:37:08 +04:00
Andrei Kortunov
a0d0e5d2db Give jumping animations higher priority than movement ones 2018-08-09 16:19:03 +04:00
Andrei Kortunov
6a03aa6fdb Reduce jittering during turning animations for player 2018-08-09 16:19:00 +04:00
Andrei Kortunov
cd92014533 Do not touch GUI modes when taking screenshots (bug #4528) 2018-08-09 16:19:00 +04:00
Marc Zinnschlag
fe19d8ff35 Merged pull request #1857 2018-08-09 13:52:51 +02:00
Marc Zinnschlag
a2a57cf694 Merged pull request #1858 2018-08-09 13:51:31 +02:00
Marc Zinnschlag
0f510011b3 Merged pull request #1852 2018-08-09 13:49:50 +02:00
Andrei Kortunov
126b2fdd42 Use the isPlayer variable to do not check if the current actor is player every time 2018-08-09 11:16:19 +04:00
AnyOldName3
1e48114492 Use JDGBOLT's indoor 'sun' direction. 2018-08-08 23:30:33 +01:00
AnyOldName3
a2b54714d4 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-08-08 23:28:06 +01:00
AnyOldName3
586ac2d12d Revert "Prevent accidental culling of first person meshes" 
This reverts commit c38bf6757a.
 2018-08-08 22:53:56 +01:00
Andrei Kortunov
51af729305 Do not use headtracking in the 1st-person view (bug #4573) 2018-08-08 23:29:03 +04:00
Andrei Kortunov
6202b4eca9 Do not touch GUI modes when taking screenshots (bug #4528) 2018-08-08 22:10:53 +04:00
Capostrophic
e9e9c0dd6b Fix guild guide fast travelling to exteriors time 2018-08-08 12:46:36 +03:00
Andrei Kortunov
b7859b3fa9 Cap underwater view distance (bug #4565) 2018-08-08 13:22:40 +04:00
Capostrophic
bcd9cc4baa Check the actor cell instead of the destination cell in fast travel price logic 2018-08-08 02:07:48 +03:00
Marc Zinnschlag
b75b5d139a Merged pull request #1845 2018-08-05 12:28:38 +02:00
Capostrophic
7087bad580 Use special behavior for all topics with reserved names (bug #4557) 2018-08-05 12:39:53 +03:00
Andrei Kortunov
b0f2e00e7f Make forcegreeting a non-op for non-actor objects (bug #4553) 2018-08-05 09:31:45 +04:00
Marc Zinnschlag
452a706047 Merged pull request #1837 2018-08-04 10:26:44 +02:00
Marc Zinnschlag
b6a919a2d1 Merged pull request #1838 2018-08-04 10:26:18 +02:00
Marc Zinnschlag
99c03d55f0 Merged pull request #1841 2018-08-04 10:25:52 +02:00
Marc Zinnschlag
2a621fedd1 Merged pull request #1842 2018-08-04 10:08:11 +02:00
Capostrophic
d15dcaff68
Don't adjust weapon rating according to weapon condition twice 2018-08-03 19:22:58 +03:00
Andrei Kortunov
e2519226aa Move boost include 2018-08-03 17:04:07 +04:00
Andrei Kortunov
eeffe2e557 Check if item model exists inside drag and drop functions 2018-08-03 16:42:43 +04:00
Andrei Kortunov
c2a175c2e0 Move crash catcher wrapper to separate file 2018-08-03 15:51:17 +04:00
Capostrophic
725a9323c4
Merge branch 'master' into sound 2018-08-03 14:16:51 +03:00
Capostrophic
4c7f3cf626
Merge branch 'master' into weaponpriority 2018-08-03 14:07:11 +03:00
Marc Zinnschlag
4d280add81 Merged pull request #1843 2018-08-03 12:56:17 +02:00
Marc Zinnschlag
d7718aae9b Merged pull request #1840 2018-08-03 12:54:56 +02:00
Marc Zinnschlag
eb5f558f6f Merged pull request #1839 2018-08-03 12:53:55 +02:00
Andrei Kortunov
712c9995db Rename mIsScripted variable because its name is ambiguous 2018-08-03 12:01:31 +04:00
Andrei Kortunov
c454f1bdad Use log file for editor (feature #4012) 2018-08-03 09:05:08 +04:00
AnyOldName3
8f4125134f Merge remote-tracking branch 'refs/remotes/upstream/master' 2018-08-02 15:51:06 +01:00
AnyOldName3
c38bf6757a Prevent accidental culling of first person meshes 2018-08-02 15:50:43 +01:00
Capostrophic
9d85b7c2d3
Use the actual damage for deducting weapon rating 2018-08-02 15:20:07 +03:00
Capostrophic
73d5496711
Revert addition change 2018-08-02 13:01:23 +03:00
Capostrophic
16af1a6c1c Replace 0 sound range values separately 2018-08-02 12:40:53 +03:00
Capostrophic
3ac030d75a
Handle explicit calls before handling quotes 2018-08-02 09:49:53 +03:00
Capostrophic
80f3bd9f86 Don't apply iWereWolfFleeMod to creatures 2018-08-02 08:36:15 +03:00
Capostrophic
fa6c205e5d Make tab autocompletion work with explicit reference calls 2018-08-02 03:24:31 +03:00
Capostrophic
bec47dfb7c Make ranged weapon bonus a distance-dependent multiplier 2018-08-01 19:57:05 +03:00
Capostrophic
382b68a081
Combat AI: take the actual hit chance in account when rating weapon 2018-08-01 19:27:19 +03:00
Andrei Kortunov
12144de8ed Initialize missing variables 2018-08-01 20:18:37 +04:00
Andrei Kortunov
c0bed0fde2 Handle case when index < 0 2018-08-01 20:17:59 +04:00
Andrei Kortunov
770d86f9bd Initialize cubeSize variable for 360 degrees screenshots correctly 2018-08-01 19:36:55 +04:00
Andrei Kortunov
a08048da4e Avoid dereference after null check 2018-08-01 19:30:30 +04:00
Capostrophic
ab29f9e13f Add permanent barter disposition change option (feature #3103) 2018-08-01 17:31:35 +03:00
Marc Zinnschlag
1c13256456 Merged pull request #1829 2018-08-01 16:17:37 +02:00
Marc Zinnschlag
0e75e3816a Merged pull request #1830 2018-08-01 16:16:30 +02:00
Marc Zinnschlag
0c507b74bc Merge pull request #1832 2018-08-01 16:13:59 +02:00
AnyOldName3
cc23a968d1 Merge upstream/master 2018-08-01 14:13:45 +01:00
Capostrophic
be2e7e9e09 Make casting caster-linked on-self effects no-op (bug #4378) 2018-08-01 02:41:57 +03:00
Andrei Kortunov
5b92910829 Limit difficulty scaling, as mentioned in docs 2018-07-31 21:14:16 +04:00
Andrei Kortunov
c07cc0dc40 Reset animation state after weapon unequipping 2018-07-30 22:24:25 +04:00
Andrei Kortunov
0f2c3ecb17 Rescale player avatar (bug #4539) 2018-07-30 17:41:43 +04:00
Capostrophic
c79f96d0d2 Implement ranged crits (feature #3703) 2018-07-29 19:42:44 +03:00
Andrei Kortunov
1d463d129d Finish AiTarget package, if destination is blocked by other actor 2018-07-29 19:41:31 +04:00
Andrei Kortunov
75835c8326 Prevent NPC from chosing farther pathgrid node 2018-07-29 18:18:05 +04:00
Marc Zinnschlag
9e6cba09a6 Merged pull request #1827 2018-07-29 12:52:51 +02:00
Marc Zinnschlag
78121c1774 Merged pull request #1823 2018-07-29 12:49:50 +02:00
Marc Zinnschlag
3ba9229f47 Merged pull request #1815 2018-07-29 12:48:20 +02:00
Capostrophic
9c8e284ead Fix quick key activation delay code (regression #4536) 2018-07-29 12:52:29 +03:00
Andrei Kortunov
6d5d0039ec Make sure we apply OT_Murder only once 2018-07-28 20:45:33 +04:00
Andrei Kortunov
bc82dbbd1b Do not try to find missing animated collision shape again and again 2018-07-28 16:49:00 +04:00
Marc Zinnschlag
b7c159e5b6 Merged pull request #1816 2018-07-27 12:09:10 +02:00
Marc Zinnschlag
c508938674 Merged pull request #1817 2018-07-27 12:06:51 +02:00
Marc Zinnschlag
bbb22643e8 Merge remote-tracking branch 'capostrophic/warning' 2018-07-27 12:05:26 +02:00
Capostrophic
f7887ab05f
Fix MSVC C4456 warning: declaration of 'stats' hides previous local declaration 2018-07-26 23:24:26 +03:00
Capostrophic
51d369d4da Add resumeGame method 2018-07-26 20:35:34 +03:00
Andrei Kortunov
23d917df9c Do not use magic numbers in capacity calculations 2018-07-26 18:06:36 +04:00
Capostrophic
cac2bc768e
Fix NPC "can't teach more" message (bug #4494) 2018-07-25 12:34:33 +03:00
Andrei Kortunov
8281fd903f Set movement speed to 0 when unconscious (bug #4519) 2018-07-19 20:17:32 +04:00
Marc Zinnschlag
78a2725169 Merged pull request #1806 2018-07-17 12:42:41 +02:00
Marc Zinnschlag
326a3e61f4 Merged pull request #1807 2018-07-17 12:42:12 +02:00
Andrei Kortunov
38fa4e0a8a Do not play un-equipping animation when we switch to hand-to-hand 2018-07-17 14:10:04 +04:00
Andrei Kortunov
edd5769022 Show magic items count in spells window (feature #4509) 2018-07-16 14:11:03 +04:00
Andrei Kortunov
30716344f2 Fix possible division by zero in the fatigue calculation (bug #4510) 2018-07-16 13:24:12 +04:00
Andrei Kortunov
3d1daaebab Rework manual spellcasting (e.g. via scripts) 2018-07-12 16:24:25 +04:00
Bret Curtis
99e4d49e7c
Merge pull request #1787 from akortunov/profilierfont 
Use the DejaVuLGCSansMono.ttf for profiler output
 2018-07-11 16:00:34 +02:00
Andrei Kortunov
70b6d4983d Use the DejaVuLGCSansMono.ttf in profilier output 2018-07-11 14:41:49 +04:00
Marc Zinnschlag
ee759effce Merged pull request #1798 2018-07-11 10:06:30 +02:00
Andrei Kortunov
c77c50e92b Make Equip console command to bypass most of restrictions (bug #4460) 2018-07-11 00:06:21 +04:00
Capostrophic
5cb9dc9d12 Use SpellTurnLeft/TurnRight animation groups 2018-07-10 22:19:56 +03:00
Bret Curtis
df1576fcf5
Merge branch 'master' into crossbowfix 2018-07-10 19:15:37 +02:00
Andrei Kortunov
1c35e20fcc Use 1h animations as fallback for crossbows 2018-07-10 17:02:51 +04:00
Andrei Kortunov
75dcbea365 Apply weapon reload animations only for upper body 2018-07-10 17:00:48 +04:00
terrabyte25
48296a7452
Update trainingwindow.cpp 2018-07-09 23:13:52 +04:00
Alexander Stillich
725cc94210 Renamed cc_install to something less cryptic (crashCatcherInstall) 2018-07-09 16:25:55 +02:00
Doc West
467989cdd5 Moved crashcatcher to a component and also use it in CS 
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
 2018-07-09 16:25:55 +02:00
Capostrophic
d09c327b20 Update changelog 2018-07-09 12:36:19 +03:00
Capostrophic
14d3b213a1
Fix double call of addContainerScripts on player in moveObject (fixes #4490) 2018-07-08 23:08:57 +03:00
Capostrophic
bded697f07
Make Goodbye block using hyperlinks 2018-07-06 19:38:36 +03:00
Marc Zinnschlag
d9de8ccb5b Merged pull request #1781 2018-07-06 11:55:45 +02:00
Capostrophic
9abfabb065
Ensure forward-compatibility of death animations in old saves (fixes #4274) 2018-07-05 22:49:40 +03:00
Capostrophic
faf3e9ba5a Make spellcasting stance transition more smooth (fixes #4358) 
If a movement animation was identical to the previous one that was played, restart it from the point the previous animation ended
 2018-07-05 01:57:34 +03:00
Thunderforge
7cbc4eeb49 Adding missing override keywords 
Prevents compiler warnings such as this:

```
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:65:22: warning: 'onOpen' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void onOpen();
                     ^
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:38:22: note: overridden virtual function is here
        virtual void onOpen() {}
                     ^
```
 2018-07-01 19:17:50 -05:00
Finbar Crago
5d9035c6b2 [Fixes #4482] Missing HandToHand on key quick key 0 (introduced in MR !11 for issue #4480) 
because apparently i can't count to ten...
 2018-07-01 13:46:23 +10:00
Marc Zinnschlag
2ea85d0bb6 Merge remote-tracking branch 'gl_finbar-crago/fix_quickkey_segfalt' 2018-06-30 10:17:05 +02:00
Finbar Crago
09c9bd34c3 cleanup more unnecessary struct keywords... 2018-06-30 12:43:50 +10:00
Capostrophic
6e9c08083d
Add missing empty attacker checks 2018-06-29 20:35:45 +03:00
Capostrophic
bccba24c40 Make unarmed creature attacks not affect armor condition (fixes #2455) 2018-06-29 20:18:28 +03:00
Finbar Crago
596be205c1 cleanup unnecessary struct keywords... 2018-06-29 23:43:51 +10:00
Finbar Crago
2722ca50fb fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570] 2018-06-29 23:32:05 +10:00
Finbar Crago
7ae388086b Merge branch 'master' into fix_quickkey_segfalt 2018-06-29 12:34:53 +10:00
Finbar Crago
ed71656ea6 fix updateActivatedQuickKey() crash 
keyboard numbers don't start at zero...
 2018-06-29 01:58:57 +10:00
Finbar Crago
24d5fb09da fix crash on simultaneous key presses 2018-06-28 22:55:02 +10:00
Bret Curtis
f07d50e5bf
Merge pull request #1785 from akortunov/warnfix 
Fix some GCC warnings
 2018-06-28 10:33:51 +02:00
Finbar Crago
d790a27060 Merge branch 'master' into fix_quickkey_segfalt 2018-06-28 18:16:00 +10:00
Andrei Kortunov
5455490ad2 Avoid fall-through in spell selection 2018-06-28 11:12:48 +04:00
Finbar Crago
80a3f0a0d4 switch mSelectedIndex/mActivatedIndex int to mSelected/mActivated keyData pointers 2018-06-28 17:02:25 +10:00
Finbar Crago
335e2c5897 add keyData struct + general cleanup 2018-06-28 13:27:08 +10:00
Nikolay Kasyanov
5fcb091127 Replace FIXME with a detailed explanation of the issue 2018-06-27 22:40:09 +02:00
Nikolay Kasyanov
9c78364c45 Revert "Merge pull request #1771 from Xenkhan/master" 
This reverts commit 9667dd051c, reversing
changes made to f52e06fc19.
 2018-06-27 22:19:09 +02:00
Andrei Kortunov
ec73011617 Clean temporary storage if we assign new AI package (bug #4464) 2018-06-27 12:52:43 +04:00
Andrei Kortunov
ee45f54b53 Refactor AiTemporaryStorage usage 2018-06-27 12:48:34 +04:00
Andrei Kortunov
3c7ab976c3 Ignore movement from scripted animations (bug #4475) 2018-06-27 08:22:45 +04:00
Finbar Crago
cac6d59140 Merge branch 'master' into fix_quickkey_segfalt 2018-06-27 12:58:43 +10:00
Finbar Crago
43c9fd4cec check MWWorld::Ptr != NULL for MWGui ItemPtr tooltips 2018-06-26 13:41:53 +10:00
Finbar Crago
186ec8c50f rm ContainerStore/refItem 2018-06-26 13:35:04 +10:00
Marc Zinnschlag
705b2dca0e Merged pull request #1777 2018-06-25 11:58:12 +02:00
Marc Zinnschlag
baeaff2309 Merged pull request #1778 2018-06-25 11:57:45 +02:00
Andrei Kortunov
97d8cc0efe Check if the local was not found, just for sure 2018-06-25 11:21:00 +04:00
Andrei Kortunov
7dff8d8fe2 Check cell for null 2018-06-25 10:26:58 +04:00
Finbar Crago
46c6abcf54 add string vectors for name/id in QuickKeysMenu for item lookups 2018-06-25 16:02:28 +10:00
Andrei Kortunov
441463327c Validate map size 2018-06-25 09:57:40 +04:00
Andrei Kortunov
359e748c28 Initialize some missing fields in constructors 2018-06-25 09:35:42 +04:00
Capostrophic
ecafcefae9
Fall back to regular head when getVampireHead fails 2018-06-24 14:39:48 +03:00
Capostrophic
35b0546737 Consider <p> tag when discarding post-EOL tag text (regression #4473) 2018-06-23 14:27:40 +03:00
Finbar Crago
da4c55d5ad prevent segfalt in QuickKeysMenu when item has been removed from player inventory 
added a MWWorld::ContainerStore to hold item copies which are then used to find
real items with findReplacement().

(storing the RefId could be a better solution but would probably leave tooltips broken...)
 2018-06-23 17:51:32 +10:00
AnyOldName3
f8e4f3fca5 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-06-22 00:11:29 +01:00
Bret Curtis
a55583a395
Merge branch 'master' into master 2018-06-21 22:22:01 +02:00
Xenkhan
405a0caf29
Remove unneeded whitespace 2018-06-20 13:56:00 -05:00
Xenkhan
5a4817c147
Get rid of reinterpret_cast<> 2018-06-20 13:33:59 -05:00
Marc Zinnschlag
22eb037c18 Merged pull request #1773 2018-06-20 19:08:50 +02:00
Bret Curtis
6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression 
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
 2018-06-20 17:19:48 +02:00
Bret Curtis
b619c0de2d
Merge pull request #1772 from akortunov/deathanim 
Fast-forward death animation to end if death animation was finished earlier
 2018-06-20 13:28:36 +02:00
Andrei Kortunov
c195144b17 Take transformation from first node with given name in file (bug #4469) 2018-06-20 14:24:32 +04:00
Bret Curtis
664edc5a39
Merge pull request #1757 from akortunov/musicfix 
Handle exception when try to load non-music file
 2018-06-20 11:18:50 +02:00
Andrei Kortunov
c9756cee4c Fast-forward death animation to end if death animation was finished earlier (regression #4468) 2018-06-20 12:37:58 +04:00
AnyOldName3
553094669b Merge upstream/master (& fix merge conflicts) 2018-06-20 00:11:23 +01:00
Xenkhan
24ddb66af9
Retrieve SDL window settings instead of using magic numbers 2018-06-19 15:03:30 -05:00
Capostrophic
6c23caadd7 Fix crash when a target in a different cell is (un)locked 2018-06-19 20:43:18 +03:00
Capostrophic
0c4fa55f16 Make Open spells casted by anything trigger player crime event (fixes #4461) 2018-06-19 17:04:38 +03:00
Marc Zinnschlag
7cfb7063c2 Merged pull request #1767 2018-06-19 13:30:10 +02:00
Marc Zinnschlag
7be069fcd2 Merged pull request #1743 2018-06-19 13:29:20 +02:00
Andrei Kortunov
5fd3ec1035 Implement unlockable locks with 'lock 0' console command 2018-06-19 14:17:33 +04:00
Marc Zinnschlag
a8ad530db9 Merged pull request #1749 2018-06-19 11:33:08 +02:00
Marc Zinnschlag
2a52ade219 Merged pull request #1760 2018-06-19 11:26:41 +02:00
Capostrophic
8376c8c68e Allow partial matches in NotCell condition (fixes #4459) 2018-06-18 03:27:31 +03:00
Bret Curtis
e93104a6b3
Merge pull request #1758 from Capostrophic/screenshot 
Remove screenshot taken message again
 2018-06-17 22:26:00 +02:00
Bret Curtis
70dec71c00
Merge pull request #1763 from akortunov/activatedoor 
Forbid actors to use teleporting doors
 2018-06-17 10:13:16 +02:00
Bret Curtis
3cc6da1db2
Update door.cpp 
typo fix
 2018-06-17 10:13:03 +02:00
Bret Curtis
3f2dbdc8a8
Merge branch 'master' into wanderfix 2018-06-17 10:00:38 +02:00
Andrei Kortunov
f3f7487664 Fix arguments parsing for AiWander console command (bug #4458) 2018-06-16 22:11:10 +04:00
Andrei Kortunov
e08b0d3070 Ignore lights without CanCarry flags when NPC selects torch (bug #4457) 2018-06-16 17:34:49 +04:00
Andrei Kortunov
2a65aaf5ab Forbid actors to use teleporting doors (bug #2562) 2018-06-16 14:21:28 +04:00
Nikolay Kasyanov
359f87ab9f Change imageToSurface to return a unique_ptr to avoid manual surface cleanup 2018-06-16 12:12:32 +02:00
Andrei Kortunov
9c3da41130 Add murder bounty when a player follower commits murder (bug #2852) 2018-06-15 14:31:09 +04:00
Capostrophic
1abf749f03
Remove screenshot taken message 2018-06-14 22:08:53 +03:00
Andrei Kortunov
2854f6ca83 Handle exception if we try to play non-music file (bug #4416) 2018-06-14 21:32:40 +04:00
Miloslav Číž
477e1437d2 Resolve conflicts 2018-06-14 15:30:28 +02:00
Andrei Kortunov
49ba00a3ec Add NPC validation to esmstore (bug #2772) 2018-06-14 16:48:16 +04:00
Miloslav Číž
dd00e438fe Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360 2018-06-13 21:35:03 +02:00
Miloslav Číž
7178ee3a6e Add FIXME comment 2018-06-13 21:34:43 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360 2018-06-13 21:16:28 +02:00
Marc Zinnschlag
2b35c5efd7 Merge remote-tracking branch 'upstream/master' 2018-06-13 18:13:15 +02:00
Marc Zinnschlag
aea481eacb Merged pull request #1753 2018-06-13 18:12:38 +02:00
Andrei Kortunov
61c968d550 Ignore broken items when search for replacement (bug #4453) 2018-06-13 18:39:02 +04:00
Andrei Kortunov
81b78a82e8 AI: try to open doors every AI_REACTION_TIME seconds (bug #4454) 2018-06-13 17:47:32 +04:00
Miloslav Číž
dcfbd554bb Remove try catch block 2018-06-13 11:12:46 +02:00
Bret Curtis
3e4dc31e39
Merge branch 'master' into fatigue 2018-06-13 10:04:32 +02:00
Marc Zinnschlag
1ba0317905 Merged pull request #1670 2018-06-13 09:02:31 +02:00
Marc Zinnschlag
48711bbdde Merged pull request #1592 2018-06-13 08:58:06 +02:00
Miloslav Číž
c3d7ee5a9e Resolve merge conflicts 2018-06-13 08:22:37 +02:00
Miloslav Číž
db8aaa74d6 Start cell border debug drawing 2018-06-13 01:48:31 +02:00
Andrei Kortunov
9c45cc7e48 Use player reference instead of pointer 2018-06-12 22:05:00 +04:00
Capostrophic
1c8a20a54a Set ok button focus in settings window by default (fixes #4368) 2018-06-12 19:45:43 +03:00
Andrei Kortunov
f299be8158 Play scripted animations even if SkipAnim is used 2018-06-12 16:07:36 +04:00
Andrei Kortunov
25bb7c1826 Make 'PlayGroup idle' to cancel scripted animations 2018-06-12 14:04:03 +04:00
Andrei Kortunov
0e441d48ac Give scripted animations highest priority (bug #4286) 2018-06-12 12:55:28 +04:00
Andrei Kortunov
0c92655250 Avoid code duplication in character manager 2018-06-12 11:51:54 +04:00
Andrei Kortunov
e3812f4075 Check creature stats only for actors 2018-06-12 11:27:18 +04:00
Andrei Kortunov
b0a140e714 Disable actor collision only after end of death animation 2018-06-12 10:00:38 +04:00
Andrei Kortunov
ebaa6fb5a2 Play death scream only once 2018-06-12 09:55:43 +04:00
Andrei Kortunov
427be928d0 Do not update animation state for dead actors 2018-06-11 23:17:54 +04:00
Andrei Kortunov
977a27ecb7 Do not clear corpses until end of death animation (bug #4307) 2018-06-11 22:29:32 +04:00
Bret Curtis
7310e3c8c2
Merge pull request #1748 from akortunov/bookfix 
Do not show any book text after last <BR> tag
 2018-06-11 17:08:26 +02:00
Andrei Kortunov
a42c663fd7 Do not interrupt scripted animations by death animation (bug #4286) 2018-06-11 18:53:25 +04:00
Andrei Kortunov
d0619cfb35 Play death animation for non-persisting actors with 0 health (bug #4291) 2018-06-11 18:52:20 +04:00
Andrei Kortunov
6099735c60 Early out only when scripted animation is playing 2018-06-11 17:52:58 +04:00
Andrei Kortunov
e234dd2a36 Do not interrupt scripted animations 2018-06-11 17:18:51 +04:00
Andrei Kortunov
66a46ff03c Do not show any book text after last <BR> tag. 2018-06-11 11:22:56 +04:00
Capostrophic
d43766d3c9 Make WakeUpPC interrupt waiting if it was supposed to be (fixes #3629) 2018-06-10 18:42:18 +03:00
Andrei Kortunov
acd3cba5fa Store previous items in the savegame 2018-06-10 16:21:19 +04:00
Andrei Kortunov
9fd2d57b86 Move previous items to player 2018-06-10 16:21:19 +04:00
Andrei Kortunov
f977c6876f Bound items: store item ID instead of pointer 2018-06-10 16:21:19 +04:00
Andrei Kortunov
4de9d9fa77 Split adjustBoundItem() 2018-06-10 16:21:19 +04:00
Andrei Kortunov
d1b1cb748d Reequip previous item only if the expired bound item was equipped 2018-06-10 16:21:19 +04:00
Andrei Kortunov
9b72a6ac69 Use the MWWorld::Ptr() instead of string ID 2018-06-10 16:21:19 +04:00
Andrei Kortunov
0375bedab2 Equip previous item after a bound item expires (bug #2326) 2018-06-10 16:21:19 +04:00
Andrei Kortunov
ae87e0d3fc Do not reset mUpperBodyState for weapon->weapon switch (regression #4446) 2018-06-09 15:34:08 +04:00
Andrei Kortunov
4ba361fea6 Unhardcode sunset and sunrise settings (bug #1990) 2018-06-09 13:09:17 +04:00
Marc Zinnschlag
7d9de93fd3 Merged pull request #1477 2018-06-09 10:52:35 +02:00
Marc Zinnschlag
551a69f1b1 Merged pull request #1559 2018-06-09 10:51:02 +02:00
Marc Zinnschlag
76972bb2f6 Merged pull request #1709 2018-06-09 10:46:02 +02:00
Andrei Kortunov
6ed2773299 Do not stack return packages 2018-06-08 21:53:47 +04:00
Andrei Kortunov
74a2cbe696 AI: return back after pursuit 2018-06-08 21:53:47 +04:00
Andrei Kortunov
3d0631cfcc Store last AI package in savegame 2018-06-08 21:53:47 +04:00
Andrei Kortunov
3a0ee78d2b AiTravel: store mHidden flag in savegame 2018-06-08 21:53:47 +04:00
Andrei Kortunov
2f5beb8853 Remove unnecessary hack 2018-06-08 21:53:47 +04:00
Andrei Kortunov
57d686131e Remove redundant condition 2018-06-08 21:53:47 +04:00
Andrei Kortunov
5105c67642 Add mHidden field to AiTravel 2018-06-08 21:53:47 +04:00
Andrei Kortunov
81f29d8dcd AiWander: resume moving to destination after combat 2018-06-08 21:53:47 +04:00
Andrei Kortunov
18ff097e4a Add the parameter to AiSequence::stack() to control ability to cancel other AI packages 2018-06-08 21:53:47 +04:00
Andrei Kortunov
9d27eb197f AiWander: return to initial position only after combat 2018-06-08 21:53:47 +04:00
Bret Curtis
61c969e970
Merge branch 'master' into hitboxfix 2018-06-08 18:36:44 +02:00
Capostrophic
b274931165
Revert erroneous changes 2018-06-08 19:18:53 +03:00
Capostrophic
dd2a11b243
Merge branch 'master' into goodbye 2018-06-08 19:16:36 +03:00
Capostrophic
24c1ee7744 Use relative stat difference for haggling 2018-06-08 19:00:45 +03:00
Capostrophic
b7026df551 Improve the offered price formula (Fixes #2222) 2018-06-08 19:00:45 +03:00
Andrei Kortunov
fed10e87aa Store integer actor ID in AI packages (bug #4036) 2018-06-08 19:57:41 +04:00
Marc Zinnschlag
9d0ce25052 Merged pull request #1738 2018-06-08 17:28:08 +02:00
Marc Zinnschlag
7899f44173 Merged pull request #1619 2018-06-08 17:07:38 +02:00
Andrei Kortunov
fea34bd73f Added support for per-group animation files 2018-06-08 17:04:15 +04:00
Capostrophic
11103211c5 Make Goodbye and Choice choices mutually exclusive 2018-06-08 15:03:19 +03:00
Marc Zinnschlag
21ea49fe83 Merge remote-tracking branch 'capostrophic/physics' 2018-06-08 11:43:10 +02:00
Capostrophic
1a354f88ac Make choices trigger goodbye if Goodbye is used (fixes #3897) 2018-06-07 22:09:55 +03:00
Andrei Kortunov
1b9edbe119 Add unequip animation during stance switching (bug #4327) 2018-06-07 16:20:17 +04:00
Andrei Kortunov
bde1d07d4e Use hitboxes and focused object for touch spells (bug #3374) 2018-06-07 16:12:27 +04:00
Andrei Kortunov
4666a6a0ab Use default hit formula as fallback 2018-06-07 16:12:27 +04:00
Andrei Kortunov
9e5d577a71 Aim from center of attacker to center of target 2018-06-07 16:12:27 +04:00
Andrei Kortunov
f5dc9f0162 Use hitbox cone only as fallback 2018-06-07 16:12:27 +04:00
Andrei Kortunov
ab433102a4 Increase hit distance for player by halfExtents 2018-06-07 16:12:27 +04:00
Marc Zinnschlag
7b4a69ff2f Merged pull request #1728 2018-06-07 13:14:53 +02:00
Marc Zinnschlag
362aa23546 Merged pull request #1724 2018-06-07 13:13:48 +02:00
Marc Zinnschlag
2ab31b0c18 Merged pull request #1723 2018-06-07 13:05:20 +02:00
David Cernat
04a2025340 Fix crash when adding items to certain disabled creatures (bug #4441) 2018-06-05 18:09:10 +03:00
Marc Zinnschlag
cd7268e9af Merge remote-tracking branch 'akortunov/effectResistFix' into openmw-44 2018-06-04 16:58:22 +02:00
Capostrophic
c14536a399 Update faction-owned items confiscation 2018-06-03 20:28:53 +03:00
Capostrophic
3810ade67a Don't make unnecessary faction ID searches 2018-06-03 12:38:53 +03:00
Capostrophic
191cc76378 Consider faction ownerships in item stolen checks (fixes #4293) 2018-06-03 10:22:20 +03:00
elsid
dba79f4d4d
Fix warnings: catching polymorphic type by value 
openmw/apps/openmw/mwworld/worldimp.cpp: In member function ‘virtual bool MWWorld::World::findExteriorPosition(const string&, ESM::Position&)’:
openmw/apps/openmw/mwworld/worldimp.cpp:2650:25: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
             catch (std::invalid_argument)
                         ^~~~~~~~~~~~~~~~
openmw/apps/openmw/mwworld/worldimp.cpp:2654:25: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
             catch (std::out_of_range)
                         ^~~~~~~~~~~~

openmw/components/widgets/numericeditbox.cpp: In member function ‘void Gui::NumericEditBox::onEditTextChange(MyGUI::EditBox*)’:
openmw/components/widgets/numericeditbox.cpp:41:21: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
         catch (std::invalid_argument)
                     ^~~~~~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp:45:21: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
         catch (std::out_of_range)
                     ^~~~~~~~~~~~
 2018-06-02 14:28:46 +03:00
Andrei Kortunov
be394870e4 Fix regressions in spell resistance 2018-06-01 20:08:53 +04:00
Andrei Kortunov
84c8fb9df7 Add pursue package only when crime was reported (bug #4433) 2018-06-01 12:41:31 +04:00
Andrei Kortunov
24863f620b RotateWorld: rotate around world axis (bug #4426) 2018-05-30 16:35:52 +04:00
AnyOldName3
759e6fb804 Merge remote-tracking branch 'refs/remotes/upstream/master' 2018-05-27 15:41:42 +01:00
scrawl
cfdf99f601
Revert "Merged pull request #1573" 
This reverts commit 7324bd368f, reversing
changes made to 810e4416f6.
 2018-05-26 11:39:30 +00:00
scrawl
99ffaafe30
Revert "Merge pull request #1701 from akortunov/standfix" 
This reverts commit da47fc79f5, reversing
changes made to 7324bd368f.
 2018-05-26 11:35:48 +00:00
Marc Zinnschlag
b151a89528 Merged pull request #1568 2018-05-26 12:17:07 +02:00
Marc Zinnschlag
832b4bb778 Merged pull request #1659 2018-05-25 11:32:08 +02:00
Andrei Kortunov
1abff5365b Capitalize enchanted items names again in spells window 2018-05-24 13:03:47 +04:00
Andrei Kortunov
afae398b5c Use utf8 lowercase function for journal index to avoid code duplication 2018-05-24 12:53:06 +04:00
Andrei Kortunov
b5374029e5 Implement case-insensitive search in spell window 2018-05-24 12:39:00 +04:00
Andrei Kortunov
9ac752ea70 Implement filtering in the spells window 2018-05-24 10:48:46 +04:00
Bret Curtis
da47fc79f5
Merge pull request #1701 from akortunov/standfix 
Do not apply queue movement for standing actors
 2018-05-23 22:35:08 +02:00
Marc Zinnschlag
7324bd368f Merged pull request #1573 2018-05-23 17:00:29 +02:00
Marc Zinnschlag
1564a3f6aa Merged pull request #1713 2018-05-23 13:51:32 +02:00
Marc Zinnschlag
2f958881b7 Merged pull request #4413 2018-05-23 13:45:35 +02:00
AnyOldName3
9ff31cc80d Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-05-22 00:14:07 +01:00
AnyOldName3
9093ab59f6 Restore water object refractions and reflections. 2018-05-21 23:57:38 +01:00
declan-millar
b8df4b7c5a Tidy in-code comment 2018-05-21 22:14:23 +01:00
declan-millar
844aef85f3 Replace spelling: soulgem -> soul gem in code comment 2018-05-21 22:12:19 +01:00
declan-millar
9ed4f33048 Replace spelling: soulgem -> soul gem 2018-05-21 19:10:24 +01:00
declan-millar
028b528c0b Get soul magnitude before checking the rebalance setting 2018-05-21 18:16:04 +01:00
declan-millar
9346a552fa Use Rebalance soulgem values option to set soulgem value 2018-05-21 13:59:20 +01:00
declan-millar
78e79d5775 Add advanced option to Rebalance soulgem values to the launcher 2018-05-21 13:33:42 +01:00
declan-millar
4b1247597e Use soulgem value rebalance formula from morrowind code patch 2018-05-20 17:06:26 +01:00
Capostrophic
867a5938ca Don't reset sneaking camera offset while in GUI (fixes #4420) 2018-05-20 10:24:20 +03:00
Bret Curtis
67c381df4e
Merge pull request #1708 from akortunov/refidfix 
fix GCC warnings
 2018-05-16 15:59:31 +02:00
Andrei Kortunov
a68de93308 Initialize srate variable in openal_output 2018-05-16 16:34:58 +04:00
Andrei Kortunov
e5db5e2651 Fix 'maybe-uninitialized' warning in openal_output 2018-05-16 16:13:22 +04:00
Andrei Kortunov
df459199dd Avoid left shift of negative value 2018-05-16 12:59:05 +04:00
Bret Curtis
caf1760251
Merge pull request #1707 from akortunov/weaponreach 
Display weapon reach on tooltips in feet
 2018-05-16 10:27:53 +02:00
Andrei Kortunov
164e3d12fe Display weapon reach on tooltips in feet. 2018-05-16 11:18:22 +04:00
Bret Curtis
c75d774356
Merge pull request #1692 from akortunov/playsound 
Prevent PlaySound overlapping
 2018-05-15 19:03:01 +02:00
Andrei Kortunov
f8655d2425 Use actor's physics position as a ray origin in tracer 2018-05-14 20:38:53 +04:00
Capostrophic
e32f38b939 Allow jumping when you're stuck on a slope (fixes #4221) 2018-05-13 17:19:33 +03:00
Capostrophic
409d466e42 Make 0/0 encumbrance 0% encumbrance 2018-05-13 17:18:45 +03:00
Capostrophic
ba077e7291 Fix movement fatigue loss encumbrance calculation (fixes #4413) 2018-05-13 17:18:45 +03:00
Capostrophic
1c9fba9a8c Fix jumping encumbrance calculation 2018-05-13 17:18:45 +03:00
Marc Zinnschlag
0f22600a98 Merged pull request #1703 2018-05-13 09:08:40 +02:00
AnyOldName3
44b2cf2b7f Merge upstream. 2018-05-11 19:15:04 +01:00
Marc Zinnschlag
b7cce1a665 Merged pull request #1702 2018-05-11 10:11:17 +02:00
David Cernat
32d71de2f5 Update MapWindow every frame, not just when it's open (bug #4279) 2018-05-09 07:33:45 +03:00
Alf Henrik Sauge
feeee50a88 Dropping a separate NPDTstruct12 object and instead use NPDTstruct52 
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
 2018-05-09 00:25:07 +02:00
Marc Zinnschlag
3197ebd8e7 Merged pull request #1694 2018-05-08 12:19:14 +02:00
Andrei Kortunov
b15bed8e22 Avoid excessive loadSound calls 2018-05-07 20:40:53 +04:00
Marc Zinnschlag
53b6ef6f8c minor code cleanup 2018-05-07 09:54:42 +02:00
Andrei Kortunov
17222eb821 Get rid of unnecessary find 2018-05-06 16:42:05 +04:00
Andrei Kortunov
3636cf2015 Do not apply queue movement for standing actors 2018-05-05 22:41:26 +04:00
Andrei Kortunov
1dd36329a3 Load default markers definitions (bug #4410) 2018-05-05 17:14:33 +04:00
Andrei Kortunov
4872edc5ed Prevent PlaySound overlapping 2018-05-01 16:24:32 +04:00
Andrei Kortunov
22fb1f3403 Play spellcasting effects from objects 2018-04-30 17:12:06 +04:00
scrawl
b995584ad2
Merge pull request #1688 2018-04-29 14:27:55 +00:00
Capostrophic
6b47f72959
Set character preview scene ambient to 0, 0, 0 2018-04-25 15:31:49 +03:00
scrawl
bdf1070852
Merge pull request #1688 2018-04-25 11:54:26 +00:00
scrawl
f0507e6b46
Merge pull request #1686 2018-04-25 10:27:38 +00:00
Capostrophic
bfcdf660f2 Utilize inventory character preview lighting rotation fallback settings 2018-04-23 22:48:15 +03:00
Capostrophic
9073e4d4ba Initialize playlist file list in playPlaylist (fixes #4134) 2018-04-22 23:21:29 +03:00
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
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
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
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
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
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
7a5748a9f1
Merge pull request #1632 2018-03-16 23:24:05 +00: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
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
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
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
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
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
Capostrophic
089666dd68
Round up displayed encumbrance 2018-02-24 15:13:14 +03: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
scrawl
b1b8e31562
Use unique_ptr over new/delete (Fixes #4305) 2018-01-30 22:05:16 +00: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
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 7ef7b1a7b1, reversing
changes made to 9e7e4de0ab.
 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
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
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
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
Chris Robinson
aecf74e7bb Don't throw exceptions from the audio decoder 2017-12-08 07:00:04 -08: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
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
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
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
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
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
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
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
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
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
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
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
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