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

23950 commits

Author SHA1 Message Date
AnyOldName3
9e547e14d2 Allow setting up multiple build configurations at once
Also fix some bugs discovered in the process.

For multi-config generators, this basically just copies the DLLs for
each configuration, and for single-config, due to there being separate
build directories with separate extracted dependencies for each, it
defaults to just one, and will run the script several times if you
manually specify several.

Details include:
* Changing CONFIGURATION from a string to an array called
  CONFIGURATIONS. This gets iterated over in a bunch of places.
* Fixing a typo of 'cannot'
* Making the DLL lists arrays per-config, too.
* Some handling for the recursive stuff and a warning if configurations
  are set with a multi-config generator.
* Moving the configuration name sanitisation after they've been set.
* Myriad changes to Google Test:
  - Build it in a directory specific to the build tools - previously,
    having an MSVC 2017 and MSVC 2019 build on the same machine was
    impossible if unit tests were on, even though it's allowed otherwise
  - Use either Debug or Release Google Test as its finder isn't looking
    for RelWithDebInfo or capable of dealing with it if we try and use
    it anyway.
  - Always build Google Test with MSBuild as it's much less hassle due
    to CMake setting up the environment for us. Currently, MSVC always
    comes with something that can build solution files, no matter how
    you get it, so this shouldn't upset anyone.
  - Use CMake's --install mode so we can set the install prefix in the
    place that uses it.
  - Pass CMake both Debug and Release Google Test instead of risking a
    C/C++ library configuration mismatch causing linker and runtime
    errors - it'll pick a suitable one for each configuration.
  - Pass the library type explicitly as CMake can't cope without a
    Release library if you only gave it Debug, due to accessing a
    Release-specific variable unconditionally.
* Remove the -legacy flag from vswhere as it's only needed for MSVC
  2015, which we don't support any more.
* Fix the -version argument for vswhere as I'd massively cocked it up.
  I don't know how that happened as I did test it on a machine with
  multiple MSVC versions installed, which was the failure case, but it
  didn't fail then.
2020-09-08 00:18:18 +01:00
AnyOldName3
f4db29a717 Kill BUILD_CONFIG
It was basically just CONFIGURATION but less confusing. CONFIGURATION
could just be less confusing.
2020-09-04 00:45:41 +01:00
AnyOldName3
dc34380f62 Merge branch '5570-fix' into 'master'
Unpin CMake version now latest is fixed

Closes #5570

See merge request OpenMW/openmw!292
2020-09-03 14:35:54 +00:00
AnyOldName3
a251461045 Unpin CMake version now latest is fixed 2020-09-03 13:50:24 +00:00
Bret Curtis
53e581fe10
Merge pull request #2899 from akortunov/multiple_effects
Track magic effect index for summoning
2020-09-01 14:17:49 +02:00
Bret Curtis
009c18a97d
Merge pull request #2998 from akortunov/crashfix
Avoid crash when object paging encounters an empty shape
2020-09-01 10:35:34 +02:00
Andrei Kortunov
7a4efe3979 Avoid crash when object paging encounters an empty shape 2020-09-01 10:13:32 +04:00
AnyOldName3
f5f59c1149 Merge branch 'fix_5586' into 'master'
Fix #5586

Closes #5586

See merge request OpenMW/openmw!291
2020-09-01 00:09:32 +00:00
Petr Mikheev
7e3d19196d Fix #5586 2020-09-01 00:37:37 +02:00
Andrei Kortunov
54f678b172
Merge pull request #2997 from Assumeru/dude-wheres-my-var
Fix unused template argument
2020-08-31 08:21:15 +04:00
Evil Eye
131bd5c91d Fix unused template argument 2020-08-30 22:10:49 +02:00
Andrei Kortunov
70e3341954
Merge pull request #2996 from akortunov/master
Fix failed assertion
2020-08-29 12:09:38 +04:00
Andrei Kortunov
9189a42c4c Fix failed assertion 2020-08-29 12:07:13 +04:00
Andrei Kortunov
67eace1028 Use struct instead of tuple 2020-08-29 11:24:08 +04:00
Andrei Kortunov
924f634bda Support for multiple summons with same ID in the single spell 2020-08-28 21:14:54 +04:00
psi29a
b4ac1e1498 Merge branch 'dont-leak-bash-settings' into 'master'
Don't leak bash settings from activate_msvc.sh

See merge request OpenMW/openmw!288
2020-08-28 11:26:42 +00:00
Bret Curtis
7ee5526dbf
Merge pull request #2993 from akortunov/warnfix
Fix MSVC warnings
2020-08-27 23:39:01 +02:00
Bret Curtis
31bdf9f41d
Merge pull request #2994 from OpenMW/test
resolve sync issue between GH/GL
2020-08-27 14:10:20 +02:00
Petr Mikheev
c495c21923 Merge branch 'movement_refactoring' into 'master'
Refactoring related to "smooth movement"

See merge request OpenMW/openmw!285

(cherry picked from commit 6eaf0a389d5aed3b74ab1a7cf89574612f964bdf)

e847b4c8 Split getSpeed() to getMaxSpeed() and getCurrentSpeed()
a96c46bc Refactor calculation of movement.mSpeedFactor
03ee9090 Use getMaxSpeed instead of getCurrentSpeed where it makes sense.
a178af5c Create helper functions `normalizeAngle` and `rotateVec2f`
2020-08-27 14:07:35 +02:00
psi29a
26c38ecb46 Merge branch 'cherry-pick-6eaf0a38' into 'master'
Merge branch 'movement_refactoring' into 'master'

See merge request OpenMW/openmw!287
2020-08-27 11:55:07 +00:00
psi29a
f90a049702 Merge branch 'movement_refactoring' into 'master'
Refactoring related to "smooth movement"

See merge request OpenMW/openmw!285

(cherry picked from commit 6eaf0a389d5aed3b74ab1a7cf89574612f964bdf)

e847b4c8 Split getSpeed() to getMaxSpeed() and getCurrentSpeed()
a96c46bc Refactor calculation of movement.mSpeedFactor
03ee9090 Use getMaxSpeed instead of getCurrentSpeed where it makes sense.
a178af5c Create helper functions `normalizeAngle` and `rotateVec2f`
2020-08-27 11:54:30 +00:00
psi29a
51bec5948f Merge branch 'sdl-error-message-fix' into 'master'
SDL resolution list fixes in launcher graphics page

Closes #5558

See merge request OpenMW/openmw!286
2020-08-27 11:48:11 +00:00
AnyOldName3
70384d8a83 Restore previous bash settings on exit 2020-08-27 03:03:03 +01:00
AnyOldName3
b71f13965a Don't set pipefail 2020-08-27 02:30:40 +01:00
AnyOldName3
a495888d3d Get per-monitor resolution list while SDL is alive 2020-08-26 16:58:51 +01:00
AnyOldName3
5538fea1d1 Display standard resolutions on single-monitor machines 2020-08-26 16:58:12 +01:00
Andrei Kortunov
f9e667dd8c Fix MSVC warnings 2020-08-26 12:34:27 +04:00
AnyOldName3
b60d5904e2 Correct SDL_GetNumVideoDisplays error message
It logged the wrong function
2020-08-26 00:16:14 +01:00
Bret Curtis
74ba6197ce
Merge pull request #2991 from akortunov/launcher
Use two columns when there is too many checkboxes in launcher's tab
2020-08-23 21:17:05 +02:00
elsid
80e23536cb Merge branch 'camera_refactoring' into 'master'
Camera refactoring

See merge request OpenMW/openmw!271
2020-08-22 22:15:18 +00:00
Andrei Kortunov
7c9497c4de Use two columns when there is too many checkboxes in launcher's tab 2020-08-22 09:26:15 +04:00
psi29a
a740b77b3d Merge branch 'shadow-uniform-thread-safety' into 'master'
Shadow uniform thread safety

Closes #5026

See merge request OpenMW/openmw!284
2020-08-21 22:04:44 +00:00
AnyOldName3
9d083ae8de Merge branch 'small_fixes' into 'master'
move project/cmake to top; set OpenGL_GL_PREFERENCE to LEGACY since we use GL2...

See merge request OpenMW/openmw!266
2020-08-21 17:24:08 +00:00
Andrei Kortunov
8e566fa7ab
Merge pull request #2989 from Capostrophic/tabs
Make Advanced tab of the launcher look okay for everyone again
2020-08-21 12:21:16 +04:00
AnyOldName3
fd14dad789 const osg::ref_ptf reference should be faster than value as constructor and destructor are non-trivial
I played around in GodBolt and got into an argument to determine this. The difference will be immeasurably small, but my curiosity has been satisfied.
2020-08-20 03:01:43 +01:00
AnyOldName3
707204133d Double-buffer shadow uniforms that change each frame 2020-08-20 00:38:13 +01:00
AnyOldName3
ce98d7053b Double buffer view-dependent data stateset 2020-08-19 22:55:41 +01:00
AnyOldName3
98b2d5d921 Make shadow debug HUD thread-safe
* Double buffer the frustum uniforms.
* Don't mess with the debug geometry's StateSet.
* Change two-element vectors to arrays so the size is explicit.
2020-08-19 19:29:19 +01:00
Alexei Dobrohotov
5c37b5bc4b
Merge pull request #2990 from akortunov/serialize
[Regression] Fix crash for ShowSceneGraph
2020-08-12 18:08:33 +03:00
Andrei Kortunov
215ddb9106 Do not print warnings for VisController 2020-08-12 11:16:37 +04:00
Andrei Kortunov
7f342374fc Fix crash when using 'showscenegraph 1' console command 2020-08-12 11:16:10 +04:00
AnyOldName3
b29d313bc2 Merge branch 'chocolatey-proxy' into 'master'
Add OpenMW Chocolatey proxy as source

See merge request OpenMW/openmw!283
2020-08-11 15:12:37 +00:00
AnyOldName3
f7d28445f7 Add l to match typo in real URL 2020-08-10 17:51:05 +01:00
AnyOldName3
35d9ef355a Specify full repository URL 2020-08-10 17:38:17 +01:00
AnyOldName3
3497dcce76 Add OpenMW Chocolatey proxy as source 2020-08-10 17:33:11 +01:00
Capostrophic
c436f29a1e Make Advanced tab of the launcher look okay for everyone again 2020-08-09 20:23:17 +03:00
Bret Curtis
a9cf82c7d0
Merge pull request #2988 from Capostrophic/pursue
AIPursue: don't do a LOS check
2020-08-09 13:02:40 +02:00
Capostrophic
a0ca7c4b43 AIPursue: don't do a LOS check
Properly resolve #4774
2020-08-09 12:48:59 +03:00
psi29a
f73aa9f27a Merge branch 'launcher_update' into 'master'
Add more settings to openmw-launcher

See merge request OpenMW/openmw!272
2020-08-07 20:17:44 +00:00
Petr Mikheev
6a4fa8a8b5 Add more settings to openmw-launcher 2020-08-07 20:17:44 +00:00