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

3187 Commits (37e4ed8029a469e4f702e77295e02fdade548ee3)

Author SHA1 Message Date
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
tomangelo2 fb00898035 Fix switch case documentation shortcut 
Also some polishing of loops help texts
 2018-07-21 00:09:37 +02:00
Fiftytwo 3f04654cd3 Make ruins destroyable 2018-07-13 13:16:30 +02:00
Fiftytwo 5b2b632de3 Add TargetBot research; make it fully operational 2018-07-13 00:03:20 +02:00
Fiftytwo 5b2f3111b6 Add trainer=1 SpaceShip 2018-07-12 20:54:58 +02:00
Fiftytwo 146581e44c Add trainer=1 AutoLab 2018-07-12 20:35:50 +02:00
Fiftytwo 02eb4623b9 Add trainer=1 ResearchCenter 2018-07-12 20:17:09 +02:00
Fiftytwo d0e29d4875 Add trainer=1 BotFactory 2018-07-12 19:55:31 +02:00
tomangelo2 4bfada2ad6 Better handling of VSync errors 2018-07-05 21:18:14 +02:00
tomangelo2 608d59f07b Moved VSync setting from Experimental to Setup 2018-07-05 20:56:38 +02:00
tomangelo2 359abf9a82 Add VSync switch to Device tab 2018-07-05 19:43:56 +02:00
Mateusz Przybył abb7d54ef5 Add support for VS CMake/vcpkg compilation (#1174) 
* Add support for VS CMake/vcpkg compilation

* Fix system_windows.cpp compilation

* Add optimization and hidden console to MSVC release builds
 2018-06-04 09:17:51 +02:00
José Robson Mariano Alves 0c16d9a272 Translation to Brazilian Portuguese 2018-05-16 10:22:57 -03:00
krzys-h 073191d1ea Small CPathManager refactoring 2018-05-16 13:28:06 +02:00
krzys-h c218fcce98 Merge branch 'master' into dev 2018-05-16 11:55:15 +02:00
krzys-h 17447e813b Fix building of colobot.rc on Windows 2018-05-16 11:55:06 +02:00
José Robson Mariano Alves dbd1f601da Translation to Brazilian Portuguese 2018-05-15 18:31:41 -03:00
José Robson Mariano Alves be1066912f Translation to Brazilian Portuguese 2018-05-15 16:50:42 -03:00
José Robson Mariano Alves 2b933264fc Translation to Brazilian Portuguese 2018-05-15 16:07:03 -03:00
krzys-h cdb8a4871a Release 0.1.11.1-alpha: Bump version 2018-05-10 21:20:13 +02:00
krzys-h 12c969c71c Post-release 0.1.11.1-alpha 2018-05-10 21:20:13 +02:00
krzys-h af306c4790 Release 0.1.11.1-alpha: Merge branch 'dev' 2018-05-10 21:20:13 +02:00
krzys-h 7aaac449f5 Fix release script version override 
This fixes a bug in 94a18e9648
 2018-05-10 21:16:42 +02:00
krzys-h acc3362172 Update data submodule 2018-05-10 21:06:10 +02:00
krzys-h f538b4f477 What did I say about commiting in a hurry 2018-05-10 11:32:33 +02:00
krzys-h 12cf57409c Support more buttonX.png files in other places than just buttons 2018-05-10 11:24:59 +02:00