summaryrefslogtreecommitdiffstats
path: root/src/script
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into dev-graphicsPiotr Dziwinski2013-01-041-27/+20
|\
| * Replaced malloc/free with new/deletePiotr Dziwinski2012-12-281-14/+19
| | | | | | | | | | | | - now new/delete used everywhere except for CBotStack, which has to be fixed in other way - some segfaults should be fixed with this
* | Engine optimization - rewritten model managementPiotr Dziwinski2012-12-261-7/+19
|/ | | | | | | | - new class CModelManager - rewritten engine object structure in CEngine - created shared model data instead of separate objects per each model instance - minor refactoring
* Doxygen/comment fixes and some #include refactoringPiotr Dziwinski2012-10-174-7/+23
|
* Merge branch 'dev' of https://github.com/colobot/colobot into devZaba9992012-10-111-0/+1
|\
| * Changing and saving input bindingsPiotr Dziwinski2012-10-071-0/+1
| |
* | Added saving user scripts on game save. Fixed bug in writing script to file.Zaba9992012-10-111-17/+13
|/
* Fixed not working message(...) CBot functionadiblol2012-09-301-0/+1
|
* Enabled CBot (experimental)Piotr Dziwinski2012-09-291-14/+17
|
* Work in progress on opening files, and listing dirsZaba9992012-09-261-2/+2
| | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet
* Warnings cleaned, left only those connected to commented out code.Zaba9992012-09-182-4/+4
|
* warnings fight in progress.Zaba9992012-09-183-10/+11
|
* changes needeto to cimpile on windows.Zaba9992012-09-172-18/+19
|
* Merge dev-common and various fixes to achieve compilationPiotr Dziwinski2012-09-155-41/+19
|\ | | | | | | | | | | | | | | - 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
* \ Merge branch 'dev-ui' into devMichał Konopacki2012-09-152-9/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | * latest changeserihel2012-09-112-10/+10
| |/ | | | | | | | | * all files except studio, map and maindialog should compile * did some code cleanup
* / Merge with changes from Zaba999 fork.Zaba9992012-09-106-787/+840
|/
* Merged changes from devPiotr Dziwinski2012-07-041-425/+0
| | | | Resolved conflicts & added fixes.
* Removed trailing whitespacePiotr Dziwinski2012-06-262-10/+10
|
* Whitespace and language changePiotr Dziwinski2012-06-268-6089/+6089
| | | | | | | - 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
* Templates for new implementationPiotr Dziwinski2012-06-224-18/+18
| | | | | | - added template of classes/structs for new implementation - changed #include paths - updated README files
* Switched to new implementation of the rest of math modulePiotr Dziwinski2012-06-194-33/+33
| | | | | | | | - changed structs from D3DVECTOR to Math::Vector and from D3DMATRIX to Math::Matrix - changed functions to new Math namespace functions - moved mainmovie module from graphics to object - added Get and Set to Math::Matrix
* FPOINT -> Math::Point & other math functionsPiotr Dziwinski2012-06-134-38/+35
| | | | | | | | | - 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
* Changed #defined constants to consts; typedef struct -> structPiotr Dziwinski2012-06-111-3/+3
|
* BOOL -> bool; additional fixes in constructors/destructorsPiotr Dziwinski2012-06-108-434/+434
|
* Fixed include paths and CMakeLists.txtPiotr Dziwinski2012-06-106-64/+56
| | | | Additionally, changed #ifndef to #pragma once everywhere
* Source files split into modulesPiotr Dziwinski2012-04-288-0/+6100
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-01 13:35:05 +0000