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

28661 commits

Author SHA1 Message Date
Mads Sandvei
2437e3daee
Update vrgui.cpp
Bump main menu priority so that the chat window won't occlude the main menu and the meta menu
2022-04-28 22:23:12 +02:00
David Cernat
78aa4e8163
Merge pull request #615 from madsbuvi/patch-1
Enable per-view mapping of water textures
2022-04-28 23:18:50 +03:00
Mads Sandvei
ba833551bd
Enable per-view mapping of water textures 2022-04-28 22:18:00 +02:00
David Cernat
3b40882ba3 [VR Browser] Run VR executable instead of regular one 2022-02-15 22:49:17 +02:00
David Cernat
71bea5fc00 [VR Build] Rename VR client executable 2022-02-15 22:00:08 +02:00
David Cernat
339a196579 Add OpenMW VR commits up to 4 Jul 2021
# Conflicts:
#   CMakeLists.txt
#   LICENSE
#   README.md
#   apps/openmw/CMakeLists.txt
#   apps/openmw/engine.cpp
#   apps/openmw/mwclass/creature.cpp
#   apps/openmw/mwclass/npc.cpp
#   apps/openmw/mwclass/npc.hpp
#   apps/openmw/mwinput/bindingsmanager.cpp
#   apps/openmw/mwmechanics/combat.cpp
2022-02-15 19:45:10 +02:00
David Cernat
571f3e8ee7 [Client] Use correct stacking value when sending SpellsActive packets 2022-02-12 18:43:18 +02:00
David Cernat
f2d95dc84d [Client] Make ActiveSpells::removeSpellByTimestamp() return a boolean
Add logging to LocalPlayer::removeSpellsActive() to track when a player's active spell hasn't been removed due to an invalid timestamp.
2022-02-12 14:00:47 +02:00
David Cernat
ed9a85f13b [General] Increase maxPlugins to 1000
This allows clients to have 1000 data files instead of 256 as before.

Also increase maxHashes to 50
2022-02-12 00:12:22 +02:00
David Cernat
4aa947ff4b [Client] Prevent player from auto-equipping items taken from containers 2022-02-10 23:10:11 +02:00
David Cernat
15fdac3f6c Revert "Merge branch '0.7.1-window-input' into 0.7.1"
This reverts commit 94f5b169e6, reversing
changes made to 43e7df6df8.

# Conflicts:
#	apps/openmw-mp/handleInput.cpp
2022-02-10 16:33:58 +02:00
David Cernat
d7044db179
Merge pull request #595 from GrimKriegor/buildsys/server-only-tweaks
[Buildsys] Tweaks to allow server-only builds
2022-02-08 22:37:46 +02:00
Grim Kriegor
aa35f0946f [Buildsys] Tweaks to allow server-only builds
Re-include Base64, Boost and SDL2[1]

Exclude OSG but keep its headers[2]

Exclude most non-essential components and their deps

[1] SDL2 is required by the debug component
May be worth deviating from upstream by making its inclusion
conditional in the future

[2] Server component requires declarations present in the OSG headers
2022-02-08 18:32:43 +00:00
David Cernat
000e8724ca [Documentation] Update changelog for 0.8.0 2022-02-07 03:39:48 +02:00
David Cernat
c02fb44ea7
Merge pull request #593 from GrimKriegor/buildsys/server-only-bullet-removal
[Buildsys] Do not require Bullet when building only the server component
2022-02-07 03:23:03 +02:00
Grim Kriegor
57c2ed2557 [Buildsys] Do not require Bullet for the server 2022-02-07 01:13:14 +00:00
David Cernat
a3160991f5 [Documentation] Update credits 2022-01-30 23:52:55 +02:00
David Cernat
76e7fdca98 [Documentation] Update year in README 2022-01-02 07:14:42 +02:00
David Cernat
438f197b20 [Client] Fix build for launcher 2021-12-12 04:57:12 +02:00
David Cernat
1cb10cd1f2 [Client] Use new exact search with ObjectActivate & ObjectDialogueChoice 2021-12-09 15:29:58 +02:00
David Cernat
646ffc7afe [Client] Add a new type of search to CellStore that also checks refIds 2021-12-09 15:22:43 +02:00
David Cernat
28d31f4648 [Client] Fix build for openmw_vr with Visual Studio 2019 2021-12-07 23:15:41 +02:00
David Cernat
572b16af41 Add OpenMW 0.47 commits to OpenMW VR up to 4 Dec 2021
# Conflicts:
#   .gitlab-ci.yml
#   CI/before_script.msvc.sh
#   CI/install_debian_deps.sh
#   CMakeLists.txt
#   apps/openmw/mwrender/screenshotmanager.cpp
#   files/ui/advancedpage.ui
2021-12-07 21:49:20 +02:00
David Cernat
ca96827ec9 [General] Change default internal server password 2021-12-07 09:12:02 +02:00
David Cernat
38363eee0d Add OpenMW 0.47 commits up to 4 Dec 2021 2021-12-05 16:12:09 +02:00
psi29a
f327288953 Merge branch 'fix_physics_deadlock_47' into 'openmw-47'
Fix deadlock in physics system (#6414 for 0.47)

See merge request OpenMW/openmw!1438
2021-12-04 17:33:40 +00:00
elsid
7f1e5b368e
Fix deadlock in physics system
* Reorder unlock and notify_all calls to avoid notifying when not all worker
  threads are waiting.
* Make sure main thread does not attempt to exclusively lock mSimulationMutex
  while not all workers are done with previous frame.
* Replace mNewFrame flag by counter to avoid modification from multiple
  threads.
2021-11-26 20:23:49 +01:00
psi29a
fe8922bdc3 Merge branch 'rtd' into 'master'
Fix readthedocs config, second attempt.

See merge request OpenMW/openmw!1342

(cherry picked from commit 26ee2d284ecbad20247385805f8baeea2e3bfeb6)

20f851b3 Fix readthedocs config, second attempt.
2021-11-05 10:25:35 +00:00
AnyOldName3
b7caf1f36e Merge branch 'rtd' into 'master'
Fix readthedocs config

See merge request OpenMW/openmw!1340

(cherry picked from commit ade3c2c61b29665abfa7562e96ee157c83a89def)

665d756f Fix readthedocs config
2021-11-05 10:25:20 +00:00
David Cernat
f85f1e1b17 [General] Change version to 0.8.0
Change repo name from openmw-tes3mp to TES3MP.
2021-11-02 23:58:14 +02:00
David Cernat
dbae0bddc2 [Client] Only play sounds from active cells when receiving ObjectSound 2021-10-21 19:20:02 +02:00
David Cernat
48de84ec32 [Client] Send ObjectSound packets with spellcasting sounds 2021-10-20 07:44:16 +02:00
David Cernat
538ccf15cf [Client] Use higher interpolation distance for DedicatedPlayers
This makes up for the laggier-looking jumps since the changes to OpenMW's physics system.
2021-10-17 20:14:21 +02:00
David Cernat
20e37204d0 [Client] Ensure physics actor is valid in World::setOnGround()
Do the same in World::setInertialForce()
2021-10-17 18:20:52 +02:00
David Cernat
e010c61167 Add OpenMW 0.47 commits up to 10 Oct 2021 2021-10-16 06:49:12 +02:00
David Cernat
efc0b88058 [Client] Don't reload Ptr for DedicatedActor after adding active spells
This prevents non-continuous spell GFX from immediately vanishing.
2021-10-16 02:00:05 +02:00
David Cernat
3e582199fb [Client] Add createSpellGfx() method to MechanicsHelper
Use it to create spell GFX when adding active spells to dedicated players and actors.
2021-10-16 01:35:30 +02:00
David Cernat
eb005a5c33 [Client] Stop processing CastSpell::inflict() in more appropriate place
This preserves the functionality of Reflect effects, which relies on inflict() getting far enough for a dedicated player or actor, without also processing parts of inflict() that should be skipped for them.
2021-10-16 00:01:06 +02:00
David Cernat
7f017217c7 [Client] Fix position sync for falling actors 2021-10-15 17:11:03 +02:00
David Cernat
fb49b62753 [Client] Fix crash when receiving ActiveSpells for uninitialized players 2021-10-12 03:51:14 +02:00
David Cernat
63c956e1d2 [Client] Fix active spell sync using actor IDs tracked in ActiveSpells 2021-10-12 02:01:05 +02:00
David Cernat
e6a1f0889f [Client] Add isStackingSpell() method to MechanicsHelper 2021-10-12 01:26:12 +02:00
David Cernat
f03a87df3c [Client] Remove previous placeholders for tracking ActiveSpells actors 2021-10-12 01:20:38 +02:00
David Cernat
c027862609 [Client] Track actor IDs in ActiveSpells 2021-10-12 00:34:15 +02:00
psi29a
bac679d5f5 Merge branch 'absorb47' into 'openmw-47'
Absorb spells per effect

See merge request OpenMW/openmw!1274
2021-10-10 16:17:03 +00:00
David Cernat
3e81371e53 [General] Fix jump synchronization for players
This had been broken by fr3dz10's physics rewrites from the earlier part of the year that made it so dedicated players were always regarded by the movement solver as being on the ground.
2021-10-09 18:11:57 +02:00
Evil Eye
f902efbfcc Absorb spells per effect 2021-10-09 16:39:49 +02:00
David Cernat
b67af8d99c [General] Use different fatal error message than OpenMW 2021-10-05 11:05:42 +02:00
Andrei Kortunov
b9dc05a158 Add missing changelog entries for 0.47 (#3145)
(cherry picked from commit 61168c3583870cc0fc6c8d91a9839e3b9489c086)
2021-10-04 09:14:14 +00:00
David Cernat
7193d1dca5 [Server] Add stackingState arg to script functions adding active spells 2021-10-03 01:39:07 +02:00