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

3188 Commits (6a23e97533de23d4574b9e5e742b590dafdbf395)

Author SHA1 Message Date
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
tomangelo 1ca213df09
Merge pull request #1274 from mgorny/ninja-man-fix 
Fix manpage build rules to work with Ninja generator
 2019-12-29 00:10:42 +01:00
tomangelo 8648de9581
Merge pull request #1278 from pkubaj/patch-1 
Fix build on ARM and PPC
 2019-12-28 22:33:04 +01:00
tomangelo c9ec197d76
Merge pull request #1275 from suve/add-missing-Polish-strings 
Add some missing strings to the Polish translation
 2019-12-28 20:54:05 +01:00
tomangelo 587e189e97
Merge pull request #1250 from colobot/dev-compilation-fix 
Fixes compilation problem
 2019-12-28 20:52:36 +01:00
pkubaj 1a771b0e72
Fix build on ARM and PPC 
ARM and PPC use unsigned char by default.
 2019-10-18 14:00:37 +02:00
suve 68ddaf550b Add some missing strings to the Polish translation 2019-10-07 14:39:51 +02:00
Michał Górny 4f9d9d0609 Fix manpage build rules to work with Ninja generator 
Specify outputs for po4a command explicitly rather than via implicit
target, in order to clearly establish the dependency chain between
manpages and input files generated by po4a.  This is necessary to make
it possible to use Ninja generator.  Otherwise, the implicit
dependencies cause the following error:

    ninja: error: '../desktop/lang/fr/colobot.pod', needed by 'desktop/fr/colobot.6', missing and no known rule to make it
 2019-09-24 16:36:24 +02:00
MrSimbax 61a7aa2592 Fix minor memory leak 2019-08-07 09:51:27 +02:00
MrSimbax 2d3d03cc38 Use SDL_GetBasePath() instead of physfs because it's buggy in old version 2019-08-07 09:51:27 +02:00
MrSimbax 41379ded7e Use workdir paths on dev builds 2019-08-07 09:51:27 +02:00
MrSimbax 5cefa57dd5 Use base dir instead of working dir for data files 2019-08-07 09:51:27 +02:00
DavivaD 190e04fdd7 Move PT_FRAGV to the end of the pyro_type.h list + Undo reordering 2019-07-26 17:33:04 +02:00
DavivaD 9c2ea5f488 Undo some changes + space fixes 2019-07-22 17:04:15 +02:00
DavivaD b8b2d32bc1 Thumper Patch 2019-07-22 01:15:11 +02:00
Fiftytwo 62620a93cd Make Wrecks destroyable; make TargetBot more fragile 2019-07-17 02:57:47 +02:00
Fiftytwo ed8dc04d94 Make TargetBot explode in water 2019-07-05 16:03:29 +02:00
B-CE 0517115557 Upd i18n fr : complete + uniformize 
Bots
  Déménageur -> Préhenseur
  shooter    -> tireur
  phazer     -> hachoir
  ...

    Buildings
  Fabrique de robots  -> Usine de robots
  convertisseur       -> raffinerie
  borne d'information -> station relais
  ...

    Objects
  batterie (standard)
  pile nucléaire
  ...
 2019-06-25 07:51:13 +02:00
B-CE 17d85eb434 Translate french comments + correct typo 2019-06-19 08:50:47 +02:00