Commit Graph

384 Commits (571cc96523cc5dce0151677e6da1f317ac846866)

Author SHA1 Message Date
krzys-h 7e41e9fe23 Refactored keybindings storage 2015-07-10 10:11:40 +02:00
krzys-h 5a68558f4c Implemented basic joystick selection
You can select joystick in the config file, there is still no GUI. By default, the first available joystick is used.
issue #171
2015-07-10 00:05:43 +02:00
Piotr Dziwinski 9b232ee3f5 Sound enum refactoring
* rename Sound -> SoundType
 * add parsing string to SoundType
2015-07-09 21:32:25 +02:00
Piotr Dziwinski f1684f85be Introduce new CObject base class and mixin class framework 2015-07-02 23:50:50 +02:00
Piotr Dziwinski f6bc8f94bf Rename fret/truck to cargo/transporter 2015-06-29 23:11:02 +02:00
krzys-h 78e09c757d Basic support for teams and code battle missions 2015-06-26 22:07:55 +02:00
Piotr Dziwinski 88ec9aaae3 Drop GCC 4.6 support 2015-06-26 00:24:32 +02:00
Piotr Dziwinski 67be6fca2a CObject interface cleanup
* remove unused functions and members
 * make protected functions used only locally or in factory
 * rename some functions to be more meaningful
 * refactor some enums to enum classes
2015-06-25 20:43:50 +02:00
Tomasz Kapuściński 90bf51ba54 Possible fix for #458 2015-06-22 22:53:55 +02:00
Piotr Dziwinski 8806d1708d Proper CAuto, CBrain, CMotion, CPhysics, CPyro lifetime management
* change manual memory manament to std::unique_ptr
 * create CPyroManager
 * finally get rid of CInstanceManager
2015-06-22 21:58:58 +02:00
Piotr Dziwinski 02ffdcfe23 Refactor level parser code
* replace manual memory management with std::unique_ptr
 * remove unnecessary dynamic allocations
 * make coding style consistent
2015-06-21 20:59:23 +02:00
Piotr Dziwinski 5f1d3c21d4 Fix some more warnings reported by Clang 2015-06-21 19:46:01 +02:00
Piotr Dziwinski 304542afe2 Some syntax sugar for iterating through all objects 2015-06-21 16:22:09 +02:00
Piotr Dziwinski 0c9a9bce98 Proper CObject lifetime management
CObjectManager is now the only class responsible for storing CObjects
2015-06-21 15:13:55 +02:00
Piotr Dziwinski fed67e6640 Rename objman.h/cpp -> object_manger.h/cpp 2015-06-20 20:02:40 +02:00
Tomasz Kapuściński 74a31c9fb4 Corrected compilation errors on Linux builds 2015-06-16 19:30:35 +02:00
Tomasz Kapuściński a880210b3d Added ShadowRange option 2015-06-15 18:41:31 +02:00
Tomasz Kapuściński 1e3c2cc2df Increased the height of text area for displaying authors.txt (should fix #465) 2015-05-09 20:36:32 +02:00
Piotr Dziwinski 6c87144ae8 Merge branch 'ManuelBlanc-dev-osx' into dev 2015-04-28 15:18:37 -07:00
Piotr Dziwinski 4c8127c6ec Fix two bugs uncovered by MSVC 2015-04-27 20:04:01 +02:00
Piotr Dziwinski 3dce58c0fa Replace override and noexcept with macros 2015-04-27 18:07:42 +02:00
krzys-h d23170aaf1 Fixed monospace CBot editor font (closes #464) 2015-04-23 21:01:04 +02:00
krzys-h df4cb110b5 Made example programs not directly runnable (#450) 2015-04-17 22:39:57 +02:00
krzys-h 45edb29de4 Fixed event management in settings, again 2015-04-17 22:02:10 +02:00
krzys-h e21853d632 Removed old, unused mouse shadow option 2015-04-17 21:54:03 +02:00
krzys-h c32e552368 Fixed event management in settings phases, fixes #452 2015-04-17 21:47:03 +02:00
krzys-h efe04be1c2 Implemented button rendering in SatCom (#232)
Finally!
2015-04-07 12:06:43 +02:00
krzys-h 2f5d4e3b2f Fixed cheat console in main menu 2015-04-06 17:23:18 +02:00
krzys-h 1dd3a4d57e Fixed loading challenge solutions and made them read-only 2015-04-06 17:00:22 +02:00
krzys-h 58016c6c69 Made programs from SatCom read-only; added program cloning 2015-04-06 16:07:49 +02:00
krzys-h a3ae7802a2 New scripts interface, removed script limit
This is a big change in game structure and requires more testing!
2015-03-29 14:21:02 +02:00
krzys-h 23c734c3c1 Implemented shortcuts for starting programs (#391) 2015-03-22 15:49:33 +01:00
krzys-h 8cc74002cf Added CLevelParser in one more place
Not sure how I missed that earlier
2015-03-22 14:29:03 +01:00
krzys-h d2d0886b76 Implemented %cat%
and renamed BuildSceneName to BuildScenePath
2015-03-22 13:51:14 +01:00
krzys-h f43acaa943 Store resolution as value instead of id on the list, closes #417
Also fixed a bug where after starting the game for the first time the "Apply changes" button would behave like you selected highest resolution possible (while the game is running at 800x600)
2015-03-19 19:46:37 +01:00
krzys-h f0d32125e9 Don't crash when there are too many images in SatCom
This limit will be removed during UI refactoring in the future.
Also, I've increased the limit to 100 lines.
issue #411
2015-03-18 21:39:35 +01:00
krzys-h e179847358 Fixed remapping virtual keys, closes #415 2015-03-18 21:29:33 +01:00
krzys-h 92ea770121 Better fix for numerical enter (issue #427)
Should now work everywhere, not only in the editor.
2015-03-18 21:10:47 +01:00
krzys-h f54b46b61d CPathManager
* Moved path management from CApplication to CPathManager
* Moved %lvl% replacements from CParserParam to CPathManager
* Added %lvl% support in produce(), closes #426
2015-03-08 15:22:21 +01:00
Tomasz Kapuściński cb95f9947c Corrected the problem where every key acted as Enter 2015-01-27 18:18:27 +01:00
tomangelo2 dfda70af07 Numerical Enter key should now act the same as normal Enter (#427) 2015-01-18 12:47:37 +01:00
krzys-h 986cf98aaf CController - entry point into CRobotMain and CMainDialog 2014-12-22 10:36:36 +01:00
krzys-h 4fef3af9ef Moved all CObject management from CInstanceManager to CObjectManager 2014-12-21 19:04:31 +01:00
krzys-h fb07691790 New speed keybindings 2014-12-14 17:05:28 +01:00
krzys-h be0f4c2ffe Refactored keybindings UI and added some keybindings 2014-12-14 16:54:32 +01:00
MBlanc 7356f67b78 Shortcuts now use the meta key on OSX 2014-12-12 01:17:05 +01:00
krzys-h 5948a9e9d8 Show game version in logs, closes #413 2014-12-11 19:59:24 +01:00
krzys-h 601a58ea31 Nicer formatting of key names 2014-12-11 19:48:06 +01:00
krzys-h eec6041104 Refactoring of input and input bindings, CInput class 2014-12-11 19:14:33 +01:00
Piotr Walkusz f8fe681dc5 Issue #396 2014-11-18 20:07:00 +01:00
Piotr Walkusz 0ce8f7ad90 Fix #395 issue and fix read function 2014-11-15 13:45:05 +01:00
Piotr Walkusz ec8b2cfd81 Fix issue #394 2014-11-14 20:23:52 +01:00
krzys-h 54098bcd55 Fixed updating "Apply" button after changing fullscreen, closes #392 2014-11-12 17:06:29 +01:00
krzys-h 675ec3a222 Fixed bug in saving list of finished missions, closes #390 2014-11-12 15:11:42 +01:00
krzys-h 80c9b35ce2 Close CBot editor by CTRL+Action key (default ENTER), closes #383 2014-11-11 17:42:19 +01:00
krzys-h 490e6fe2d6 Always show CBot documentation in SatCom, fixes #382 2014-11-11 17:22:21 +01:00
krzys-h a50da4f5de Loading texturesfrom objects/ subdirectory
Closes #381
2014-11-11 15:52:08 +01:00
krzys-h a1fe9c8d7f Implemented autosave (#292) 2014-11-11 14:50:44 +01:00
krzys-h b8103963c3 Sorting saved games list (#380) 2014-11-11 12:08:19 +01:00
krzys-h 97e76e6303 Better handling of filenames longer than maximum allowed
#354
2014-11-10 22:07:51 +01:00
krzys-h 759b9871bb Removed CMainDialog::GetPHYSFSSavegameDir()
CMainDialog is also finished.
This is last commit for saving with PHYSFS, closes issue #334
2014-11-10 19:26:36 +01:00
krzys-h aeaea87d0d Saving/loading list of finished missions via PHYSFS 2014-11-10 19:23:51 +01:00
krzys-h fc5fcc7e61 Loading/saving apperance via PHYSFS 2014-11-10 19:02:43 +01:00
krzys-h 4994965201 Removed CRobotMain::GetPHYSFSSavegameDir()
Everything in CRobotMain uses PHYSFS now
2014-11-10 19:02:07 +01:00
krzys-h c330bcac6d PHYSFS in CStudio 2014-11-10 18:17:13 +01:00
krzys-h 5bb740696f Fixed screenshot saving 2014-11-10 17:50:36 +01:00
krzys-h fc16c36a45 Use PHYSFS in listing save files
Revert "Don't use physfs in saving code for now"

This reverts commit 3b1cfdbfb4.

Conflicts:
	src/ui/maindialog.cpp
2014-11-10 17:37:34 +01:00
krzys-h 3dade17f89 Level saving through CLevelParser 2014-11-10 14:27:42 +01:00
krzys-h 6d152d5aee Fixed console spam when music files are not installed
Closes #359
2014-11-02 13:35:00 +01:00
krzys-h 11a8742079 #335, #348, #352
I don't know what I'm doing anymore :/
I should set up dev envrioment on Windows so I don't have to commit every time I want somebody on Windows to test if my changes work
2014-11-01 14:02:39 +01:00
krzys-h 71577b7b0a Fixed #335 and #348 2014-10-31 20:40:19 +01:00
krzys-h c1f931c8ee Added some debug stuff, possible fix for #348 and #335 2014-10-30 22:18:33 +01:00
krzys-h 066344dde3 Fixed screenshoot loading again
issue #335
2014-10-29 21:15:45 +01:00
krzys-h d6d08797ca I forgot to remove some debug stuff 2014-10-29 21:13:12 +01:00
krzys-h f68e7df8d6 Fixed program saving (#352) 2014-10-29 21:06:59 +01:00
CoLoRaptor ca3a1cb02b Changed splashscreens filenames in maindialog.cpp 2014-10-28 10:37:05 +01:00
krzys-h f679b5c84c Sorry, I didn't mean to remove that 2014-10-27 22:09:57 +01:00
krzys-h d75efcc5b2 Fixed problems with loading save screenshots (issue #335) 2014-10-27 22:08:49 +01:00
krzys-h 475f222276 Fixed "Device" tab opening if it was opened in main menu earlier 2014-10-25 19:11:24 +02:00
krzys-h 0d873ad43a Added warning about restarting game in order to apply changes
issue #339
2014-10-25 18:43:02 +02:00
krzys-h 26376c652d Nothing else works, so restart the game on resolution change
Fixes #339 for now, but we'll need alternative solution later
2014-10-25 18:34:29 +02:00
krzys-h fdbc4080c7 But do 182d5206a8 only on Windows, since it works correctly on Linux 2014-10-25 17:28:30 +02:00
krzys-h 182d5206a8 Disable resolution settings in simulation 2014-10-25 17:23:09 +02:00
krzys-h ef1edba307 Fixed #340 again 2014-10-25 17:09:14 +02:00
krzys-h 78d7cc9eef Change userlevels button text via text file 2014-10-25 12:21:13 +02:00
krzys-h db7ab65354 Fixed #344 2014-10-25 12:10:29 +02:00
krzys-h 7d28b9a6da Fixed #340 2014-10-25 12:01:21 +02:00
krzys-h 2d043d46bb Merge branch 'vieux-blood_mode' into dev
Conflicts:
	src/common/restext.cpp
	src/ui/maindialog.cpp
2014-10-22 17:52:17 +02:00
Victor Vieux d019a4990f add option to disable blood 2014-10-21 21:44:17 -07:00
krzys-h 97b7c0cab1 Fixed map turning gray after resizing window 2014-10-20 21:54:52 +02:00
krzys-h c0ac60e4fa Fixed save directories in things not yet refactored to use PHYSFS 2014-10-20 21:15:39 +02:00
krzys-h 0245fdc6c3 Merge branch 'dev-physfs' into dev
Conflicts:
	src/app/app.cpp
2014-10-19 16:18:36 +02:00
krzys-h d7ef0a1a5f Implemented "Apply changes" button (issue #141) 2014-10-19 15:45:59 +02:00
krzys-h 0fb1cb11d4 Changed max and default font size
Min font size is 9, max is now 24 (previously 21)
Default size is now 19 (previously 9)

Closes #330
2014-10-19 13:33:19 +02:00
krzys-h 83abb8ca8e Fixed program saving 2014-10-19 13:18:31 +02:00
krzys-h f65b00089a Merge branch 'dev' into dev-physfs
Conflicts:
	data
2014-10-14 15:42:19 +02:00
krzys-h 9fd6cf5449 Changed all occurences of PPC in the code to TerranovaTeam 2014-10-14 15:26:18 +02:00
Piotr Dziwinski 5274acd624 Merge with dev 2014-10-07 22:15:40 +02:00
krzys-h c29ef4ec41 Fixed some warnings
Removed unused variables and fixed signed/unsigned comparation warnings
2014-09-27 16:49:00 +02:00
krzys-h d3eaf2e1ce Merge branch 'dev-physfs' into dev-physfs-levels 2014-09-26 21:05:55 +02:00
krzys-h 71f84d1e16 Fixed human.png texture 2014-09-26 21:02:54 +02:00
krzys-h de375548ad Userlevel listing 2014-09-26 20:53:11 +02:00
krzys-h 3b1cfdbfb4 Don't use physfs in saving code for now
This requires too much refactoring and we want to release 0.1.5 soon.
We'll need to rewrite saving/loading code to fully implement new level parser anyway.
2014-09-26 19:50:27 +02:00
Piotr Dziwinski 2b86e6e9d9 Rewrite CMainDialog to use physfs 2014-09-21 12:29:06 +02:00
Piotr Dziwinski e4d52d9afb CProfile refactoring 2014-08-12 21:24:33 +02:00
Piotr Dziwinski 9de086390b Remove some more delete checks (#318) 2014-08-10 17:51:47 +02:00
Piotr Dziwinski ac019c263d Remove unnecessary delete checks (#318) 2014-08-09 22:45:07 +02:00
krzys-h ea0615ee05 Fixed #315 2014-08-08 14:03:43 +02:00
krzys-h 7131abd385 Fixed SatCom image loading
Now LoadTexture/SetTexture functions require full path with "textures/" directory
2014-07-24 22:17:49 +02:00
krzys-h 02ba358a89 Help file loading 2014-07-11 16:40:07 +02:00
krzys-h 96d49d84aa Merge branch 'dev' into dev-physfs
Conflicts:
	data
	src/app/gamedata.cpp
	src/ui/control.cpp
	src/ui/edit.cpp
	src/ui/maindialog.cpp
2014-07-11 15:24:44 +02:00
krzys-h 9a6c06665c Removed some old stuff related to Ceebot-Teen 2014-07-10 17:39:45 +02:00
krzys-h c22e55b99a Removed some unused code related to Quit button
The button itself has been removed a long time ago
2014-07-10 16:52:29 +02:00
krzys-h 5223ef1fb1 Fixed mission description loading 2014-07-10 16:36:00 +02:00
krzys-h 106ec014b8 Fixed texture and script loading 2014-07-10 16:25:40 +02:00
krzys-h 7b04f67358 Fixed music loading 2014-07-10 15:38:37 +02:00
krzys-h 1ee0c0e8fe Fixed level list 2014-07-10 15:27:43 +02:00
Krzysztof Dermont aa190bb59b Last changes 2014-06-30 17:40:40 +02:00
krzys-h 1835d2ae58 Removed old code based on #ifs (issue #55) 2014-06-27 19:52:09 +02:00
Mohamed Waheed b7125a5b24 formatting and enhancements for savefile screenshot feature 2014-06-24 20:27:31 +03:00
Mohamed Waheed 613e1d74c4 implemented savefile screenshot feature 2014-06-24 01:35:05 +03:00
Krzysztof Dermont 754154341d More work on PhysFS support
* added output stream
* fixed music loading
2014-06-22 15:01:06 +02:00
Krzysztof Dermont 2260f6bf4f Big part of PhysFS support
* removed -mod argument
* removed -datadir argument
* removed -lang argument
* removed some dead ui code
* added resource manager and file loaders (stream and SDL)
* changed interface textures location to match new directory structure
* removed CGameData for mod support
* added PhysFS support
2014-06-20 23:51:28 +02:00
krzys-h f0d97bfdb9 Better datadir mod support 2014-05-18 12:12:47 +02:00
krzys-h 4a237f5925 CPauseManager 2013-12-31 13:24:09 +01:00
krzys-h 0ff7e55b33 Fix for #177 - save list sorting 2013-12-27 22:28:25 +01:00
krzys-h 1b73893678 Temporary fix for #232 - don't try to show the buttons
This makes SatCom usable for now
2013-12-27 21:46:16 +01:00
krzys-h 246b7e107e Removed prototypes support 2013-12-27 20:36:11 +01:00
krzys-h 9a741a66a4 Changed version display in bottom-right corner to be actually version number instead of date 2013-12-27 11:15:36 +01:00
krzys-h 8b5b2eeaa1 Added error message when CEdit is unable to read a file 2013-12-27 10:50:52 +01:00
krzys-h fcda183b96 Hide userlevels menu in release version
Userlevels aren't working right now (issue #219)
2013-12-26 21:05:58 +01:00
krzys-h 5661f5a413 Fixed "default controls" button (#263) 2013-12-25 19:41:15 +01:00
Piotr Dziwinski 3966e3fce0 Merge branch 'dev-string-in-restext' into dev
Merging branches after code review

This should fix buffer overflow problems with translation strings
2013-12-20 20:22:51 +01:00
Piotr Dziwinski 95661918ce Some further refactoring and test corrections 2013-12-20 20:18:30 +01:00
erihel fe3f9ea38c Sound support changes
* removed 2d sound
* fixed listener orientation (propably issue #235)
* removed unused code and minor refactoring
2013-12-19 22:46:29 +01:00
Piotr Dziwinski 8deb130572 Changed char[] to std::string in restext
Experimental changes
2013-12-04 00:15:39 +01:00
Didier Raboud f4355b8b8e Fix tooltip to display as white and not transparent 2013-11-19 17:12:16 +01:00
Piotr Dziwinski 418f57f8be Buffer overflow fix 2013-11-13 18:51:52 +01:00
Didier Raboud 2acc338c3a Drop now-useless display of licenses.txt in PHASE_GENERIC
The content of licenses.txt in data has gotten useless as the
restrictions got waived, displaying it is useless.
2013-10-30 21:51:05 +01:00
Piotr Dziwinski 5d0d9b5aa5 Fixed some CBot-related memory leaks
* fixed leaks in CScript::CheckToken()
 * fixed leaks in CInterface
 * commented out unused function in robotmain.cpp
2013-10-12 18:50:30 +02:00
krzys-h d70d31acc1 Fix for #232 - Images in SatCom
Only images, icons still don't work
2013-09-28 11:13:45 +02:00
Piotr Dziwinski bfcce26f89 Changes in build organization
* targets are now created in top-level build directory
 * more things are now configured through CMake options
 * changed debug build detection from NDEBUG to DEV_BUILD
 * moved po and desktop directories
 * moved last unit test out of src directory
2013-06-22 01:17:19 +02:00
Piotr Dziwinski 7874aca10c Enhanced logging, option to auto-start mission
* added logging of application events
 * changed debug mode flag to independent debug modes
 * added option to auto-start mission (load a mission immediately
   after startup)
 * removed "enum value out of range" prints
 * some refactoring
2013-06-16 21:54:36 +02:00
Piotr Dziwinski b22d852b4c Fixed variable shadowing warnings
* fixed -Wshadow warnings
 * refactored some constructors
2013-05-27 22:29:42 +02:00
Piotr Dziwinski 12313fecf5 Fixed some memory issues
* invalid pointer, uninitialized buffer
2013-05-27 20:59:50 +02:00
Piotr Dziwinski 8765d58b02 Fixed code formatting
* moved braces to new lines
 * fixed some function/variable names
 * fixed whitespace issues
2013-05-27 10:19:16 +02:00
Piotr Dziwinski 538745a731 Fixed some compilation warnings
* fixed warnings about hiding virtual functions and several others
2013-05-27 10:19:04 +02:00
Piotr Dziwinski b41957f2f9 Corrected some valgrind issues
* fixed several uninitialized variable issues
 * fixed possible memory corruption in CEngine
2013-05-26 11:34:53 +02:00
krzys-h c25b6ab472 Fix for #192 2013-05-12 15:23:26 +02:00
Piotr Dziwinski cec406ea31 Non-power-of-2 padding for background images
* added padding options
 * removed old hardcoded image sizes
2013-05-11 23:12:13 +02:00