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

3079 Commits (coolant-mod)

Author SHA1 Message Date
immibis 8885f8476b Finished coolant mod trial 2020-06-15 13:20:15 +02:00
immibis ad048ce60c add name for Bucket 2020-02-02 12:59:12 +01:00
immibis d7cf54c55b Added Bucket object. Water pump now fills bucket (then cycles to empty and repeats) 2020-02-02 12:46:27 +01:00
immibis 80840b7c95 [SUBMIT ON MAIN BRANCH] Blender script: Ignore the error code that for some reason we are passing to all the exceptions 2020-02-02 12:38:42 +01:00
immibis e11cbae55e [SUBMIT ON MAIN BRANCH] Python uses string.join(list) not list.join(string) 2020-02-02 12:21:52 +01:00
immibis 8553be4ef3 [SUBMIT ON MAIN BRANCH] Bump Blender script version. 2020-02-02 12:03:23 +01:00
immibis 9d7fb57067 [SUBMIT ON MAIN BRANCH] Blender script fix: Export texture names correctly 2020-02-02 12:03:11 +01:00
immibis 0662424055 [SUBMIT ON MAIN BRANCH] Blender script fix: support version 2 models 2020-02-02 11:56:16 +01:00
immibis 8e54962c65 Water pump object is a power cell charger (including nuclear), with an animation, custom model, and collision 2020-02-01 22:26:08 +01:00
immibis 346c2ee1f3 [SUBMIT PR ON MAIN BRANCH] Support new model format in normal model loader. 2020-02-01 17:50:48 +01:00
immibis cd49e4a702 Animate the new building 2020-01-27 21:20:43 +01:00
immibis 84585f4ebc Barebones new building (TODO: not currently buildable) 2020-01-27 21:14:42 +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
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
melex750 17d0d2abb1
Fix compiling literal numbers 2019-05-12 08:33:53 -04:00
melex750 5f089f4a9b Fix and improve switch...case (#1008) 2019-04-11 05:34:00 -04:00
melex750 1058a326ad Add binary and character literals in CBOT 2019-04-11 05:14:11 -04:00
melex750 bc572aa52f Add sizeof() operator for numeric data types 2019-04-11 04:21:22 -04:00
melex750 c0cdd84e85 Add missing primitive data types in CBOT 2019-04-11 04:19:29 -04:00
melex750 250ea57e8b Fix arithmetic operations with integers (#993) 
Also fixed unsigned right shift operator ">>>"
 2019-04-11 04:15:27 -04:00
melex750 a66b3d0672 Refactor SaveState and RestoreState to use streams 2019-04-11 04:13:13 -04:00
tomangelo 97a8cfe6f9
Merge pull request #1251 from fernape/fix-freebsd-build 
Add FreeBSD support.
 2019-04-10 22:13:15 +02:00
fernape 44083053ce Add FreeBSD support. 
Add a new PLATFORM_FREEBSD variable. We can compile like MacOS with just an
extra linker flag.
 2019-03-09 19:04:00 +01:00
Tomasz Kapuściński 16a1dc7b9d Removed unnecessary dependency on libwebp which causes compilation problems with static builds. 2019-03-04 21:40:59 +01:00
MrSimbax d038d18943 Add trailing ; to Keywords entry in colobot.desktop 
Related issue: #1246
 2019-02-26 17:41:51 +01:00
MrSimbax d4ab82eaae Release 0.1.12-alpha: Bump version 2019-02-23 20:01:33 +01:00
MrSimbax ef6b692d41 Post-release 0.1.12-alpha 2019-02-23 20:01:33 +01:00
MrSimbax 6ec644d20b Release 0.1.12-alpha: Merge branch 'dev' 2019-02-23 20:01:33 +01:00
MrSimbax 7d99aa954b Fix release.py 2019-02-23 20:01:21 +01:00
MrSimbax 46098834a1 Update data submodule 2019-02-23 18:54:39 +01:00
MrSimbax aca552242f Update po files 2019-02-23 18:51:37 +01:00
tomangelo 0efb8d50ba
Merge pull request #1244 from colobot/dev-portable-saves 
Fix PORTABLE_SAVES flag not working
 2019-02-23 18:28:06 +01:00
MrSimbax 0eb31a1f45 Fix PORTABLE_SAVES flag not working 2019-02-23 13:12:37 +01:00
Mateusz Przybył 275724ab97
Build AppImage in Jenkins (#1243) 2019-02-21 17:46:11 +01:00
krzys_h e02a3373fd
Update Jenkinsfile for dockerized build environment (#1240) 2019-02-18 19:18:53 +01:00
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