Commit Graph

244 Commits (4634461c1d90ba85c8ac5fe2f5834f03d646e0e4)

Author SHA1 Message Date
krzys-h f03c3dbc10 Implement ScoreboardObjectRule 2018-05-08 23:44:23 +02:00
krzys-h db72a36315 Fix code style 2018-05-08 19:44:24 +02:00
krzys_h 50ed675acd
Merge pull request #1150 from AbigailBuccaneer/debug-rendering
Add generic debug rendering functions
2018-05-07 20:53:12 +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 b9e2edce6c
Merge pull request #1146 from colobot/dev-scene-camera
Implement viewpoint feature
2018-05-07 20:42:18 +02:00
krzys_h 35640b8e3f
Merge branch 'dev' into dev-scoreboard-sort 2018-05-07 20:41:40 +02:00
melex750 a918fcabb4 Fix save/load NewScript programs for factory bots
Fixes #797
2018-04-30 13:43:03 -04:00
AbigailBuccaneer c445d7d9a9 Add generic debug rendering functions
Currently the engine can draw debug spheres to show crash sphere
positions. This extends this to draw arbitrary spheres and cuboids,
transformed arbitrarily. With these in place it's now very quick and
easy to create a debug visualisation - for example, it's a one-line code
change to render the bounding box or sphere of every EngineObject.
2018-04-29 23:41:53 +01:00
krzys_h 64ab5e3308
Merge pull request #1053 from colobot/dev-a-thing
added a thing
2018-04-24 14:13:42 +02: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 289b6577d5
Merge pull request #1139 from AbigailBuccaneer/clang-7
Fix building under clang-7
2018-04-24 14:12:15 +02:00
tomangelo2 5e8be5f6bc Better align of viewpoint UI 2018-04-23 08:12:33 +02:00
AbigailBuccaneer ea64edaa0b Compile with -Wmissing-declarations
-Wmissing-declarations enforces that every function (except for static
functions) must be declared separately before it's defined. This
essentially enforces that every function must be either static, or
declared in a header elsewhere.

This helps the optimizer, as it can do a better job of inlining if it
knows that a function won't be used outside of a given file. It also
helps -Wunused-function (which is enabled by -Wall) find more unused
functions.

Note that Clang spells this option -Wmissing-prototypes, which
confusingly is the name of a related but different warning option under
GCC.
2018-04-21 16:49:27 +01:00
krzys-h e964d3e48c Fix colobot-lint warnings 2018-04-20 02:21:12 +02:00
krzys-h 1c2bdc9cab Update license headers 2018-04-20 02:08:50 +02:00
krzys-h 9f1bd2176f Jenkinsfile: Run colobot-lint 2018-04-20 02:08:50 +02:00
AbigailBuccaneer 5cec29f4e6 Fix building under clang-7
Currently the build fails because of -Wdelete-non-virtual-dtor warnings.
This catches when an object is destructed, has a non-virtual destructor,
and is an abstract base class or a non-final class with virtual
functions. The warning happens inside unique_ptr<T>::~unique_ptr.

The warning is to prevent somebody writing code like this:

    class MySceneEndCondition : public CSceneEndCondition {
        ~MySceneEndCondition() { /* some complex logic */ }
    };
    // this won't call MySceneEndCondition's destructor, potentially
    // leading to leaks or segfaults:
    std::unique_ptr<CSceneEndCondition> p{new MySceneEndCondition()};
2018-04-19 10:19:05 +01:00
tomangelo2 2f71cce9c9 Fix camera behaviour when switching to viewpoint 2018-04-15 00:06:04 +02:00
tomangelo2 b04d8d205b Added viewpoints feature
This allows you to set fixed viewpoints in specific location, without attaching to any object, enabling you to track the game from any location.
Proper camera handling will be implemented in next commits.
2018-04-11 21:24:20 +02:00
tomangelo2 ad6dd00275 Change new functions return type and switch to enum class
As suggested by @krzys_h
2018-04-08 23:43:22 +02:00
tomangelo2 d371338920 Fix scoreboard sorting parameters 2018-03-11 17:00:17 +01:00
tomangelo2 1b79e8409f Add switch to determine sort type
You can set it in scene file with ScoreboardSortType SortBy="Name" or "Points"
2018-03-07 21:25:35 +01:00
tomangelo2 ff0f22ef44 Sort scoreboard
First, the team with more points, then which team scored points faster
2018-03-07 15:46:30 +01:00
Fiftytwo ca0ff013d4 Update Trainer bots 2017-12-21 01:49:56 +01:00
Fiftytwo 5f8b7a8149 Update BotFactory interface 2017-11-25 12:30:16 +01:00
Fiftytwo 614dc5e591 Builder research 2017-11-23 00:11:29 +01:00
krzys-h 7f6c0cd31e added a thing 2017-11-22 18:29:09 +01:00
Fiftytwo a024866fd3 Builder bots base implementation 2017-11-16 18:43:45 +01:00
krzys_h 17d47e9b63
Merge pull request #1040 from melex750/dev
Saved game bug fix
2017-11-04 11:24:09 +01:00
krzys-h 387b7b5396 Fix non-scoreboard code battles, closes #1023 2017-11-04 11:23:17 +01:00
melex750 d357de1438 Save object lifetime and abstime
Fixes #1006
2017-10-24 05:12:19 -04:00
melex750 1eee06d9f9 Keep mission history after loading a crashsave
Fixes #812
2017-10-24 04:55:22 -04:00
tomangelo2 054d1c3e54 Changed in-engine fonts names 2017-10-11 17:10:04 +02:00
tomangelo2 75d9f8573b Display warning if no quicksave slot is found 2017-06-11 23:29:50 +02:00
tomangelo2 d63ed865f4 Added QuickSave/QuickLoad feature #929
Also rearranged a bit speed control buttons to make some space for it
F5 - QuickSave
F6 - lower speed (current/2)
F7 - reset speed
F8 - higher speed (current*2)
F9 - QuickLoad
2017-06-11 17:50:21 +02:00
krzys-h d860a08d21 Merge long first frame rendering fix from #898
Also did some changes to make sure the "F1 to open SatCom" appears immediately (not after 0.1s),
and that mission timer won't start ticking in the first simulation frame (mainly for code battle initial pause)
2017-06-04 13:10:50 +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 7216d8d12e Fix crash after exiting a code battle 2017-05-24 12:42:37 +02:00
krzys-h 08d87fa975 Make initial scoreboard values editable 2017-05-24 12:39:05 +02:00
krzys-h f60108f367 Prevent enforcement of ObligatoryToken for level controller scripts 2017-05-24 10:50:43 +02:00
krzys-h 904b7e580b Prevent giving scoreboard points to team 0 2017-05-23 20:20:46 +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 681d5203e5 Make code battle start button header translatable 2017-05-19 21:23:14 +02:00
krzys-h c68f5e276f Add live scoreboard display 2017-05-19 21:11:43 +02:00
krzys-h b3ea687d32 Minor documentation fixes 2017-05-19 20:15:13 +02:00
krzys-h 8948da0612 Add Barricade objects 2017-05-19 15:33:44 +02:00
krzys-h 327eafddb7 Add order= parameter for ScoreboardEndTakeRule 2017-05-18 20:39:32 +02:00
krzys-h cf7c19ef62 Make teams and scoreboard translatable 2017-05-17 19:00:40 +02:00
krzys-h 880f31a7c6 Add basics of scoreboard implementation; better support for multiple teams 2017-05-17 18:22:58 +02:00
Smok94 8a0c7279dc Command history for cheat console, closes #316 (PR #869)
Adds console command history. Browsable by up and down arrow keys.
2017-01-02 20:23:19 +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 6a382830a9 Allow selectinsect to select other objects with selectable=0 2016-12-27 22:20:58 +01:00
krzys-h 5722fdb163 Fix bug (?) related to lost cutscenes
This was here since the original game, probably unused but I fixed it anyway
2016-12-27 15:21:49 +01:00
tomangelo2 5dc38f1526 Objects outside BuildType list cannot be build anymore
Fix issue #863
2016-12-05 14:16:11 +01:00
krzys-h 856ee9a0fe Don't allow whitespace player names, closes #840 2016-11-11 17:13:32 +01:00
MatiRg dc415c3d2a Remove character limit in CEdit (#836) 2016-09-25 19:13:04 +02:00
MrSimbax 514829de60 Normalize dir parameter when copying to clipboard 2016-08-20 13:22:53 +02:00
krzys-h fef050f6dd Fixed loading apperance scene, closes #802 2016-07-24 16:44:27 +02:00
krzys-h 9e545d0d39 Fixed colobot-lint warnings 2016-07-09 20:39:18 +02:00
krzys-h 6f412df232 Fixed lockups when calling StartSuspend multiple times 2016-07-04 17:02:39 +02:00
krzys-h 58815059ea Added warnings about planned changes to EndMisisonTake (#759) 2016-07-04 16:30:22 +02:00
krzys-h 8ad53ce327 Fixed pause blur in main menu 2016-06-19 22:18:03 +02:00
krzys-h bd4362e26c Fixed dynamic textures not being reloaded properly 2016-06-19 19:57:55 +02:00
krzys-h 7ce23fdf52 Do not rotate after changing autosave settings
See https://github.com/colobot/colobot/pull/789#discussion_r67570610
2016-06-17 22:39:45 +02:00
Krzysztof Dermont 32629a2f2a Refactor autosave rotation.
In order to remove boost:filesystem from CResourceManager Move()
function has to be removed or rewrited. Since Move is only used in
autosave rotation it's simpler to change autosave rotation and remove
Move().

Now oldest autosaves (with lowest timestamp) will be removed in rotation.
2016-06-09 19:30:08 +02:00
krzys-h 646e5104f6 Some CCamera cleanup and docs 2016-05-28 18:44:38 +02:00
krzys-h 942f746a21 Removed CAM_TYPE_DIALOG 2016-05-28 12:50:32 +02:00
krzys-h 250047579f Allow using custom paths for win/lost scenes 2016-05-27 23:37:36 +02:00
Tomasz Kapuściński 213fd6b203 Added blur effect when the game is paused (issue #656)
Might be unstable, needs more testing. To enable, add PauseBlur=1 to [Experimental] section in colobot.ini
2016-05-21 14:27:35 +02:00
krzys-h dd8a324f9b Fixed crash when loading level with incorrect object type 2016-04-10 13:27:56 +02:00
krzys-h d3f808f66d Merge branch 'dev-savegame' into dev 2016-04-10 13:16:10 +02:00
krzys-h 4de9d25f04 Man, those compile errors... 2016-04-09 18:58:34 +02:00
krzys-h 32af7f45df Fixed missing #includes 2016-04-09 18:52:15 +02:00
krzys-h 04d7c343ef Removed misc.cpp / misc.h 2016-04-09 18:46:12 +02:00
krzys-h 139592bc00 Proper l10n for date/time 2016-04-09 18:23:57 +02:00
krzys-h 7f38aca766 Improvements to ObligatoryToken/ProhibitedToken
Now you can specify exactly how many times given instruction can occur
2016-04-08 22:15:58 +02:00
krzys-h 3e4fbe93a6 This time really fixed compile errors 2016-04-08 21:22:00 +02:00
krzys-h ed58e7e012 Fix compile warning 2016-04-08 21:16:03 +02:00
krzys-h 4c8da2c503 LevelController improvements; minor EndMissionTake cleanup
* using LevelController script in the level doesn't forcefully disable EndMissionTake and AudioChange anymore
* cleaned up some code related to processing EndMissionTake commands
2016-04-08 20:56:09 +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 15702ec856 Fixed indentation 2016-04-03 20:29:55 +02:00
Smok94 6afdb7b6c8 First person camera unlocked for Me and Tech
*unlocked camaera button for Me and Tech
*unlocked first ferson view for Me and Tech
*Me and Tech have no "camera view" effect like robots in first person
mode

#156
2016-04-02 15:56:27 +02:00
Smok94 831276f378 Appearance customization face butons fix
*face buttons 2 and 4 swaped.
*default hair colors now fit to buttons look
*changing face changes hair color do default

Fixes two first issues mentioned in the #724
2016-04-02 13:13:42 +02:00
Didier Raboud a06035ecb8 Fix occured/occurred spelling error 2016-03-30 13:40:26 +02:00
Krzysztof Dermont 8ccad5b954 Deactive pause before jumping to next visit
When pause was active setting new pause resulted in strange behavior.

This should fix issue #736.
2016-03-29 22:32:44 +02:00
krzys-h 4af02c86f8 Debug menu 2016-03-28 17:58:31 +02:00
krzys-h 7fe65067ee Fixed exit after single mission mode 2016-03-27 13:46:48 +02:00
krzys-h d2ac1afcf0 Changed reference colors using when recoloring textures to constants 2016-03-27 13:34:26 +02:00
krzys-h 5de577400b Refactor CRobotMain::ExecuteCmd() to std::string 2016-03-26 19:06:07 +01:00
krzys-h 6585ee9ae8 Refactor some references to CRobotMain from CEngine 2016-03-26 18:55:39 +01:00
krzys-h d812db19f8 Fixed ground spots not working after changing texture params; use UpdateTexture instead of destroy and recreate 2016-03-25 17:06:01 +01:00
Piotr Dziwinski 15c9cbd228 Debug mode for displaying crash spheres, closes #400 2016-03-19 11:54:58 +13:00
krzys-h cbdda57288 Merge branch 'dev-right-click-camera' into dev 2016-03-13 14:52:17 +01:00
krzys-h 438bc477d1 Removed low CPU mode 2016-03-13 14:52:07 +01:00
krzys-h 47d39e5b22 Right click camera; minor CCamera cleanups 2016-02-19 17:14:08 +01:00
krzys-h a583b5ed1d Fixed another crash with focus pause 2016-02-16 12:26:52 +01:00
krzys-h 831eca921b Fixed possible crash with background pause 2016-02-15 19:05:32 +01:00
krzys-h a3477edc8e Pause game when in background, closes #609 2016-02-13 21:35:01 +01:00
krzys-h 8ce5c3ab4c Fixed level scale unit not being reset, closes #666 2016-02-13 20:46:03 +01:00