summaryrefslogtreecommitdiffstats
path: root/src/common
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-10-021-2/+2
|\
| * Further work on saving profile and directory listing.Zaba9992012-10-021-2/+2
| |
* | Fixed bugs in texture coloringPiotr Dziwinski2012-09-301-4/+4
|/
* Map texture paintingPiotr Dziwinski2012-09-302-0/+9
|
* MXE support and CMake files refactoringPiotr Dziwinski2012-09-291-2/+1
| | | | | | - added support for cross-compiling with MXE (http://mxe.cc/) - refactored CMake files, adding some options and moving definitions to more suitable places
* Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-09-296-71/+156
|\
| * Small fix in profile + profile_test rewritten to gtest.Zaba9992012-09-284-39/+48
| |
| * Profile rewritten to boost. Read/write to ini should work.Zaba9992012-09-272-22/+26
| | | | | | | | Load/Save should work.
| * Work in progress on opening files, and listing dirsZaba9992012-09-263-30/+102
| | | | | | | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet
* | Updated docs and some Doxygen fixesPiotr Dziwinski2012-09-273-3/+3
| |
* | Refactored resource and relief loadingPiotr Dziwinski2012-09-262-8/+33
|/ | | | | - now loading can be from any image format - added IntColor struct for precise pixel operations
* Removed metafile editor and loaderPiotr Dziwinski2012-09-222-488/+0
|
* Various fixesPiotr Dziwinski2012-09-221-2/+6
| | | | | | | | - disabled UserDir() in path lookup - fixed crashes on loading missions in CObject - fixed texture bug in CTerrain - changed mouse move event handling to avoid flooding event queue - enabled all missions for testing
* Data dir pathsPiotr Dziwinski2012-09-221-0/+20
| | | | | - changed access to paths in data directory in CApplication - models now load from data directory
* Event fixes & refactoringPiotr Dziwinski2012-09-222-63/+61
| | | | | | - added new state tracking to Event - removed old fields from Event - fixed some issues with Events and fps counter
* * Fixed audio problemserihel2012-09-221-1/+1
| | | | | | * Added colobot.ini to CApp in Create function * Fixes to plugin manager * Fixed CProfile segfault
* robotmain, restext and engine fixesPiotr Dziwinski2012-09-211-34/+60
|
* Mouse wheel events, motion vectorsPiotr Dziwinski2012-09-193-54/+85
| | | | | | - added mouse wheel events - added motion vectors to CRobotMain - other minor changes in event.h
* Input bindings rewritePiotr Dziwinski2012-09-195-68/+103
| | | | | | - moved input bindings to CRobotMain - added virtual keymod and joystick button key presses - fixed putenv error; other minor fixes
* Warnings cleaned, left only those connected to commented out code.Zaba9992012-09-182-2/+2
|
* warnings fight in progress.Zaba9992012-09-185-9/+9
|
* Interface worksPiotr Dziwinski2012-09-161-1/+7
| | | | | | - 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
* Successful compilation & runningPiotr Dziwinski2012-09-151-1/+1
| | | | | | | - temporarily mocked CSoundInterface and CPluginInterface - added CRobotMain to application - successfully compiles & runs, but doesn't display correctly at the moment
* CMainDialog rewritePiotr Dziwinski2012-09-151-1/+1
| | | | - rewritten CMainDialog and updated CRobotMain
* Merge dev-common and various fixes to achieve compilationPiotr Dziwinski2012-09-1526-4184/+582
|\ | | | | | | | | | | | | | | - 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
| * Locale settings and translation fixesPiotr Dziwinski2012-09-133-63/+4
| | | | | | | | | | | | - added locale setting - removed unused translations - updated .po files
| * Image pixel read/writePiotr Dziwinski2012-09-134-17/+167
| |
| * Simulation timestamps and input bindingsPiotr Dziwinski2012-09-123-4/+11
| | | | | | | | | | | | - added new simulation time calculations in CApplication - added simulation frame updates - rewritten old input binding code and input state tracking
| * Refactoring in src/commonPiotr Dziwinski2012-09-0922-461/+331
| | | | | | | | | | - refactored CInstanceManager and some headers - removed old headers
* | Merge branch 'dev-ui' into devMichał Konopacki2012-09-152-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/CMakeLists.txt src/common/misc.cpp src/common/misc.h src/object/robotmain.cpp src/object/robotmain.h src/script/cbottoken.cpp src/script/cbottoken.h src/ui/button.cpp src/ui/button.h src/ui/check.cpp src/ui/check.h src/ui/color.cpp src/ui/color.h src/ui/compass.cpp src/ui/compass.h src/ui/control.cpp src/ui/control.h src/ui/displayinfo.cpp src/ui/displayinfo.h src/ui/displaytext.cpp src/ui/displaytext.h src/ui/edit.cpp src/ui/edit.h src/ui/gauge.cpp src/ui/gauge.h src/ui/interface.cpp src/ui/interface.h src/ui/key.cpp src/ui/map.h src/ui/shortcut.h src/ui/slider.h src/ui/target.cpp src/ui/target.h src/ui/window.cpp src/ui/window.h
| * \ Merge branch 'dev' of https://github.com/adiblol/colobot into dev-uierihel2012-09-038-4288/+1650
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/restext.cpp src/common/restext.h
| * | | latest changes; few more classes should compile nowerihel2012-08-312-2/+2
| | | |
| * | | * ui/key.cpp compileserihel2012-08-171-0/+1
| | | | | | | | | | | | | | | | * csoundinterface to ccontrol
| * | | First approach to port 2D UI InterfaceMichał Konopacki2012-08-154-1436/+1439
| | | | | | | | | | | | | | | | | | | | - changes in src/ui ; be CAREFUL, not every file is changed in a proper way -> bugs - necessary changes in object/robotmain.h and common/misc.h/.cpp in order to compile
* | | | Merge with changes from Zaba999 fork.Zaba9992012-09-105-217/+3791
| |_|/ |/| |
* | | Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-09-098-4282/+1645
|\ \ \ | | |/ | |/|
| * | Whitespace fixPiotr Dziwinski2012-08-271-22/+22
| | |
| * | Move strings out of restext. Add i18n via gettextAlexander Monakov2012-08-253-3524/+840
| | |
| * | Move ResTextType enum to a separate fileAlexander Monakov2012-08-252-109/+120
| | |
| * | Move Error enum to a separate fileAlexander Monakov2012-08-252-133/+151
| | |
| * | Move EventType enum to a separate fileAlexander Monakov2012-08-252-516/+534
| |/
* / New model file formatPiotr Dziwinski2012-08-312-15/+75
|/ | | | | | | - added new binary and text formats for models - fixes and improvements in CModelFile - tool for converting model files - minor additions and fixes
* FixPiotr Dziwinski2012-08-131-1/+1
|
* Merge branch 'dev-graphics' into devPiotr Dziwinski2012-08-122-6/+40
|\ | | | | | | CEngine object handling
| * Object handling in CEnginePiotr Dziwinski2012-08-122-6/+40
| | | | | | | | | | | | - finished rewriting CEngine object, shadow, etc. handling - refactored texture code - added new log levels
* | Merge branch 'dev-opengl' into deverihel2012-08-124-39/+49
|\|
| * Documentation updatePiotr Dziwinski2012-08-112-9/+10
| | | | | | | | | | | | - updated Doxyfile - added/changed file, dir and namespace descriptions - fixed some errors in doxygen tags
| * Graphics stubsPiotr Dziwinski2012-08-091-23/+36
| | | | | | | | | | | | | | - added stubs for functions in CLightning, CParticle and CPyro - cleaned object.h and physics.h headers - created temporary stubs to compile CCamera - other necessary changes to compile successfully
| * Font renderingPiotr Dziwinski2012-08-061-7/+3
| | | | | | | | - implemented rest of CText interface excluding some minor features
* | * New CPluginManager class for managing plugins based on colobot.inierihel2012-08-129-26/+106
| | | | | | | | | | * Moved sound plugin into sound dir * Minor changes in logger and profile
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-09 04:19:25 +0000