Commit Graph

211 Commits (a4b791e298336eda7418bef6ece05fc2a61c7021)

Author SHA1 Message Date
krzys-h fcb052cc8d Added [set/get][build/research[done/enable]] ( ); function fo CBot
* setbuild ( );
* setresearchdone ( );
* setresearchenable ( );
* getbuild ( );
* getresearchdone ( );
* getresearchenable ( );
2013-05-05 14:44:51 +02:00
krzys-h fb5d14dddf Functions playmusic(filename, repeat) and stopmusic()
for MissionController
Parameter repeat can be 0 or 1
2013-05-01 22:11:08 +02:00
krzys-h 9e1870f6bd Removed some warnings
+ fix for previous commit
2013-05-01 13:19:10 +02:00
krzys-h 643153d64d Added function endmission()
Works only with MissionFile version=3
Created for MissionController, but works on any bot
- 1st parameter:
* ResultWin - win mission
* ResultLost - lost mission
* ResultLostQuick - lost mission (Me died)
- 2nd parameter: win/lost delay, like in mission file. Doesn't work for ResultLostQuick.
Please don't use for cheating =)
2013-04-30 21:43:59 +02:00
krzys-h 75950c55ba MissionController improved 2013-04-29 17:26:32 +02:00
XienDev 6a4ac9ce16 Added functions "canbuild(category)" and "buildinfo(category)"
Also fixed issue with undefined behaviour of build(category) function
2013-04-28 16:49:48 +03:00
XienDev 41fb814e99 Added build
Third patch
2013-04-27 18:11:26 +03:00
erihel a693e87293 * Patch for issue #167 2013-04-27 13:03:20 +02:00
krzys-h 69e52e5f24 Removed find() & repeat() functions
Issue #168
2013-04-12 23:28:44 +02:00
krzys-h 0d70b6e2f8 More parameters to destroy()
Also, removed some warnings in script.cpp
2013-03-31 12:04:12 +02:00
krzys-h 90301e24c0 Added field "item" to class "object" in CBot 2013-03-31 10:21:22 +02:00
krzys-h 040a7e8f24 Added function destroy(rank) 2013-03-30 15:43:09 +01:00
krzys-h 8777c126de Added SatCom translations 2013-03-29 10:03:35 +01:00
krzys-h c6d89f6210 Revert "Fix for #30"
This reverts commit bfdd52ade0.
That wasn't working. :(
2013-03-27 21:58:34 +01:00
krzys-h bfdd52ade0 Fix for #30 2013-03-27 21:37:37 +01:00
krzys-h 8f379e5cf1 Changes to Scribbler interface 2013-03-27 19:55:27 +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
krzys-h 37a095b5b6 MORE improvements to produce() 2013-03-01 21:56:52 +01:00
krzys-h 0864e44c7b Fix for #135
jet() parameter > 1
2013-03-01 21:36:38 +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
krzys-h 5d331f37ae Another small fix.
I'm a noob. Sorry.
2013-02-14 17:26:01 +01:00
krzys-h 945299ae5d Small fix 2013-02-14 17:23:26 +01:00
krzys-h e2d0f44961 More fixes to produce()
Now every object can be created.
2013-02-14 17:18:04 +01:00
krzys-h de228f57e8 Small fix in produce() 2013-02-14 16:04:52 +01:00
krzys-h 89a272cf87 produce() extended 2013-02-14 15:48:02 +01:00
krzys-h 59a40088a5 Merge pull request #125 from PaweX/dev 2013-02-13 11:26:17 -08:00
krzys-h 8658d6da80 Added Destroyer from Ceebot-Teen.
We need a new icon for it.
2013-02-13 16:58:19 +01:00
PaweX 86b302eb17 Added cAim(CBotVar* &var, void* user) 2013-02-13 16:20:35 +01:00
PaweX 4128383ee1 Update src/script/script.cpp 2013-02-13 14:04:24 +01:00
PaweX bcd06bd0e8 Function aim(x, y) - "Giv" to "Get" 2013-02-13 13:56:50 +01:00
PaweX f25aed44d2 aim(x,y) - "Giv" to "Get" 2013-02-13 13:48:56 +01:00
PaweX c26c063c5f Additional parameter for function aim(x, y). 2013-02-13 02:36:20 +01:00
PaweX 34a008a49d Additional parameter for function aim(x, y). 2013-02-13 02:32:41 +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 89a3f586a2 Merge branch 'dev' into dev-graphics 2013-01-04 00:05:28 +01:00
Piotr Dziwinski 3e4c1a1ad8 Replaced malloc/free with new/delete
- now new/delete used everywhere except for CBotStack, which
   has to be fixed in other way
 - some segfaults should be fixed with this
2012-12-28 13:37:08 +01:00
Piotr Dziwinski 5574eccebd Engine optimization - rewritten model management
- new class CModelManager
 - rewritten engine object structure in CEngine
 - created shared model data instead of separate objects per each
   model instance
 - minor refactoring
2012-12-26 20:58:02 +01:00
Piotr Dziwinski f6e27099b2 Doxygen/comment fixes and some #include refactoring 2012-10-17 21:55:45 +02:00
Zaba999 7575ffd49b Merge branch 'dev' of https://github.com/colobot/colobot into dev 2012-10-11 23:10:07 +02:00
Zaba999 8a932fed3e Added saving user scripts on game save. Fixed bug in writing script to file. 2012-10-11 23:09:29 +02:00
Piotr Dziwinski 97f44035f1 Changing and saving input bindings 2012-10-07 00:46:46 +02:00
adiblol ac1472621a Fixed not working message(...) CBot function 2012-09-30 17:09:49 +02:00
Piotr Dziwinski caf8e08a8d Enabled CBot (experimental) 2012-09-29 20:27:23 +02:00
Zaba999 f6638a173e Work in progress on opening files, and listing dirs
Fixed includes
profile changed from SimpleIni to boost::ptree -> not finished yet
2012-09-26 22:57:43 +02:00
Zaba999 36ae984ac7 Warnings cleaned, left only those connected to commented out code. 2012-09-18 22:33:28 +02:00
Zaba999 a397922e8d warnings fight in progress. 2012-09-18 00:01:00 +02:00
Zaba999 844e11db4f changes needeto to cimpile on windows. 2012-09-17 20:47:27 +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
Michał Konopacki d439f4fa93 Merge branch 'dev-ui' into dev
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
2012-09-15 16:35:48 +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
Zaba999 479a67a731 Merge with changes from Zaba999 fork. 2012-09-10 23:29:38 +02:00
Piotr Dziwinski af3057df7e Merged changes from dev
Resolved conflicts & added fixes.
2012-07-04 19:56:22 +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 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 9f784e81f8 Switched to new implementation of the rest of math module
- 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
2012-06-19 20:11:47 +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 a8665d2042 Changed #defined constants to consts; typedef struct -> struct 2012-06-11 17:28:27 +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