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

25669 commits

Author SHA1 Message Date
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
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
Evil Eye
f902efbfcc Absorb spells per effect 2021-10-09 16:39:49 +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
psi29a
b81df8af9c Merge branch 'cursorspeedmerge' into 'master'
Updated: Change cursor speed with settings.cfg (#6312)

Closes #6312

See merge request OpenMW/openmw!1255

(cherry picked from commit 1d342f80ed1af25d3cf1f70759be7fba1c9237b2)

b5af1928 gamepad cursor speed fix
2021-10-01 11:24:15 +00:00
psi29a
81748f8e3d Merge branch 'vanilla_projectile_47' into 'openmw-47'
#6233 / !1188 for 0.47 (Vanilla arrow behaviour)

See merge request OpenMW/openmw!1238
2021-09-28 10:09:24 +00:00
fredzio
32108adc31 Change projectile behaviour to be like in vanilla wrt. water plane:
- enchanted arrow explode upon hit the water plane
- non enchanted arrow disappear (or more accurately, they hit nothingness)
- enchanted arrow shot underwater explode immediately
- non enchanted arrow disappear immediately

Also, solve a bug that occured previously and could theoritically still happens where we use the last tested collision position for instead of the last registered hit:
Use the hit position as saved inside Projectile::hit() instead of the last position saved inside the callback.
If a projectile collides with several objects (bottom of the sea and water surface for instance), the last collision tested won't necessarily be the impact position as we have no control over the order in which the tests are performed.
2021-09-24 20:32:00 +02:00
psi29a
f0a77a48df Merge branch 'check_pathgrid' into 'master'
Make sure PathFinder::getClosestPoint is not called with failing precondition (#6294)

Closes #6294

See merge request OpenMW/openmw!1236

(cherry picked from commit baa33799de3cb27d9d3805e164b9d7ccea6a3e4d)

d36595e0 Make sure PathFinder::getClosestPoint is not called with failing precondition
2021-09-23 12:50:46 +00:00
elsid
56869ec296 Merge branch 'fix_6296' into 'master'
Ignore time to destination when giving way (#6296)

See merge request OpenMW/openmw!1234

(cherry picked from commit 14516b9fd603bf603ca2ae366bc0884106fd368c)

5893b884 Ignore time to destination when giving way (#6296)
2021-09-23 08:09:59 +00:00
psi29a
ad703d7470 Merge branch 'fix_pathgrid_path' into 'master'
Use pathgrid path when destination is closer to different graph component node

See merge request OpenMW/openmw!1155

(cherry picked from commit 4bf22f3ca0e5e5776c09cb8d5ad9793986373975)

9112c65a Use pathgrid path when destination is closer to different graph component node
2021-09-08 09:56:37 +00:00
psi29a
ec4e3b04a7 Merge branch 'terrainselectioncrashfix' into 'openmw-47'
Fix terrain selection crash

See merge request OpenMW/openmw!1165
2021-08-22 19:22:13 +00:00
unelsson
08f7c73e02 Fix text 2021-08-22 20:11:02 +03:00
unelsson
4b14818035 Restucture code 2021-08-22 20:09:21 +03:00
unelsson
cb42b5287d Remove friend, make getEditMode public to allow editmode testing. 2021-08-22 19:14:51 +03:00
unelsson
d62ddc002e Use QPointer to detect object existence, less verbose debug messages 2021-08-22 19:04:16 +03:00
unelsson
b84e41bd27 Avoid storing ref, dynamic cast worldspacewidget for safety 2021-08-22 15:33:40 +03:00
psi29a
af3b9187b4 Merge branch 'navmesh_reduce_lock_wait_openmw-47' into 'openmw-47'
Reduce waiting duration on locks when updating navmesh object in the main thread (#6193) (for 0.47)

See merge request OpenMW/openmw!1089
2021-08-04 15:22:09 +00: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
psi29a
ffa91b07dd Merge branch 'spawn_fix47' into 'openmw-47'
!1046 for 0.47

See merge request OpenMW/openmw!1049
2021-07-24 14:15:40 +00:00
fredzio
9d17cece3a Set mCanWaterWalk and mOnGround when adding Actor to the scene.
mCanWaterWalk was set to false and updated during next frame's simulation
mOnGround is set to true but then was updated as part of the scene
loading logic.
2021-07-24 15:04:17 +02:00
psi29a
196497a992 Merge branch 'slimfast47' into 'openmw-47'
Like !1024 but targeted at 0.47

See merge request OpenMW/openmw!1045
2021-07-23 20:03:07 +00:00
fredzio
744cfc6a51 Do not store a btTransform into Projectile class: reduce its size by 112 bytes 2021-07-23 19:40:42 +02:00
fredzio
20aefb5f5f Do not store btTransform into Object class: reduce its size by 104 bytes 2021-07-23 19:40:42 +02:00
fredzio
8861d53809 Do not store a btTransform into Actor class: reduce its size by 128 bytes 2021-07-23 18:10:23 +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
psi29a
59da0a0da9 Merge branch 'skip_async' into 'master'
Don't put player in the air after going out of tcl

See merge request OpenMW/openmw!1009

(cherry picked from commit 6d08a1d7318ae076839738d173b884fcc7b1a348)

6ad2cf8e Skip simulation result after calling Actor::updatePosition(). Otherwise
2021-07-16 17:05:52 +00:00
psi29a
d1c0cfa524 Merge branch 'lifetime' into 'master'
Maybe fix #6071

Closes #6071

See merge request OpenMW/openmw!1010

(cherry picked from commit 64750820957773a00d449d29551bb15fbf5fe08b)

1650dabe Assign the return value of weak_ptr::lock() to a variable, so that the
2021-07-12 14:11:30 +00:00
psi29a
8530bc5cf5 Merge branch 'fix_debugbatch_colors' into 'master'
Fix black objects in object paging debug view

See merge request OpenMW/openmw!1011

(cherry picked from commit 5287c9627c92b77c25581dbb9ac9d0b0dc4c9698)

389b8300 fix black objects with OP batch debug due to unitialized uniform
2021-07-12 09:14:09 +00:00
psi29a
a21da63464 Merge branch 'FixLODIssueWithObjectPaging' into 'master'
LOD issue with object paging

See merge request OpenMW/openmw!1007

(cherry picked from commit 5688b7b4d8df93fbf28307d2259c57f8d878eeb8)

269cd310 Use same world coordinates to compute distances
2021-07-10 21:03:32 +00:00
psi29a
74aa7cdd48 Merge branch 'fix_door_freeze' into 'master'
Fix slow AiPackage::getTarget calls (#6136)

Closes #6136

See merge request OpenMW/openmw!990

(cherry picked from commit 6a4eeeb39bbe025625273dffc9754d29733e570a)

8d1eb7e2 Fix slow AiPackage::getTarget calls
2021-07-05 08:18:03 +00: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
psi29a
dfacaa3711 Merge branch 'fix_navmesh_update' into 'master'
Fix navmesh update on opening/closing door

See merge request OpenMW/openmw!995

(cherry picked from commit 9123db3a5954dd082f501151cba0a08bfe3ff908)

c7c0d11c Trigger navmesh update when any navigator object has been updated
2021-07-05 07:30:49 +00:00
psi29a
109a7c3daf Merge branch 'base64-fixes' into 'master'
Base64 fixes

Closes #6111

See merge request OpenMW/openmw!965

(cherry picked from commit 07c3ed16d0e05df8724b1f45696e9d17a2111938)

873b3b48 Handle empty strings.
d38126ef Pack default CS config
2021-07-02 06:27:36 +00: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
fa30531461 Merge branch 'positively_glowing' into 'master'
Detach objects from the active grid when attempting to get their animation

Closes #6105

See merge request OpenMW/openmw!951

(cherry picked from commit 7d8949ec3fcd1919da59308deab06433136f6629)

692615fd Detach objects from the active grid when attempting to get their animation
2021-06-25 09:20:43 +00:00
Bret Curtis
b9109e8b1c Merge pull request #3094 from akortunov/master
Fix 0.46 and 0.47 changelogs
2021-06-22 09:30:50 +02:00
psi29a
05b5ada6bf Merge branch 'fix_smooth_movement' into 'master'
Validate almost straight shortcuts by navmesh raycast (#6102)

Closes #6102

See merge request OpenMW/openmw!947

(cherry picked from commit 9c3117d2d4a70475b021f4e4a50eec88cd7cf125)

e7d68d3d Validate almost straight shortcuts by navmesh raycast
2021-06-21 19:55:05 +00:00
psi29a
1e1c8a17ed Merge branch 'fix_new_game_guard_2' into 'master'
Reapply new game guard fix

See merge request OpenMW/openmw!944

(cherry picked from commit eca0a95a5a16cf3734a32c76cab0c0a0dd6dfe2d)

56e63053 Revert "Merge branch 'fix_new_game_guard' into 'master'"
e5e04b85 Consider time to destination when try to avoid collision
2021-06-19 13:34:56 +00:00
psi29a
ce020428f0 Merge branch 'example-suite-documentation' into 'master'
Initial page to document the Template. Mainly deals with how to install it....

See merge request OpenMW/openmw!929

(cherry picked from commit c4ddbb5800da2234d3d732a93096393785d8cf71)

10391198 Initial page to document the Template. Mainly deals with how to install it....
32af7ab2 Add proper formatting, add some links and extra information to the Template installation articles.
2f52e5c8 Fix spelling mistake and add a tiny bit of clarification.
da8515b2 Add more information on how not to mix Morrowind and template content. It's...
9fdae4bc Some more clarification on how and why not to mix Template and Morrowind files.
bda267c2 Fix rst formatting to properly display the Note section.
2021-06-19 12:09:13 +00:00