immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,378 Commits
19 Branches
15 Tags
59 MiB
Commit Graph

3378 Commits (b322ce064b44599adf41326b57e7ce1f3d52dada)

Author SHA1 Message Date
Tomasz Kapuściński b322ce064b Added dependency on glm 
# Conflicts:
#	src/CMakeLists.txt
 2021-09-05 16:31:57 +02:00
Tomasz Kapuściński ec21faf15c Removed gl14 and gl21 devices 2021-09-05 16:25:38 +02:00
Mateusz Przybył 37f82acff0
Merge pull request #1457 from vieux/master 
system_macosx.cpp: fix typo
 2021-09-05 14:40:32 +02:00
Mateusz Przybył c04d3ef50d
Merge pull request #1341 from colobot/dev-modern 
Merge dev-modern into dev
 2021-09-05 14:32:13 +02:00
MrSimbax 62b14bcf62 Bump C++ version from 11 to 17 2021-09-04 22:27:06 +02:00
MrSimbax 005f5b5103 Replace ::add-path:: function with appending to $GITHUB_PATH 
See https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
 2021-09-04 21:59:49 +02:00
MrSimbax bb6c32c897 Update run-vcpkg action from v3 to v7 2021-09-04 21:52:58 +02:00
MrSimbax 8299fe41bc Remove JenkinsFile as it's no longer used 2021-09-04 21:52:58 +02:00
MrSimbax d39f1999e7 Remove support for MXE 2021-09-04 21:52:58 +02:00
MrSimbax d06b7e1456 Update vcpkg version used in CI 2021-09-04 21:52:58 +02:00
MrSimbax 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
MrSimbax bbf5c806d8 Fix MSVC compilation due to macros in Windows API headers 
There exists `CreateDirectory` `#define` somewhere and it results in
failed compilation of `resourcemanager.cpp`.
Similarly for `RemoveDirectory`. See
https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createdirectorya

Rename the two methods to remove the conflict.

The fail occurs at least when using Visual Studio 2022 Preview.
 2021-09-04 20:34:02 +02:00
MrSimbax 8f0b367f9c Find Opus because SndFile now depends on it 2021-09-04 20:33:15 +02:00
MrSimbax 65e12621ff Link brotli since freetype can now depend on it 
The fixes are from PR #1371
 2021-09-04 20:31:22 +02:00
MrSimbax 84d23e91ed Fix CMAKE_MSVC_RUNTIME_LIBRARY name for dynamic runtime 2021-09-04 20:29:52 +02:00
MrSimbax 5e37f84bc7 Merge branch 'dev' into dev-modern 2021-09-04 19:11:24 +02:00
Victor Vieux 11047ecd53 system_macosx.cpp: fix typo 2021-08-24 15:48:31 -07:00
Mateusz Przybył c039e7e859 Post-release 0.2.0-alpha 2021-08-21 22:57:34 +02:00
Mateusz Przybył faa4eaae20 Release 0.2.0-alpha: Bump version 2021-08-21 22:57:34 +02:00
Mateusz Przybył d9c966a95b Release 0.2.0-alpha: Merge branch 'dev' 2021-08-21 22:57:33 +02:00
MrSimbax 92f574d2ca Remove Ubuntu 16.04 from CI jobs 2021-08-21 22:48:51 +02:00
MrSimbax decab29555 Remove linter CI jobs 
They require Ubuntu 16.04 which is no longer supported.
 2021-08-21 22:48:51 +02:00
MrSimbax ecc23dfb3e Update data submodule 2021-08-21 22:18:52 +02:00
Fiftytwo a5d9bae052 Fix missing AmphibiousTrainer in drive_type 2021-08-20 18:17:36 +02:00
tomangelo c04291a55e
Update polish translation (#1407) 2021-08-16 18:01:08 +02:00
Emxx52 efad9a4dae
Merge pull request #1438 from melex750/dev-cbot-fix-leaks 
CBOT bug fixes and improved performance
 2021-08-14 20:15:58 +02:00
Emxx52 3ab153225a
Merge pull request #1439 from melex750/dev-cbot-repeat 
Restore repeat(n) instruction in CBOT
 2021-08-14 20:15:00 +02:00
melex750 9f5ee21bbe Restore repeat(n) instruction 
fixes #1403
 2021-06-11 23:28:53 -04:00
melex750 27466a4223 Make all CBotStack data members non-static 2021-06-11 22:48:50 -04:00
melex750 a279541198 Make all CBotCStack data members non-static 2021-06-11 22:47:33 -04:00
melex750 309f80b25f Fix some bugs and memory leaks in CBOT 
* Added CBotStack::StackOver() calls where it was possible
  to go out-of-bounds when calling CBotStack::AddStack().
* Fixed some bugs in CBotExternalCallClass
 2021-06-11 22:46:23 -04:00
melex750 993a6adf6e Fix inherited data members not being saved 
* Removed erroneous 'parent instance' from CBotVarClass.
* Fixed output of CBVarClass::GetValString()
 2021-06-11 22:44:20 -04:00
Emxx52 fabbdda964
Merge pull request #1406 from colobot/dev-gameplus 
Add Missions+ gamemode, add new CBOT categories and functions, update Sniffers
 2021-03-30 21:05:34 +02:00
Fiftytwo cdb63e2a8c Update data submodule 2021-03-30 20:51:17 +02:00
Fiftytwo 8647deafc8 Merge branch dev into dev-gameplus 2021-03-21 22:30:23 +01:00
Fiftytwo dbd9db86a6 Update data submodule 2021-03-21 22:10:42 +01:00
tomangelo b338b18f16
Merge pull request #1405 from colobot/dev-missing-library 
Add missing library in MSYS2 instruction
 2021-03-21 21:10:34 +01:00
tomangelo2 0b948b655e Add missing library in MSYS2 instruction 2021-03-21 15:17:28 +01:00
Mateusz Przybył 52446c1049
Merge pull request #1371 from jaladreips/dev-cmake 
Fix MSVC building issues by correcting CMakeLists.txt
 2021-02-22 20:49:27 +01:00
krzys_h fbbe25b25e
Merge pull request #1391 from colobot/dev-gh-actions 
Fix uploading linter results from forks to GitHub
 2021-02-22 19:09:35 +00:00
krzys-h f5519f8936
Send comment when pull request targets the wrong branch 2021-02-22 12:57:04 +01:00
krzys-h 9f2f7780a4
Safely upload linter results from forks to GitHub 
This makes lint results from pull requests appear as GitHub checks
similarly to how pull requests from branches are able to work

Based on https://securitylab.github.com/research/github-actions-preventing-pwn-requests
 2021-02-22 12:57:03 +01:00
krzys-h 9c91fd1e52
Replace custom download script with dawidd6/action-download-artifact 2021-02-22 10:44:45 +01:00
Mateusz Przybył 7b237ce9ad
Merge pull request #1387 from colobot/dev-fix-vsync 
Remove vsync loop and improve vsync UI
 2021-02-07 21:40:24 +01:00
MrSimbax 404d2dbeb1 Fix segfault in CApp UT 
I moved m_engine creation to the constructor.
However, it is not complete until after calling m_engine->Create().
The UT segfault because the pointer is not null and destructor calls
m_engine->Destroy() on an incomplete object.
(Yes, UTs test incomplete SUT.)

So I moved back the m_engine creation to CApp::Create() but before
the SDL initialization as m_engine holds the flag for vsync.
 2021-02-07 13:38:29 +01:00
MrSimbax 9a04685101 Fix compile error 2021-02-07 13:03:12 +01:00
MrSimbax a7aaa07356 Update vsync list after user interaction 
The vsync may immediately fallback to another option after change from
the user so the UI should reflect that.

Todo: show a popup in UI informing the user why their desired vsync
option couldn't be set. Right now the error message is visible only from
the logs.
 2021-02-07 12:50:13 +01:00
MrSimbax 71ff89a803 Remove vsync disable/enable loop (fix #1383) 
Also a small refactor due to repeated code.
The vsync flag in m_engine is now synchronized with the SDL state
during initial configuration of CApp.
 2021-02-07 12:47:32 +01:00
jakac c336a67afa Fix MSVC building issues by correcting CMakeLists.txt 2021-01-03 15:46:01 +01:00
Fiftytwo 10ec454f6b Fix Target research() executing in ResearchCenter 2020-12-31 05:00:33 +01:00