Commit Graph

24176 Commits (2972033a72d50b93b24703bf1530f285160d29e5)
 

Author SHA1 Message Date
AnyOldName3 086db32c13 Merge branch 'typo' into 'master'
fix typo in terrainstorage.hpp

See merge request OpenMW/openmw!299
4 years ago
tessa 58b5249e8b fix typo in terrainstorage.hpp 4 years ago
AnyOldName3 85b5fdee35 Discard the alpha channel of 16-bit TGAs, just like Morrowind 4 years ago
Bret Curtis 673f0f4f77
Merge pull request #3003 from akortunov/min_cost
Set a minimum 1gp cost for services
4 years ago
Andrei Kortunov 753ca91556 Set a minimum 1gp cost for services (regression #5600) 4 years ago
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.
4 years ago
AnyOldName3 ffed6acc49 Merge branch 'patch-1' into 'master'
force static data variance for water geometry

See merge request OpenMW/openmw!294
4 years ago
AnyOldName3 02a4489278 Merge branch 'cmake-ipo' into 'master'
Use CMake's system for IPO/LTO

Closes #5265

See merge request OpenMW/openmw!293
4 years ago
Alexei Dobrohotov 99ab629a03
Merge pull request #2995 from akortunov/arrows
Improve ammo resetting
4 years ago
Mads Buvik Sandvei 2d021430b8 force static data variance for water geometry 4 years ago
Andrei Kortunov c9f0e4b62a
Merge pull request #3000 from akortunov/swish
Do not use swish sound for ranged weapons
4 years ago
Andrei Kortunov bf1c4c7af3
Merge pull request #3002 from akortunov/multiple_effects
Fix SummonKey comparison function
4 years ago
Andrei Kortunov 9f1fbd56a3 Fix SummonKey comparison function 4 years ago
AnyOldName3 f4db29a717 Kill BUILD_CONFIG
It was basically just CONFIGURATION but less confusing. CONFIGURATION
could just be less confusing.
4 years ago
AnyOldName3 643db61dfb Make warnings more informative. 4 years ago
AnyOldName3 1dcea961c6 Only enable LTO for release
This is how it was for the original implementation
4 years ago
Eli2 257a6b4629 Use cmake method to enable interprocedural optimizations 4 years ago
AnyOldName3 dc34380f62 Merge branch '5570-fix' into 'master'
Unpin CMake version now latest is fixed

Closes #5570

See merge request OpenMW/openmw!292
4 years ago
AnyOldName3 a251461045 Unpin CMake version now latest is fixed 4 years ago
Andrei Kortunov f9ca08a984 Do not use swish sound for ranged weapons 4 years ago
Andrei Kortunov 787ca06d55 Apply effects during rest before fast-forwarding spells state 4 years ago
Bret Curtis 53e581fe10
Merge pull request #2899 from akortunov/multiple_effects
Track magic effect index for summoning
4 years ago
Bret Curtis 009c18a97d
Merge pull request #2998 from akortunov/crashfix
Avoid crash when object paging encounters an empty shape
4 years ago
Andrei Kortunov 7a4efe3979 Avoid crash when object paging encounters an empty shape 4 years ago
AnyOldName3 f5f59c1149 Merge branch 'fix_5586' into 'master'
Fix #5586

Closes #5586

See merge request OpenMW/openmw!291
4 years ago
Petr Mikheev 7e3d19196d Fix #5586 4 years ago
Andrei Kortunov 54f678b172
Merge pull request #2997 from Assumeru/dude-wheres-my-var
Fix unused template argument
4 years ago
Evil Eye 131bd5c91d Fix unused template argument 4 years ago
Andrei Kortunov 70e3341954
Merge pull request #2996 from akortunov/master
Fix failed assertion
4 years ago
Andrei Kortunov 9189a42c4c Fix failed assertion 4 years ago
Andrei Kortunov 67eace1028 Use struct instead of tuple 4 years ago
Andrei Kortunov 924f634bda Support for multiple summons with same ID in the single spell 4 years ago
Andrei Kortunov 47af221f10 Reset ammo when switching view to avoid warnings spam 4 years ago
Andrei Kortunov 297898182b Reset attached arrow in the beginning of unequipping animation 4 years ago
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
4 years ago
Bret Curtis 7ee5526dbf
Merge pull request #2993 from akortunov/warnfix
Fix MSVC warnings
4 years ago
Bret Curtis 31bdf9f41d
Merge pull request #2994 from OpenMW/test
resolve sync issue between GH/GL
4 years ago
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`
4 years ago
psi29a 26c38ecb46 Merge branch 'cherry-pick-6eaf0a38' into 'master'
Merge branch 'movement_refactoring' into 'master'

See merge request OpenMW/openmw!287
4 years ago
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`
4 years ago
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
4 years ago
AnyOldName3 70384d8a83 Restore previous bash settings on exit 4 years ago
AnyOldName3 b71f13965a Don't set pipefail 4 years ago
AnyOldName3 a495888d3d Get per-monitor resolution list while SDL is alive 4 years ago
AnyOldName3 5538fea1d1 Display standard resolutions on single-monitor machines 4 years ago
Andrei Kortunov f9e667dd8c Fix MSVC warnings 4 years ago
AnyOldName3 b60d5904e2 Correct SDL_GetNumVideoDisplays error message
It logged the wrong function
4 years ago
Bret Curtis 74ba6197ce
Merge pull request #2991 from akortunov/launcher
Use two columns when there is too many checkboxes in launcher's tab
4 years ago
elsid 80e23536cb Merge branch 'camera_refactoring' into 'master'
Camera refactoring

See merge request OpenMW/openmw!271
4 years ago
Andrei Kortunov 7c9497c4de Use two columns when there is too many checkboxes in launcher's tab 4 years ago