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

3081 Commits (3fbfadb0d4a1787195afc837ba094773727dfdb1)

Author SHA1 Message Date
tomangelo2 a46750ede2 Fix crash when destroying unpowered PowerPlant with Titanium 
Appendix to pull #1206
 2019-02-18 14:43:56 +01:00
tomangelo2 0f6e1d7d4a Style fix 2019-02-18 14:43:56 +01:00
tomangelo 0da792c77c
Merge pull request #1205 from ananace/add-appdata 
Add an appdata XML for Linux packaging (#1204)
 2019-02-09 21:42:05 +01:00
tomangelo 9fe05f4472
Merge pull request #1237 from Uposax/master 
Complete french translation
 2019-02-07 01:37:43 +01:00
tomangelo bc3fbd21d0
Merge pull request #1231 from colobot/dev-issue-1128 
Potential fix for issue #1128
 2019-02-07 01:12:10 +01:00
tomangelo b50a71bde4
Merge pull request #1239 from suve/use-sizeof-in-ModelOutput-WriteOldModel 
Tweak strncpy() usage in ModelOutput::WriteOldModel
 2019-02-07 01:11:55 +01:00
suve 086e07168d Use sizeof() instead of magic number for strncpy in ModelOutput::WriteOldModel 2019-02-02 18:53:36 +01:00
tomangelo 02fd258697
Merge pull request #1206 from iceslab/dev 
Fixes for #1203 and #1194
 2019-01-29 20:31:57 +01:00
tomangelo 04b8bf6c42
Merge pull request #1235 from vkuzkokov/master 
Put pitch and roll in [-180,180) range.
 2019-01-29 20:31:37 +01:00
maf-ia 2175e7f90a Merge branch 'master' of https://github.com/Uposax/colobot 2019-01-12 21:44:00 +01:00
krzys-h 4c3440bbe6 Fix building of colobot.rc on Windows 2019-01-12 21:43:01 +01:00
maf-ia 634248885f Complete last 5 french sentences not fully translated 2019-01-12 21:35:51 +01:00
maf-ia 63bf8e07da Complete last 5 french sentences not fully translated 2019-01-12 21:28:49 +01:00
Vladislav Kuzkokov e3f53dc203 Put pitch and roll in [-180,180) range. 
Reasonable values lie close to either side of 0.
 2019-01-06 07:09:57 +01:00
tomangelo2 be97167994 Potential fix for issue #1128 2019-01-02 01:18:45 +01:00
tomangelo2 92d2de5325 Fixed VSync options list 
Now VSync list is aligned for same height as resolution list from the bottom, as it's very hard to align them from top on different screen resolutions.
 2019-01-02 00:34:34 +01:00
tomangelo 9cf89db8af
Merge pull request #1213 from ananace/fix-xdg 
Fix Linux savegame path issue, closes #1212
 2018-12-23 16:43:59 +01:00
Mateusz Przybył d57c45cbb2
Merge pull request #1211 from suve/limit-game-speeds 
Add a minimum & maximum game speed limit
 2018-12-22 15:49:53 +01:00
Mateusz Przybył 3db153f964
Merge pull request #1202 from colobot/dev-restext 
Add a note mentioned in issue #1197
 2018-12-22 15:17:28 +01:00
suve 508e7529d2 Use Math::Clamp() when limiting game speed 2018-11-27 19:25:56 +01:00
Alexander Olofsson d11404a6e9
Fix Linux savegame path issue, closes #1212 2018-11-25 14:49:01 +01:00
suve 4305f8de03 Add a minimum & maximum game speed limit 2018-11-18 21:09:11 +01:00
Alexander "Ananace" Olofsson 634d087d5e
Don't grab the AppData XML from binary dir 
Only supposed to grab from there when generating the file from CMake variables.
 2018-10-29 18:32:34 +01:00
Bartosz Cieśla 7c88a6e667 Fix for #1194 2018-10-13 10:12:41 +02:00
Bartosz Cieśla abf1a60a86 Fix for #1203 2018-10-10 19:14:23 +02:00
Alexander Olofsson 0dbf82ca4e Add the donation link to the appdata XML as well 2018-10-04 01:07:20 +02:00
Alexander Olofsson 2871bac0ce Add an appdata XML for Linux packaging 
Fixes #1204
 2018-10-04 00:52:31 +02:00
tomangelo 9165a8475e
Merge pull request #1201 from nextghost/dev 
Minor improvements in Czech translation
 2018-09-08 22:03:46 +02:00
tomangelo 3f6e84b418
Merge pull request #1167 from badernageral/dev 
Translation to Brazilian Portuguese
 2018-09-08 22:03:28 +02:00
tomangelo 9aa3773752
Merge pull request #1199 from CHmSID/fix-more-warnings 
Fix another GCC 8.2.0 warning
 2018-09-08 22:01:01 +02:00
tomangelo a76bbe49ed
Merge pull request #1189 from colobot/dev-msvc 
Add some Visual Studio specific fixes
 2018-09-08 22:00:47 +02:00
tomangelo aed74321cb
Merge pull request #1115 from B-CE/dev-tabMgt 
fix #274 : pasting tabs
 2018-09-08 22:00:18 +02:00
tomangelo2 b37cf36a52 Updated pot files 
Just figured out I didn't updated them before
 2018-08-21 21:35:37 +02:00
tomangelo2 ee0b46a278 Add a note mentioned in issue #1197 2018-08-21 21:28:45 +02:00
tomangelo 31b309fa24
Merge pull request #1186 from colobot/dev-switch-case 
Fix switch case documentation shortcut
 2018-08-21 12:16:41 +02:00
tomangelo 7d46ee762a
Merge pull request #1181 from colobot/dev-vsync 
Add VSync switch to Device tab
 2018-08-21 12:16:03 +02:00
Martin Doucha 47ff155022 Minor improvements in Czech translation 2018-08-20 23:05:19 +02:00
Jerzy B 6f0a294048 Give space for a null character in texture name 2018-08-18 09:11:46 +01:00
Jerzy B f3b30625ee Fix GCC 8 warning about sprintf overflow (#1192) 2018-08-12 07:49:45 +02:00
MrSimbax 7e19622b85 Allow both F11 and F12 for stats 2018-07-25 23:45:15 +02:00
MrSimbax cb701cacb8 Add a workaround for failed assertion in VS debugger 
Assertion failed: ploc->_Mbcurmax == 1 || ploc->_Mbcurmax == 2

Apparently MS C/C++ library doesn't support UTF-8 locales, which causes the assertion to fail. My solution is to ignore the system locale and try to set the classic one.

LibreOffice seems to have this problem fixed in less simple way: https://gerrit.libreoffice.org/#/c/54110/
 2018-07-25 21:44:31 +02:00
MrSimbax 32d3d1eb92 Change key for debug menu to F10 and for stats to F11 
F12 is used by Visual Studio debugger to trigger a breakpoint and apparently it cannot be changed:

"The F12 key is reserved for use by the debugger at all times, so it should not be registered as a hot key. Even when you are not debugging an application, F12 is reserved in case a kernel-mode debugger or a just-in-time debugger is resident."
Source: https://msdn.microsoft.com/en-us/library/windows/desktop/ms646309.aspx?f=255&MSPPError=-2147217396
 2018-07-25 21:38:47 +02:00
MrSimbax f93fd61c26 Rename OFFICIAL_BUILD to OFFICIAL_COLOBOT_BUILD 
In order to avoid conflict with OFFICIAL_BUILD variable inside ntverp.h. It caused compilation error "invalid integer expression"

https://github.com/tpn/winsdk-10/blob/master/Include/10.0.10240.0/shared/ntverp.h#L134
 2018-07-25 21:34:39 +02:00
tomangelo 5080cb46b1
Merge pull request #1031 from tomangelo2/dev 
Added fonts configurability by a separate file
 2018-07-25 19:51:55 +02:00
tomangelo2 3383532752 Changed font_config to font_loader 
Apparently linter doesn't like files with `config` in its name
 2018-07-25 00:44:06 +02:00
tomangelo2 d84be03a83 Removed non-existing font from code 
Forgot to check build on clean data directory
 2018-07-23 14:10:27 +02:00
tomangelo2 df46bcfe2d Fix another linter warning 2018-07-23 14:03:59 +02:00
tomangelo2 14b6f7cafa Fixed some linter warnings in font_config files 2018-07-23 12:46:47 +02:00
tomangelo d90592f7b6
Merge pull request #1162 from AbigailBuccaneer/gl-cleanup 
Clean up and improve CGLxxDevice code
 2018-07-23 12:15:08 +02:00
tomangelo 5041aa377d
Merge pull request #1156 from AbigailBuccaneer/redundant-shadowmap-renderbuffer 
Don't create a color renderbuffer for shadow map
 2018-07-23 12:14:45 +02:00