Commit Graph

24000 Commits (be5fd6fd03bc3f86ee8764ce33b1e10556fb5010)
 

Author SHA1 Message Date
AnyOldName3 be5fd6fd03 Exclude directories correctly
We don't need `/*` as we don't want the directory itself, not just its
contents. We also need to list possible other directories explicitly as
there's currently no way to skip directories without matches.

It would be much nicer if CMake was tracking the DLLs we needed for us.
4 years ago
AnyOldName3 73708a6f2a Install openmw-cs.cfg on single-config generators and from the right directory on multi-config 4 years ago
AnyOldName3 8dd820ba48 Exclude deps 4 years ago
AnyOldName3 d0ddf488db Install PDBs when appropriate 4 years ago
AnyOldName3 db0f7c607f Make Windows install target slightly less breakable 4 years ago
fredzio 87290cf6d1 Add support for multi configurations generators on unix
Since version 3.17 cmake supports the Ninja Multi-Config
No change for Xcode, VS and Ninja "single config"
4 years ago
Alexei Dobrohotov acdf4cb5e3
Merge pull request #3007 from akortunov/warnfix
Fix unsugned/signed comparison warning
4 years ago
Andrei Kortunov 7d776609c8 Fix unsugned/signed comparison warning 4 years ago
AnyOldName3 bb2f89b497 Merge branch 'macos-gldebug-hotfix' into 'master'
Disable OpenGL Debug stuff when SDL doesn't provide the necessary definitions

See merge request OpenMW/openmw!304
4 years ago
AnyOldName3 390fb4f12e Disable OpenGL Debug stuff when SDL doesn't provide the necessary definitions 4 years ago
Bret Curtis dd7e964baf
Merge pull request #2999 from akortunov/spellfix
Apply effects during rest before fast-forwarding spells state
4 years ago
psi29a 86c6d9b1b5 Merge branch 'cherry-pick-b3db3875' into 'master'
Merge branch '4771-and-4631' into 'master'

Closes #4631 and #4471

See merge request OpenMW/openmw!303
4 years ago
psi29a 22c3588d0d Merge branch '4771-and-4631' into 'master'
Try lower MSAA level if the requested value isn't available

Closes #4471 and #4631

See merge request OpenMW/openmw!297

(cherry picked from commit b3db387512340a5e9a77427c2d7d9d88c2340056)

da0aef7a Retrieve SDL OpenGL attributes after context creation
a51e63b3 Try lower MSAA levels if OpenGL context doesn't have what we requested
c4e92a0a Update CHANGELOG.md
4 years ago
psi29a 87028e1640 Merge branch 'flipping-heck' into 'master'
Make NiFlipControllers only affect base texture

Closes #2069

See merge request OpenMW/openmw!301
4 years ago
psi29a b4ccd2658a Merge branch 'khr_debug' into 'master'
Khr debug

See merge request OpenMW/openmw!302
4 years ago
Bret Curtis 8f07b7e076
Merge pull request #3005 from Assumeru/dont-search-containers
Don't search containers
4 years ago
AnyOldName3 3f61ff3a44 Make OpenGL debugging optional 4 years ago
AnyOldName3 441c09578a Merge remote-tracking branch 'origin/khr_debug' into khr_debug 4 years ago
AnyOldName3 14740855b5 Merge branch '16-bit-tga-alpha' into 'master'
Discard the alpha channel of 16-bit TGAs, just like Morrowind

See merge request OpenMW/openmw!298
4 years ago
AnyOldName3 f8f72ce4c4 Add changelog entry 4 years ago
AnyOldName3 b2cb98d30e Fix NiFlipController
NiFlipControllers *always* affect the base texture, even if no base
texture is bound. When no base texture is bound, they default to UV set
zero and to having wrapped UV coordinates, instead of using the settings
for the disabled base texture.
4 years ago
Alexei Dobrohotov 8390ba0a0c Merge branch 'fix_5557' into 'master'
Fix #5557

Closes #5557

See merge request OpenMW/openmw!290
4 years ago
Evil Eye fe82cd9f92 Don't search containers 4 years ago
Petr Mikheev 874c754b68 Fix #5557 4 years ago
psi29a 165fa1c376 Merge branch 'multi-config-runtime-resources' into 'master'
Allow setting up multiple build configurations at once

See merge request OpenMW/openmw!296
4 years ago
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