Commit Graph

3206 Commits (6c3012b8a1d455f6cb827b0d14c6906553976f68)

Author SHA1 Message Date
tomangelo2 a2df003b7e Fix radar function parameter type detection, fixes #1298 2020-07-05 12:58:45 +02:00
melex750 fb9fa49ce8 Use PHYSFS for saving screenshots 2020-07-05 12:55:40 +02:00
Droog71 f449d9c800 Fix for issue #842 2020-07-05 11:04:21 +02:00
Fiftytwo a7d4eb00b6 Update po files 2020-06-21 22:00:09 +02:00
Fiftytwo 55b46942cb Remove unnecessary whitespaces 2020-06-16 21:02:52 +02:00
Fiftytwo 5c0cfba8ae Merge branch 'dev' into dev-cbot-factory 2020-06-16 20:07:03 +02:00
Emxx52 6a0234edd5
Merge pull request #1050 from colobot/dev-builders
Implement Builders
2020-06-16 19:32:58 +02:00
Fiftytwo 6d584ba481 Update data submodule 2020-06-16 18:54:35 +02:00
Fiftytwo 373d8de7d0 Make burning and destroyed objects physical 2020-06-13 16:08:06 +02:00
Fiftytwo 7f9efea0a2 Remove unnecessary whitespaces 2020-05-15 20:29:48 +02:00
Fiftytwo bbf9356628 Fix colobot-lint error 2020-05-15 19:26:03 +02:00
Fiftytwo 0b9673029d Merge dev into dev-builders and resolve conflicts 2020-05-15 15:06:37 +02:00
Fiftytwo 9a14c8c7e9 Merge branch 'dev' of https://github.com/colobot/colobot into dev 2020-05-15 01:08:06 +02:00
Emxx52 354bbf9287
Merge pull request #1058 from colobot/dev-targetpractice
Update Trainer (Practice) bots, trainer=1 objects, and TargetBot
2020-05-14 23:32:32 +02:00
Fiftytwo 7bd18f9c8e Update colobot.pot 2020-05-14 15:46:45 +02:00
Fiftytwo 0f33dbe154 Add holder model for trainer Subber 2020-05-14 13:36:37 +02:00
Michał Górny f3ae4b4209 Fix missing <limits> include
Add missing <limits> include for std::numeric_limits.  This fixes
build failure after boost stopped implicitly including it for us.
2020-05-14 11:26:15 +02:00
Marcin Zajączkowski 11e67cc61b Add info about Fedora package to README 2020-05-06 18:58:51 +02:00
Emxx52 00d72d8d7b
Merge pull request #1265 from DavivaD/dev-thumper-patch
Thumper Patch
2020-04-24 21:09:04 +02:00
Fiftytwo d8e0465d6d Merge branch 'dev' of https://github.com/colobot/colobot into dev 2020-04-07 23:17:56 +02:00
Emxx52 92c9031749
Merge pull request #1295 from colobot/dev-fix-unstable-build
Fix Jenkins marking builds as unstable
2020-04-07 23:09:14 +02:00
MrSimbax 17ba464d33 Fix so called ''compilation errors'' in linter 2020-04-07 20:16:23 +02:00
MrSimbax ad33e0e624 Fix 'code block placement' linter issues 2020-04-07 20:05:32 +02:00
MrSimbax f09768fb2d Fix 'undefined function' linter issue 2020-04-07 19:13:30 +02:00
Fiftytwo 9db6bb63e4 Merge branch 'dev' of https://github.com/colobot/colobot into dev 2020-04-07 19:10:32 +02:00
MrSimbax 87fec23f4b Fix 'class naming' linter issues 2020-04-07 18:59:46 +02:00
Emxx52 5815db4062
Merge pull request #1247 from colobot/dev-basedir
Add support for binary relocation
2020-04-07 18:49:57 +02:00
MrSimbax b925838a91 Try no. 3 to fix Jenkins 2020-04-07 17:43:45 +02:00
Fiftytwo e5d994b9e2 Merge branch 'dev' of https://github.com/colobot/colobot into dev 2020-04-07 14:46:43 +02:00
Fiftytwo ddab760624 Add rollert.png to OldModelManager 2020-04-07 14:35:59 +02:00
Fiftytwo 0c69dc8d30 Make Ants and Spiders able to destroy TargetBot 2020-04-05 16:05:57 +02:00
MrSimbax c5e8df16e0 Try #2 to fix Jenkins build 2020-04-05 14:20:53 +02:00
MrSimbax 0597c0efda Try to fix Jenkins build 2020-04-05 14:11:08 +02:00
MrSimbax 621453a01c Make all relative paths use base dir 2020-04-05 13:24:45 +02:00
MrSimbax 3fbfadb0d4 Merge branch 'dev' into dev-basedir 2020-04-03 21:12:48 +02:00
MrSimbax 8f122d6603 Fix MSVC compilation (again) 2020-04-03 20:18:14 +02:00
MrSimbax d4b2f23c4a Add handling of env variables 2020-04-03 20:15:24 +02:00
MrSimbax ad02b55541 Merge branch 'dev-basedir' of github.com:colobot/colobot into dev-basedir 2020-04-03 15:03:04 +02:00
Fiftytwo b5466261d4 Make buildings inherit trainer param from builder 2020-03-31 19:02:53 +02:00
Fiftytwo 0d6218bfa0 Fix trainer Builder segfault 2020-03-31 16:57:45 +02:00
tomangelo 088c661839
Merge pull request #1291 from suve/fix-missing-includes
Add missing includes in CBotExprLitString.cpp
2020-02-09 16:06:25 +01:00
suve fc2bd68876 Fix missing std includes 2020-02-09 00:36:05 +01:00
Fiftytwo 853d8eee5d Adjust HeavyTrainer rear light sprite position 2020-01-11 18:39:44 +01:00
Fiftytwo 5bf6f12ae5 Add HeavyTrainer texture recoloring 2020-01-11 17:04:40 +01:00
tomangelo a67266553f
Merge pull request #1253 from melex750/dev-savegame
Add types byte, short, char, long, and double
2020-01-02 15:01:16 +01:00
tomangelo 51cde3c868
Merge branch 'dev' into dev-savegame 2020-01-02 15:00:33 +01:00
tomangelo b8c4232312
Merge pull request #1262 from B-CE/i18n-fr2
Update i18n fr
2020-01-02 14:42:15 +01:00
tomangelo2 f97da6482b Fixed escape character 2020-01-02 13:52:07 +01:00
tomangelo2 4e4c3671c6 Fixed Jenkins builds 2020-01-02 13:52:07 +01:00
tomangelo2 b9ac5688e9 Fix package name in compilation instruction 2020-01-02 13:51:01 +01:00