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

3399 Commits (171bba1bcd87ef4630b3daa1bcee46cc8705c255)

Author SHA1 Message Date
MrSimbax df415880d0 Fix linter issues 2020-07-22 17:26:46 +02:00
MrSimbax 1be69a0a51 Fix compile errors 2020-07-22 17:24:07 +02:00
MrSimbax 2b96eda86d Fix minor issues 2020-07-22 17:13:52 +02:00
MrSimbax f57da76ae8 Add handling of mods manifests 
Also add Polish translations for mod manager related strings.
 2020-07-22 16:35:47 +02:00
Mateusz Przybył a5c7187017
Fix crashes on SatCom in Moon missions (#1334) 2020-07-22 00:37:37 +02:00
MrSimbax 5112bf86df Fix linter issues 2020-07-21 21:11:08 +02:00
Mateusz Przybył 2d32e3a798
Merge pull request #1255 from timgott/smooth_shadows_gl21 
Smooth shadows in gl21
 2020-07-21 20:55:47 +02:00
Mateusz Przybył fd2b72b296
Merge pull request #1263 from nextghost/dev 
Fix OpenGL specular lighting
 2020-07-21 20:55:21 +02:00
MrSimbax eac74c23ec Fix linter issues 2020-07-21 20:39:00 +02:00
MrSimbax 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
Droog71 c4385961c4
Fix for issue #1163 (#1332) 
* Clamped power variable before assignment to params in object manager. Attempted to fix formatting issues.

* Fixed Clamp function not implemented correctly.

* Fixed formatting issue, space after commas.

* Created ClampPower method in object_manager.h and implemented in object_manager.cpp, Removed similar code from robotmain.cpp

* Removed redundant call to ClampPower in object_manager.cpp

* Added second call to ClampPower back to object_manager.cpp. Made ClampPower method private. Attempted to fix whitespace issues.

* Fixed missing assignment to params.power in CreateObject method of object_manager.cpp

* fixed white space at end of line 182 in object_manager.h

* Fixed doxygen compatibility issue.
 2020-07-20 21:55:44 +02:00
krzys_h f1d6787b08
Merge pull request #1333 from colobot/dev-gh-actions 
Use colobot-lint from GitHub Actions rather than Jenkins and fix linter on PRs from forks
 2020-07-20 21:42:13 +02:00
krzys-h b47ee4dd1e Don't try to upload annotations for pull requests from forks 
The GITHUB_TOKEN is readonly when running from a fork... and I've found exactly 0 workarounds for this issue

I wanted to check permissions on the actual token rather than if we are running inside a fork, but the header that is supposed to specify the permissions doesn't exist under GH Actions (╯°□°)╯︵ ┻━┻
 2020-07-20 21:06:13 +02:00
krzys_h dc6cfbb691 Use colobot-lint from GitHub Actions rather than Jenkins 2020-07-20 19:51:50 +02:00
Fiftytwo 754dfefefd Add Missions+ gamemode 2020-07-20 18:35:31 +02:00
MrSimbax 7e6782a1be Try to improve font reloading 2020-07-19 16:07:27 +02:00
MrSimbax 56a8c5eb48 Fix build error on GCC 2020-07-19 15:16:39 +02:00
MrSimbax 63bf6bed08 Add saving mods list in colobot.ini 2020-07-19 15:02:35 +02:00
Droog71 d64d78acfc
Fix for issue #1221 (#1230) 
* Fix for issue #1221

* Removed object array and implemented GetObjectName method in it's place.

* Fixed indentation issue.

* Fixed white space at end of lines 1571, 1572.
 2020-07-19 10:55:55 +02:00
MrSimbax 69d2d39c36 Add ability to use arrays in colobot.ini 2020-07-18 18:06:14 +02:00
MrSimbax a0635ae400 Fix linter issues 2020-07-18 15:01:36 +02:00
MrSimbax dc64b95406 Fix build error 2020-07-18 14:47:18 +02:00
MrSimbax 8390d85e46 Refactor the mod manager 
Moved list of mods logic to a new CModManager class.

The list of enabled mods is now managed by a flag instead of directory
names of mods.

Mods are now disabled by default.

Also general cleanup, fixing issues from the code review in
https://github.com/colobot/colobot/pull/1191 and fixing linter issues.

Regression: the state of enabled/disabled mods is now not persistent.
The plan is to use some kind of config file for this.
 2020-07-18 14:30:50 +02:00
Fiftytwo 95cab790c1 Rename 'freemissions' back to 'free' 2020-07-17 19:33:53 +02:00
Fiftytwo b72bedaf60 Add BrownMushroom and GreenMushroom categories in CBOT 2020-07-17 18:00:36 +02:00
MrSimbax 5f76722ecb Add error dialogs for open path/url buttons 2020-07-17 17:27:09 +02:00
MrSimbax 4905abe30b Merge branch 'dev-mod-manager' of https://github.com/DavivaD/colobot into dev-mod-manager 2020-07-17 11:49:51 +02:00
Fiftytwo ac32e40003 Add Ruin, Bush, GraviPlant, and Crystal categories in CBOT 2020-07-17 03:37:13 +02:00
Mateusz Przybył 52ed8041f7
Merge pull request #1330 from colobot/dev-cmake-targets 
Use CMake targets instead of variables
 2020-07-15 11:32:33 +02:00
Emxx52 0a3cdd342b
Merge pull request #1322 from colobot/dev-update-translations 
Update translations
 2020-07-14 23:52:20 +02:00
Emxx52 d29570c20a
Merge pull request #1331 from colobot/dev-heavyduty 
Update Heavy bots, fix collisions
 2020-07-14 22:52:08 +02:00
Mateusz Przybył 174669ec92
Merge pull request #1257 from immibis/1164-fix 
When game speed is 2 or higher, run multiple ticks.
 2020-07-14 22:41:05 +02:00
MrSimbax f87ae45745 Update translations 
Also add a Polish translation for "Mute sounds in background".
Related issue: #1316
 2020-07-14 22:16:56 +02:00
MrSimbax 2fa706a123 Add x86 MSVC build to GH Actions 2020-07-14 21:43:34 +02:00
MrSimbax 73429315a7 Add USE_STATIC_RUNTIME option 
Mainly useful for MSVC.
 2020-07-14 20:43:42 +02:00
MrJohn10 61126af370
Update contact section in Readme - add Discord server, remove forum and IRC channels (#1328) 2020-07-14 18:32:51 +02:00
MrSimbax 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
MrSimbax 167dd01bbe Revert "Fix CBotUT.FunctionRecursionStackOverflow test" 
This reverts commit 004c861ba9.
 2020-07-14 13:54:32 +02:00
MrSimbax df7cdd4b8e Fix some minor issues after CR 2020-07-14 13:51:07 +02:00
MrSimbax 2143f21828 Fix linter 2020-07-14 13:43:33 +02:00
MrSimbax 17e38bf66c Install PDB file if available 2020-07-13 23:39:11 +02:00
MrSimbax 3ec39047e1 Fix MXE build 2020-07-13 22:46:32 +02:00
MrSimbax a9717206f3 Try to fix linter errors 2020-07-13 22:04:33 +02:00
MrSimbax 634efbcabd Fix GLEW_STATIC redefinition warnings 2020-07-13 21:33:36 +02:00
MrSimbax c15efbad7b Revert "Delete FindGLEW" 
This reverts commit 86f595b8ef.
 2020-07-13 21:27:56 +02:00
MrSimbax f0ba8ec325 Revert "Fix warnings about redefining GLEW_STATIC" 
This reverts commit 9cf30fd9bc.
 2020-07-13 21:27:31 +02:00
MrSimbax 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
MrSimbax 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
Fiftytwo 83a32b36b3 Fix collision persistence of exploding Heavy bots 2020-07-13 20:27:40 +02:00
Fiftytwo c80a816808 Merge branch 'dev' into dev-heavyduty 2020-07-13 19:51:23 +02:00