Commit Graph

776 Commits (a1ea633a3e1383908b24b8369700a374c3007745)

Author SHA1 Message Date
DavivaD a4482f1a7c Decrease radius of squashing items. 2017-07-24 23:20:21 +02:00
DavivaD b5e0f9966f Make Recycler Recycle small Building Ruins. 2017-07-21 20:37:18 +02:00
DavivaD bef6e9eceb Make Thumper Squash transportable/small objects. 2017-07-21 20:36:31 +02:00
DavivaD a29a4f93ac Damage Alert Implementation (2th Stage) 2017-06-20 23:35:33 +02:00
krzys-h bb35585194 Fix object.factory() code type detection, closes #938 2017-06-03 21:43:10 +02:00
Abigail f4614658cf Fix -Wundefined-var-template warning (#963)
This avoids specializing CSingleton<T>::m_instance for each type, and
instead just defines it once in the header. This is allowed by the
standard, multiple definitions are merged in the same way that inline
functions are.
2017-05-29 20:46:11 +02:00
krzys-h 02aa281d30 Remove unnecessary m_instance declarations
They don't do anything at all in gcc and clang, but cause compile errors in MSVC
see #955
2017-05-24 14:00:34 +02:00
krzys-h 935b789d02 Fix alien animations after 5d4dfd8cb5 2017-05-24 10:45:31 +02:00
krzys-h 5d4dfd8cb5 Fix scoreboard points sometimes being added multiple times 2017-05-23 22:25:40 +02:00
krzys-h 648dfd75c4 Fix handling of particle 'father' objects when they are destroyed 2017-05-23 20:31:55 +02:00
MatiRg 417301ff06 Fix rendering glasses in FPP camera, closes #775 (#959) 2017-05-23 18:57:41 +02:00
Abigail 11d950221b Fix all compiler warnings and enable -Werror (#955)
This removes all compilation warnings on:
* g++ 4.7.4, 4.8.5, 4.9.4, 5.4.1, 6.3.0, 7.0.1-svn246759
* clang++ 3.9.1, 4.0.0, 5.0.0-svn303007
2017-05-22 11:10:35 +02:00
krzys-h 7b328fbfc3 Make UraniumOre not destroyable, closes #777
This was likely a mistake during object interface refactoring
2017-05-21 21:45:46 +02:00
krzys-h 8948da0612 Add Barricade objects 2017-05-19 15:33:44 +02:00
krzys-h 880f31a7c6 Add basics of scoreboard implementation; better support for multiple teams 2017-05-17 18:22:58 +02:00
krzys-h fda58a6008 Change bullet collision logic to allow for collisions with non-damageable objects
For now, you have to add bulletWall=true to objects you want bullets to collide with.
It's ugly but will work for now. This is needed mostly for compatibility
with exercises which use barriers to block movement but not bullets.

I also made the collision checks run more often because otherwise the bullets
would sometimes miss the objects (but only visually)
2017-04-29 13:14:10 +02:00
krzys-h 7fadf7bad5 Fix aliens being selectable by default (#900)
Broken in 6a382830a9
This change also allows you to make selectable insects with selectable=1 in scene file
2017-01-28 12:53:28 +01:00
krzys-h 7b3b257580 Fix code style 2017-01-02 14:54:38 +01:00
krzys-h 46aa6fc907 Some CRobotMain cleanup
* improved documentation
* renamed cheat variables to include the word "cheat" to make it clearer what they do
* removed some useless members
2016-12-27 23:38:57 +01:00
krzys-h 17511ddb6a Fix some code style 2016-12-27 15:54:52 +01:00
krzys-h f33ffaf18b Fix mission end before astronaut death scene is finished (#848) 2016-12-27 15:32:38 +01:00
krzys-h b6cda6cd4c Add error when object is busy (#871) 2016-12-27 13:36:46 +01:00
krzys-h eb2a1857dc Fix goto() with multiple objects at the exact same position (#732) 2016-12-04 16:07:41 +01:00
krzys-h 3472ec6613 Revert CParticle::CheckChannel changes
I misinterpreted this as being a bug, while actually it seems to be an explicit CParticle design choice (maybe not the best one, but whatever). We DO need better docs for some old code like this :/

Fixes #806

This reverts commit 99a831a03b.
2016-09-27 18:34:54 +02:00
MatiRg dc415c3d2a Remove character limit in CEdit (#836) 2016-09-25 19:13:04 +02:00
Jeremy Mickelson 859cec774a Added comment explaining container choice 2016-08-13 12:18:54 -06:00
Jeremy Mickelson 88227a3647 Allow multiple objects with exactly the same distance to be returned by `radarall` 2016-08-13 12:13:41 -06:00
krzys-h 2c3e90b126 Added CBot performance counter 2016-07-24 16:36:13 +02:00
krzys-h 646e5104f6 Some CCamera cleanup and docs 2016-05-28 18:44:38 +02:00
krzys-h d80fa387b9 Fixed some particle crashes after 99a831a03b 2016-05-28 16:16:48 +02:00
krzys-h 99a831a03b Fixed CParticle::CheckChannel "errors"
Not really errors, but I fixed them anyway
2016-05-28 00:26:56 +02:00
krzys-h d3f808f66d Merge branch 'dev-savegame' into dev 2016-04-10 13:16:10 +02:00
krzys-h 04d7c343ef Removed misc.cpp / misc.h 2016-04-09 18:46:12 +02:00
krzys-h ae4e875729 Do not store exact object part positions
This seems to be unnecessary, as the animation update code should set those on its own. Needs some more testing though.
2016-04-08 18:28:35 +02:00
krzys-h ac950978a9 Fixed AlienWorm collisions (#740) 2016-04-07 20:30:25 +02:00
KarolTrzeszczkowski 1960b373f1 Solves #700
It turns out, that tower is not over powered in code battle mode. It never hits flying enemy robot.
2016-04-03 13:31:08 +02:00
krzys-h 98dd9f90c8 Fixed code style warnings 2016-04-03 13:06:55 +02:00
krzys-h e24d77bde8 goto() bitmap debugger 2016-03-28 21:42:25 +02:00
krzys-h d38ddcbc41 goto() path debugger 2016-03-28 20:25:07 +02:00
krzys-h 45c93f58ec Fixed Houston lights when object is rotated 2016-03-27 18:54:56 +02:00
krzys-h 4e50f36214 Merge branch 'dev' into dev-right-click-camera 2016-03-02 20:00:57 +01:00
krzys-h dba944740f Removed unused members of COldObject 2016-02-21 15:16:30 +01:00
krzys-h 63c7b83d82 Removed unused object effect lights 2016-02-21 14:51:09 +01:00
krzys-h 47d39e5b22 Right click camera; minor CCamera cleanups 2016-02-19 17:14:08 +01:00
krzys-h f3820bc81a Fixed using SOUND_CLICK instead of SOUND_NONE, some sound documentation fixes 2016-02-19 17:12:27 +01:00
krzys-h 5c9bdde587 Fixed lag on saving programs 2016-02-16 12:54:08 +01:00
krzys-h c93fa12552 Fixed TitaniumOre and UraniumOre not being destroyable, closes #635 2016-02-13 21:15:15 +01:00
krzys-h 463992b2c1 Fixed ExchangePost info being loaded twice (closes #671) 2016-02-13 19:54:56 +01:00
krzys-h 977607a934 Updated license headers 2016-02-13 14:11:30 +01:00
krzys-h f6db624d00 Fix occasional segfault in drop zone after object destruction 2016-01-30 18:01:38 +01:00
krzys-h 9749419b87 Fixed LevelController 2016-01-30 17:24:47 +01:00
krzys-h b96305060b Fix colobot-lint warnings 2016-01-23 21:59:02 +01:00
krzys-h 9bece23ede Fixed clang build 2016-01-23 21:24:42 +01:00
krzys-h 07a4d6a16b CBot namespace 2015-12-26 14:29:10 +01:00
Grunaka ece0666954 Create new file CBot.h. Included only useful interfaces. 2015-12-01 23:25:36 +01:00
Grunaka 1a6b5ded64 Delete CBotDll.h 2015-12-01 23:25:36 +01:00
Grunaka 43ac0e35f2 Moving global files function from CBot.cpp to CBotFileUtils.cpp 2015-12-01 23:25:36 +01:00
krzys-h 6492908cef Added radarall() (#624) 2015-11-22 14:10:45 +01:00
krzys-h 6f91442db1 Removed some more unused strings 2015-11-21 17:10:14 +01:00
Piotr Dziwinski d11ebc891c Bring to zero some types of issues reported by colobot-lint 2015-10-04 00:09:10 +02:00
krzys-h b5e98dd6e9 Removed CSettings access through CRobotMain 2015-10-01 19:19:40 +02:00
krzys-h d03ce19fbe Fixed #639 2015-09-30 20:54:36 +02:00
krzys-h 3a7aa4ae9c Restored CreateSpot code in Teen objects 2015-09-30 18:15:09 +02:00
Piotr Dziwinski 61a3ba2800 Fix undefined function colobot-lint issues 2015-09-29 21:44:24 +02:00
Piotr Dziwinski 94b3f82988 Fix colobot-lint issues in restored code 2015-09-29 20:55:51 +02:00
krzys-h 2cb2782c9d Restored old Ceebot-Teen objects
In preparations for new programming course
2015-09-28 22:08:59 +02:00
Piotr Dziwinski 66ce745be0 Introduce forward declarations as suggested by colobot-lint 2015-09-27 16:28:14 +02:00
krzys-h 4062d3d4ef Fixed #633 2015-09-13 20:43:24 +02:00
krzys-h 38a26e53a9 Possible fix to #628 crash 2015-09-11 18:40:41 +02:00
krzys-h 0a59f0a907 Fixed a possible bug in CObjectManager::GetObjectByRank (might fix #611) 2015-09-07 20:38:25 +02:00
Piotr Dziwinski cf72693b25 Fix another issue in #621 2015-09-06 16:29:21 +02:00
Piotr Dziwinski a03911dde6 Compile fix 2015-09-06 16:08:10 +02:00
Piotr Dziwinski 86678d4f7a Fix for #621 2015-09-06 13:48:41 +02:00
Piotr Dziwinski b1e383f89e Temporarily revert new tree0 model code
* create tree0 using the old model code
 * don't install new model files yet in data submodule
2015-09-06 12:12:21 +02:00
krzys-h ff17961584 Refactored CPauseManager 2015-08-31 21:47:55 +02:00
Piotr Dziwinski a47da3fd3f Whitespace fixes 2015-08-30 22:18:49 +02:00
krzys-h 6711154762 Fixed produce() and NewScript not marking programs as loaded from level files (closes #613); refactored NewScript to std::vector and std::string 2015-08-29 16:52:07 +02:00
krzys-h bd9a56fe7b Indentation! :/ 2015-08-29 16:29:45 +02:00
krzys-h 21b9d5b8cc Fixed saving object activity state (#610) 2015-08-29 16:28:10 +02:00
Piotr Dziwinski a8eb7499ac Fix #607 2015-08-29 10:49:04 +02:00
krzys-h 43901aa62a Fixed objects being able to move while executing tasks, closes #603 2015-08-25 17:21:25 +02:00
krzys-h 48481718e6 Restored astronaut damage multiplier, closes #578 2015-08-25 17:03:18 +02:00
krzys-h 65d26733fa Fixed Derrick output direction, closes #605
I won't even ask who designed it like that, okay?
2015-08-25 12:37:55 +02:00
krzys-h d8372510b8 Don't allow buildings to work before they are built, closes #582 2015-08-25 10:57:36 +02:00
krzys-h b9e7143734 Fixed PowerCaptor not recharging transported objects, closes #594 2015-08-25 10:32:50 +02:00
krzys-h 5a29bee3b4 Fixed RepairCenter repairing itself, closes #579 and #589 2015-08-25 10:27:14 +02:00
krzys-h 79d796754a Fixed Shielder shutdown animation, closes #595 2015-08-24 20:55:21 +02:00
krzys-h 2722e72afb Fixed Destroyer destroying itself, closes #599 2015-08-24 20:27:57 +02:00
krzys-h f78f4854b4 Fixed failing assertion when turning objects into ruins, closes #598 2015-08-24 20:22:08 +02:00
Piotr Dziwinski b93f610930 Fix license header in all files 2015-08-22 16:40:02 +02:00
krzys-h 27bbc27948 Fixed object creation after loading save file
Looks like @piotrdz broke it when creating the ObjectCreateParams struct. I'm kinda suprised this remained unnoticed for so long ;)
Reported in issue #570
2015-08-19 20:06:55 +02:00
krzys-h 371621ced4 Render trace colors in the code instead of using texture 2015-08-18 22:11:04 +02:00
krzys-h eef76a9b29 Fixed not working Converter, closes #574 2015-08-18 19:38:58 +02:00
krzys-h 28925106e4 Cleaned up some long lists of ifs 2015-08-18 12:29:41 +02:00
krzys-h a5c84b9a1e Removed unused OBJECT_FIX and OBJECT_FRET 2015-08-18 11:43:41 +02:00
Piotr Dziwinski a63a959dbe Apply clang-modernize -use-nullptr 2015-08-17 22:40:52 +02:00
Piotr Dziwinski ba3284b8b8 Apply clang-modernize -add-override 2015-08-17 22:12:09 +02:00
krzys-h 2dbacc28b5 Fixed too small AlienAnt damage 2015-08-17 22:05:26 +02:00
krzys-h 1717fe071e Removed unused variables 2015-08-17 21:42:18 +02:00
Piotr Dziwinski 6534978dea Refactor Character::posPower 2015-08-17 21:28:30 +02:00
krzys-h ee9457f156 Fixed failing assert in CMotionHuman with Tech 2015-08-17 19:32:17 +02:00
krzys-h d5a468df46 Fixed regex in checking object.factory parameter 2015-08-17 19:30:27 +02:00
krzys-h 0bff05f095 Fixed problems with motor() + fire() in CBot while the robot was selected 2015-08-17 18:26:09 +02:00
krzys-h 1059ae37c1 Shielder subclass 2015-08-17 14:06:31 +02:00
krzys-h 63bee182d2 Moved SetFixed/GetFixed to CBaseAlien 2015-08-17 13:19:21 +02:00
krzys-h 304b0b20d8 Created base classes for aliens, robots and buildings 2015-08-17 12:49:54 +02:00
krzys-h 75de19f10e COldObjectInterface::SetViewFromHere -> CControllableObject::AdjustCamera 2015-08-17 11:53:34 +02:00
krzys-h 9f19ee2263 Fixed ExchangePost interface not updating 2015-08-17 11:47:56 +02:00
krzys-h ad84478c71 Removed Get/SetInfoReturn 2015-08-17 11:44:05 +02:00
krzys-h 303dd17d58 Improved documentation of new object interface; removed unused Get/SetSoluceName 2015-08-17 00:43:32 +02:00
krzys-h 0d9b3b907a Moved GetActive and GetDetectable to CObject 2015-08-17 00:02:38 +02:00
krzys-h e11d2ec33e Refactor object dying status and GetActive 2015-08-16 20:24:48 +02:00
krzys-h 92e2c217af Fixed aliens not becoming controllable after "selectinsect" 2015-08-16 18:03:04 +02:00
krzys-h 8c617badae Fixed all portable objects being usable as energy cells 2015-08-16 16:06:51 +02:00
krzys-h 4182be3216 Never save copy of programs from level files when saving scene
Prevents some possible bugs related to changing level files. This might also slightly improve saving time (which is kinda important with one-threaded autosaves ;))
2015-08-16 15:27:41 +02:00
krzys-h db3596ace1 Removed Get/SetDefRank 2015-08-15 23:49:51 +02:00
krzys-h ceae617949 Fixed user programs disappearing after swapping them with level programs 2015-08-15 23:47:51 +02:00
krzys-h fe5a8c4629 Updated progress bar values 2015-08-15 23:37:30 +02:00
krzys-h bc7d0c1c51 Rewritten program storage, closes #534 2015-08-15 23:29:21 +02:00
krzys-h 0eaf0d6f65 Split Programmable and ProgramStorage 2015-08-15 21:29:08 +02:00
krzys-h d7800e03d1 Fixed tabs instead of spaces 2015-08-15 20:42:02 +02:00
krzys-h 6e2e7b5d06 Fixed another bug in CTaskShield 2015-08-15 20:38:25 +02:00
krzys-h 856c5baa0e Removed CTaskManager 2015-08-15 20:30:15 +02:00
Piotr Dziwinski dd227f5fba Fix some stupid mistakes connected with implicit bool casts 2015-08-15 19:17:15 +02:00
krzys-h 9a15db1bea Split global.h 2015-08-15 14:02:07 +02:00
Piotr Dziwinski d5ddf3ac76 Addressed comments on commit efedb44 2015-08-15 00:16:50 +02:00
Piotr Dziwinski efedb44cce Add proper initializations and remove manual memory management in remaining classes
Except CBot-related stuff of course
2015-08-14 23:44:00 +02:00
krzys-h f9abeb21ec Fixed a bug in CTaskShield 2015-08-14 19:08:34 +02:00
Piotr Dziwinski 9ad513550b Add other missing #include <stdexcept> 2015-08-14 19:05:24 +02:00
krzys-h d92d9799d6 Changed amount of damage done by shooters, fixes #560 2015-08-14 18:36:02 +02:00
krzys-h 57646c0c7b Refactored object creation 2015-08-14 18:20:44 +02:00
krzys-h bde0261fe7 Fixed broken Damageable hack in COldObject, closes #559 2015-08-14 13:50:05 +02:00
krzys-h 9d8bef877d Renamed old-style shadows to shadow spots in the code 2015-08-14 13:37:40 +02:00
krzys-h eda7435eb6 Removed a lot of useless settings (#556) 2015-08-14 13:04:05 +02:00
krzys-h 222517a5e7 Don't assert a powered object unless asked to take a cell from youself in CTaskManip 2015-08-14 00:30:23 +02:00
krzys-h 5bef62f01a Removed incorrect assert in CTaskTake 2015-08-14 00:24:08 +02:00
Piotr Dziwinski 26e4ec0ae2 Add more missing includes and forward declarations 2015-08-13 22:49:05 +02:00
krzys-h 3f57aab406 Fixed Thumper crash 2015-08-13 22:41:24 +02:00
krzys-h 74609d9bea Fixed astronaut death bug
introduced in f7d2f501bb
2015-08-13 22:27:39 +02:00
Piotr Dziwinski b832200798 Add missing include 2015-08-13 21:46:19 +02:00
krzys-h 8bff64ae3e Fixed OrgaShooter bug 2015-08-13 21:27:18 +02:00
krzys-h c399e5e246 Somehow missed some more Scraps :/ 2015-08-13 19:53:03 +02:00
krzys-h a644fc107d Use +infinity instead of -1 for immediate object destruction 2015-08-13 19:46:30 +02:00
krzys-h 275e792a81 Removed old Scrap objects; cleaned up some more if()'s 2015-08-13 19:41:21 +02:00
krzys-h 28d88347eb Added some notes in function documentation 2015-08-13 19:06:18 +02:00
krzys-h bfd3a5b23c Refactored ExplodeObject 2015-08-13 18:54:44 +02:00
krzys-h e5e1d4973f CDestroyableObject, CFragileObject, CShieldedObject and CShieldedAutoRegenObject 2015-08-13 13:41:25 +02:00
krzys-h ff957afefc Moved files not directly related to CObject into src/level/ directory 2015-08-13 11:47:32 +02:00
krzys-h e937db94c8 Moved GetPhysics() and GetMotion() to CMovableObject; moved trace drawing to CTraceDrawingObject 2015-08-13 10:49:45 +02:00
krzys-h 5d52214737 CFlyingObject; CJetFlyingObject 2015-08-12 19:09:35 +02:00