Commit Graph

46 Commits (b698c40abff328f30f8bf044d3c0e96cec679507)

Author SHA1 Message Date
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 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 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
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 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 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
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 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 1835d2ae58 Removed old code based on #ifs (issue #55) 2014-06-27 19:52:09 +02:00
krzys-h 4a237f5925 CPauseManager 2013-12-31 13:24:09 +01:00
Piotr Dziwinski 95661918ce Some further refactoring and test corrections 2013-12-20 20:18:30 +01:00
Piotr Dziwinski 8deb130572 Changed char[] to std::string in restext
Experimental changes
2013-12-04 00:15:39 +01: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
krzys-h 07374db2a3 Increased maximum font size 2013-05-01 21:32:40 +02:00
erihel 593be3b776 * Fix for bad file listing (issue #60) 2013-04-11 21:37:19 +02:00
erihel 7146cf8ee6 * Issue #60: Fix for "(null)" instead of time on windows platform 2013-04-08 12:58:00 +02:00
krzys-h 8777c126de Added SatCom translations 2013-03-29 10:03:35 +01:00
erihel 1406464f0c * Changed Set/Get HilateCap to Set/Get HighlightCap
* Changes ReadText in CEdit to fix problem with SatCom links
* Filenames when loading/saving scripts should be fixed on mxe
2013-03-20 21:50:44 +01:00
erihel 0cd64113aa * Implemented CStudio::UpdateDialogList() function for listing saved files 2013-03-17 20:23:57 +01:00
erihel d6bbc99c90 * Changed file loading to fix issue #73
* Moved few functions from misc.cpp to profile.cpp (used to set/get user dir)
* Removed some warnings
* More work to change const char* to std::string
* Some work on file path to fix issue #60 with bad slashes on POSIX platform
2013-03-17 19:01:32 +01:00
Piotr Dziwiński 001d37b257 CInstanceManager refactoring
* removed classes managed by CInstanceManager
   except for CObject, CPyro, CBrain and CPhysics
   because of dependencies
 * refactored instance searching to use existing singleton instances of
   CApplication, CEngine and CRobotMain and calling their getter
   functions
2013-02-17 12:11:56 +01:00
erihel 6f64770714 * Fixes to ingame editor
* Fixes to editor window. It's now possible to resize, move and press buttons
2013-02-09 21:00:07 +01:00
Piotr Dziwinski 97f44035f1 Changing and saving input bindings 2012-10-07 00:46:46 +02:00
Piotr Dziwinski 0ff419560d Event fixes & refactoring
- added new state tracking to Event
- removed old fields from Event
- fixed some issues with Events and fps counter
2012-09-22 00:38:17 +02:00
Piotr Dziwinski 51884cef8e Input bindings rewrite
- moved input bindings to CRobotMain
- added virtual keymod and joystick button key presses
- fixed putenv error; other minor fixes
2012-09-19 18:32:18 +02:00
Zaba999 7bce8f073c Merge branch 'dev' of https://github.com/adiblol/colobot into dev
Conflicts:
	src/ui/slider.cpp
2012-09-18 22:39:10 +02:00
Zaba999 36ae984ac7 Warnings cleaned, left only those connected to commented out code. 2012-09-18 22:33:28 +02:00
Piotr Dziwinski da5d4edeb3 Fixed invalid text alignment 2012-09-18 17:52:36 +02:00
Michał Konopacki c439964d28 [src/ui] CStudio compiles 2012-09-15 22:06:10 +02:00
Piotr Dziwinski ad6bc13dc2 Merge dev-common and various fixes to achieve compilation
- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio
2012-09-15 18:50:51 +02:00
erihel 01cc0fbc49 * latest changes
* all files except studio, map and maindialog should compile
* did some code cleanup
2012-09-11 12:49:41 +02:00
erihel 6ba0f42f22 latest changes; few more classes should compile now 2012-08-31 22:28:07 +02:00
Piotr Dziwinski c2a7375788 Removed trailing whitespace 2012-06-26 23:01:17 +02:00
Piotr Dziwinski ebed57aa22 Whitespace and language change
- changed tabs to spaces and DOS line endings to Unix
  (except in CBot and metafile)
- changed language to English
- fixed #include <d3d.h> in d3dengine.h
2012-06-26 22:23:05 +02:00
Piotr Dziwinski b08a63790c SDL project
- added (very basic) SDL template in CApplication and CEngine
- split project into two targets: colobot_old (dependent on DirectX and WinAPI)
  and colobot_new (dependent on SDL and OpenGL)
- moved sound.h/cpp to old/ and created new template in Snd namespace
- added platform-independent dialog boxes in app/system.h/cpp
2012-06-25 19:59:17 +02:00
Piotr Dziwinski 8bb223e679 Templates for new implementation
- added template of classes/structs for new implementation
- changed #include paths
- updated README files
2012-06-22 16:31:55 +02:00
Piotr Dziwinski b735913deb FPOINT -> Math::Point & other math functions
- changed FPOINT to Math::Point and some functions
  from math module to the new implementation
- moved old function and FPOINT struct declarations to math3d.cpp
- removed some unused functions in math module
- fixed some #include dependencies
- moved #define STRICT and #define D3D_OVERLOADS to compile options
2012-06-13 22:48:35 +02:00
Piotr Dziwinski 697fbdabf1 BOOL -> bool; additional fixes in constructors/destructors 2012-06-10 15:28:12 +02:00
Piotr Dziwinski 680af17819 Fixed include paths and CMakeLists.txt
Additionally, changed #ifndef to #pragma once everywhere
2012-06-10 00:18:08 +02:00
Piotr Dziwinski 449cc186d5 Source files split into modules 2012-04-28 17:53:17 +02:00