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

8885 commits

Author SHA1 Message Date
MiroslavR
4086bc4848 Do not spawn blood vfx on player if hit fader is enabled 2014-10-06 18:33:41 +02:00
MiroslavR
b6abfb0145 Do not display hit fader if the player wasn't damaged 2014-10-06 18:31:02 +02:00
MiroslavR
ff74d54e98 Merge branch 'master' of github.com:OpenMW/openmw 2014-10-06 18:24:41 +02:00
scrawl
8097d9801d Fix HasSoulgem function to return number of soulgems 2014-10-06 14:56:49 +02:00
scrawl
9ab8d0a8e6 Hotfix for crash when deleting an actor 2014-10-06 14:56:49 +02:00
Jordan Ayers
aac2de270e Cleanup: Don't call <environment obj>.get().
mEnvironment.get() is redundant.  Switch the call to resemble the
surrounding environment get() calls, instead.
2014-10-05 18:12:55 -05:00
Jordan Ayers
2f5721bf61 Fix typo in comments. 2014-10-05 18:12:33 -05:00
scrawl
9cce3bc31b Implement fDispositionMod according to research wiki 2014-10-05 23:03:30 +02:00
scrawl
39bc11681e Fix broken onGround status when levitating 2014-10-05 22:59:24 +02:00
scrawl
829a7bfd1b Fix being able to rest while water-walking (Fixes #1712) 2014-10-05 22:35:53 +02:00
scrawl
d9165593d9 Fix footstep sounds played during water-walking 2014-10-05 22:27:25 +02:00
scrawl
064f1964ba More efficient water walking 2014-10-05 22:27:20 +02:00
MiroslavR
e1799cbcf4 Fix a typo in condition 2014-10-05 19:53:36 +02:00
scrawl
04614651fa Fix recharging items not being updated for actor's initial inventory 2014-10-05 18:27:26 +02:00
MiroslavR
de2cb8926a Feature #1697: Queue fade operations, implement hit fader & werewolf overlay 2014-10-05 17:53:50 +02:00
scrawl
d790506525 Fix projectiles colliding with dead actors (Fixes #1971) 2014-10-05 17:41:56 +02:00
scrawl
c4fa671381 Don't allow raising faction rank if the next rank has no name (Fixes #1975) 2014-10-05 16:47:55 +02:00
scrawl
fe4d74a6cb Fix not being able to move with 0/0 encumbrance (Fixes #1979) 2014-10-05 15:52:33 +02:00
scrawl
5c3bc6563b Fix divisions by zero in normalizedEncumbrance 2014-10-05 15:50:01 +02:00
scrawl
8dd410fe96 Teleport indirect followers as well when using a door (Fixes #1974) 2014-10-05 15:18:32 +02:00
Marc Zinnschlag
2d3ffc4483 fixed pathgrid saving 2014-10-05 15:12:12 +02:00
scrawl
ff11745429 Fix magic projectile sound disappearing after multiple save/load cycles 2014-10-05 14:47:23 +02:00
Jordan Ayers
663647bee8 Simplify getEffectMultiplier.
Both return cases were same, except for some overflow conditions.
2014-10-04 15:28:58 -05:00
Lukasz Gromanowski
bcb38c3eba Issue #1887: Equipped items do not emit sounds
Added handling of autoEquip and unequipAll cases.

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

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

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

Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
2014-10-02 16:50:10 +02:00
scrawl
861cc26aa6 Don't sell racial spells (Fixes #1961) 2014-10-02 16:50:05 +02:00
Marc Zinnschlag
f4c9897bbd Merge branch 'master' into tables 2014-10-02 15:49:36 +02:00
Marc Zinnschlag
00073694c6 added pathgrid subview 2014-10-02 15:16:19 +02:00
scrawl
cc63f7f051 Fix broken idle camera 2014-10-02 14:23:13 +02:00
scrawl
afbd2de511 Fix broken alchemy magnitude/duration 2014-10-02 13:55:42 +02:00
scrawl
7e10818bdf Fix uninitialized flags for custom-made spells 2014-10-02 13:55:42 +02:00
scrawl
0bd9f30c67 Remove comment for old MyGUI version 2014-10-02 13:55:42 +02:00
Marc Zinnschlag
d64127106b load and save pathgrid records 2014-10-02 12:30:15 +02:00
Marc Zinnschlag
ce52735df6 Merge remote-tracking branch 'cc9cii/Bug-No-1750' 2014-10-02 08:43:59 +02:00
Jordan Ayers
3bc91c66e6 Disease Check: Shorten the resistance calculations. 2014-10-01 19:29:03 -05:00
Jordan Ayers
a9a0930b85 Disease check: Reuse corprus check from spells.hpp. 2014-10-01 19:26:25 -05:00
scrawl
1c51694aa9 Don't update physics and animation for actors outside the AI processing distance 2014-10-02 00:27:04 +02:00
scrawl
88da7f5157 Adjust border skin for loading bar and message boxes to match vanilla MW 2014-10-02 00:27:03 +02:00
scrawl
85f5754bb6 Apply third person camera distance to the camera node instead of only the camera itself (Fixes #1705) 2014-10-02 00:26:57 +02:00
cc9cii
517a797a3e Remove seemingly unnecessary clearFocus() call (thanks scrawl for help). Fix saving window size on linux. 2014-10-02 07:00:15 +10:00
scrawl
f9b6cc468d Don't reset an unbound input action to its default binding if the key/mouse button for that default binding is already used by another action (Fixes #1960) 2014-10-01 17:54:18 +02:00
scrawl
46adf6344a Adjust third person camera height and default distance to match vanilla MW 2014-10-01 17:45:20 +02:00
scrawl
ee8b85aa2c Fix priority bug in AiSequence::stack (Fixes #1959) 2014-09-30 22:57:38 +02:00
scrawl
795dfdb557 Fix size_t underflow for journals with 1 page (Fixes #1958) 2014-09-30 18:14:25 +02:00
scrawl
c010c28337 Implement ToggleWorld instruction 2014-09-30 15:54:09 +02:00
Marc Zinnschlag
850a40d4e2 fixed resources table drag source problem 2014-09-30 13:15:15 +02:00
Marc Zinnschlag
ff530a2e19 added missing magic effect table columns 2014-09-30 12:33:48 +02:00
Jordan Ayers
da9d858201 Add 'const' to a spell helper function. 2014-09-29 20:59:10 -05:00
scrawl
3e153d0a9b Optimize actor physics: Use only one convexSweepTest for stepping down and checking onGround status, instead of 2 2014-09-29 22:30:21 +02:00
scrawl
b345c50a86 Run stepSimulation before moving actors
Shouldn't make too much of a difference, but a nice side effect is seeing the convexSweepTest calls for actor movements in the profiler results.
2014-09-29 14:55:31 +02:00
scrawl
7f18f85a1d Forgot const 2014-09-29 12:04:19 +02:00
cc9cii
7675df60ba Fix far clip distance (again), workaround for broken settings minimum value. 2014-09-29 08:17:51 +10:00
cc9cii
54c77cf875 Silence clang warnings. 2014-09-29 06:39:44 +10:00
cc9cii
f0c739b763 Apply camera setting changes immediately. Remove current value check for shader setting changes. 2014-09-29 06:27:54 +10:00
scrawl
bdab3fa321 Bullet optimization: Don't update AABBs of static objects every frame 2014-09-28 18:02:57 +02:00
scrawl
ff0b4e0583 Add debug window (F10), displays Bullet's profiler output 2014-09-28 18:02:49 +02:00
scrawl
7c52d05f85 Disable topics list visually when in a choice 2014-09-28 14:00:15 +02:00
scrawl
e9ed0211c9 Attempt to fix Clang warnings 2014-09-28 12:44:47 +02:00
scrawl
58571f7ac2 Revert "Transfer item ownership to the buyer if item wasn't stolen"
Fixes #1953.

This reverts commit 5d77c5e8ca.
2014-09-28 12:18:46 +02:00
cc9cii
6e8977348a Check the FSAA setting of windows rather than system value. 2014-09-28 19:43:26 +10:00
cc9cii
303b0ee8c6 Update scenewidget when antialiasing settings change. 2014-09-28 15:43:33 +10:00
cc9cii
8a0ff17c22 Update SceneWidget when relevant user settings change. 2014-09-28 14:08:14 +10:00
cc9cii
9902e08773 Apply sh::Factory settings immediately. 2014-09-28 11:05:27 +10:00
cc9cii
a25cffc242 Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights. 2014-09-28 10:17:54 +10:00
scrawl
02dec787fd Cache GMSTs in getDerivedDisposition 2014-09-27 22:44:20 +02:00
scrawl
ea956b537c Don't search for fFatigueReturnBase and fFatigueReturnMult every frame 2014-09-27 22:37:53 +02:00
MiroslavR
508113f271 Resolve merge conflict 2014-09-27 17:50:17 +02:00
MiroslavR
1c4e52a0e5 Book formatter: Fix an excessive line break case 2014-09-27 17:35:57 +02:00
cc9cii
d790b8edfa Revert old fix. 2014-09-27 23:39:22 +10:00
cc9cii
a2d043f43a Re-check unknown record id after loading. 2014-09-27 23:36:27 +10:00
MiroslavR
cb5f661596 Book formatter: Support FONT closing tag, minor code cleanup 2014-09-27 13:31:59 +02:00
Marc Zinnschlag
e47f9c7268 added first batch of magic effect columns (re-using existing columns) 2014-09-27 12:51:46 +02:00
Marc Zinnschlag
aa89370db6 make sure magic effects added by expansions are available 2014-09-27 12:38:42 +02:00
Marc Zinnschlag
25a1112627 add magic effect records for newly created games 2014-09-27 12:26:25 +02:00
cc9cii
810ba61909 While loading overwrite records with the same id. Should resolve bug #1750. 2014-09-27 17:46:48 +10:00
scrawl
e868a48a63 Don't trigger OnPcHitMe for friendly hits (Fixes #1950)
Don't consider actors as followers if they are also in combat with the follow target
2014-09-26 22:08:07 +02:00