summaryrefslogtreecommitdiffstats
path: root/src/ui/edit.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into dev-physfskrzys-h2014-10-141-16/+18
|\ | | | | | | | | Conflicts: data
| * Changed all occurences of PPC in the code to TerranovaTeamkrzys-h2014-10-141-16/+18
| |
* | Merge with devPiotr Dziwinski2014-10-071-16/+9
|\|
| * Remove some more delete checks (#318)Piotr Dziwinski2014-08-101-12/+5
| |
| * Fixed #315krzys-h2014-08-081-4/+4
| |
* | Userlevel listingkrzys-h2014-09-261-3/+5
| |
* | Fixed SatCom image loadingkrzys-h2014-07-241-4/+3
| | | | | | | | Now LoadTexture/SetTexture functions require full path with "textures/" directory
* | Help file loadingkrzys-h2014-07-111-11/+15
| |
* | Merge branch 'dev' into dev-physfskrzys-h2014-07-111-4/+0
|\| | | | | | | | | | | | | | | | | Conflicts: data src/app/gamedata.cpp src/ui/control.cpp src/ui/edit.cpp src/ui/maindialog.cpp
| * Removed old code based on #ifs (issue #55)krzys-h2014-06-271-4/+0
| |
* | Fixed texture and script loadingkrzys-h2014-07-101-3/+3
| |
* | More work on PhysFS supportKrzysztof Dermont2014-06-221-10/+13
| | | | | | | | | | * added output stream * fixed music loading
* | Big part of PhysFS supportKrzysztof Dermont2014-06-201-26/+17
|/ | | | | | | | | | | * 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
* Better datadir mod supportkrzys-h2014-05-181-1/+2
|
* Temporary fix for #232 - don't try to show the buttonskrzys-h2013-12-271-0/+2
| | | | This makes SatCom usable for now
* Added error message when CEdit is unable to read a filekrzys-h2013-12-271-1/+4
|
* Changed char[] to std::string in restextPiotr Dziwinski2013-12-041-3/+9
| | | | Experimental changes
* Fix for #232 - Images in SatComkrzys-h2013-09-281-4/+4
| | | | Only images, icons still don't work
* Fixed code formattingPiotr Dziwinski2013-05-271-40/+68
| | | | | | * moved braces to new lines * fixed some function/variable names * fixed whitespace issues
* Removed some warningskrzys-h2013-05-011-5/+5
| | | | + fix for previous commit
* * Added clipboard support (issue #60)erihel2013-04-111-167/+71
| | | | * Fixed keyboard shortcuts while code editing in game
* Added SatCom translationskrzys-h2013-03-291-1/+1
|
* * Changed Set/Get HilateCap to Set/Get HighlightCaperihel2013-03-201-5/+13
| | | | | * Changes ReadText in CEdit to fix problem with SatCom links * Filenames when loading/saving scripts should be fixed on mxe
* * Changes std::stoi to atoi as gcc does not support it on windows platformerihel2013-03-171-7/+1
|
* * Changed file loading to fix issue #73erihel2013-03-171-77/+59
| | | | | | | * 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
* * Fix for satcom freezeerihel2013-02-241-2/+10
|
* CInstanceManager refactoringPiotr Dziwiński2013-02-171-2/+2
| | | | | | | | | * 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
* * Fixed crash when inputing cheatserihel2013-02-111-6/+6
|
* * Syntax highlighting in cbot editor (needs to be tested)erihel2013-02-091-25/+38
|
* * Fixes to ingame editorerihel2013-02-091-2/+2
| | | | * Fixes to editor window. It's now possible to resize, move and press buttons
* * Fixed problem with scrolling down text fields with mouse scrollerihel2012-12-291-27/+33
| | | | * Fixed problem with scroll bar not updating position properly in text fields
* Merge branch 'dev' of https://github.com/colobot/colobot into devZaba9992012-10-111-2/+2
|\
| * Changing and saving input bindingsPiotr Dziwinski2012-10-071-2/+2
| |
* | Added saving user scripts on game save. Fixed bug in writing script to file.Zaba9992012-10-111-3/+2
|/
* Fixed CEdit delete[] issuesPiotr Dziwinski2012-09-291-6/+6
|
* Fixed CEdit cursorPiotr Dziwinski2012-09-291-8/+8
|
* * Ingame help should now display correctlyerihel2012-09-271-45/+47
|
* Fixed CEdit text input and drawing issuesPiotr Dziwinski2012-09-261-12/+12
|
* Event fixes & refactoringPiotr Dziwinski2012-09-221-24/+24
| | | | | | - added new state tracking to Event - removed old fields from Event - fixed some issues with Events and fps counter
* Changes in Ui, solves part of #47Michał Konopacki2012-09-191-39/+39
|
* Mouse wheel fixesPiotr Dziwinski2012-09-191-5/+5
|
* Input bindings rewritePiotr Dziwinski2012-09-191-7/+5
| | | | | | - moved input bindings to CRobotMain - added virtual keymod and joystick button key presses - fixed putenv error; other minor fixes
* Fixed includes in ui.Zaba9992012-09-191-1/+1
|
* Merge branch 'dev' of https://github.com/adiblol/colobot into devZaba9992012-09-181-5/+5
|\ | | | | | | | | Conflicts: src/ui/slider.cpp
| * Fixed invalid text alignmentPiotr Dziwinski2012-09-181-5/+5
| |
* | warnings fight in progress.Zaba9992012-09-181-18/+18
|/
* Some memory leaks fixedPiotr Dziwinski2012-09-161-17/+39
|
* Interface worksPiotr Dziwinski2012-09-161-9/+9
| | | | | | - removed mock of CInterface and fixed event passing to CRobotMain - changed texture names from tga and bmp to png - UI now works but interaction is still broken
* Merge dev-common and various fixes to achieve compilationPiotr Dziwinski2012-09-151-2/+6
|\ | | | | | | | | | | | | | | - 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
* | * latest changeserihel2012-09-111-1/+1
| | | | | | | | | | * all files except studio, map and maindialog should compile * did some code cleanup