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

24312 commits

Author SHA1 Message Date
psi29a
5c43e015a7 Merge branch 'noobject' into 'master'
Unbreak build with cmake < 3.12

See merge request OpenMW/openmw!344
2020-10-14 05:34:24 +00:00
Andrei Kortunov
8e647aa72a Fix crash on saving 2020-10-14 09:16:01 +04:00
fredzio
4ea07639b8 Unbreak build with cmake < 3.12
This reverts commit 3cadc16f88.
2020-10-14 06:15:23 +02:00
Assumeru
72549651e0
Rework container resolution (#3006)
* Rework container resolution

* add optional argument to getCount

* remove now-redundant changes

* undo worldimp changes

* move save-fixing code to InventoryState

* replace Rng instances with Seeds
2020-10-13 17:46:32 +02:00
Bret Curtis
c99be77a32
Merge pull request #3008 from akortunov/strings
Rework fixed strings handling
2020-10-13 17:37:48 +02:00
psi29a
82736f013d Merge branch 'objectlib' into 'master'
Convert components to an object library.

See merge request OpenMW/openmw!342
2020-10-13 13:32:43 +00:00
psi29a
9a912486f9 Merge branch 'deprecated-exception' into 'master'
Use C++11 exception specification

See merge request OpenMW/openmw!343
2020-10-13 13:31:48 +00:00
fredzio
3cadc16f88 Convert components to an OBJECT library. It saves space in the object
directory (about 1G on an optimized build on Windows and BSD).
Build should run somewhat fast as well.
2020-10-13 14:10:52 +02:00
Bret Curtis
11c938b176
Merge pull request #3011 from elsid/navmesh_fixes
Navmesh fixes
2020-10-12 11:22:26 +02:00
psi29a
1274e68e1d Merge branch 'fix_5630' into 'master'
Fix #5630 "NPCs momentarily turn when the player character is moving backwards during combat"

Closes #5630

See merge request OpenMW/openmw!339
2020-10-12 07:59:30 +00:00
psi29a
ed0bf72119 Merge branch 'menu' into 'master'
Put the main menu below other windows (bug #5622)

See merge request OpenMW/openmw!312
2020-10-12 07:36:15 +00:00
Petr Mikheev
15078f5b3c Fix #5630 "NPCs momentarily turn when the player character is moving backwards during combat" 2020-10-10 23:06:43 +02:00
Alexei Dobrohotov
b85d507f35 Merge branch 'absorption' into 'master'
Restore empty target check in spell absorption

See merge request OpenMW/openmw!338
2020-10-10 19:08:14 +00:00
Alexei Dobrohotov
1842f546c3 Restore empty target check in spell absorption 2020-10-10 14:27:52 +03:00
fredzio
460e69e92a Get rid of warning: dynamic exception specifications are deprecated 2020-10-10 12:12:55 +02:00
AnyOldName3
341bcb66f5 Merge branch 'macos_shared_runner' into 'master'
MacOS Shared Runners

See merge request OpenMW/openmw!325
2020-10-09 22:42:31 +00:00
Alexei Dobrohotov
e930251d92 Merge branch 'godmode' into 'master'
Add many more godmode checks to harmful magic (bug #5633)

Closes #4264

See merge request OpenMW/openmw!336
2020-10-09 22:09:46 +00:00
AnyOldName3
5514c95b23 Merge branch 'debian-cache-bump' into 'master'
Bump Debian cache version numbers

See merge request OpenMW/openmw!337
2020-10-09 22:01:45 +00:00
AnyOldName3
c6eb0dacd3 Bump Debian cache version numbers
This should stop MR builds clobbering the increased size with their tiny
size.
2020-10-09 20:51:25 +00:00
Alexei Dobrohotov
0e8c5c5034 Merge branch 'avoid_collision_update' into 'master'
Update logic of "NPCs avoid collisions"

See merge request OpenMW/openmw!318
2020-10-09 18:43:43 +00:00
Alexei Dobrohotov
b85875a354 Ignore Burden effect in god mode 2020-10-09 21:34:39 +03:00
Alexei Dobrohotov
39678c74bf Add many more godmode checks to harmful magic (bug #5633) 2020-10-09 20:36:51 +03:00
Alexei Dobrohotov
f8293536e6 Merge branch 'regressions' into 'master'
Fix recent regressions

See merge request OpenMW/openmw!335
2020-10-09 16:43:55 +00:00
Alexei Dobrohotov
05cd005b30 Fix NiTriStripsData loading 2020-10-09 19:37:54 +03:00
Alexei Dobrohotov
0dcb8c6b69 Fix pick/probe uses decrement 2020-10-09 19:20:50 +03:00
AnyOldName3
ea669cc115 Merge branch 'fix-ccache' into 'master'
Increase CCache size for Debian where needed

See merge request OpenMW/openmw!334
2020-10-09 14:19:55 +00:00
AnyOldName3
ef41edba9b Install tools in before_install.osx.sh 2020-10-09 13:56:21 +00:00
AnyOldName3
1aa5e5cc52 Increase CCache size for Debian where needed 2020-10-09 13:32:28 +00:00
Alexei Dobrohotov
f04be08327 Merge branch 'revert-bbcfcc88' into 'master'
Revert "RigGeometry: convert some pairs to structs"

See merge request OpenMW/openmw!333
2020-10-08 23:25:45 +00:00
Alexei Dobrohotov
9f08dc9968 Revert "Merge branch 'skinning' into 'master'"
This reverts merge request !327
2020-10-08 23:24:28 +00:00
AnyOldName3
3a39e1f8f8 config was from Windows CI 2020-10-08 22:25:16 +00:00
AnyOldName3
2f1b7c4d2f Rename DMG file 2020-10-08 21:35:37 +00:00
AnyOldName3
da49901dbc Merge branch 'castray' into 'master'
Fix RayCastingResult warning

See merge request OpenMW/openmw!331
2020-10-08 19:48:08 +00:00
Alexei Dobrohotov
ec825b2510 Fix RayCastingResult warning 2020-10-08 22:44:46 +03:00
AnyOldName3
c26c43bb73 Merge branch 'cmake' into 'master'
fix cmake warning

See merge request OpenMW/openmw!330
2020-10-08 19:38:34 +00:00
tess
38e567a7e4 match opening and closing if args 2020-10-08 19:34:03 +00:00
tessa
02861fa8e3 fix cmake warning 2020-10-08 13:06:04 -05:00
elsid
7591d45008
Use memcpy to create navmesh key
Implementation with memcpy is ~13 times faster.
2020-10-08 19:55:56 +02:00
elsid
f637dc38bd
Add cached flag to update navmesh status 2020-10-08 19:55:55 +02:00
elsid
eb140ed15f
Write unknown status numeric value 2020-10-08 19:55:55 +02:00
elsid
7d73e73cad
Consider tile as not removed when it is not found 2020-10-08 19:55:55 +02:00
psi29a
bbcfcc8823 Merge branch 'skinning' into 'master'
RigGeometry: convert some pairs to structs

See merge request OpenMW/openmw!327
2020-10-08 08:56:17 +00:00
psi29a
c8b3ab68b6 Merge branch 'gitlab_ci_separate_debian_cache' into 'master'
Use separate caches for Debian builds

See merge request OpenMW/openmw!326
2020-10-08 06:39:26 +00:00
Alexei Dobrohotov
6be808e301 RigGeometry: convert some pairs to structs 2020-10-08 03:05:59 +03:00
Petr Mikheev
be27b51279 Add head bobbing in first person mode 2020-10-08 00:22:01 +02:00
AnyOldName3
5515bc94b7 Keep logs as artifacts 2020-10-07 21:04:36 +00:00
elsid
63a6541d0e
Use separate caches for Debian builds
Different builds cache different states. Each time cache file is written it
erases the state created by a different type of build.
2020-10-07 22:18:12 +02:00
AnyOldName3
cfd9268a74 Install Qt if missing 2020-10-07 19:12:13 +00:00
AnyOldName3
a47d96ce0b Install CMake on MacOS if it's missing 2020-10-07 19:06:28 +00:00
psi29a
c34fd220db Update .gitlab-ci.yml 2020-10-07 17:31:29 +00:00