mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:53:52 +00:00
Code Issues Releases Wiki Activity
28238 commits 38 branches 54 tags 122 MiB
Commit graph

19621 commits

Author SHA1 Message Date
Atahualpa
6c49074765 Remove old references to Cell class. 2021-05-18 14:56:03 +02:00
Atahualpa
008bf64dd9 Second step toward fixing terrain selection issues. 2021-05-18 14:56:03 +02:00
Atahualpa
18ea4d8eb2 First step toward fixing terrain selection issues. 2021-05-18 14:56:02 +02:00
Bret Curtis
373f8636b7
Merge pull request #3092 from akortunov/master 
Do not trigger in-game bindings via mouse buttons when controls are disabled
 2021-05-18 10:47:45 +02:00
psi29a
ae66afb219 Merge branch 'less_verbose' into 'master' 
Make the code less verbose.

See merge request OpenMW/openmw!874
 2021-05-18 08:30:50 +00:00
psi29a
e9fbd76e9b Merge branch 'windows_tests' into 'master' 
Support running tests and benchmarks for windows

See merge request OpenMW/openmw!839
 2021-05-18 08:12:22 +00:00
psi29a
4bc7012104 Merge branch 'pack-default-settings' into 'master' 
Pack default settings

Closes #5925

See merge request OpenMW/openmw!822
 2021-05-18 08:11:13 +00:00
elsid
3ef1b27099
Add missing includes 2021-05-18 01:21:42 +02:00
psi29a
f1f1703441 Merge branch 'fix_navmesh_wait' into 'master' 
Fix redundant waiting until navmesh is generated

See merge request OpenMW/openmw!861
 2021-05-17 10:54:23 +00:00
Andrei Kortunov
c11774f278 Do not trigger in-game bindings via mouse buttons when controls are disabled (bug #6047) 2021-05-17 12:23:56 +04:00
AnyOldName3
c2e4eda825 Merge branch '6013-fix' into 'master' 
Retain draw callback

Closes #6013 and #5967

See merge request OpenMW/openmw!875
 2021-05-16 17:30:38 +00:00
madsbuvi
f3e17e7c52 Don't redundantly call notify on every frame. 2021-05-16 18:09:48 +02:00
Frederic Chardon
62c7adc87b Merge branch 'no_at_boundaries' into 'master' 
Don't use at() instead [] when length is checked/known

See merge request OpenMW/openmw!866
 2021-05-16 11:58:14 +00:00
Frederic Chardon
38db2f8810 Merge branch 'includes_mwgui' into 'master' 
Remove some useless includes from apps/openmw/mwgui

See merge request OpenMW/openmw!870
 2021-05-16 11:46:13 +00:00
madsbuvi
5b9a2b73b0 Retain final draw callback as a member variable in ScreenshotManager, and do not call setFinalDrawCallback after init. 2021-05-16 13:04:30 +02:00
Frederic Chardon
807c7a2025 Merge branch 'useless_includes_mwmechanics' into 'master' 
Remove some useless headers in apps/openmw/mwmechanics

See merge request OpenMW/openmw!871
 2021-05-16 10:51:43 +00:00
fredzio
5b63019719 Embed actor velocity inside its class. It makes the code simpler. 2021-05-16 12:42:17 +02:00
fredzio
c55db790f3 Make the code less verbose / more readable using for range loop and 
structured binding.

No functional changes.
 2021-05-16 12:42:16 +02:00
Frederic Chardon
730f1fe2a7 Merge branch 'useless_includes_mwphysics' into 'master' 
Remove some useless includes in apps/openmw/mwphysics

See merge request OpenMW/openmw!872
 2021-05-16 10:37:33 +00:00
jvoisin
9373e4ada7 Remove some useless includes in apps/openmw/mwphysics 2021-05-15 23:13:46 +02:00
jvoisin
9522a64e7d Remove some useless includes from apps/openmw/mwgui 2021-05-15 22:15:46 +02:00
jvoisin
1cd15613a6 Remove some useless headers in apps/openmw/mwmechanics 2021-05-15 22:14:08 +02:00
psi29a
3d61d7ec9a Merge branch 'optimize_initial_load' into 'master' 
Optimize engine initial loading time

See merge request OpenMW/openmw!867
 2021-05-15 18:48:17 +00:00
Evil Eye
6cb6461cba Merge branch 'const_ref_it' into 'master' 
Use const references when possible in for loops

See merge request OpenMW/openmw!869
 2021-05-15 18:47:03 +00:00
jvoisin
7deb6a6ffd Use const references when possible in for loops 
No need for useless copies.
 2021-05-15 19:50:01 +02:00
jvoisin
c1e3869f25 Remove an unused struct 2021-05-15 19:49:15 +02:00
elsid
1e2aae8095
Use stable sort+unique to collect RefIDs for ESMStore records counting 
The idea is to avoid std::map lookup for each CellRef. Instead generate a
sequence of added and removed RefNums into a vector then order them by RefNum
using a stable sort that preserves relative order of elements with the same
RefNum. RefIDs are stored in a different vector to avoid std::string move ctor
calls when swapping elements while sorting. Reversed iteration over added and
removed RefNums for each unique RefNum is an equivalent to what map-based
algorithm produces. The main benefit from sorting a vector is a data locality
that means less cache misses for each access. Reduces ESMStore::countRecords
perf cycles by 25%.
 2021-05-15 18:45:22 +02:00
elsid
9938af2289
Use unordered_map for ref count 
Reduces ESMStore::countRecords time by 8%.
 2021-05-15 18:45:22 +02:00
elsid
6248dc72cb
Convert to lower case only when needed 2021-05-15 18:45:21 +02:00
elsid
f2188d2533
Reduce temporary allocations on ESM loading 
By moving objects instead of copying when possible.
 2021-05-15 18:45:21 +02:00
Bret Curtis
8a315b01ae
Merge pull request #3089 from xyzz/fix-journalbooks-ub 
Fix out-of-bounds access in JournalBooks::createCyrillicJournalIndex
 2021-05-15 17:25:47 +02:00
Ilya Zhuravlev
13f060623f Fix out-of-bounds access in JournalBooks::createCyrillicJournalIndex 2021-05-15 10:45:39 -04:00
jvoisin
690d85d0e9 Don't use at() instead [] when length is checked/known 2021-05-15 15:38:17 +02:00
Andrei Kortunov
b63f53f5bb Disable shield animation when we launch a torch one (bug #6043) 2021-05-15 11:31:08 +04:00
AnyOldName3
5d83de189a Merge branch 'insert_or_assign' into 'master' 
Use insert_or_assign() instead of hand rolled version.

See merge request OpenMW/openmw!862
 2021-05-14 22:57:07 +00:00
fredzio
fb344d27e0 Use insert_or_assign() instead of hand rolled version. 2021-05-14 23:38:39 +02:00
elsid
59f89d22f8
Apply min distance only for not present tiles 
To avoid waiting when navmesh update is triggered by transformed object for
already present tiles.
 2021-05-14 22:41:11 +02:00
Bret Curtis
66a527c3de
Merge pull request #3075 from akortunov/warnfix 
Fix MSVC's C4244 and C4267 warnings
 2021-05-14 21:28:56 +02:00
psi29a
3944648f0b Merge branch 'opencs_remove_inclde' into 'master' 
Remove some superfluous includes in the opencs

See merge request OpenMW/openmw!829
 2021-05-14 13:33:06 +00:00
jvoisin
06ae26037f Remove some superfluous includes in the opencs 2021-05-14 10:57:31 +02:00
psi29a
6a5a9fbde4 Merge branch 'static-access' into 'master' 
[Launcher] Replacing static method access through instances

See merge request OpenMW/openmw!834
 2021-05-13 17:06:44 +00:00
psi29a
fd89582e0c Merge branch 'navmesh_wait' into 'master' 
Wait until navmesh is generated within given distance around player (#5500)

Closes #5500

See merge request OpenMW/openmw!819
 2021-05-13 16:56:39 +00:00
Andrei Kortunov
963e1b8b3f Fix MSVC's C4244 warnings 2021-05-12 10:34:40 +04:00
Andrei Kortunov
f9d42ed396 Fix MSVC's C4267 warnings 2021-05-12 10:34:39 +04:00
Andrei Kortunov
49a744b65a Make groundcover to use rendering distance in units instead of cells 2021-05-12 09:29:25 +04:00
elsid
4d7e5245a3
Support benchmarks for windows 
Don't run the binary because gitlab can't execute it successfully due to
unknown reason.
 2021-05-11 13:16:59 +02:00
psi29a
f7b8c817f8 Merge branch 'performance-faster-string-find' into 'master' 
Fixing performance-faster-string-find issues

See merge request OpenMW/openmw!842
 2021-05-11 08:42:01 +00:00
Thunderforge
339d347aea Fixing performance-faster-string-find issues 
This addresses the Clang Tidy check [performance-faster-string-find](https://clang.llvm.org/extra/clang-tidy/checks/performance-faster-string-find.html).
 2021-05-10 22:44:07 -05:00
Bret Curtis
08059247b8
Merge pull request #3081 from akortunov/master 
Skip hidden nodes for ObjectPaging
 2021-05-10 09:19:47 +02:00
psi29a
13fd0e11ff Merge branch 'no_time_to_talk' into 'master' 
Don't stop and turn to the player while sneaking or jumping

Closes #6016

See merge request OpenMW/openmw!838
 2021-05-10 06:51:49 +00:00
AnyOldName3
09f39b29f0 Load defaults.bin instead of settings-default.cfg. Do not decode yet. 2021-05-09 21:14:06 +01:00
AnyOldName3
92325976e9 Update documentation to refer to defaults.bin 2021-05-09 21:13:34 +01:00
AnyOldName3
0d737a3501 Create defaults.bin at configure time 2021-05-09 21:00:49 +01:00
Evil Eye
c5aa3d4f77 Don't stop and turn to the player while sneaking or jumping 2021-05-09 19:55:27 +02:00
Evil Eye
ffd84502f9 Remove unimplemented method declaration 2021-05-09 19:07:15 +02:00
Andrei Kortunov
132fedf290 Analyze only used LOD levels in ObjectPaging 2021-05-09 15:43:13 +04:00
Andrei Kortunov
a939cb6692 Skip hidden nodes for ObjectPaging 2021-05-09 14:10:35 +04:00
Thunderforge
ead51784dc [Launcher] Replacing static method access through instances 
This addresses the Clang Tidy check [readability-static-accessed-through-instance](https://clang.llvm.org/extra/clang-tidy/checks/readability-static-accessed-through-instance.html). It also simplifies the code by reducing the number of parameters we're passing around.
 2021-05-08 23:28:29 -05:00
Frederic Chardon
caf382c19f Merge branch 'barrier' into 'master' 
Do not store callback inside Misc::Barrier

See merge request OpenMW/openmw!821
 2021-05-07 22:21:44 +00:00
David Cernat
85ab67fff4 [Server] Use consistent order for script functions for Spells 
Fix a small typo.
 2021-05-07 18:43:07 +02:00
David Cernat
1f3a17eff7 [Client] Remove pointless declaration of DedicatedPlayer as struct 
This seems to have been a typo left over from Koncord's early work on the project.
 2021-05-07 18:40:11 +02:00
David Cernat
e00ee1425a [Client] Reload DedicatedActor ptrs when setting their active spells 
This makes the spells' visual effects appear correctly.
 2021-05-07 18:15:39 +02:00
psi29a
08e1a8e0fb Merge branch 'esm_opti' into 'master' 
Teensy optimisation for esmtool

See merge request OpenMW/openmw!826
 2021-05-07 14:21:37 +00:00
David Cernat
1eeee29d51 [General] Implement ActorSpellsActive packet, part 2 
Additions and removals of actors' active spells can now be saved to and loaded from the server.
 2021-05-07 14:25:55 +02:00
psi29a
9b017ef04d Merge branch 'internal_includes_openmw' into 'master' 
Clean up some internal includes of the openmw component

See merge request OpenMW/openmw!796
 2021-05-07 10:53:25 +00:00
Andrei Kortunov
a0582caa26 Fix uninitialized variable 2021-05-07 10:41:14 +04:00
David Cernat
ea6d5c68ae Add OpenMW commits up to 6 May 2021 
# Conflicts:
#   CMakeLists.txt
#   components/CMakeLists.txt
 2021-05-06 23:32:48 +02:00
jvoisin
e97e4d07dd Teensy optimisation for esmtool 
- Use an unordered_set instead of a list to
  keep track of skipped records.
- Reduce the number of conditions when parsing 4-letters
  records by using a switch-case instead of cascading conditions.
- Add a const
 2021-05-06 22:41:20 +02:00
elsid
00de80c884 Merge branch 'deadcode' into 'master' 
GC some unused code, simplify some other

See merge request OpenMW/openmw!820
 2021-05-06 11:03:14 +00:00
fredzio
e99b61d362 Simplify the code 2021-05-06 06:15:00 +02:00
elsid
626e032931
Do not store callback inside Misc::Barrier 
The only wait method can be provided with it so pass it as a template
parameter there.
 2021-05-05 23:42:47 +02:00
fredzio
00de540a31 Remove unused function. 2021-05-05 20:27:22 +02:00
elsid
7a51d0db18
Wait until navmesh is generated within given distance around player 
Add a setting to change this distance.

To prevent situations when there is not enough navmesh generated and actors
can't find path correctly.
 2021-05-05 19:44:16 +02:00
elsid
f169f8e6f0
Wait until navmesh is generated for interior cells 
Add special loading progress bar.

It should be fast enough to not keep loading screen for noticably long but
will provide better pathfinding for actors inside interior cells.
 2021-05-05 19:27:49 +02:00
psi29a
b8128d09f9 Merge branch 'enchanted-item-selected-fix' into 'master' 
Fix for enchanted items being removed on item equip cycling when they are re-equipped

See merge request OpenMW/openmw!714
 2021-05-05 07:27:00 +00:00
psi29a
9eb876cc17 Merge branch 'read_me' into 'master' 
Allow activation of inventory items

Closes #5991

See merge request OpenMW/openmw!788
 2021-05-04 22:53:45 +00:00
psi29a
6ac4dfbeb7 Merge branch '9001st_time_the_charm' into 'master' 
Rework again scripted movements

See merge request OpenMW/openmw!799
 2021-05-04 22:52:37 +00:00
psi29a
15f6932aaa Merge branch 'openmwizzrd_include' into 'master' 
Remove some useless includes from the wizzard

See merge request OpenMW/openmw!767
 2021-05-04 22:25:26 +00:00
psi29a
6513c38875 Merge branch 'clean_navigator' into 'master' 
Remove redundant and useless code from navigator

See merge request OpenMW/openmw!815
 2021-05-04 21:57:16 +00:00
psi29a
b10a817f7e Merge branch 'useuless_launcher' into 'master' 
Remove some useless includes from the launcher

See merge request OpenMW/openmw!775

(cherry picked from commit a84bd643b334eb6ac715681c497184ac22212ced)

d3fff8cf Remove some useless includes from the launcher
 2021-05-04 21:09:39 +00:00
elsid
ec87b3f8f7
Remove redundant ChunkyTriMesh 
This AABB tree required when need to filter out input mesh that has not
influence navmesh tile output. This filtering is already done before. Each
recast mesh corresponds to a single navmesh tile and has appropriate bounds.
 2021-05-04 13:00:06 +02:00
David Cernat
a3f304107b Add OpenMW commits up to 2 May 2021 
# Conflicts:
#   components/CMakeLists.txt
 2021-05-02 20:55:49 +02:00
jvoisin
d45184a730 Sprinkle some const-ref to avoid unnecessary copies 2021-05-02 14:43:46 +02:00
Chris Djali
f0cef87cd8
Merge pull request #3069 from akortunov/msvc_warnings 
Rework warnings settings
 2021-05-01 19:03:43 +01:00
fredzio
4fa0972b2d Tone down actor's skip simulation flag to an optional skip collision 
detection flag.
 2021-05-01 14:22:30 +02:00
Evil Eye
bd45449f9d Allow activation of inventory items 2021-05-01 14:07:29 +02:00
jvoisin
998cc97a4f And done! 2021-04-30 20:49:22 +02:00
jvoisin
be371ccd9f An another pass 2021-04-30 20:27:33 +02:00
jvoisin
ee2446d5c4 Trim even more 2021-04-30 20:11:41 +02:00
jvoisin
04edb1c817 Trim down some internal includes 2021-04-30 19:39:26 +02:00
psi29a
16bb3919d1 Merge branch 'navmesh_cache_simplification' into 'master' 
Simplify navmesh cache

See merge request OpenMW/openmw!691
 2021-04-28 08:01:06 +00:00
Alexei Dobrohotov
e3bb45fd61 Merge branch 'minor_aicombat' into 'master' 
Minor optimization in aicombat.cpp

See merge request OpenMW/openmw!737

(cherry picked from commit f1d19035cccfff2523faad0d4e4d96cd3ddae2e6)

bbbfc520 Minor optimization in aicombat.cpp
237b34a6 Fix style
a14911cb Fix indentation
 2021-04-26 07:10:41 +00:00
jvoisin
4c96644f8d Use a char instead of a string in find() where possible 
This was done via PVS Studio ( https://pvs-studio.com ),
and should provide a super-duper-marginal performance boost \o/
 2021-04-25 19:57:09 +02:00
elsid
e1d955d92b
Remove noexcept specifier from CreatureCustomData move ctor 
C++17 doesn't allow to declare defaulted move ctor with not matching
exception specification to the calculated one:
/Users/eddie/Downloads/BUILD/openmw-master/apps/openmw/mwclass/creature.cpp:63:9: error:
      exception specification of explicitly defaulted move constructor does not
      match the calculated one
        CreatureCustomData(CreatureCustomData&& other) noexcept = default;
        ^

http://wg21.link/p1286r2 makes this possible in C++20 and newer compilers
already have it working even with -std=c++17 but older onces give an error.
 2021-04-24 00:32:22 +02:00
elsid
ca7add0624
Add move constructor to MWMechanics::Spells 2021-04-24 00:32:22 +02:00
elsid
46e34c500c
Use algorithms to add/remove listener to SpellList 2021-04-24 00:32:07 +02:00
Andrei Kortunov
6d351b2bdd Fix MSVC 4706 warnings 2021-04-23 22:53:59 +04:00
Simon Meulenbeek
cd419256ad don't forget to close the audio device after you're done with it. 2021-04-22 18:42:56 +00:00
jvoisin
fb55207328 Remove some useless includes from the wizzard 2021-04-21 19:08:06 +02:00
Andrei Kortunov
faad18b7f9
Merge pull request #3072 from akortunov/warnfix 
Fix node masks signed/unsigned mismatch
 2021-04-21 09:26:06 +04:00