Piotr Dziwinski
342210b062
GCC 4.6 compilation fixes
2014-10-07 23:25:37 +02:00
Piotr Dziwinski
5274acd624
Merge with dev
2014-10-07 22:15:40 +02:00
krzys-h
2770ee8927
Fixed issue #324
2014-10-07 21:40:51 +02:00
krzys-h
3ef2f976df
Added %chap% for current chapter directory
2014-09-29 21:53:21 +02:00
krzys-h
f2c6b322dd
Replaced std::to_string with boost::lexical_cast<std::string>
...
MXE has problems with std::to_string
2014-09-28 19:25:28 +02:00
krzys-h
ad79babbc1
Made proxyDistance optional
2014-09-27 18:34:08 +02:00
krzys-h
b3fa72c007
Moved effect??.png textures and made pos= in GroundSpot optional
2014-09-27 18:26:29 +02:00
krzys-h
32504be8a9
Fixed TerrainLevel bug
2014-09-27 17:46:52 +02:00
krzys-h
8fab044bcd
Removed more unused variables
2014-09-27 17:16:58 +02:00
krzys-h
c29ef4ec41
Fixed some warnings
...
Removed unused variables and fixed signed/unsigned comparation warnings
2014-09-27 16:49:00 +02:00
krzys-h
de375548ad
Userlevel listing
2014-09-26 20:53:11 +02:00
krzys-h
740036e430
New level parser
...
Known issues:
* TerrainLevel for some reason doesn't work
* %lvl% is not yet implemented everywhere because of hardcoded directories in functions
2014-09-24 22:56:19 +02:00
Piotr Dziwinski
e4d52d9afb
CProfile refactoring
2014-08-12 21:24:33 +02:00
Piotr Dziwinski
360b72ac5a
Fix task stopping checks in CBrain
...
This possibly fixes some issues resulting from improperly
stopping tasks (CTask::Abort() not called before deleting the task).
Found while looking for instances of #318 .
2014-08-10 18:00:40 +02:00
krzys-h
a56e69883f
Removed some unused code
2014-08-06 16:58:36 +02:00
krzys-h
7131abd385
Fixed SatCom image loading
...
Now LoadTexture/SetTexture functions require full path with "textures/" directory
2014-07-24 22:17:49 +02:00
krzys-h
02ba358a89
Help file loading
2014-07-11 16:40:07 +02:00
krzys-h
96d49d84aa
Merge branch 'dev' into dev-physfs
...
Conflicts:
data
src/app/gamedata.cpp
src/ui/control.cpp
src/ui/edit.cpp
src/ui/maindialog.cpp
2014-07-11 15:24:44 +02:00
krzys-h
9a6c06665c
Removed some old stuff related to Ceebot-Teen
2014-07-10 17:39:45 +02:00
krzys-h
c22e55b99a
Removed some unused code related to Quit button
...
The button itself has been removed a long time ago
2014-07-10 16:52:29 +02:00
krzys-h
106ec014b8
Fixed texture and script loading
2014-07-10 16:25:40 +02:00
krzys-h
1835d2ae58
Removed old code based on #ifs (issue #55 )
2014-06-27 19:52:09 +02:00
Krzysztof Dermont
3aca1de731
More work on levels
2014-06-22 21:30:23 +02:00
Krzysztof Dermont
2260f6bf4f
Big part of PhysFS support
...
* 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
2014-06-20 23:51:28 +02:00
krzys-h
f0d97bfdb9
Better datadir mod support
2014-05-18 12:12:47 +02:00
krzys-h
f71658e38d
Random relief generator
2014-04-10 21:50:26 +02:00
Oleg Kosmakov
7485ed790c
Fixes #295
...
When cannon cannot turn at specified angle, it will still reach the edge angle, but return the error code
2014-03-21 13:08:36 +02:00
MrSimbax
e569fd6c39
Fix for #294
2014-03-16 15:25:49 +01:00
krzys-h
fbe2bf8bc7
Added special mode in scene for bots to build more buildings than they usualy can
...
Will be used in "Leaving Earth" missions for making decorative bots building base
2014-03-03 21:55:28 +01:00
krzys-h
a806d4257c
Check if pause music is defined in scene before trying to play it
2014-03-02 16:10:02 +01:00
krzys-h
14709427c4
Fixed compile warning
2014-02-21 14:33:56 +01:00
krzys-h
bb2a9bcfd3
Added option to set pause audio in Scene
2014-02-21 14:19:58 +01:00
Piotr Dziwinski
181a404930
Fixed warnings about unknown commands in scene files
2014-01-18 19:24:08 +01:00
krzys-h
652dc6081d
Removed some unused objects
2014-01-11 23:43:10 +01:00
krzys-h
59935b4706
Changed comments in ObjectType to be object categories; removed unused SEAWEED
2014-01-01 17:33:19 +01:00
krzys-h
90437d1765
Fixed two bugs in dc81cda4b1
...
* win/end scene animations
* produce() was producing empty cells
2014-01-01 16:45:08 +01:00
krzys-h
999490e88b
Code for changing music in pause mode
...
As requested by @Emxx52. Only code for now, we don't have the music yet. Temporairly in developements builds music will change to Prototype (in CBot editor) and Constructive Destruction (in SatCom)
2013-12-31 16:58:21 +01:00
krzys-h
4a237f5925
CPauseManager
2013-12-31 13:24:09 +01:00
krzys-h
3536f1c7cc
Added CObjectManager::Flush()
...
Possible fix for #275
2013-12-30 10:51:29 +01:00
krzys-h
a36450a6da
Added tool= i drive=
2013-12-29 15:03:21 +01:00
krzys-h
dc81cda4b1
Cleaned up creating objects
2013-12-29 12:08:59 +01:00
krzys-h
e9addb5a5e
Added smooth transition in music - issue #205
2013-12-28 12:30:46 +01:00
krzys-h
246b7e107e
Removed prototypes support
2013-12-27 20:36:11 +01:00
krzys-h
555c486fc6
Disable immediat SatCom when scene test is enabled
2013-12-26 22:33:17 +01:00
krzys-h
0f57809f51
Added scene test mode
...
... and fixed a "small" bug in previous commit ;)
2013-12-26 22:13:04 +01:00
krzys-h
3a78d587bd
Exit the game after finishing the mission while using -runscene
2013-12-26 21:54:05 +01:00
krzys-h
8b121910c1
Indentation fixes
2013-12-26 19:39:32 +01:00
krzys-h
46a7aa98b0
Added error message when unable to load script from file specified in CreateObject
2013-12-26 19:36:17 +01:00
krzys-h
0d31f59b12
.takeoff() for SpaceShip ( #265 )
2013-12-26 18:50:05 +01:00
krzys-h
c8ec3f2020
Added "E" as a secondary action button
...
As requested by @Emxx52 on IRC
2013-12-25 19:43:11 +01:00
krzys-h
55fd03ade3
Added WSAD as secondary controls ( #231 )
2013-12-25 19:34:34 +01:00
krzys-h
d0285d6886
Fixed AudioChange
2013-12-25 18:53:32 +01:00
Piotr Dziwinski
8deb130572
Changed char[] to std::string in restext
...
Experimental changes
2013-12-04 00:15:39 +01:00
Didier Raboud
3bcf80a82a
Tweak tooltip margin and correct french jargon comment
2013-11-19 17:22:25 +01:00
Piotr Dziwinski
9017dbbbdb
Fixed CTerrain-related memory leaks
2013-10-13 14:44:12 +02:00
Piotr Dziwinski
5d0d9b5aa5
Fixed some CBot-related memory leaks
...
* fixed leaks in CScript::CheckToken()
* fixed leaks in CInterface
* commented out unused function in robotmain.cpp
2013-10-12 18:50:30 +02:00
erihel
41fa8458c2
Some Ui refactoring
2013-06-24 22:09:39 +02:00
Piotr Dziwinski
bfcce26f89
Changes in build organization
...
* targets are now created in top-level build directory
* more things are now configured through CMake options
* changed debug build detection from NDEBUG to DEV_BUILD
* moved po and desktop directories
* moved last unit test out of src directory
2013-06-22 01:17:19 +02:00
Piotr Dziwinski
28b4e9a634
Fixed terrain light priorities (fix for #139 )
...
* lights illuminating the terrain specified in scene file are now
always moved to front of light ordering
2013-06-20 23:14:37 +02:00
Piotr Dziwinski
7874aca10c
Enhanced logging, option to auto-start mission
...
* added logging of application events
* changed debug mode flag to independent debug modes
* added option to auto-start mission (load a mission immediately
after startup)
* removed "enum value out of range" prints
* some refactoring
2013-06-16 21:54:36 +02:00
Piotr Dziwinski
7cf8811888
Fix for #195
...
* loading time now is not counted in elapsed time
2013-06-13 17:25:58 +02:00
krzys-h
e8e220085a
Fixed bug with showing wrong filename in Level Checker errors after using CacheAudio
2013-06-10 15:44:25 +02:00
Piotr Dziwinski
b22d852b4c
Fixed variable shadowing warnings
...
* fixed -Wshadow warnings
* refactored some constructors
2013-05-27 22:29:42 +02:00
Piotr Dziwinski
950a3474d5
Refactored sound code
...
* fixed formatting and naming to be uniform with rest of code
* moved default implementation of CSound to cpp module
2013-05-27 10:19:16 +02:00
Piotr Dziwinski
8765d58b02
Fixed code formatting
...
* moved braces to new lines
* fixed some function/variable names
* fixed whitespace issues
2013-05-27 10:19:16 +02:00
Piotr Dziwinski
538745a731
Fixed some compilation warnings
...
* fixed warnings about hiding virtual functions and several others
2013-05-27 10:19:04 +02:00
Piotr Dziwinski
b41957f2f9
Corrected some valgrind issues
...
* fixed several uninitialized variable issues
* fixed possible memory corruption in CEngine
2013-05-26 11:34:53 +02:00
krzys-h
f90a4b48f5
Added object.research(type)
2013-05-19 21:48:29 +02:00
krzys-h
b9d0ee034e
Running program in robots created using object.factory()
2013-05-19 16:27:33 +02:00
krzys-h
b65196c17f
Change in goto() for Destroyer
2013-05-18 18:22:18 +02:00
krzys-h
796cb92ffc
Added object.destroy()
2013-05-18 18:04:48 +02:00
krzys-h
8004e68948
Added object.busy()
2013-05-18 18:04:48 +02:00
krzys-h
47d7b80507
Added object.factory(cat)
2013-05-18 18:04:48 +02:00
krzys-h
06cf93f466
Better print fix
2013-05-12 13:05:32 +02:00
Piotr Dziwinski
cec406ea31
Non-power-of-2 padding for background images
...
* added padding options
* removed old hardcoded image sizes
2013-05-11 23:12:13 +02:00
Piotr Dziwinski
dcf4c8941f
Corrected print
2013-05-11 23:11:58 +02:00
krzys-h
40954038ab
Added error message for undefined command
2013-05-05 20:51:08 +02:00
krzys-h
4dcee0a4d1
Added continue at end of every Cmd() check
...
As mentioned in issue #173
2013-05-05 20:38:20 +02:00
krzys-h
dbcc2c61f9
Added Build and Research constants
2013-05-05 20:10:36 +02:00
krzys-h
78e32cf894
Changed MissionController version requirement 3->2
...
Also, adding it before BeginObject isn't wrong, and now recommended because it disables Audio and EndMissionTake commands
2013-05-05 13:43:05 +02:00
krzys-h
6333d2d38e
Removed most of "No such node" messages
2013-05-04 11:56:03 +02:00
krzys-h
26c92d074d
Fixed "ptree is too deep"
2013-05-03 21:39:02 +02:00
krzys-h
f68581a3ae
Improved log levels of trace control
2013-05-03 12:26:26 +02:00
krzys-h
1250f889d9
Improved MissionController movement a little bit
2013-05-02 20:59:20 +02:00
krzys-h
02b65fecd3
Fixed Destroyer button
...
* Commands were executed for all Destroyers on map
* Button can't be clicked when Destroyer is working
2013-05-02 19:17:17 +02:00
krzys-h
8a1e4b1e5f
Added button for Destroyer
...
Issue #142
2013-05-02 17:55:53 +02:00
krzys-h
d9f1b4f69d
Added CacheAudio to level files
2013-05-02 10:53:18 +02:00
krzys-h
c1db140ad3
Updated Main Mnu music
...
For now only code - we need to wait for PiXeL to give us new music :)
2013-05-02 10:44:07 +02:00
krzys-h
d815fbf09e
Saving information to profile ( #154 )
2013-05-01 21:02:43 +02:00
krzys-h
9e1870f6bd
Removed some warnings
...
+ fix for previous commit
2013-05-01 13:19:10 +02:00
krzys-h
f419293207
Minor refactoring
2013-05-01 12:12:32 +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
erihel
2ba146cd63
Fixed problem with test compilation
...
Altered test cmake files to fix linker problem.
Changed tga to png in pyro.
Changed enum in CMotionDummy.
2013-04-29 14:29:12 +02:00
erihel
64162a0e6f
Merge branch 'fix-for-shadows' of https://github.com/xiendev/colobot into xiendev-fix-for-shadows
2013-04-29 14:20:07 +02:00
XienDev
d425e09186
Merge branch 'shadow-bug' into fix-for-shadows
2013-04-29 13:55:02 +03:00
XienDev
658ebe015f
Fix for shadows (bugs #176 and #132 )
2013-04-29 13:51:37 +03:00
krzys-h
5fd64624d3
Fix for game crashing sometimes when using MissionController
2013-04-28 20:24:46 +02:00
erihel
919b0e8114
Merge branch 'dev' of github:colobot/colobot into dev
2013-04-28 20:09:41 +02:00
krzys-h
c7d289c00b
Beggining of MissionController
...
Controling mission using CBot
2013-04-28 20:05:19 +02:00