mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 21:45:33 +00:00
Code Issues Releases Wiki Activity
24724 commits 38 branches 54 tags 122 MiB
Commit graph

17747 commits

Author SHA1 Message Date
James Stephens
7d3f6e1cd9 Altered process so that cost only appears on spell purchase window. 
Added myself to authors
 2019-09-02 17:18:56 +00:00
James Stephens
b33429001c Fixes the offset question mark in the alchemy tooltip when the effect is not known 2019-09-02 17:13:56 +00:00
James Stephens
1cd1bfca74 Fixes bug #4650 2019-09-02 16:49:29 +02:00
David Cernat
95967ea289 [General] Rename unused ObjectReset packet into ObjectHit 2019-09-01 08:30:03 +03:00
David Cernat
6dccdfe0c1 [Client] Load up TES3MP's settings in the same map as OpenMW's settings 
This allows the "font size" property to be read when the chat window is created.
 2019-08-28 06:37:33 +03:00
Andrei Kortunov
b6044d231a Handle death event manually before disposing a corpse if a death animation was not finished yet (feature #5146) 2019-08-27 22:42:41 +04:00
David Cernat
3a1e3cf0f5 [Client] Prevent chat key from switching to chat window while in console 2019-08-27 15:23:12 +03:00
David Cernat
a9f1481e5c [Client] Revert changes to key focus setting as per 56539fee4f 2019-08-27 15:22:11 +03:00
David Cernat
a52d32602d [Client] Fix code style in PlayerList 2019-08-27 09:29:43 +03:00
Andrei Kortunov
84b3aaedaa
Merge pull request #2506 from akortunov/refactor 
Rename getWeaponPart() function
 2019-08-27 10:05:44 +04:00
Andrei Kortunov
c059bf04cc Rename getWeaponPart() function 2019-08-27 09:55:02 +04:00
David Cernat
3e1c96a49c [Client] Fix crash by not trying to enable markers for invalid players 2019-08-26 21:10:02 +03:00
David Cernat
78a9a428a6 [Client] Remove unnecessary mwmp::Main::pressedKey() function 
Additionally, add comment around where it was originally used.
 2019-08-26 15:41:45 +03:00
David Cernat
e0f623fb87 [Client] Move check for preventing auto equipping to correct spot 2019-08-26 15:39:56 +03:00
David Cernat
e15428e139 [General] Remove "created by" stamps added by IntelliJ 2019-08-26 12:33:28 +03:00
elsid
16170131b7
Add enum type for door state 2019-08-25 15:21:00 +02:00
David Cernat
9350e1d484 [General] Split up Attack packets into Attack and Cast ones 
Create an entirely new PlayerCast packet for that purpose, but rename the already existing but unused ActorInteraction into ActorCast.
 2019-08-25 09:35:23 +03:00
Alexei Dobrohotov
43a58e181f
Merge pull request #2455 from Capostrophic/input 
Revert questionable input manager decisions
 2019-08-24 15:02:50 +03: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
f671c0bddc Add OpenMW commits up to 1 Apr 2019 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/engine.cpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/trainingwindow.cpp
#	apps/openmw/mwgui/travelwindow.cpp
#	apps/openmw/mwgui/waitdialog.cpp
 2019-08-21 23:54:39 +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
6fdef4fd0a Add OpenMW commits up to 1 Jan 2019 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-21 14:37:54 +03:00
David Cernat
68886e7539 Add OpenMW commits up to 2 Dec 2018 
# Conflicts:
#	.travis.yml
#	README.md
 2019-08-21 13:08:56 +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
3efffe92e3 Add OpenMW commits up to 5 Nov 2018 
# Conflicts:
#	CI/before_install.linux.sh
#	CMakeLists.txt
#	apps/openmw/mwmechanics/aifollow.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/CMakeLists.txt
 2019-08-21 05:08:50 +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
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
David Cernat
300cef0073 [Server] Allow setting of container record flags in SetRecordFlags() 2019-08-01 21:28:03 +03:00