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

5914 commits

Author SHA1 Message Date
David Cernat
a032c8d399 Add TES3MP 0.8.0 commits up to 28 Apr 2022
# Conflicts:
#	apps/openmw/mwclass/creature.cpp
#	apps/openmw/mwclass/npc.cpp
2022-04-29 01:55:54 +03:00
David Cernat
f219cb5417 [General] Ensure that objects initialized as DedicatedActors are actors 2022-03-23 09:51:05 +02:00
David Cernat
cc8c222d18 [General] Combine CellStore's exact object searches 2022-03-22 10:42:19 +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
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
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
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
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
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
David Cernat
b67af8d99c [General] Use different fatal error message than OpenMW 2021-10-05 11:05:42 +02:00
David Cernat
6e95604627 [Client] Remove credits check on Windows client 2021-09-20 05:55:51 +02:00
David Cernat
7393e3def6 [General] Add and use getShortDescription() for ESM::Cell
ESM::Cell's getDescription() method was modified by aa5161f99e despite being used heavily by TES3MP. All instances of it in the TES3MP code have now been changed into the newly added getShortDescription() that is identical to the previous getDescription().
2021-09-17 19:14:55 +02:00
David Cernat
26033ff7e7 Add OpenMW 0.47 commits up to 4 Aug 2021 2021-08-04 22:02:39 +02:00
elsid
82cff1abf8
Create RecastMesh outside critical section
To not lock main thread when it tries to update objects.
2021-08-04 13:16:55 +02:00
elsid
08b026e907
Store copies of ref_ptr for btCollisionShape wrappers in Navigator
To keep btCollisionShape lifetime.
2021-08-04 13:16:31 +02:00
elsid
668788a5a2
Use RecastMeshBuilder once to create RecastMesh
This allows to move all data out of the object instead of copying.
2021-08-04 09:25:19 +02:00
elsid
1a995ae68f
Shrink to fit recast mesh data 2021-08-04 09:25:18 +02:00
psi29a
93f495ecb5 Merge branch 'properly_initialize_lightsettings' into 'master'
Properly initialize light settings

See merge request OpenMW/openmw!1083

(cherry picked from commit 1f8209158baf6301048bf023651e9b38a9a099b3)

1e52ca2b properly initialize light settings
2021-08-02 08:42:45 +00:00
psi29a
10b799653b Merge branch 'opt-out-compose' into 'master'
Make it possible to opt out of composing variables

Closes #6186

See merge request OpenMW/openmw!1076

(cherry picked from commit 15d278de554818fef6fecf300456800523e91adf)

4727ae4b Make it possible to opt out of composing variables
04e9b6d2 Abort on duplicate content file
2021-08-01 08:54:11 +00:00
David Cernat
0567dc1fd4 Add OpenMW 0.47 commits up to 25 Jul 2021 2021-07-25 22:29:47 +02:00
David Cernat
a64bd5e11b [General] Add missing parenthesis to CMakeLists.txt in components 2021-07-25 21:47:23 +02:00
David Cernat
e05ea03fb9 [General] Stop requiring some libraries when building only the server 2021-07-25 21:40:19 +02:00
David Cernat
eb50d3e497 [General] Don't require crashcatcher when not building on Windows 2021-07-25 19:22:11 +02:00
David Cernat
3f3fe66fde [General] Track casters of spells in SpellsActive packets
Also simplify sending of SpellsActive packets slightly.
2021-07-21 18:14:31 +02:00
psi29a
db39b4e7d4 Merge branch 'fix-iterator-badness' into 'master'
Actually increment iterators to be erased.

Closes #6163

See merge request OpenMW/openmw!1027

(cherry picked from commit 7c246b28e7cb8c514b22214309fc9fed7fc40edc)

5ec2ddb4 Actually increment iterators to be erased.
2021-07-20 18:45:40 +00:00
David Cernat
fe4a761ffe [General] Implement game setting records for RecordDynamic packets
Remove unused placeholder for variants from RecordDynamic.
2021-07-18 11:36:07 +02:00
David Cernat
3222afc8b7 [General] Implement PlayerCooldowns packet
Although this packet may be used for other kinds of cooldowns in the future, it currently only handles cooldowns for magical powers.
2021-07-10 22:15:19 +02:00
psi29a
d6a2838c8b Merge branch 'even-fixier-alpha' into 'master'
Correctly track added and removed state to fix various alpha testing issues

Closes #6119

See merge request OpenMW/openmw!989

(cherry picked from commit 94be4eba18d328391a2c2aea85bb029e80b32cee)

0e57622b Correctly track added and removed state
e42b3bf9 Adapt destination alpha factor for AMD
84a9face Disable coverage adjustment for blended objects
2021-07-05 08:15:31 +00:00
David Cernat
014e4ab01f [General] Disable OpenMW's log timestamps
Having timestamps from two different loggers isn't useful, so only the ones from TES3MP's logger are staying for now, especially as that logger is used by both the client and the server.
2021-07-05 07:02:44 +02:00
David Cernat
294f64d12d [General] Track timestamps for spells in SpellsActive packets
This makes it possible to remove a specific effect in effect stacks by checking its timestamp.
2021-07-04 12:54:11 +02:00
David Cernat
6b45a48116 Add OpenMW 0.47 commits up to 1 Jul 2021
# Conflicts:
#   components/CMakeLists.txt
2021-07-01 19:13:04 +02:00
psi29a
bb393cb91c Merge branch 'fix_new_game_guard_3' into 'master'
Fix new game guard 3 (#6126)

Closes #6126

See merge request OpenMW/openmw!976

(cherry picked from commit 89ca56632c6bc37f07e430e7f5cd23d855610b19)

a3942a1e Remove redundant check for y coordinate in inRange function
cc08a45c Move include where it is needed
7e1630a7 Remove redundant getPolyHeight wrapper
793c30ab Check dtNavMeshQuery::getPolyHeight status
a54c4bc2 Check dtNavMeshQuery::findStraightPath status
94e460ba Use proper check for distance
5624fe19 Consider path not found when there is navmesh query error
2021-07-01 09:06:54 +00:00
psi29a
c68cecb1eb Merge branch 'optimize_off_mesh_connections' into 'master'
Optimize off mesh connections

See merge request OpenMW/openmw!969

(cherry picked from commit 9dcea247d2cd7d25d719fabc142cef5360233e2a)

3e98db8d Fix styleguide
7f65a2c4 Remove unused code
81e569c3 Move OffMeshConnectionsManager implementation into cpp
a8ba9a0e Cleanup unused tile positions from OffMeshConnectionsManager
ff1af5e8 Use only off mesh connections starting or ending in a given tile
1552e7e3 Add pathgrid edges as one direction off mesh connection
2021-06-30 14:46:19 +00:00
psi29a
0394f848cd Merge branch 'fix_malexa_escape' into 'master'
Inscribe physical bounding box into navmesh agent cylinder (#6114)

Closes #6114

See merge request OpenMW/openmw!967

(cherry picked from commit 67f32263b2f7e4be9f50d46de842a8727449cae2)

84d6dea2 Inscribe physical bounding box into navmesh agent cylinder
2021-06-28 14:26:37 +00:00
psi29a
a5b8eb72a5 Merge branch 'alpha-test-override' into 'master'
Ensure original (removed) state overrides replacement state when recreating shaders

Closes #6108

See merge request OpenMW/openmw!966

(cherry picked from commit 07a7a903a7a034b661adc1b033af928a9cd68528)

8a1b4bde Ensure original (removed) state overrides replacement state when recreating shaders
0e122b1e Avoid copy and deep equality check
2147c18c Do not overwrite old removed state with old dummy state
2021-06-28 13:54:55 +00:00
psi29a
b31750a337 Merge branch 'object_paging_min_size_combo_box' into 'master'
Adding Object Paging Min Size combo box to Advanced -> Visuals

See merge request OpenMW/openmw!917

(cherry picked from commit f66196588c16a9a16211d8f400ce7812127f26c0)

9f2f5174 Adding Object Paging Min Size combo box to Advanced -> Visuals
89950e55 Preventing type conversion of double to float for objectPagingMinSize
2021-06-19 00:22:00 +00:00
David Cernat
62f0237376 Add OpenMW commits up to 17 Jun 2021 2021-06-17 10:33:19 +02:00
Bret Curtis
868a5b35e3 workaround shadow issue on macOS, https://gitlab.com/OpenMW/openmw/-/issues/6057 2021-06-12 00:10:55 +02:00
David Cernat
767287ae51 [General] Track stacking spells in SpellsActive packets 2021-06-10 13:27:52 +02:00
jvoisin
7f4f2c042e Use sizeof(GLfloat) instead of sizeof(GL_FLOAT)
GL_FLOAT is an enum, with the value 0x1406, while GLFloat is the actual type.
Source: https://www.khronos.org/opengl/wiki/OpenGL_Type
2021-06-04 23:21:26 +02:00
David Cernat
1f0cb09933 Add OpenMW commits up to 1 Jun 2021
# Conflicts:
#   .travis.yml
#   README.md
2021-06-01 17:22:52 +02:00
David Cernat
86630b048f [General] Add creature attack values to RecordDynamic packets 2021-05-28 19:35:05 +02:00
elsid
d4f28ac979
Avoid resetting buffer object when configuring light buffer layout
Otherwise this casues RaceSelectionPreview to have no light until first change.
2021-05-28 10:46:42 +02:00
psi29a
9dfba37ce9 Merge branch 'fix_big_object_navmesh_update' into 'master'
Fix overwhelming recast mesh and navmesh updates for big rotating objects (#6060)

Closes #6060

See merge request OpenMW/openmw!911
2021-05-27 21:08:33 +00:00
elsid
4a6961b365
Trigger navmesh update on moved player only when player tile has been changed 2021-05-27 16:52:42 +02:00
elsid
ed91cf9397
Replace unordered_map by map for storing objects
For small amount of items it gives better performance for find by key
for update.
2021-05-27 16:38:40 +02:00
elsid
22c2f106b7
Store object tiles position as sorted vector instead of set 2021-05-27 16:00:31 +02:00
elsid
f4f9fa4701
Limit oscillating recast mesh object AABB by tile bounds
AABB change outside recast mesh tile should not affect navmesh for this tile.
2021-05-27 12:40:29 +02:00
elsid
d122e184cc
Report navmesh change for not posted tiles
Corresponding recast mesh tiles can be updated but navmesh tiles may never
appear for them. Report back zero navmesh version to allow oscillating recast
objects detection to work. This version is always less than any generated
navmesh tile version so any report for generated navmesh will override it.
If zero navmesh version is reported after recast mesh tile got report about
generated navmesh tile it is a no-op since generated version is always greater
than zero.
2021-05-27 12:40:00 +02:00