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

751 Commits (fabbdda9648dc4685c47772dab81623ab1d13605)

Author SHA1 Message Date
Fiftytwo 8647deafc8 Merge branch dev into dev-gameplus 2021-03-21 22:30:23 +01:00
Jeff Law ad2e3db92f Fix more dynamic casts for gcc-11 
Signed-off-by: suve <veg@svgames.pl>
Jeff's patch was written for the 0.1.12 stable release.
Adapted to work with the "dev" branch (as of commit 13098ee).
 2020-09-15 10:20:24 +02:00
Jeff Law 8c6ac4cd16 Fix dynamic casts to avoid gcc-11 diagnostics 2020-09-04 11:16:45 +02:00
tomangelo 2685a1eb60
Add cell capacity parameters (#1348) 2020-08-31 13:37:45 +02:00
Fiftytwo 4c1d3eecd1 Add flag() and deflag() CBOT functions 2020-08-15 03:31:17 +02:00
Fiftytwo 56c99e741e Make Vault buildable 2020-08-08 20:51:56 +02:00
Fiftytwo a92fa950e2 Make Sniffers able to plant flags 2020-07-30 11:03:12 +02:00
Fiftytwo e63afb3461 Add WayPoint animation in deletemark 2020-07-30 04:21:35 +02:00
Mateusz Przybył fbe2191800
Allow producing objects with no keyword in CBOT (#1335) 2020-07-24 02:20:06 +02:00
Droog71 c4385961c4
Fix for issue #1163 (#1332) 
* Clamped power variable before assignment to params in object manager. Attempted to fix formatting issues.

* Fixed Clamp function not implemented correctly.

* Fixed formatting issue, space after commas.

* Created ClampPower method in object_manager.h and implemented in object_manager.cpp, Removed similar code from robotmain.cpp

* Removed redundant call to ClampPower in object_manager.cpp

* Added second call to ClampPower back to object_manager.cpp. Made ClampPower method private. Attempted to fix whitespace issues.

* Fixed missing assignment to params.power in CreateObject method of object_manager.cpp

* fixed white space at end of line 182 in object_manager.h

* Fixed doxygen compatibility issue.
 2020-07-20 21:55:44 +02:00
Fiftytwo 754dfefefd Add Missions+ gamemode 2020-07-20 18:35:31 +02:00
Fiftytwo ac32e40003 Add Ruin, Bush, GraviPlant, and Crystal categories in CBOT 2020-07-17 03:37:13 +02:00
Fiftytwo c80a816808 Merge branch 'dev' into dev-heavyduty 2020-07-13 19:51:23 +02:00
Fiftytwo a2c62a9da6 Make Heavy bots destroy bushes on contact 2020-07-13 19:44:50 +02:00
Fiftytwo 6a23e97533 Fix collisions of animated plants 2020-07-08 14:17:08 +02:00
tomangelo 37e4ed8029
Updated license headers (#1317) 
* Updated headers

* Updated more headers
 2020-07-07 10:19:36 +02:00
Fiftytwo c50b36118e Revert "Make Recycler Recycle small Building Ruins." 2020-07-07 09:40:47 +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 0f33dbe154 Add holder model for trainer Subber 2020-05-14 13:36:37 +02:00
Emxx52 00d72d8d7b
Merge pull request #1265 from DavivaD/dev-thumper-patch 
Thumper Patch
 2020-04-24 21:09:04 +02:00
Fiftytwo b5466261d4 Make buildings inherit trainer param from builder 2020-03-31 19:02:53 +02:00
Fiftytwo 853d8eee5d Adjust HeavyTrainer rear light sprite position 2020-01-11 18:39:44 +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
pkubaj 1a771b0e72
Fix build on ARM and PPC 
ARM and PPC use unsigned char by default.
 2019-10-18 14:00:37 +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
B-CE 17d85eb434 Translate french comments + correct typo 2019-06-19 08:50:47 +02:00
melex750 a66b3d0672 Refactor SaveState and RestoreState to use streams 2019-04-11 04:13:13 -04:00
tomangelo2 a46750ede2 Fix crash when destroying unpowered PowerPlant with Titanium 
Appendix to pull #1206
 2019-02-18 14:43:56 +01:00
Fiftytwo 723c552783 Add Heavy and Amphibious trainer bots 2018-12-23 07:04:06 +01:00
Bartosz Cieśla abf1a60a86 Fix for #1203 2018-10-10 19:14:23 +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
krzys-h ed397d2b0f Make sure aliens hatched from eggs are not selectable by default, closes #1054 2018-05-09 23:25:52 +02:00
krzys-h 319d8e6854 Fix delete() not returning sometimes, closes #1067 2018-05-09 23:12:26 +02:00
krzys-h dd40c4d4ee Make magnifyDamage=0 for fragile objects actually work 
This fixes a bug in 36d2cf14b8
 2018-05-08 19:54:25 +02:00
krzys_h b36d40a509
Merge pull request #1151 from melex750/dev-savegame 
Fix saving/loading "NewScript" programs for factory bots
 2018-05-07 20:42:51 +02:00
krzys-h 36d2cf14b8 Make magnifyDamage influence fragile objects 2018-05-07 20:31:36 +02:00
krzys-h 1d09ee9b3c Fix transportable object damage rules 
This makes the rules match the original Colobot like they were supposed to
 2018-05-07 20:31:36 +02:00
melex750 a918fcabb4 Fix save/load NewScript programs for factory bots 
Fixes #797
 2018-04-30 13:43:03 -04:00
krzys_h 8b86a1f222
Merge pull request #1142 from AbigailBuccaneer/Wmissing-declarations 
Compile with -Wmissing-declarations
 2018-04-24 14:12:43 +02:00
krzys_h 6289ea91b1
Merge pull request #1140 from AbigailBuccaneer/Wsuggest-override 
Compile with -Wsuggest-override under GCC
 2018-04-24 14:12:31 +02:00