Commit Graph

260 Commits (a88d9cdd39e6f6db46ca2281150e392d9709f01b)

Author SHA1 Message Date
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
krzys-h d06516507a Fixed game not being unpaused if you leave code battle without starting, closes #679 2016-02-13 20:40:23 +01:00
krzys-h 977607a934 Updated license headers 2016-02-13 14:11:30 +01:00
Krzysztof Dermont 8a0cda1c2a Fix issue #648
Should be proper fix
2016-02-10 17:06:02 +01:00
Krzysztof Dermont 12e3724319 Implement issue #606
Add button to open SatCom in main menu
2016-02-10 17:04:26 +01:00
tomangelo2 1fc9186aaf Fixes for issue #648 and #631 2016-02-09 20:05:04 +01:00
krzys-h bdf99f3de5 Fixed SatCom music not starting with immediat SatCom enabled 2016-02-05 20:38:03 +01:00
Tomasz Kapuściński 91f897057e Another fix for visibility distance 2016-01-31 01:07:34 +01:00
krzys-h 9749419b87 Fixed LevelController 2016-01-30 17:24:47 +01:00
krzys-h f3094312b2 Fix startup crash with disabled autosave, closes #705 2016-01-28 20:36:55 +01:00
krzys-h 223d17843e Fixed NuclearPlant being available without research, closes #662 2016-01-24 22:18:04 +01:00
krzys-h 40352be5cc Add language switcher to the settings UI, closes #506 2016-01-24 16:03:24 +01:00
krzys-h b96305060b Fix colobot-lint warnings 2016-01-23 21:59:02 +01:00
krzys-h 04e9e8768d Removed unused CRobotMain members 2016-01-15 16:55:56 +01:00
krzys-h 07a4d6a16b CBot namespace 2015-12-26 14:29:10 +01:00
krzys-h 51644369cb Moved standard math and file functions into CBot library 2015-12-20 18:36:20 +01:00
krzys-h 6832c91496 Fixed #695 2015-12-20 14:28:38 +01:00
krzys-h 1dd230aaaf Fixed incombatibility with old save files, closes #686 2015-12-19 22:02:24 +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
Grunaka 77d738634c Moving CBotClass class in its own header and source files. 2015-12-01 23:25:35 +01:00
Piotr Dziwinski 1182dea692 Merge pull request #678 2015-11-10 21:36:29 +00:00
piotrwalkusz1 ce480c1720 Fix #670 2015-11-08 19:03:35 +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 2111c6d177 More CRobotMain cleanup 2015-10-01 20:10:52 +02:00
krzys-h 2c7deea6a9 Removed some unused functions from CRobotMain 2015-10-01 19:37:31 +02:00
krzys-h b5e98dd6e9 Removed CSettings access through CRobotMain 2015-10-01 19:19:40 +02:00
krzys-h 3815ef0bd6 Refactored CPauseManager (again) 2015-10-01 18:55:41 +02:00
krzys-h 95f1e3f19a Fixed water/lava moving and waves (#659) 2015-09-30 20:31:09 +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 dfa06dafcf Refactored window resize 2015-09-25 11:11:35 +02:00
krzys-h 53e4470dbf Started SDL2 migration 2015-09-24 21:09:46 +02:00
krzys-h 7500ab4988 Added code battle spectator mode switch 2015-09-13 15:59:42 +02:00
krzys-h 21a7f1bced Made 'invui' work in main menu 2015-09-12 10:35:31 +02:00
krzys-h e6e38eae7f Fixed cheat console actiaving multiple times, closes #627 2015-09-10 21:32:25 +02:00
krzys-h 20105d09ec Added code battles button to the main menu 2015-09-10 20:20:24 +02:00
krzys-h 74cee19c09 Fixed objects being deselected if not clicked on any object 2015-09-09 20:32:56 +02:00
krzys-h b058a6986b Minor improvments to plane camera 2015-09-06 20:33:04 +02:00
krzys-h f6fdec1479 Allow controlling free camera with arrows when no object is selected 2015-09-06 20:09:47 +02:00
krzys-h 883348c6cf Do not (auto)save code battles 2015-09-06 20:01:59 +02:00
krzys-h d36fcf4187 New code battle camera behavior 2015-09-06 19:59:26 +02:00
krzys-h 51330dde5e Added code battle start button; fixed bug with starting code battle 2015-09-06 19:12:00 +02:00
Piotr Dziwinski 44a1f85891 Refactor CRobotMain::DeleteObject -> DestroySelectedObject 2015-09-06 13:23:43 +02:00
krzys-h fb03a497d7 Added command to hide the UI 2015-09-04 19:16:21 +02:00
krzys-h e956311626 Moved free camera controls to numpad; added 'camtype %d', 'camspeed %f', 'freecam' 2015-09-04 19:04:42 +02:00
krzys-h e015d9f1c3 Don't allow saving if crashed during loading 2015-09-01 16:15:59 +02:00
krzys-h c3d7876a5c Made CPauseManager not a singleton 2015-08-31 22:05:21 +02:00
krzys-h ff17961584 Refactored CPauseManager 2015-08-31 21:47:55 +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 934d97a801 Fixed #581 for aliens 2015-08-25 17:25:53 +02:00
krzys-h 5eae234b83 Fixed EndMissionDelay win=-1 not working, closes #592 2015-08-25 17:17:11 +02:00
krzys-h fe44e617a8 Fixed selection markers not disappearing when moving gun away 2015-08-25 16:57:10 +02:00
krzys-h d4b431adaa Recalculate camera projection matrix after aspect ratio change 2015-08-25 16:18:01 +02:00
krzys-h d9c8a7ed9b Fixed MXE builds, 2nd try 2015-08-25 12:18:15 +02:00
krzys-h f206b49106 Fixed MXE builds 2015-08-25 12:01:22 +02:00
krzys-h d287af159d Support for #rrggbbaa syntax for colors (mentioned in #591) 2015-08-25 11:53:56 +02:00
krzys-h db099bade4 Legacy 0-255 color support in level files, closes #591
Thanks @attila123
2015-08-25 11:41:01 +02:00
krzys-h 39d2236be6 Fixed %lvl% in saved games, closes #586 2015-08-24 20:08:08 +02:00
Piotr Dziwinski c3d4d46583 Fix missing empty line after license header 2015-08-22 17:52:07 +02:00
Piotr Dziwinski b93f610930 Fix license header in all files 2015-08-22 16:40:02 +02:00
krzys-h 118ceaa099 Fixed music stopping during apperance phase, closes #573 2015-08-18 19:33:01 +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 98748d757f Fixed paths to RemoveDirectory 2015-08-17 21:03:40 +02:00
krzys-h 7e028977bd Implemented emergency save on crash, closes #572 2015-08-17 20:56:42 +02:00
krzys-h e11d2ec33e Refactor object dying status and GetActive 2015-08-16 20:24:48 +02:00
krzys-h b5cca39cc2 Prevent big simulation step after loading 2015-08-16 17:08:38 +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
Piotr Dziwinski 2289d69735 Replace NULL -> nullptr 2015-08-16 12:43:42 +02:00
krzys-h f21025b526 User-friendly abort error messages 2015-08-16 00:44:36 +02:00
Piotr Dziwinski d703eb7165 Compile fixes for MSVC2013 2015-08-16 00:39:08 +02:00
krzys-h db3596ace1 Removed Get/SetDefRank 2015-08-15 23:49: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 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 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 0ec3f29e68 Fixed win/lost scene music cached at startup not being ever used 2015-08-14 19:44:44 +02:00
Piotr Dziwinski 9ad513550b Add other missing #include <stdexcept> 2015-08-14 19:05:24 +02:00