mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-07 03:45:31 +00:00
Code Issues Releases Wiki Activity
28699 commits 38 branches 54 tags 122 MiB
Commit graph

1126 commits

Author SHA1 Message Date
Capostrophic
9c930e38fa Add option to always allow stealing from KO'd actors (feature #5545) 2020-07-26 13:10:44 +03:00
Capostrophic
cc6e4ad215 Fix pickpocketing sneaking stance check 2020-07-26 12:20:17 +03:00
Evil Eye
040a92c373 implement additem/removeitem for non-unique actors 2020-07-26 11:07:18 +02:00
David Cernat
5eb7eb8d88 Add OpenMW commits up to 4 Jul 2020 
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/charactercreation.cpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/character.cpp
 2020-07-04 16:50:54 +03:00
Mads Buvik Sandvei
58d73e14e6 Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr 
# Conflicts:
#	apps/openmw/mwbase/environment.cpp
#	apps/openmw/mwbase/environment.hpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwinput/inputmanagerimp.hpp
#	apps/openmw/mwrender/animation.cpp
#	apps/openmw/mwrender/camera.cpp
#	apps/openmw/mwrender/camera.hpp
#	apps/openmw/mwrender/renderingmanager.cpp
#	apps/openmw/mwrender/renderingmanager.hpp
 2020-06-28 11:59:07 +02:00
Capostrophic
2b2f9a8714 Redistribute hits to carried left slot when possible (#5490) 2020-06-25 15:44:40 +03:00
David Cernat
3b2eb6f62c Add OpenMW commits up to 22 Jun 2020 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
 2020-06-22 20:50:55 +03:00
Petr Mikheev
b4c699348f Improved strafe movement 2020-06-22 15:22:34 +02:00
elsid
374b85a00d
Add Class methods to get walk, run, swim speed 2020-06-13 02:24:51 +02:00
elsid
a35497de0c
Remove redundant runSpeed as always equal to walkSpeed 2020-06-13 02:24:45 +02:00
David Cernat
e5b1843089 Add OpenMW commits up to 11 Jun 2020 
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/activespells.cpp
#	apps/openmw/mwmechanics/aiactivate.cpp
#	apps/openmw/mwmechanics/aiactivate.hpp
#	apps/openmw/mwmechanics/creaturestats.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2020-06-11 13:21:58 +03:00
Bret Curtis
6bc04507ef
Merge pull request #2715 from akortunov/cleanup 
Remove custom data for disposed actors
 2020-06-08 12:29:28 +02:00
Andrei Kortunov
5468fcb29f Store attributes and skills values as floats (bug #4021) 2020-06-03 17:34:15 +04:00
Evil Eye
4d7947d27c Mutate base records when editing AI settings (#2798) 2020-06-02 21:59:37 +02:00
Mads Buvik Sandvei
cbbc82f053 Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/engine.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwinput/inputmanagerimp.hpp
#	apps/openmw/mwphysics/physicssystem.cpp
#	apps/openmw/mwrender/water.cpp
#	apps/openmw/mwrender/water.hpp
#	apps/openmw/mwworld/worldimp.cpp
 2020-05-17 23:47:28 +02:00
Mads Buvik Sandvei
6474d703ae GUI fixes. Animation fixes, i now understand movement accumulation better and was able to clean up some of the hacks with a better result. Lockpicks and probes now work. Haptics. Ready to be playtested. 2020-05-17 16:25:51 +02:00
David Cernat
a20f8e77dc Add OpenMW commits up to 25 Apr 2020 
# Conflicts:
#	.travis.yml
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
 2020-04-25 09:52:58 +03:00
Bret Curtis
e7795f2bf7
Merge pull request #2775 from Capostrophic/dooractivation 
Only disarm traps with keys when the door/container is locked (bug #5370)
 2020-04-24 08:46:24 +02:00
Bret Curtis
8a8107e837 as it says; revert vismask and uncomplicate openmw 2020-04-20 20:57:38 +02:00
David Cernat
f8c557fbc0 [General] Read and use weapon quantity in RecordDynamic packets 2020-04-19 23:17:09 +03:00
Capostrophic
5dc8da5f67 Only disarm traps with keys when the door is locked (bug #5370) 2020-04-13 20:26:51 +03:00
David Cernat
25a632c650 Add OpenMW commits up to 13 Apr 2020 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	apps/openmw/engine.cpp
#	apps/openmw/mwclass/creaturelevlist.cpp
#	apps/openmw/mwgui/quickkeysmenu.cpp
 2020-04-13 19:53:42 +03:00
Andrei Kortunov
cb6707624d
Merge branch 'master' into soul 2020-04-13 13:47:13 +04:00
Capostrophic
07779d7fcf Properly utilize creature levelled list's scale (bug #5369) 2020-04-12 13:21:13 +03:00
Capostrophic
96a447ee3a Show the soulgem soul in count dialog (feature #5362) 2020-04-12 11:55:00 +03:00
David Cernat
7bc3298ed4 Add OpenMW commits up to 1 Apr 2020 
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	apps/openmw/mwphysics/physicssystem.cpp
 2020-04-01 19:24:11 +03:00
Mads Buvik Sandvei
14bb0f0208 Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr 
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2020-03-30 01:37:29 +02:00
Andrei Kortunov
dea2018d9f Do not use dynamic casts when using ObjectState 2020-03-17 15:18:40 +04:00
Mads Buvik Sandvei
893b75d767 Realistic combat, first draft 2020-03-15 15:31:38 +01:00
Andrei Kortunov
ae65b0228a Do not write custom data for disposed actors 2020-03-07 13:01:14 +04:00
David Cernat
8b2bf941cd [Client] Only play trap disarm sounds when the server approves disarming 2020-02-26 22:24:58 +02:00
David Cernat
85fb1d1a0b Add OpenMW commits up to 19 Feb 2020 
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
 2020-02-20 01:51:47 +02:00
Andrei Kortunov
84979fa8b7 Move VisMask to components 2020-02-16 16:03:35 +04:00
David Cernat
a58f09fd6c Add OpenMW commits up to 2 Jan 2020 
# Conflicts:
#	apps/openmw/mwmechanics/enchanting.cpp
#	apps/openmw/mwworld/scene.cpp
 2020-01-02 22:09:54 +02:00
Andrei Kortunov
88a695f251 Add safety checks for door state 2019-12-23 19:29:12 +04:00
David Cernat
bc093c8596 [General] Implement OnObjectHit packet, part 2 
ObjectHit is now also sent when local actors succeed or fail in hitting other actors with melee attacks, with the packet including the success state of their attack.

It is also sent when creatures hit a non-actor object.
 2019-12-13 14:00:51 +02:00
David Cernat
2973cc4f4d [General] Implement OnObjectHit packet, part 1 
ObjectHit is now sent when an NPC hits a non-actor object.
 2019-12-08 16:14:01 +02:00
David Cernat
ecf00af548 [General] Implement WorldDestinationOverride packet, part 1 
Destinations for doors with cell transitions are now overridden.
 2019-12-04 16:43:56 +02:00
David Cernat
c4950f1beb [Client] Implement PlayerTeam packet, part 2 
When determining actors siding with someone, also check the team members of DedicatedPlayers, not just those of the LocalPlayer.

Don't set players as each other's hitAttemptActor if they are team members.

Don't run startCombat() for DedicatedPlayers who get attacked.
 2019-12-03 22:40:02 +02:00
David Cernat
5762a36fc2 Add OpenMW commits up to 7 Nov 2019 
# Conflicts:
#	apps/openmw/mwmechanics/aifollow.hpp
 2019-11-08 06:20:41 +02:00
Andrei Kortunov
61ab7f3c1e Implement actors movement deceleration (feature #4544) 2019-10-31 14:41:12 +04:00
David Cernat
cc25612b8d Add OpenMW commits up to 18 Sep 2019 
# Conflicts:
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
#	apps/openmw/mwmechanics/security.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/miscextensions.cpp
 2019-09-18 23:46:08 +03:00
Evil Eye
32de86d114 merge master 2019-09-17 20:31:53 +02:00
Evil Eye
7c8b82f45c move locking behaviour to cellref 2019-09-17 20:30:37 +02:00
Andrei Kortunov
4a6d2cbaff Do not allow player to take items from evidence chests (bug #3609) 2019-09-17 19:08:33 +04:00
Andrei Kortunov
649a14dfae
Merge branch 'master' into activation 2019-09-16 10:52:16 +04:00
Capostrophic
480000da07 Use Open action as fallback for companion activation (bug #5161) 2019-09-15 23:17:36 +03:00
Capostrophic
718dbd3f9a Use object ID as the substitution for their name (bug #5158) 2019-09-11 00:06:50 +03:00
Capostrophic
6b74630f6e Preparation work 
Phase out canBeActivated() to unify activation checks
Use getName() for the name caption in tooltips
Always use tooltips for non-activator objects
Invert hasTooltip default value
 2019-09-10 23:38:16 +03:00
Evil Eye
a86a8ecc0e Allow locking/picking just about everything 2019-09-10 21:53:26 +02:00
Evil Eye
56b6a7ada4 Fix #5155 2019-09-09 22:29:59 +02:00
David Cernat
ca67587b89 Add OpenMW commits up to 5 Sep 2019 
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-09-05 21:41:50 +03:00
elsid
16170131b7
Add enum type for door state 2019-08-25 15:21:00 +02:00
David Cernat
353e7d530a Add OpenMW commits up to 18 Aug 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-22 22:44:00 +03:00
David Cernat
ed05125f6a Add OpenMW commits up to 2 Aug 2019 
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
 2019-08-22 15:38:15 +03:00
David Cernat
b57c0bcafe Add OpenMW commits up to 6 June 2019 
# Conflicts:
#	apps/openmw/mwgui/hud.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/waitdialog.cpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-22 11:42:02 +03:00
David Cernat
5181c601c0 Add OpenMW commits up to 2 May 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/statsextensions.cpp
 2019-08-22 08:40:32 +03:00
David Cernat
8729c3c5e3 Add OpenMW commits up to 9 Mar 2019 
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	README.md
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwscript/animationextensions.cpp
#	apps/openmw/mwscript/guiextensions.cpp
#	apps/openmw/mwscript/miscextensions.cpp
#	apps/openmw/mwscript/soundextensions.cpp
 2019-08-21 19:04:04 +03:00
David Cernat
95a5607509 Add OpenMW commits up to 22 Feb 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/containerextensions.cpp
 2019-08-21 17:29:24 +03:00
David Cernat
6205ff6b04 Add OpenMW commits up to 30 Jan 2019 
# Conflicts:
#	apps/openmw/mwworld/worldimp.cpp
 2019-08-21 15:48:07 +03:00
David Cernat
cbba81df03 Add OpenMW commits up to 14 Nov 2018 
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/inventorystore.cpp
 2019-08-21 09:04:36 +03:00
David Cernat
fba07194cf Add OpenMW commits up to 29 Oct 2018 
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-20 13:15:00 +03:00
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
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
capostrophic
e5331aab28 Escape number signs in object names for tooltips 2019-08-17 21:53:52 +03: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
unknown
2a53f6bc3e Merge branch 'master' of https://github.com/OpenMW/openmw into script-respawn 2019-08-07 10:56:21 +02:00
unknown
6baa5da6c9 Fix scripts not executing on respawn 2019-08-06 21:30:21 +02: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
capostrophic
2affb8ed63 Human-readable light source duration (feature #5091) 2019-07-31 21:37:20 +03:00
capostrophic
dcbe76d888 [Regression] Avoid confusing inventory doll with player 2019-07-31 17:34:32 +03:00
Capostrophic
9a19af5b33 Escape number signs in cell/region names (bug #5047) 2019-05-28 23:02:30 +03:00
Andrei Kortunov
f775f7977b Fix RaiseRank/LowerRank script functions (feature #4316) 2019-05-14 21:43:19 +04:00
Capostrophic
144b1b9b06 Magic armor mitigation for creatures (feature #5033) 2019-05-11 19:21:49 +03:00
Frederic Chardon
6619150b23 Do not show magnitude for ingredients 2019-05-06 23:48:13 +00:00
Andrei Kortunov
29cfd2c583 Do not respawn container if player did not touch it 2019-05-04 14:09:09 +04:00
Andrei Kortunov
861d41f4a4 Native graphics herbalism support (feature #5010) 2019-05-02 23:03:47 +04:00
Capostrophic
7814bd1b76 Support eight possible blood types (feature #4958) 2019-04-14 18:48:31 +03:00
Capostrophic
424716977b Only play miss sound for player attacks (bug #4969) 2019-04-10 22:28:22 +03:00
Capostrophic
1424399118 Disable any footstep sounds when flying (bug #4948) 2019-04-04 17:22:24 +03:00
Vladimir Panteleev
12bbecacfd
Reuse a previously-saved value 2019-03-04 16:23:57 +00:00
Andrei Kortunov
00ab552184 Add more settings to water reflections in exteriors (feature #4859) 2019-03-02 14:26:14 +04:00
Bret Curtis
56d5fc788c
Merge pull request #2163 from Capostrophic/hello 
AI data handling minor revisions
 2019-02-24 20:14:08 +01:00
Bret Curtis
d4564a9be7
Merge pull request #2180 from akortunov/includes 
Remove redundant includes
 2019-02-24 01:14:16 +01:00
Capostrophic
594ea39f5d Revise AI data handling 
Make Hello 16-bit unsigned as it's intended to be
Get rid of redundant mHasAI boolean
Always save AI data subrecord
Adjust creature and NPC default rating values to Morrowind defaults
 2019-02-23 21:00:47 +03:00
Bret Curtis
df2de8a661
Merge pull request #2068 from Capostrophic/normalweapons 
Make normal weapon resistance behavior closer to vanilla (bug #4384)
 2019-02-23 08:38:30 +01:00
Andrei Kortunov
3032b177a1 Remove redundant includes 2019-02-23 08:02:12 +04:00
Bret Curtis
212f097b3c
Merge pull request #2172 from akortunov/pvs_fix 
Fix some issues, found by PVS-Studio
 2019-02-22 15:01:37 +01:00
Capostrophic
b738cc0383 Make normal weapon resistance behavior closer to vanilla (bug #4384) 
Check both the ranged weapon and the projectile before modifying the damage
Don't attempt to apply NPC-specific werewolf damage mult to damage to creatures
 2019-02-22 00:01:21 +03:00
Capostrophic
64d5cd17d6 Move werewolf silver damage mult applying into a new function 2019-02-22 00:01:21 +03:00
Capostrophic
808b8ce8db Refactor normal weapon resistance 2019-02-22 00:01:21 +03:00
Capostrophic
c20030d8c9 Correct jumping velocity 2019-02-18 16:22:01 +03:00
Andrei Kortunov
ad9412a117 Remove some redundant checks 2019-02-17 14:29:36 +04:00
Capostrophic
5c889f7359 Add creature-with-the-same-model soundgen fallback (bug #4813) 
Creatures will use sounds of the first creature that has the same model in the record store when possible.
 2019-01-29 16:29:47 +03:00
Andrei Kortunov
02a43d0b32 Do not scale player's model in the 1st-person view depending on race (bug #4383) 2019-01-07 12:58:47 +04:00
David Cernat
5d9893ee92 [Client] Set actor killer correctly for spells that do damage over time 
Additionally, clean up comments related to other code that sets actor killers.
 2018-12-30 07:40:11 +02:00