Commit Graph

561 Commits (b925838a913a61a993acdeac1ea06caa8c10f09e)

Author SHA1 Message Date
piotrwalkusz1 ce480c1720 Fix #670 2015-11-08 19:03:35 +01:00
Tomasz Kapuściński 1b855f5dc3 Possible fix for issue #667 2015-10-15 17:40:15 +02: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 883e07ad6a Fixed mouse scroll on lists going out of range, closes #660 2015-10-01 20:22:52 +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
Victor Vieux 49ee00d90d fix MacOSX install instruction and compilation
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-09-29 22:39:33 +02:00
Piotr Dziwinski 61a3ba2800 Fix undefined function colobot-lint issues 2015-09-29 21:44:24 +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 fd07589ebb Separated config.h and version.h
This prevents unnecessary recompilation of some files when version number changes
2015-09-26 21:12:12 +02:00
krzys-h 07df35ca01 Refactored mouse wheel 2015-09-25 22:54:48 +02:00
krzys-h e965414d34 Rewritten text input to SDL2 2015-09-25 19:49:50 +02:00
krzys-h 53e4470dbf Started SDL2 migration 2015-09-24 21:09:46 +02:00
krzys-h c9a1bbefbb Fixed code battle start button becoming visible after closing file selection dialog 2015-09-11 18:38:25 +02:00
krzys-h 48f24fe6cc Fixed CInterface::SetFocus not recursing into windows, this fixes highlighting of compilation errors in the editor
It's not really nice, but at least it works
2015-09-11 18:34:47 +02:00
krzys-h 4d40bd6992 Hide completion marks in code battle level list 2015-09-10 20:42:48 +02:00
krzys-h 20105d09ec Added code battles button to the main menu 2015-09-10 20:20:24 +02:00
krzys-h 060db9c069 Fixed save button being always unavailable 2015-09-09 20:24:44 +02:00
krzys-h 09ff821f2c Fixed code battle start button not disappearing in the editor 2015-09-07 21:45:51 +02:00
krzys-h 883348c6cf Do not (auto)save code battles 2015-09-06 20:01:59 +02:00
krzys-h 51330dde5e Added code battle start button; fixed bug with starting code battle 2015-09-06 19:12:00 +02:00
krzys-h 78e4e440b5 Removed cancel button from player selection screen
Not really needed, and it had a bug with removing players (it would still go back to the deleted player)
2015-09-01 16:30:05 +02:00
krzys-h 6f38ec1911 Clear player name text field on delete 2015-09-01 16:25:09 +02:00
krzys-h ec9a38a681 Don't show level completion marks in free games 2015-09-01 16:22:57 +02:00
krzys-h 89c93c15cd Fixed crash after removing last program from a robot 2015-09-01 16:10:12 +02:00
krzys-h c3d7876a5c Made CPauseManager not a singleton 2015-08-31 22:05:21 +02:00
krzys-h 75d18ced05 Fixed #596 2015-08-31 21:57:46 +02:00
krzys-h ff17961584 Refactored CPauseManager 2015-08-31 21:47:55 +02:00
krzys-h cc7e36968f Fixed new text in editor not being monospace 2015-08-31 12:21:28 +02:00
krzys-h 82e06bfd8e Fixed wrong program being highlighted after loading (closes #616) 2015-08-31 11:37:02 +02:00
krzys-h 934d97a801 Fixed #581 for aliens 2015-08-25 17:25:53 +02:00
krzys-h fe44e617a8 Fixed selection markers not disappearing when moving gun away 2015-08-25 16:57:10 +02:00
krzys-h 8b7bd663b9 Fixed shooters detecting all objects as friendly, closes #581 2015-08-25 16:29:26 +02:00
krzys-h 00ae6c32f1 Fixed CBot scripts in SatCom not being sometimes colorized
This is because in some places \c; and \s; are reversed
2015-08-25 11:32:15 +02:00
krzys-h d9b680bdcf Removed Windows restart on resolution change workaround 2015-08-24 19:47:48 +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 e1f0c0f91f Fixed #585 2015-08-19 20:56:04 +02:00
krzys-h 8421189716 Merge branch 'dev-cbot-syntax-highlighting' into dev (#575) 2015-08-18 23:01:02 +02:00
krzys-h e91ecbbb01 Removed unused references to effect03.png from the code 2015-08-18 22:59:31 +02:00
krzys-h d6a946618e Syntax highlighting in SatCom 2015-08-18 22:35:38 +02:00
krzys-h 3fe44be5d5 Fixed no monospace font in the editor 2015-08-18 22:12:00 +02:00
krzys-h c5da68d516 New CBot syntax highlighting 2015-08-18 22:12:00 +02:00
krzys-h b086c52b14 Render some things in code instead of using effect03.png texture (in CEdit) 2015-08-18 21:04:00 +02:00
krzys-h 28925106e4 Cleaned up some long lists of ifs 2015-08-18 12:29: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 63b4849275 Fixed #561 2015-08-17 21:57:53 +02:00
krzys-h 1059ae37c1 Shielder subclass 2015-08-17 14:06:31 +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 e11d2ec33e Refactor object dying status and GetActive 2015-08-16 20:24:48 +02:00
krzys-h 3f303ea824 Removed some unneccessary includes 2015-08-16 16:35:39 +02:00
krzys-h 0986a200d7 Fixed CBot editor being inaccessible while running program 2015-08-16 16:03:36 +02:00
Piotr Dziwinski d703eb7165 Compile fixes for MSVC2013 2015-08-16 00:39:08 +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 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
krzys-h 9a15db1bea Split global.h 2015-08-15 14:02:07 +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
krzys-h 78a279b479 Better shadow type selection UI 2015-08-14 13:37:27 +02:00
krzys-h 009b3abc03 Moved some interface controls 2015-08-14 13:14:57 +02:00
krzys-h eda7435eb6 Removed a lot of useless settings (#556) 2015-08-14 13:04:05 +02:00
krzys-h 1d6c3cc748 Fixed CEngine trying to use unsupported values as defaults, closes #552
Also fixed the settings buttons not being disabled properly
2015-08-14 12:03:53 +02:00
krzys-h 41c0ec0940 Fixed game save being always blocked
Also, prevent autosave if saving is blocked
2015-08-14 00:21:18 +02:00
krzys-h 02b76e5aba Workaround for too fast calling of m_app->Render 2015-08-14 00:10:07 +02:00
Piotr Dziwinski 26e4ec0ae2 Add more missing includes and forward declarations 2015-08-13 22:49:05 +02:00
krzys-h bc05cda0e7 Removed image, link and marker limits in SatCom, closes #554 2015-08-13 14:14:11 +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 60797f72d3 Removed some old, unused code 2015-08-12 17:25:41 +02:00
krzys-h 63d83185b5 Move GetTooltipText and Get/SetLock to CObject; remove Get/SetEnable 2015-08-12 00:16:57 +02:00
Piotr Dziwinski 571cc96523 Add proper initializers and remove manual memory management in ui classes 2015-08-11 23:15:32 +02:00
krzys-h 364f87c49b CPowerContainerObject interface 2015-08-11 22:51:16 +02:00
krzys-h 15c1c7ee03 CMovableObject, CControllableObject 2015-08-10 23:21:15 +02:00
krzys-h abb272600e Merged CBrain into CProgrammableObject 2015-08-10 18:16:00 +02:00
krzys-h 726cfbda77 Removed manual memory management in CBrain and CObjectInterface 2015-08-10 17:17:02 +02:00
krzys-h a3fa3487b2 Fixed editor being unavailable after starting the program 2015-08-10 17:06:26 +02:00
krzys-h a754b2ad06 Fixed manual control overriding tasks 2015-08-10 17:02:31 +02:00
krzys-h 78a51f0acb Moved all UI code out of CBrain into Ui::CObjectInterface 2015-08-10 16:37:03 +02:00
krzys-h 3a5f618f65 CTaskExecutorObject interface; some general task and CBrain cleanup 2015-08-10 13:46:39 +02:00
krzys-h 2f156f022e Fixed screen_level_list.cpp warnings 2015-08-09 23:21:08 +02:00
krzys-h 115e18cc85 Fixed version display being invisible during loading 2015-08-09 22:53:59 +02:00
krzys-h a8707e2568 Added Anisotropy to configuration presets 2015-08-09 22:41:43 +02:00
krzys-h 903f4f144f Fixed apperance interface (#551) 2015-08-09 22:32:28 +02:00
krzys-h bb3fc63e03 More details on terrain loading 2015-08-07 23:40:38 +02:00
krzys-h 57469533b6 Implemented loading progress bar 2015-08-07 20:48:55 +02:00
krzys-h f90bb63520 Hide some things in save screenshots
Save indicator, mouse cursor, CDisplayText and interface particles
2015-08-07 15:59:05 +02:00
krzys-h 6d363ba887 Fixed version being displayed during intro 2015-08-07 15:26:37 +02:00
krzys-h d58d015edd Fixed selection save when saving manually 2015-08-07 15:25:17 +02:00
krzys-h 0d00952b10 Rename text.png to effect03.png 2015-08-06 22:41:54 +02:00
krzys-h 69e6ae2c5e Added "saving in progress" indicator 2015-08-06 20:15:17 +02:00
krzys-h 8d34286b1d Added "No userlevels installed" message 2015-08-06 19:37:18 +02:00
Piotr Dziwinski f95980456a Replace anonymous union in Event with pointer to appropriate struct 2015-08-06 19:11:50 +02:00
krzys-h e05fba22fd Moved some interface controls around 2015-08-06 19:03:15 +02:00
krzys-h ec3ded75b8 Removed unused LOD level setting 2015-08-06 18:35:56 +02:00
krzys-h 7649731b49 Reimplemented hiding mouse during loading 2015-08-06 18:28:28 +02:00
krzys-h dc9e2d2e8b GUI loading error popup
Also added fireParticles option
2015-08-06 18:19:01 +02:00
krzys-h b9bd075903 Drop (now unused) m_phase from CMainDialog 2015-08-06 16:20:29 +02:00
krzys-h 711643b454 Refactored CMainDialog 2015-08-06 16:02:59 +02:00
Piotr Dziwinski 6ca0757fec Fix for Clang compilation 2015-08-06 14:31:40 +02:00
krzys-h 0dbfa027b1 Fixed dialog opening animation and particles 2015-08-06 14:04:33 +02:00
krzys-h 02417363e4 Fixed version text disappearing during loading 2015-08-06 14:03:07 +02:00
krzys-h f0cfc35356 Fixed mouse particles appearing in simulation 2015-08-06 13:54:59 +02:00
krzys-h b20d589c87 Check available texture units in shadow mapping settings 2015-08-06 13:47:42 +02:00
krzys-h dc85aa2138 Moved all UI controls to a subdirectory 2015-08-06 13:25:24 +02:00
krzys-h 2b4210dcbc Separated CMainUserInterface from CMainDialog 2015-08-06 12:59:09 +02:00
krzys-h a322f46f00 Split CScreenSetup 2015-08-06 12:16:38 +02:00
Piotr Dziwinski 596bb49de0 Normalize static variables and functions
* get rid of some of them
 * put the rest into anonymous namespaces
2015-08-06 10:12:20 +02:00
Piotr Dziwinski bdeeaf690b Get rid of memsets 2015-08-06 09:37:25 +02:00
Piotr Dziwinski 7097ec38e3 Fix very subtle memory access bug
Some CScreen classes have functions which call ChangePhase() on
CRobotMain, which in turn calls ChangePhase() on CMainDialog, which in
turn deletes current CScreen object :(.

So the fix is to keep all CScreen objects created all the time and only
keep pointer to the currently active object.

This also makes it easy to clean up dependencies between CScreen classes
and get rid of all these ugly static variables and functions.
2015-08-06 08:18:22 +02:00
krzys-h 95a438bcc6 Fixed cheat console and particles during loading 2015-08-05 22:54:13 +02:00
Piotr Dziwinski a9a643eea4 Add virtual destructor to CScreen to fix memory corruption issue 2015-08-05 20:59:49 +02:00
krzys-h 47d79c9977 Added #Include support in level files 2015-08-05 19:27:26 +02:00
krzys-h 5e0cff29dc Removed GetChapPassed from maindialog.h 2015-08-04 23:32:44 +02:00
krzys-h 54254e2158 Split CMainDialog 2015-08-04 23:29:18 +02:00
krzys-h 3f48e4699d Moved window position and font size storage from CRobotMain to CSettings 2015-08-04 13:09:34 +02:00
krzys-h a4f12f1b11 Removed unused m_access* variables 2015-08-04 12:50:49 +02:00
krzys-h 4b271cee2d Moved settings out of CMainDialog into a separate class
Also fixed some problems with resolution list selection after starting game
2015-08-04 12:46:54 +02:00
krzys-h ea7bfdefda Moved scene to load out of CMainDialog 2015-08-04 10:56:49 +02:00
krzys-h fc8d8cb9d4 Moved saved scene loading to CPlayerProfile 2015-08-04 09:55:39 +02:00
krzys-h 522c54afc3 Possible fix for MXE builds 2015-08-03 22:12:41 +02:00
krzys-h 6ea98ed995 Fixed screenshot image lag on old GPUs that have problems with not power-of-2 textures (#546) 2015-08-03 22:06:27 +02:00
krzys-h 5e4a423bf0 Cleaned up "textures/"+something, fixed more possible occurences of #531 2015-08-03 20:55:33 +02:00
krzys-h 1e38edcec7 Fixed InterfaceGlint and InterfaceRain using the same config value name 2015-08-03 20:40:27 +02:00
Piotr Dziwinski 11b0398c03 Include refactoring
* reordered includes according to correct style
 * removed some unnecessary includes
2015-08-02 17:49:07 +02:00
Piotr Dziwinski 7d8b56d9ab More style fixes 2015-08-02 12:06:14 +02:00
Piotr Dziwinski 3b585d9f51 Some style and whitespace fixes 2015-08-02 11:36:36 +02:00
krzys-h 119bc62a7c Fixed #542 2015-07-29 22:46:52 +02:00
krzys-h 1bc0c891b0 Fixed early profile creation (#538) 2015-07-29 18:17:28 +02:00
krzys-h ab6a8eba2b Possible fix to #482 2015-07-29 09:41:25 +02:00
krzys-h 59d5545eca Fixed code pause editor bug (#527) 2015-07-22 18:01:24 +02:00
krzys-h 0c54e1e8de Fixed public program save directory
Such a dumb mistake. AGAIN.
2015-07-22 12:23:26 +02:00
krzys-h 72b9738eb9 Fixed possible problems when trying to use shadow maps in unsupported configuraions (#522) 2015-07-20 22:34:39 +02:00
krzys-h e821aa9cef Better scaling of shortcut buttons on widescreen resolutions 2015-07-20 21:07:20 +02:00
krzys-h 4741118b61 Added new options to configuration presets 2015-07-20 20:47:44 +02:00
krzys-h 7b3ae32626 Shadow mapping now disables old shadows 2015-07-20 18:56:15 +02:00
krzys-h f03734d17f Added shadow mapping to settings screen 2015-07-20 18:42:09 +02:00
krzys-h fce1539888 Made settings unavailable during in simulation setup visible but not editable 2015-07-20 17:19:49 +02:00
krzys-h 572b8ea566 Fixed a crash on exiting from win scene to level list 2015-07-20 17:06:28 +02:00
krzys-h e2ebcb769e Added MSAA to settings screen 2015-07-20 16:29:09 +02:00
krzys-h 90756f8b34 Added FilterMode, MipmapLevel and Anisotropy to settings screen 2015-07-20 13:56:45 +02:00
krzys-h a879e496f5 Removed unused texture quality setting 2015-07-20 12:21:16 +02:00
krzys-h 283676fea1 Fixed CEditValue crash
It happened after pressing slider buttons
2015-07-20 12:12:01 +02:00
krzys-h 1c947f9a80 Renamed some phases to more meaningful names 2015-07-19 23:11:41 +02:00