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

3450 Commits (fdc1792932315c084036840c94bf779018355a77)

Author SHA1 Message Date
MrSimbax a69b88e09a Move time related functions out of CSystemUtils 
GetCurrentTimeStamp() has not been moved because of
CApplication unit tests.
 2021-09-11 13:26:38 +02:00
MrSimbax 5daaba6e64 Fixes after merge 
Fix mistakes after previous merge and make it compile.

Rewrite the function interpolating between time stamps as it was
written after the original pull request was created. Add unit tests
for it.

I couldn't help myself and also changed some enums to enum classes and
did some renames.
 2021-09-11 12:44:26 +02:00
MrSimbax 2b107736e2 Merge branch 'platform-independent' of https://github.com/AbigailBuccaneer/colobot into AbigailBuccaneer-platform-independent 2021-09-11 10:47:39 +02:00
Mateusz Przybył e0c5ca962f
Merge pull request #1327 from MrJohn10/vscode-instructions 
Add instructions for compilation and installation using vscode
 2021-09-05 15:17:04 +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
lb_ii 91a290dade Assign team id to Alien eggs created during produce() 2021-08-25 01:09:58 +03:00
lb_ii ea62a449d4 Add optional team parameter to produce() function 2021-08-24 02:21:42 +03:00
Mateusz Przybył faa4eaae20 Release 0.2.0-alpha: Bump version 2021-08-21 22:57:34 +02:00
Mateusz Przybył c039e7e859 Post-release 0.2.0-alpha 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
immibis 76314f522f Slotted object interface 2021-07-04 21:50:56 +02:00
melex750 55d6c431f2 Fix a bug in WriteStream and ReadStream 
Added a unit test to confirm reliability of I/O
functions used by SaveState and RestoreState.
 2021-06-25 18:50:15 -04:00
melex750 ce450d1c00 Fix save/load programs for insects from AlienEgg 
fixes #1370
 2021-06-25 18:47:25 -04: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