6f05280ccb
Extracted CBot library to a separate directory
2023-08-09 13:47:55 +02:00
83b9ded0dc
Merge branch 'dev' into dev-graphics-overhaul
2023-08-08 01:01:57 +02:00
84ac0d3ba8
Post-release 0.2.1-alpha
2023-08-08 00:43:51 +02:00
acc3c5ae5e
Release 0.2.1-alpha: Bump version
2023-08-07 22:47:21 +02:00
4531dc432e
Merge branch 'dev' into dev-graphics-overhaul
2023-04-14 23:41:28 +02:00
efbd296fc3
Merge branch 'dev' into dev-fix-macos-compilation
2023-04-08 17:55:03 +02:00
4634461c1d
Added vcpkg manifest file
2023-04-03 00:01:30 +02:00
1d8e06c7ba
Revert "Fix for SDL on Windows"
...
This reverts commit 21b6572b5b
2022-11-26 20:00:44 +01:00
21b6572b5b
Fix for SDL on Windows
2022-11-26 17:42:34 +01:00
983a9a6e03
Another fix for SDL
2022-11-26 15:32:56 +01:00
2f50470591
Fix for linking to SDL
2022-11-26 14:52:39 +01:00
0e53336d61
Merge branch 'dev' into dev-fix-macos-compilation
2022-11-05 19:27:52 +01:00
f2cc131ff7
Merge branch 'dev' into dev-graphics-overhaul
...
# Conflicts:
# .github/workflows/build.yml
2022-05-02 09:24:05 +02:00
b6f2a9e544
Fix for invisible batteries (code by melex750) ( #1520 )
...
* Fix for invisible batteries (code by melex750)
* Updated vcpkg
* A workaround for sprintf define
* Added mpg123 to dependencies due to newer version of SndFile
* Removed CONFIG
* Another fix for dependencies
* Made additional dependencies optional
2022-04-29 00:02:04 +02:00
fd3c2af358
A proper fix?
2022-03-11 23:33:21 +01:00
5c2c52ad31
Fix for missing <filesystem>?
2022-03-11 23:16:50 +01:00
c011e49112
Another fix
2022-02-26 21:42:09 +01:00
628567701a
Added nlohmann json as submodule
2022-02-26 21:12:40 +01:00
6447304531
Added nlohmann-json library to dependencies
2022-02-25 20:41:45 +01:00
e3ba1a1840
Fix compilation errors on MacOS
2022-02-10 19:46:50 +01:00
3bd4fee844
Merge branch 'dev' into dev-graphics-overhaul
...
# Conflicts:
# src/graphics/engine/camera.cpp
# src/object/auto/autonuclearplant.cpp
# src/object/auto/autopowerplant.cpp
# src/object/interface/powered_object.h
# src/object/motion/motionvehicle.cpp
# src/object/old_object.cpp
# src/object/old_object.h
# src/object/task/taskmanip.cpp
# src/object/task/taskmanip.h
# src/object/task/tasktake.cpp
2022-02-02 18:11:06 +01:00
33744de372
Add target alias for older versions of glm
2021-12-14 23:42:14 +01:00
7e0db31cc1
Merge branch 'dev' into dev-graphics-overhaul
2021-12-14 22:27:43 +01:00
f9c275919e
Fix CMake warning about empty GoogleTest version
...
The warning appeared when GoogleTest is used as a submodule.
2021-12-08 19:25:36 +01:00
3aa7c3c2e0
Stop handling compilation warnings as errors ( #1477 )
...
* Stop handling compilation warnings as errors
* Restore mistakenly removed flag
2021-12-05 11:51:28 +01:00
b322ce064b
Added dependency on glm
...
# Conflicts:
# src/CMakeLists.txt
2021-09-05 16:31:57 +02:00
62b14bcf62
Bump C++ version from 11 to 17
2021-09-04 22:27:06 +02:00
d39f1999e7
Remove support for MXE
2021-09-04 21:52:58 +02:00
41cf9974f9
Bump CMake version from 3.17 to 3.16
...
See https://github.com/colobot/colobot/issues/1306#issuecomment-657096265
2021-09-04 21:51:55 +02:00
84d23e91ed
Fix CMAKE_MSVC_RUNTIME_LIBRARY name for dynamic runtime
2021-09-04 20:29:52 +02:00
5e37f84bc7
Merge branch 'dev' into dev-modern
2021-09-04 19:11:24 +02:00
c039e7e859
Post-release 0.2.0-alpha
2021-08-21 22:57:34 +02:00
faa4eaae20
Release 0.2.0-alpha: Bump version
2021-08-21 22:57:34 +02:00
f57da76ae8
Add handling of mods manifests
...
Also add Polish translations for mod manager related strings.
2020-07-22 16:35:47 +02:00
242477e3ee
Major UI change to mod manager
...
Move the button to the sidebar.
Add reordering option.
General improvements and refactoring.
2020-07-21 20:27:24 +02:00
73429315a7
Add USE_STATIC_RUNTIME option
...
Mainly useful for MSVC.
2020-07-14 20:43:42 +02:00
419bd1cc21
Fix CBOT stack overflow test failing on MSVC
...
Increased the stack size to the default (?) stack size on Linux.
The failing test name: CBotUT.FunctionRecursionStackOverflow
2020-07-14 14:26:37 +02:00
c4037a885f
Make CI Windows build with MSVC instead of MXE
2020-07-12 23:17:42 +02:00
1b9d40d2fb
Set C++ standard the modern CMake way
2020-07-11 17:20:41 +02:00
e8f9c0292b
Handle the case where GTest is not found
2020-07-11 12:26:35 +02:00
81ddda4515
Make tests work with targets
2020-07-11 12:16:20 +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
b9297cd9f4
Bump CMake version
2020-07-09 21:25:47 +02:00
0597c0efda
Try to fix Jenkins build
2020-04-05 14:11:08 +02:00
621453a01c
Make all relative paths use base dir
2020-04-05 13:24:45 +02:00
8f122d6603
Fix MSVC compilation (again)
2020-04-03 20:18:14 +02:00
5cefa57dd5
Use base dir instead of working dir for data files
2019-08-07 09:51:27 +02:00
97a8cfe6f9
Merge pull request #1251 from fernape/fix-freebsd-build
...
Add FreeBSD support.
2019-04-10 22:13:15 +02:00
44083053ce
Add FreeBSD support.
...
Add a new PLATFORM_FREEBSD variable. We can compile like MacOS with just an
extra linker flag.
2019-03-09 19:04:00 +01:00
d4ab82eaae
Release 0.1.12-alpha: Bump version
2019-02-23 20:01:33 +01:00
Tomasz Kapuściński