summaryrefslogtreecommitdiffstats
path: root/src/script/cbottoken.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Added SatCom translationskrzys-h2013-03-291-197/+198
|
* Additional parameter for function aim(x, y).PaweX2013-02-131-1/+1
|
* warnings fight in progress.Zaba9992012-09-181-5/+5
|
* Merge dev-common and various fixes to achieve compilationPiotr Dziwinski2012-09-151-12/+3
|\ | | | | | | | | | | | | | | - 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-151-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-5/+5
| |/ | | | | | | | | * all files except studio, map and maindialog should compile * did some code cleanup
* / Merge with changes from Zaba999 fork.Zaba9992012-09-101-16/+16
|/
* Whitespace and language changePiotr Dziwinski2012-06-261-519/+519
| | | | | | | - 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-221-2/+2
| | | | | | - added template of classes/structs for new implementation - changed #include paths - updated README files
* FPOINT -> Math::Point & other math functionsPiotr Dziwinski2012-06-131-2/+0
| | | | | | | | | - 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
* BOOL -> bool; additional fixes in constructors/destructorsPiotr Dziwinski2012-06-101-78/+78
|
* Fixed include paths and CMakeLists.txtPiotr Dziwinski2012-06-101-8/+8
| | | | Additionally, changed #ifndef to #pragma once everywhere
* Source files split into modulesPiotr Dziwinski2012-04-281-0/+521
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-10 21:24:13 +0000