1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 23:45:31 +00:00
Commit graph

17616 commits

Author SHA1 Message Date
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
David Cernat
ab93b5ddc5 [General] Use PlayerItemUse packets when using items through quick keys 2019-08-16 05:50:07 +03:00
David Cernat
ae5200cbb2 [General] Implement light records for RecordDynamic packets 2019-08-14 21:10:53 +03:00
David Cernat
6160293e86 [Client] Don't clear placeholder summons in CastSpell::inflict() 2019-08-12 15:12:34 +03:00
David Cernat
1d09763bad [Client] Allow blanking out the enchantment IDs of records using a base 2019-08-08 08:05:10 +03: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
David Cernat
18e2a14645 [General] Implement tool-related records for RecordDynamic packets 2019-08-04 17:53:18 +03:00
David Cernat
4100d93dea [General] Implement ingredient records for RecordDynamic packets 2019-08-03 06:19:22 +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
Alexei Dobrohotov
3f2b63122d
Merge pull request #2467 from Capostrophic/stream
[Regression] Editor: Avoid locale-related settings parsing issues
2019-08-01 20:39:06 +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
David Cernat
0189d19d14 [Server] Clear new types of records in ClearRecords() 2019-08-01 15:47:13 +03: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
capostrophic
5341ca4e22 [Regression] Avoid locale-related conversion issues in editor 2019-08-01 11:47:31 +03:00
David Cernat
247d2fad30 [General] Implement activator & static records for RecordDynamic packets 2019-08-01 09:48:57 +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
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
Chris Djali
576285573b
Merge pull request #2404 from Capostrophic/framerate
Make framerate limit configurable in the launcher
2019-07-19 16:16:20 +01: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
Axel Vestin
c0f66ac70c Fixes Albemic typo in OpenMW-CS 2019-07-06 00:13:30 +02: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