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

13240 commits

Author SHA1 Message Date
David Cernat
056591b957 Add OpenMW commits up to 14 Sep 2018 
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-20 12:14:57 +03:00
David Cernat
889bcec7f8 Add OpenMW commits up to 1 Sep 2018 
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwclass/creature.cpp
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/difficultyscaling.cpp
#	apps/openmw/mwscript/transformationextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-20 11:31:51 +03:00
David Cernat
84cab59057 Add OpenMW commits up to 19 Aug 2018 
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/main.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/containerextensions.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/misc/debugging.hpp
 2019-08-20 10:06:15 +03:00
David Cernat
0339958e21 [General] Rename Log class into TimedLog 2019-08-19 21:39:33 +03:00
Andrei Kortunov
bd18655d23
Merge pull request #2439 from Capostrophic/jumping 
Fix jumping mechanics framerate dependency (bug #4991)
 2019-08-18 10:57:11 +04:00
Andrei Kortunov
b58c632c20
Merge pull request #2502 from akortunov/master 
Optimize custom bones search visitor
 2019-08-18 10:36:01 +04:00
Andrei Kortunov
fe71ce9cb2 Optimize custom bones search visitor 2019-08-18 10:30:21 +04:00
Andrei Kortunov
ed8828d3bc
Merge pull request #2457 from Capostrophic/sneak 
Sneaking consistency fixes (bug #5103)
 2019-08-18 08:57:22 +04:00
Andrei Kortunov
661d11c83e
Merge pull request #2465 from Capostrophic/duration 
Human-readable light source duration (feature #5091)
 2019-08-18 08:43:51 +04:00
Andrei Kortunov
d0bc06b849
Merge pull request #2438 from Capostrophic/camera 
Rewrite messed up playerlooking switch handling (bug #5078)
 2019-08-17 23:15:21 +04:00
capostrophic
e5331aab28 Escape number signs in object names for tooltips 2019-08-17 21:53:52 +03:00
elsid
ad05de44ae
Use 3d coordinates to detect stuck 
To able water and flying creatures move to player going up or down.
 2019-08-17 18:09:00 +02:00
elsid
7b94183d83
Revert "Take in account actor half extents for obstacle check" 
This reverts commit 5434e92437.
 2019-08-17 17:55:49 +02:00
Andrei Kortunov
f7917964a0
Merge pull request #2484 from Capostrophic/fallbackanim 
Allow SwimRunForward state WalkForward fallback (bug #5126)
 2019-08-17 12:45:25 +04:00
Andrei Kortunov
ca724d45a1
Merge pull request #2498 from akortunov/master 
[Regression] inject bones for NPC's with custom animation models
 2019-08-17 12:21:34 +04:00
Andrei Kortunov
6156ab45de [Regression] inject bones for NPC's with custom animation models 2019-08-17 12:17:13 +04:00
Alexei Dobrohotov
1eac6f67db
Merge pull request #2496 from Capostrophic/reverb 
Change the default reverb preset to improve underwater FX transition
 2019-08-17 00:29:29 +03:00
Andrei Kortunov
0afb142b8e [Regression] restore ammo inventory sounds 2019-08-16 21:56:14 +04:00
capostrophic
99710e8f55 Allow SwimRunForward state WalkForward fallback (bug #5126) 2019-08-16 20:46:22 +03:00
Andrei Kortunov
786a6c6d42 Use a common doors rotation code in the "lock" command handler 2019-08-16 21:30:24 +04:00
capostrophic
f779529cab Change the default reverb preset to improve underwater FX transition 2019-08-16 17:37:38 +03:00
David Cernat
ab93b5ddc5 [General] Use PlayerItemUse packets when using items through quick keys 2019-08-16 05:50:07 +03:00
elsid
4d86bf3bf2
Update rotated world objects in navigator 2019-08-15 18:19:19 +02:00
David Cernat
ae5200cbb2 [General] Implement light records for RecordDynamic packets 2019-08-14 21:10:53 +03:00
Alexei Dobrohotov
17991164e4
Merge pull request #2489 from ArgonianAccount/class-quiz 
Class quiz fixes
 2019-08-13 21:47:30 +03:00
David Cernat
6160293e86 [Client] Don't clear placeholder summons in CastSpell::inflict() 2019-08-12 15:12:34 +03:00
Andrei Kortunov
deeccb2783
Merge pull request #2461 from Capostrophic/geteffect 
Use up-to-date magic effects for GetEffect (bug #3894)
 2019-08-11 22:20:20 +04:00
ArgonianAccount
53facf7baa Class quiz fixes 2019-08-12 00:54:02 +12:00
Alexei Dobrohotov
e10bbea7c0
Revert 3.4-breaking 8b1ed6c 2019-08-11 12:07:49 +03:00
Alexei Dobrohotov
5640a305e2
Merge pull request #2487 from akortunov/arrows 
Corrections for extended weapon animations feature
 2019-08-10 20:00:34 +03:00
Andrei Kortunov
6019f6507d Corrections for extended weapon animations feature 2019-08-10 20:57:37 +04:00
Julien Valentin
8b1ed6c357
fix Sunglare bug with osg 3.6 2019-08-10 18:28:03 +02:00
Andrei Kortunov
1f7d2f8da0 Revert "Do not use a separate GlowUpdater for every arrow in quiver" 
This reverts commit b7c214b1bc.
 2019-08-09 21:38:03 +04:00
Andrei Kortunov
b09f0f8c2d
Merge pull request #2458 from Capostrophic/jump 
Don't "jump" with 0 vertical velocity in all cases (bug #5106)
 2019-08-09 21:03:24 +04:00
Alexei Dobrohotov
307e9ba666
Merge pull request #2413 from akortunov/weapon 
Refactor weapon types behaviour
 2019-08-09 20:02:10 +03:00
capostrophic
26f59e47db Improve readability 2019-08-09 19:56:21 +03:00
capostrophic
a9c4b18d38 Make sure cast chance checks mana when necessary (bug #5112) 2019-08-09 19:27:25 +03:00
Andrei Kortunov
134631ad72
Merge pull request #2463 from Capostrophic/crit 
Vanilla-friendly ranged crits (bug #5067)
 2019-08-09 20:23:56 +04:00
Andrei Kortunov
fcd6e915d4 Fallback for long animation groups 2019-08-09 19:40:30 +04:00
Andrei Kortunov
123ca175c8 Fallback for short weapon groups 2019-08-09 19:40:30 +04:00
Andrei Kortunov
afaff8231d Use the Weapon Bone as fallback 2019-08-09 19:40:30 +04:00
Andrei Kortunov
f0cef772fa Refactor weapon types behaviour 
1. Move weapon types behaviour from switches to the table (should allow
us to de-hardcode weapon types later)
2. Gereralize bones injection to actors skeletons (instead of using the
hardcoded xbase_anim_sh.nif)
 2019-08-09 19:40:27 +04:00
Andrei Kortunov
07cf93f4db Update weapon state when we cancel attack animation (bug #5124) 2019-08-09 09:17:36 +04:00
David Cernat
1d09763bad [Client] Allow blanking out the enchantment IDs of records using a base 2019-08-08 08:05:10 +03:00
Alexei Dobrohotov
ed364a1e29
Merge pull request #2476 from akortunov/arrows 
Use magic glow for enchanted arrows
 2019-08-07 17:32:38 +03:00
Andrei Kortunov
b7c214b1bc Do not use a separate GlowUpdater for every arrow in quiver 2019-08-07 12:58:18 +04:00
Andrei Kortunov
8557346fbd Use glow for enchanted arrows (feature #5122) 2019-08-07 12:58:14 +04:00
unknown
2a53f6bc3e Merge branch 'master' of https://github.com/OpenMW/openmw into script-respawn 2019-08-07 10:56:21 +02:00
David Cernat
14af0be657 [General] Include AI alarm & flee for creatures/NPCs in RecordDynamic 2019-08-07 11:21:22 +03:00
David Cernat
ef432d1419 [General] Include AI services for creatures/NPCs in RecordDynamic 2019-08-07 10:44:07 +03:00
Andrei Kortunov
1eed511b4e Use enchanted glow for pulled arrows 2019-08-07 09:45:10 +04:00
Andrei Kortunov
4c92f0c4e1 Move getEnchantmentColor() from Animation to Class 2019-08-07 08:51:46 +04:00
unknown
6baa5da6c9 Fix scripts not executing on respawn 2019-08-06 21:30:21 +02:00
Andrei Kortunov
06ba80e19b
Merge pull request #2469 from Capostrophic/instant 
Apply instant effects of permanent spells in AddSpell immediately (bug #5055)
 2019-08-06 07:57:18 +04:00
capostrophic
cac05ef826 Sneaking consistency fixes (bug #5103) 
Correct pickpocketing behavior when not actually sneaking
Fix first person swimming animation regression when sneaking stance is on
Move typical sneaking use case checks into mechanics manager
Correct awareness checks
 2019-08-05 20:22:03 +03:00
Andrei Kortunov
ad8b10c8db
Merge pull request #2464 from Capostrophic/enchant 
Ignore on-strike enchanted projectile charge (#5104)
 2019-08-05 11:32:16 +04:00
David Cernat
18e2a14645 [General] Implement tool-related records for RecordDynamic packets 2019-08-04 17:53:18 +03:00
capostrophic
6928adcee1 Prevent front() and operator[] from causing undefined behavior 2019-08-04 14:47:33 +03:00
Alexei Dobrohotov
4d4a21ff09
Merge pull request #2460 from Capostrophic/swim 
Don't force-trace down swimming actors (bug #5089)
 2019-08-03 23:23:12 +03:00
Alexei Dobrohotov
b3fe85fb6d
Merge pull request #2324 from elsid/aiwander_navmesh 
Use navmesh for AiWander
 2019-08-03 23:11:18 +03:00
Alex Rice
e7ae7a8ca6 Allow user controller bindings 2019-08-03 19:55:58 +00:00
elsid
6c46d929c2
Build path to first pathgrid node by navmesh 2019-08-03 16:10:55 +02:00
elsid
f684c90932
Make angular velocity depending on actor speed 
To avoid moving in circles for actors with high speed.
 2019-08-03 16:06:04 +02:00
David Cernat
4100d93dea [General] Implement ingredient records for RecordDynamic packets 2019-08-03 06:19:22 +03:00
capostrophic
82ac99ec56 Apply instant FX in AddSpell immediately (bug #5055) 2019-08-02 21:26:47 +03:00
capostrophic
f8c07ca9dc Don't "jump" with 0 vertical velocity in all cases (bug #5106) 2019-08-02 18:16:47 +03:00
capostrophic
e9c71a3808 Ignore on-strike enchanted projectile charge (#5104) 2019-08-02 18:15:27 +03:00
capostrophic
ff133bd740 Don't clamp final actor fight rating to 0 (bug #5105) 
Fix werewolf aggro distance
 2019-08-02 18:11:48 +03:00
elsid
4ad04a28f9
Reset path after AiTravel is fast forwarded 
Otherwise actor will keep going to the first path point that may be
unreachable.
 2019-08-01 15:13:03 +02:00
Artem Nykolenko
610e87cb24 Fix Non-swimming enemies entering water if player is water walking (bug #5099) 2019-08-01 10:02:35 +00:00
Andrei Kortunov
264a769827
Merge pull request #2466 from Capostrophic/doll 
[Regression] Avoid confusing inventory doll with player in non-uniform scaling
 2019-08-01 13:10:40 +04:00
David Cernat
247d2fad30 [General] Implement activator & static records for RecordDynamic packets 2019-08-01 09:48:57 +03:00
capostrophic
2affb8ed63 Human-readable light source duration (feature #5091) 2019-07-31 21:37:20 +03:00
Alexei Dobrohotov
1a2f51ef6f
Merge pull request #2415 from Assumeru/unix-console 
Unix console hotkeys
 2019-07-31 21:34:09 +03:00
capostrophic
dcbe76d888 [Regression] Avoid confusing inventory doll with player 2019-07-31 17:34:32 +03:00
capostrophic
e2496af5c5 Vanilla-friendly ranged crits (bug #5067) 2019-07-31 13:55:09 +03:00
capostrophic
e7ec27e45d Use up-to-date magic effects for GetEffect (bug #3894) 2019-07-31 01:06:06 +03:00
capostrophic
6fe429c4e8 Don't force-trace down swimming actors (bug #5089) 2019-07-31 00:45:54 +03:00
capostrophic
15bf05215e Revert questionable input manager decisions 
Remove Options Menu shortcut
Revert to more pleasant 0.45.0 Escape behavior
Re-enable keyboard GUI arrow conversion feature
Remove gamepad button release handling
 2019-07-30 19:48:46 +03:00
Capostrophic
4e54ed86b3 Fix jumping mechanics framerate dependency (bug #4991) 2019-07-29 15:45:57 +03:00
Capostrophic
0b074f2211 Rewrite messed up playerlooking switch handling (bug #5078) 2019-07-29 15:44:17 +03:00
David Cernat
e9336e53fc [General] Implement container and door records for RecordDynamic packets 2019-07-27 03:45:50 +03:00
Alexei Dobrohotov
facbb2e0db
[Regression] Make sure unloaded objects can be opened 2019-07-20 00:12:05 +03:00
Andrei Kortunov
69277b52d0
Merge pull request #2451 from Capostrophic/sounds 
Fix combat sound inconsistencies (bugs #5092, #5093)
 2019-07-19 08:03:33 +04:00
Artem Nykolenko
d996b565a5 Improve character window resizing (bug #4276) 2019-07-17 00:44:36 -04:00
Alexei Dobrohotov
29ebfe709e
Play 'Hand To Hand Hit' only for fatigue damage (bug #5093) 2019-07-14 23:56:38 +03:00
Alexei Dobrohotov
65ee420ab9
Only play on-strike failure sound on the player (bug #5092) 2019-07-14 23:42:42 +03:00
David Cernat
57f84914c3 [Client] Prevent permanent deletion of player markers on cell changes 2019-07-14 22:42:55 +03:00
Alexei Dobrohotov
366906ac51
Fix paralyzed actors' death animations 2019-07-12 12:31:10 +03:00
David Cernat
48ebdb38c7 [Client] Set LocalPlayer's killer for damage over time spell effects 
Simplify related code that sets LocalActors' killers for damage over time spell effects.
 2019-07-06 14:44:04 +03:00
jeremy
962462c1c5 Removed unnecessary calls to stopSound3D 
playSound3D (the one taking a ptr) already stops the sound if it's playing.
 2019-07-04 22:54:39 +02:00
jeremy
c8c06ceee9 Fixed SoundManager::stopSound when output is not initialized (bug #4600 probably) 2019-07-04 22:48:33 +02:00
Evil Eye
cb4664b31b Remove arrow key behaviour as it's in MyGUI now 2019-07-03 22:38:07 +02:00
Evil Eye
405c556ce9 Merge branch 'master' of https://github.com/OpenMW/openmw into unix-console 2019-07-03 21:58:06 +02:00
Justin Ivany
643f259cbf Adding option for cursor speed when using gamepad 2019-07-02 11:19:10 +00:00
Justin Ivany
49f2615d2b Fix scrolling with controller on gui 2019-07-01 17:32:20 -03:00
David Cernat
94a9292cc6 [Client] Use correct index when unassigning quickkeys from WindowManager 2019-07-01 13:48:45 +03:00
Alexei Dobrohotov
9dfee1dfe2
Fix invisibility/chameleon alpha (thanks Hrnchamd) 2019-06-30 16:13:11 +03:00
Alexei Dobrohotov
19dc01232c
Fix CenterOnCell target rotation 2019-06-30 16:03:24 +03:00
Capostrophic
b8afe14206 Disallow paralyzed actors to greet the player (bug #5074) 2019-06-29 13:31:36 +03:00
Andrei Kortunov
633b8e26ad
Merge pull request #2436 from Capostrophic/enchanting 
Correct cast style behavior when there's no item picked (bug #5075)
 2019-06-29 13:01:13 +04:00
Capostrophic
cbb22f0f63 Correct cast style behavior when there's no object (bug #5075) 2019-06-28 15:52:37 +03:00
Capostrophic
453068cc7d Disallow actors to start combat with themselves (bug #3550) 
Allow creatures to play initial attack dialogue
Don't add combat package to dead actors
 2019-06-27 19:50:54 +03:00
Alexei Dobrohotov
3cbe4ab85d
Fix idlestorm blend mask (bugs #4240, #5071) 2019-06-22 23:05:20 +03:00
Andrei Kortunov
b9a1e4d796
Merge pull request #2425 from Capostrophic/esm 
Signedness fixes
 2019-06-21 10:01:10 +04:00
Capostrophic
df89c6b6ce Make unarmed creature attacks affect shield condition again (bug #5069) 2019-06-20 20:45:52 +03:00
David Cernat
77952440f6 [Client] Clean up handling of draw states 2019-06-19 08:24:53 +03:00
Capostrophic
3aa65273c5 Signedness fixes 2019-06-18 14:47:10 +03:00
David Cernat
301fff7fe5 [Client] Always allow spellcasting from dedicated players and actors 2019-06-17 04:21:43 +03:00
Alexander Perepechko
19b0b056e5 Remove spell FX and VFX after playing the death animation (bug #5060) 2019-06-13 21:42:25 +00:00
Andrei Kortunov
dcf03f6785
Merge pull request #2416 from Capostrophic/cast 
Make Player->Cast select the spell instead (bug #5056)
 2019-06-10 09:39:23 +04:00
Andrei Kortunov
a62b6910ba
Merge pull request #2411 from Capostrophic/fader 
Make sure fade operations properly end (bug #4639)
 2019-06-10 08:58:26 +04:00
Capostrophic
56539fee4f Partially revert "Get rid of redundant setKeyFocusWidget() method" 2019-06-09 02:12:44 +03:00
David Cernat
01804af100 [Client] Add updateInventoryWindow() method to LocalPlayer 2019-06-09 01:00:01 +03:00
David Cernat
49fa35a516 [Client] Use ObjectActivate packets when picking up items from inventory 2019-06-09 01:00:01 +03:00
Capostrophic
295ee11063 Make Player->Cast select the spell instead (bug #5056) 2019-06-08 17:08:39 +03:00
Alexei Dobrohotov
ef2a7160fa
Fix automovement toggling on "joystick used" flag 2019-06-08 15:06:04 +03:00
Evil Eye
67fb19c2b9 fix deletion when not at end of line and implement ^LEFT and ^RIGHT 2019-06-07 18:41:35 +02:00
Evil Eye
4aca8240e5 implement ^W and ^U in the console 2019-06-06 22:09:54 +02:00
Capostrophic
596dbbe70b Make sure fade operations properly end (bug #4639) 2019-06-06 12:25:01 +03:00
Alexei Dobrohotov
61db93e7da
Merge pull request #2407 from akortunov/scrollbars 
Add separate textures for scrollbars
 2019-06-06 09:09:55 +03:00
Capostrophic
25e52f7dfe Use 2D distance for fight rating of vertically moving actors (bug #4961) 2019-06-05 21:41:02 +03:00
Andrei Kortunov
a02f730a77
Merge pull request #2406 from Capostrophic/invalid 
Erase effects with invalid indices from spells (bug #5050)
 2019-06-03 09:21:11 +04:00
Andrei Kortunov
08716ed330
Merge pull request #2409 from Capostrophic/input 
Correct always run behavior when both a gamepad and a keyboard are used
 2019-06-03 08:18:46 +04:00
Capostrophic
b7afb213ae "Handle" RepairedOnMe scripting function (feature #4255) 2019-06-03 02:17:32 +03:00
Capostrophic
70635ed1e2 Correct always run behavior when both a gamepad and a keyboard are used 2019-06-02 22:57:31 +03:00
Capostrophic
d98a90194b Erase effects with invalid indices from spells (bug #5050) 2019-06-02 14:56:39 +03:00
Andrei Kortunov
2436652181
Merge pull request #2405 from Capostrophic/idlestorm 
Improve face shielding behavior in general case (bug #4240)
 2019-06-02 08:41:32 +04:00
Andrei Kortunov
34fe896f4e
Merge pull request #2400 from Capostrophic/colorcode 
Escape number signs in cell/region names (bug #5047)
 2019-06-02 08:06:40 +04:00
Alexei Dobrohotov
8ebecb7584 Merge branch '7' into 'master' 
fixes pitch black ripples in shadow

See merge request OpenMW/openmw!123
 2019-06-01 12:13:14 +00:00
Andrei Kortunov
ae935a8084 Add separate textures for scrollbars (feature #5051) 2019-06-01 16:12:03 +04:00
Capostrophic
e7208bb80e Improve face shielding behavior in general case (bug #4240) 2019-05-30 12:16:25 +03:00
bzzt
403171e083 fixes pitch black ripples in shadow 2019-05-29 13:37:00 +00:00
Andrei Kortunov
1ce370e7fa Make console to do not hide other GUI windows (bug #1515) 2019-05-29 17:10:57 +04:00
Capostrophic
9a19af5b33 Escape number signs in cell/region names (bug #5047) 2019-05-28 23:02:30 +03:00
Andrei Kortunov
4d292425b3
Merge pull request #2398 from Capostrophic/saydone 
Make SayDone return 1 on the frame speech is started (bug #4879)
 2019-05-28 22:55:07 +04:00
Andrei Kortunov
f9143decc9
Merge pull request #2397 from Capostrophic/gamepad 
Analogue movement fixes
 2019-05-28 22:45:42 +04:00
Capostrophic
e095d51999 More queue handling adjustments 2019-05-26 19:23:42 +03:00
Capostrophic
c975dab7c3 Update say sound queue explicitly once per frame 2019-05-26 18:46:53 +03:00
Capostrophic
4c2b694b29 Make SayDone return 1 on the frame speech is started (bug #4879) 2019-05-26 18:00:50 +03:00
Alexei Dobrohotov
e0fb411fc8 Merge branch '2' into 'master' 
stop making new reflacttetures at intext change

See merge request OpenMW/openmw!116
 2019-05-24 14:08:09 +00:00
bzzt
6c310c64d2 stop making new reflacttetures at intext change 2019-05-24 13:37:00 +00:00
Capostrophic
f271ac255d Avoid conflicts between gamepad movement and always run setting 2019-05-24 12:50:16 +03:00
Capostrophic
40c1db32bd Apply analogue speed mult to fatigue loss 2019-05-24 12:50:16 +03:00
Andrei Kortunov
fae5843347 Setup the ICO settings only once instead of every loading (bug #5025) 2019-05-24 08:04:20 +04:00
Andrei Kortunov
ab03b9ac1c Do not sort the Land store every savegame load - it is static anyway (bug #4844) 2019-05-24 08:04:20 +04:00
Andrei Kortunov
57176ff8d4 Unload viewer and stop background jobs before resources unloading 2019-05-24 08:03:45 +04:00
David Cernat
f29bfb6b8e [Client] Add debug for received kill counts 2019-05-22 23:20:44 +03:00
Alexei Dobrohotov
7c46102f0c
Merge pull request #2389 from akortunov/fmt 
Introduce a custom format() function
 2019-05-21 21:45:52 +03:00
Alexei Dobrohotov
54ee08cb75
Merge pull request #2396 from akortunov/master 
Remove BOM from CPP files
 2019-05-21 21:22:34 +03:00
Andrei Kortunov
6832a2fa9a Remove BOM from CPP files (allows to build OpenMW with LCC on Elbrus) 2019-05-21 19:22:34 +04:00
David Cernat
abc4090a0f [Client] Fix loop in ActiveSpells::getEffectDuration() 2019-05-20 23:09:54 +03:00
Andrei Kortunov
e679190f31 Introduce a custom format() function to get rid of boost::format() and hackish replace() 2019-05-20 09:20:01 +04:00
Alexei Dobrohotov
0ee73d89f0
Correct selling prices of creature merchants 2019-05-19 23:43:40 +03:00
Andrei Kortunov
faf940546b Get rid of redundant setKeyFocusWidget() method 2019-05-17 19:09:40 +04:00
Andrei Kortunov
675be20a0f Get rid of redundant ControllerRepeatClick class 2019-05-17 10:49:00 +04:00
Andrei Kortunov
ac8fa54e6e Get rid of redundant MWScroll class 2019-05-17 10:23:34 +04:00
Capostrophic
3f73766304 Make enchanting make more sense (bug #5038) 2019-05-15 18:40:52 +03:00
Andrei Kortunov
7023e86d19
Merge pull request #2388 from Capostrophic/animation 
Hardcode the correct first person sneaking anim speed (bug #4787)
 2019-05-15 09:02:53 +04:00
Andrei Kortunov
316c79fecd
Merge pull request #2387 from Capostrophic/spells 
Don't break GetSpellEffects execution if the spell doesn't exist
 2019-05-15 08:55:54 +04:00
Andrei Kortunov
6bf5960b96
Merge pull request #2386 from Capostrophic/waiting 
Exit waiting at the correct time when the player is in air
 2019-05-15 08:44:47 +04:00
Capostrophic
1de984364a Hardcode the correct first person sneaking anim speed (bug #4787) 2019-05-15 01:46:55 +03:00
Alexei Dobrohotov
3d3e9f373c
Merge pull request #2384 from akortunov/ranks 
Fix RaiseRank/LowerRank script functions
 2019-05-15 01:42:59 +03:00
Capostrophic
5f7343ad7f Don't break GetSpellEffects execution if the spell doesn't exist 2019-05-14 21:24:03 +03:00
Andrei Kortunov
f775f7977b Fix RaiseRank/LowerRank script functions (feature #4316) 2019-05-14 21:43:19 +04:00
Capostrophic
272df29a12 Exit waiting at the correct time when the player is in air 2019-05-14 20:38:41 +03:00
Capostrophic
485ed903c4 Enchanting window stays open after a failed attempt (feature #5034) 2019-05-14 17:16:37 +03:00
Andrei Kortunov
a79955352f Revert MR !103 and !105 since they cause issues with dialogue window 2019-05-14 14:22:54 +04:00
Andrei Kortunov
55767eaf7e
Merge pull request #2380 from Capostrophic/faction 
Allow scripted faction leaving using PCLowerRank (feature #5036)
 2019-05-13 21:21:47 +04:00
Andrei Kortunov
27737d4258 Fix an exception during reload when container windows is active. 
It is a regression in the animated containers feature.
 2019-05-13 17:59:32 +04:00
Alexei Dobrohotov
bb0c989f87
Clear expelled status when leaving faction 2019-05-13 10:22:03 +03:00
Alexei Dobrohotov
d37cb871d6
Fix last-minute typo 2019-05-13 09:50:32 +03:00
Capostrophic
555e43855d Allow scripted faction leaving using PCLowerRank (feature #5036) 2019-05-12 20:57:54 +03:00
Capostrophic
144b1b9b06 Magic armor mitigation for creatures (feature #5033) 2019-05-11 19:21:49 +03:00
Capostrophic
c67eb6d9db Drop bogus accounting for armor rating from weapon priority 2019-05-11 19:06:45 +03:00
Alexei Dobrohotov
4a5e2d1d4e
Merge pull request #2281 from akortunov/shaders 
Minor water shader fixes
 2019-05-11 18:07:58 +03:00
Capostrophic
62482657fc GetWeaponType returns -2 for picks and -3 for probes (feature #5031) 2019-05-11 14:18:29 +03:00
Alexei Dobrohotov
0cea76c684
Merge pull request #2375 from akortunov/warnfix 
Do not copy pointers during iteration
 2019-05-11 14:10:01 +03:00
Andrei Kortunov
ef4042703d
Merge pull request #2373 from Capostrophic/barter 
Make offered price caps barter-specific (bug #5028)
 2019-05-11 15:05:41 +04:00
Andrei Kortunov
9ba6f5f36c Do not copy pointers during iteration 2019-05-11 09:44:30 +04:00
Alexei Dobrohotov
216f908a07
Merge pull request #2286 from akortunov/map 
Do not re-render maps for all active cells during cell transitions
 2019-05-11 02:30:38 +03:00
Phillip A
c4d5203e14 Fix MR !103 breaking of dialogue with actors with no greetings 2019-05-09 23:28:43 +00:00
Capostrophic
9d191055bf Make offered price caps barter-specific (bug #5028) 2019-05-09 21:19:10 +03:00
Bret Curtis
e0af6532ec
Merge pull request #2371 from Capostrophic/sneak 
Don't toggle sneaking when controls are disabled
 2019-05-07 09:52:21 +02:00
Frederic Chardon
6619150b23 Do not show magnitude for ingredients 2019-05-06 23:48:13 +00:00
Alexei Dobrohotov
310e19d47f Merge branch 'ptr-fix' into 'master' 
Make sure pointers are set before GUI windows are brought up

See merge request OpenMW/openmw!103
 2019-05-06 20:33:25 +00:00
Phillip Andrews
a481d2dc1a Make sure pointers are set before GUI windows are brought up 
This most noticiably fixes an issue when resting in a bed while levitating.
 2019-05-06 14:53:20 -05:00
Alexei Dobrohotov
1d12d778ea
Merge pull request #2370 from akortunov/herbalism 
Container search tweaks
 2019-05-06 22:34:12 +03:00
Capostrophic
4787e6b9a7 Don't toggle sneaking while controls are disabled 2019-05-06 22:30:07 +03:00
Andrei Kortunov
7214f24f5c Ignore containers, when we search for owner 2019-05-06 23:06:13 +04:00
Andrei Kortunov
abe1009e98 Do not resolve container's content during search 2019-05-06 23:05:31 +04:00
Capostrophic
cb9d16cf5f Support negative effect magnitude in spell/ingredient/potion tooltips 2019-05-05 21:27:48 +03:00
Capostrophic
458c0bba41 Avoid using null pointer for player's cell in moveObjectImp 2019-05-05 16:43:32 +03:00
Capostrophic
3add9765c3 Fix spell deletion for character without a birthsign 2019-05-04 21:51:36 +03:00
Alexei Dobrohotov
15142a608d
Merge pull request #2344 from xyzz/delete-spell 
Add a button to delete spells from spellwindow
 2019-05-04 21:05:12 +03:00
Alexei Dobrohotov
acae586765
Merge pull request #2365 from akortunov/guifixes 
Refactor Settings::Manager::apply()
 2019-05-04 21:01:15 +03:00
Andrei Kortunov
4f42fe5595 Refactor Settings::Manager::apply() 2019-05-04 21:38:36 +04:00
Alexei Dobrohotov
e4ef7e8d3f
Merge pull request #2355 from akortunov/transparency 
Use the StateSetUpdater to modify alpha for Animation objects
 2019-05-04 20:24:01 +03:00
Alexei Dobrohotov
1bfe0e43af
Merge pull request #2360 from akortunov/guifixes 
Do not track resolution settings changes in the InputManager
 2019-05-04 20:23:03 +03:00
Alexei Dobrohotov
632e7b973b
Merge pull request #2349 from akortunov/pinning 
Allow to maximize windows via Shift + Double Click
 2019-05-04 20:21:30 +03:00
Alexei Dobrohotov
a737935748
Merge pull request #2363 from akortunov/herbalism 
Additional herbalism-related tweaks
 2019-05-04 13:57:17 +03:00
Andrei Kortunov
c91d1e7394 Ignore containers without resolved content for Detect spells 2019-05-04 14:40:32 +04:00
Andrei Kortunov
29cfd2c583 Do not respawn container if player did not touch it 2019-05-04 14:09:09 +04:00
Andrei Kortunov
c01153569d Add missing Organic flag check for herbalism 2019-05-04 12:36:58 +04:00
Alexei Dobrohotov
4f74d09179
Handle GetAngle axis more gracefully too 2019-05-04 00:24:23 +03:00
Alexei Dobrohotov
6aef52931f
Merge pull request #2166 from akortunov/distant_slider 
Rework the viewing distance slider
 2019-05-03 21:19:47 +03:00
Alexei Dobrohotov
74112976b2
Merge pull request #2085 from akortunov/herbalism 
Native graphics herbalism support
 2019-05-03 20:58:22 +03:00
Andrei Kortunov
4513c5516c Increase the viewing distance cap in the slider when the Distant Terrain is enabled 2019-05-03 10:23:10 +04:00
Andrei Kortunov
5876a417c3 Use the StateSetUpdater to modify alpha for Animation objects (bug #5001) 2019-05-03 08:18:52 +04:00
Andrei Kortunov
ed859c41be
Merge pull request #2353 from Capostrophic/drop 
Make Drop behavior closer to vanilla (bug #4999)
 2019-05-03 08:12:46 +04:00
Andrei Kortunov
861d41f4a4 Native graphics herbalism support (feature #5010) 2019-05-02 23:03:47 +04:00
Capostrophic
3c18079c14 Handle invalid instruction axis more gracefully 2019-05-02 20:50:05 +03:00
Andrei Kortunov
0cd8d4b842 Do not track resolution settings changes in the InputManager (bug #4902) 2019-05-02 19:00:47 +04:00
Andrei Kortunov
c5ac580e74 Allow to maximize windows via Shift + Double Click (feature #3999) 2019-05-01 20:15:11 +04:00
Ilya Zhuravlev
1d02c1ef37 engine: fix window creation when SDL returns different-sized window 2019-04-30 14:25:24 -04:00
Capostrophic
b42f981200 Make Drop and soulgem instruction behavior closer to vanilla (bug #4999) 2019-04-30 19:06:02 +03:00
Andrei Kortunov
c3fdccac1f Do not use the xbase_anim.kf as a fallback for werewolves (bug #5004) 2019-04-30 17:51:38 +04:00
Ilya Zhuravlev
16d2db8492 android: remove unused file 2019-04-28 18:21:48 -04:00
Ilya Zhuravlev
7865ffa1a7 android: Switch to C++ 2019-04-28 18:21:31 -04:00
Andrei Kortunov
c610a58cf0 Improve reset of idle animations (bug #4847) 2019-04-28 22:28:24 +04:00
Andrei Kortunov
1832f1759d AI: use a consistent check if a target is hidden (bug #4920) 2019-04-28 16:41:10 +04:00
Andrei Kortunov
c36a22653f
Merge pull request #2348 from Capostrophic/music 
Increase music crossfade time to 1 second
 2019-04-25 21:36:42 +04:00
Capostrophic
6e98cd8eaa Increase music crossfade time to 1 second 2019-04-25 20:26:40 +03:00
Alexei Dobrohotov
5e405ca679
Merge pull request #2347 from akortunov/pinning 
Make pinnable windows hiding persistent
 2019-04-25 20:15:05 +03:00
Andrei Kortunov
8e48493264 Make pinnable windows hiding persistent (feature #4994) 2019-04-25 21:05:43 +04:00
Ilya Zhuravlev
e057ea171f spell window: don't manually recalculate edit box width every update 2019-04-25 09:13:32 -04:00
Ilya Zhuravlev
e1ce15efb5 spellwindow: do onWindowResize in ctor after dimensions are set 2019-04-25 08:51:57 -04:00
Ilya Zhuravlev
26ac7412a0 Spell window: dynamically resize the edit box, change delete button caption 2019-04-25 08:46:11 -04:00
Ilya Zhuravlev
2ee0b1287b spellmodel: add a break to getSelectedIndex 2019-04-25 06:14:12 -04:00
David Cernat
02e646e838 [Client] Use check for credits file that makes more sense 2019-04-25 04:39:25 +03:00
David Cernat
437854180c [Client] Clean up variable & function names in mwmp/Main.cpp 2019-04-25 04:29:54 +03:00
Ilya Zhuravlev
6c96b5653b Add a button to delete spells from spellwindow 2019-04-24 19:22:47 -04:00
Andrei Kortunov
28252bb359 Merge branch 'hashRefID' into 'master' 
Remove string copy in CellStore::search

See merge request OpenMW/openmw!77
 2019-04-24 16:46:13 +00:00
Capostrophic
8abe92fe41 Don't recover normalise speed setting every frame 2019-04-24 16:22:56 +03:00
Capostrophic
34ea9ea813 Add an option to restore MCP-like movement behavior 2019-04-24 16:21:12 +03:00
Capostrophic
c7ac06b960 Always account for every follower travelling 2019-04-24 16:21:12 +03:00
Andrei Kortunov
95d6a99c7f Do not use the CPU affinity of OSG viewer (bug #4785) 2019-04-24 14:51:00 +04:00
Bret Curtis
b43eb56b7c
Merge pull request #2336 from akortunov/logging 
Use the logging system for compiler errors
 2019-04-24 12:00:44 +02:00
Andrei Kortunov
df94bfbf29
Merge pull request #2343 from Capostrophic/vfx 
Tweak object VFX scaling (bug #4989)
 2019-04-24 10:47:35 +04:00
David Cernat
f6db7d4fc5 [Client] Avoid sending repeated ObjectDelete packets about an object 2019-04-24 00:52:11 +03:00
Andrei Kortunov
bd2188a0f8 Use the logging system for compiler errors 2019-04-23 22:20:18 +04:00
Bret Curtis
2cc359a205
Merge pull request #2339 from akortunov/mygui 
Increase required MyGUI version to 3.2.2
 2019-04-23 16:43:14 +02:00
Capostrophic
f2638b58c1 Tweak object VFX scaling (bug #4989) 2019-04-22 21:27:33 +03:00
Andrei Kortunov
9059971a69 Increase required MyGUI version to 3.2.2 2019-04-22 20:52:18 +04:00
Andrei Kortunov
6a01e4cd8a Fix arguments order for raytracing in the getHitContact() (bug #4990) 2019-04-22 20:46:38 +04:00
uramer
2531378d0b make getEffectDuration to look for a specific effect 2019-04-21 20:53:38 +02:00
Andrei Kortunov
626a05f825
Merge pull request #2128 from Capostrophic/blood 
Support all eight possible blood types (feature #4958)
 2019-04-21 21:14:30 +04:00
Alexei Dobrohotov
3e61ef32e7
Merge pull request #2332 from akortunov/particles 
Apply looping particles when adding spell to existing actor
 2019-04-21 10:39:17 +03:00
Andrei Kortunov
09686d684e Update background texture if a new one is empty (regression #4986) 2019-04-20 11:40:42 +04:00
Andrei Kortunov
5508e67aad Apply looping particles when adding spell to existing actor (bug #4918) 2019-04-20 09:52:15 +04:00