df7cdd4b8e
Fix some minor issues after CR
2020-07-14 13:51:07 +02:00
2143f21828
Fix linter
2020-07-14 13:43:33 +02:00
17e38bf66c
Install PDB file if available
2020-07-13 23:39:11 +02:00
3ec39047e1
Fix MXE build
2020-07-13 22:46:32 +02:00
a9717206f3
Try to fix linter errors
2020-07-13 22:04:33 +02:00
634efbcabd
Fix GLEW_STATIC redefinition warnings
2020-07-13 21:33:36 +02:00
c15efbad7b
Revert "Delete FindGLEW"
...
This reverts commit 86f595b8ef
2020-07-13 21:27:56 +02:00
f0ba8ec325
Revert "Fix warnings about redefining GLEW_STATIC"
...
This reverts commit 9cf30fd9bc
2020-07-13 21:27:31 +02:00
fde66a9422
Make MSVC Windows build a separate job
...
Bring back the old file for Linux (with MXE).
Find number of logical processors on Windows by using PowerShell magic.
2020-07-13 21:19:03 +02:00
17ece36b3e
Enable OpenAL in CI MSVC build
...
The issue with OpenAL not compiling with vcpkg was solved upstream.
2020-07-13 20:43:32 +02:00
83a32b36b3
Fix collision persistence of exploding Heavy bots
2020-07-13 20:27:40 +02:00
c80a816808
Merge branch 'dev' into dev-heavyduty
2020-07-13 19:51:23 +02:00
a2c62a9da6
Make Heavy bots destroy bushes on contact
2020-07-13 19:44:50 +02:00
86f595b8ef
Delete FindGLEW
2020-07-12 23:18:21 +02:00
cc4cfd2122
Fix linter
2020-07-12 23:18:21 +02:00
c4037a885f
Make CI Windows build with MSVC instead of MXE
2020-07-12 23:17:42 +02:00
immibis
a2aeef0155
When game speed is 2 or higher, run multiple ticks.
2020-07-11 21:20:55 +02:00
fa5cf01af0
Mark libraries includes as system includes
2020-07-11 17:21:44 +02:00
1b9d40d2fb
Set C++ standard the modern CMake way
2020-07-11 17:20:41 +02:00
9e8ebe4595
Checkout Google Test in GH workflow
...
I hope this works.
2020-07-11 12:41:33 +02:00
e8f9c0292b
Handle the case where GTest is not found
2020-07-11 12:26:35 +02:00
004c861ba9
Fix CBotUT.FunctionRecursionStackOverflow test
...
On MSVC it throws StackOverflow exception. I reduced the stack size to
make the test pass.
2020-07-11 12:17:20 +02:00
81ddda4515
Make tests work with targets
2020-07-11 12:16:20 +02:00
3da26a38ed
Replace Google Test with a submodule
2020-07-11 10:54:52 +02:00
6c3012b8a1
Fix hippomocks target
...
.h file shouldn't be listed as source to add_library(... INTERFACE)
2020-07-11 10:53:13 +02:00
90af1d9c16
Merge pull request #1318 from Erihel/mute_fix
...
Save audio settings when option changes
2020-07-10 20:30:41 +02:00
7d7a29117e
Save audio settings when option changes
...
Mute/unmute option when game windowis in background relies on settings
being updates. This happens when users leaves Options screen. This
commit adds saving audio settings on each change.
This is a fix for #1315
2020-07-10 20:15:18 +02:00
9cf30fd9bc
Fix warnings about redefining GLEW_STATIC
...
I guess this flag is now set by CMake somehow so we no longer need
to define it ourselves.
2020-07-10 18:55:47 +02:00
df65862c49
Start using CMake targets instead of variables
...
Moved most of the variables to targets in the main src.
Made libraries in repo export targets.
Refactor STATIC flags a little and add more.
This commit definitely breaks a lot of things like tests
but the main game builds at least with MSVC.
2020-07-10 18:49:54 +02:00
f2d91cde80
Update Find*.cmake modules
...
Make them export targets instead of variables.
Some platforms need libintl, abstract it to a Find*.cmake module.
Static linking requires linking to dependencies of dependencies (it is
as horrific as it sounds). This commit handles this only for libsndfile.
SDL2_image and SDL2_ttf probably also have some hidden dependencies.
FindGLEW module is now bundled with CMake, hence it is deleted.
Added Copyright.txt since some modules are taken from CMake.
2020-07-10 18:38:06 +02:00
db031c7985
Merge branch 'vscode-instructions' of https://github.com/MrJohn10/colobot into vscode-instructions
2020-07-10 15:49:37 +02:00
a3ceecb21e
improve screenshots
2020-07-10 15:48:52 +02:00
da6c0c66d7
delete dubled file
2020-07-10 15:26:20 +02:00
767f7f0049
fix discord link
2020-07-10 15:24:19 +02:00
85f0f88c20
overall improvements
2020-07-10 15:17:34 +02:00
870d5237bb
fixes, add screenshot
2020-07-10 13:18:57 +02:00
4ae0360640
Remove source grouping temporarily
...
It's probably not how it should be done with modern CMake, so I'm
removing this for now to focus on other changes first.
2020-07-10 13:03:23 +02:00
b8523aa1db
Merge pull request #1329 from colobot/dev-msvc-sed-fix
...
Fix update-pot not working with MSBuild
2020-07-10 11:33:41 +02:00
bf1982f4e4
Change `make update-pot` comment to cmake command
...
`make update-pot` only works if a generator producing Makefiles was
used with `cmake`. The `cmake` command to build a specific target
will work for any generator.
2020-07-10 11:01:47 +02:00
963cd1b347
Fix sed cmd not working with MSBuild
...
Fixes the `'\1' is not recognized as an internal or external command`
error when trying to run the target `update-pot` with MSBuild.
The `|` characters probably messed with cmd.exe or PowerShell syntax
rules so they were replaced with slashes `/`.
Also, at least some implementations of sed for Windows would produce
CRLF line endings instead of LF line endings. The issue is fixed by
adding the flag `-b`.
2020-07-10 10:53:38 +02:00
4c02fe9cda
Merge pull request #1323 from colobot/dev-cmake-version-bump
...
Bump CMake version
2020-07-09 21:47:31 +02:00
70b7a63b66
fix
2020-07-09 21:32:27 +02:00
31781f214c
fixes
2020-07-09 21:29:31 +02:00
1b74cc1144
improve link
2020-07-09 21:27:33 +02:00
535696de28
refactor
2020-07-09 21:25:48 +02:00
b9297cd9f4
Bump CMake version
2020-07-09 21:25:47 +02:00
a78cc159f8
add cloning instructions, improve links
2020-07-09 21:25:19 +02:00
fbb45807f1
Create intructions for using vscode
2020-07-09 21:16:03 +02:00
1c8c01ad96
Merge pull request #1325 from colobot/dev-gh-actions-lint
...
Send colobot-lint results to GitHub using annotations
2020-07-09 20:14:05 +02:00
97b266182b
Fix MXE build
2020-07-09 19:55:11 +02:00
MrSimbax
immibis