Commit Graph

866 Commits (6c6f2924388a1f7c1d449d598785fd8c218aeea2)

Author SHA1 Message Date
krzys-h 18b27d258e Fixed bug with white map
I'm not sure when it was introduced, probably in 8f6fd2a131.
It was showing errors like "Couldn't load texture 'map.png'" and "Invalid texture data"
2013-06-10 15:38:55 +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 12313fecf5 Fixed some memory issues
* invalid pointer, uninitialized buffer
2013-05-27 20:59:50 +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
adiblol cc2e192f0d Reorganize string parsing in CBotToken::NextToken to fix #212 2013-05-26 18:40:25 +02:00
Piotr Dziwinski 8f6fd2a131 Changes in texture code & refactoring
* refactored and altered slightly the texture pack code
 * added flushing of texture cache
 * some refactoring and const-correctness in CApplication methods
2013-05-26 14:50:23 +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
Piotr Dziwinski ff101c6973 Fix for #213
Was caused by invalid options for getopt
2013-05-26 10:24:35 +02:00
adiblol 1cd0bc3152 Resizing is fully functional so it can be enabled by default. 2013-05-25 23:18:27 +02:00
krzys-h f90a4b48f5 Added object.research(type) 2013-05-19 21:48:29 +02:00
krzys-h 6798641a71 Translated <erreur> and <sans nom> 2013-05-19 17:03:55 +02:00
krzys-h 6b25608e69 Added progfunc( funcname );
For simple creating of programs executing public functions :)

Example:

    public void object::SecondBot()
    {
        message("It works!");
    }
    extern void object::FirstBot()
    {
        object item = radar(BotFactory);
        item.factory(WheeledGrabber, progfunc("SecondBot"));
    }
2013-05-19 16:56:08 +02:00
krzys-h b9d0ee034e Running program in robots created using object.factory() 2013-05-19 16:27:33 +02:00
krzys-h 7662f312b3 Changed "Inappropariate bot"->"Inappropariate object" in newly added functions 2013-05-18 18:29:07 +02:00
krzys-h b65196c17f Change in goto() for Destroyer 2013-05-18 18:22:18 +02:00
krzys-h 58cc0603cc Fix for build() not being able to build Detroyer 2013-05-18 18:04:48 +02:00
krzys-h 796cb92ffc Added object.destroy() 2013-05-18 18:04:48 +02:00
krzys-h d0de6a88ba Renamed destroy() -> delete() 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
Piotr Dziwinski 07839a561f Unicode symbols for special characters
* added support for special characters from original text bitmaps
2013-05-12 18:38:01 +02:00
krzys-h 61841b3f40 Backwards combatibility for retobject() (#209) 2013-05-12 15:54:35 +02:00
krzys-h 1f77efb9cb Fixed bug with std::bad_alloc when using produce()
I'm not sure why it wasn't happening before, but it's fixed :)
2013-05-12 15:38:09 +02:00
krzys-h c25b6ab472 Fix for #192 2013-05-12 15:23:26 +02:00
krzys-h 04f747b00b Added simple texturepack support (#208) 2013-05-12 14:55:41 +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
Piotr Dziwinski f7f6e10c70 Added check and warning about non-power-of-2 textures 2013-05-11 21:40:09 +02:00
Piotr Dziwinski cc8ed2979b Fixed deleting of CObjectManager
* fix in CApplication destructor
 * re-enabled unit tests
2013-05-11 21:22:03 +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 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 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 9549359b46 Fix for saving wrong Fullscreen value 2013-05-04 20:13:27 +02:00
krzys-h 6333d2d38e Removed most of "No such node" messages 2013-05-04 11:56:03 +02:00
krzys-h c3e95d40a2 Added relative install paths for MXE build 2013-05-03 22:23:36 +02:00
krzys-h 26c92d074d Fixed "ptree is too deep" 2013-05-03 21:39:02 +02:00
krzys-h 64ebda0ab9 Added creating ini file with default values 2013-05-03 21:35:33 +02:00
erihel 5a31a93610 Changed log level in profile.cpp to error 2013-05-03 21:33:19 +02:00
erihel 3c442d17dc Fix for issue #202 with 3D sound disabled 2013-05-03 21:12:39 +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 166a6b4403 Improved music cache 2013-05-02 16:37:11 +02:00
krzys-h 56709f0e56 Small changes to looping main menu music 2013-05-02 10:58:38 +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 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 07374db2a3 Increased maximum font size 2013-05-01 21:32:40 +02:00
krzys-h d815fbf09e Saving information to profile (#154) 2013-05-01 21:02:43 +02:00
krzys-h 23e3e552f3 Made colobot.ini & savegame dir location depended on build type
For Debug, it's current dir
For Release it's like it was before
Made on @CoLoRaptor's request :)
2013-05-01 19:44:55 +02:00
krzys-h 9e1870f6bd Removed some warnings
+ fix for previous commit
2013-05-01 13:19:10 +02:00
krzys-h 293376b82d Removed sound081.wav
It wasn't used in Colobot and caused errors because we removed it from data package.
2013-05-01 12:47:06 +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
krzys-h c2932f4ee3 Added new Intro music (by PiXeL) 2013-04-29 15:33:28 +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
krzys-h fc28a8e840 Implemented EndMissionNever (#181) 2013-04-28 18:33:59 +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
erihel 5669053de0 Some code refactoring
Changed vehicule (french) to vehicle (english) in enums and variables
2013-04-27 17:50:30 +02:00
XienDev 41fb814e99 Added build
Third patch
2013-04-27 18:11:26 +03:00
krzys-h 4f1e000cea Fix for #167 when starting mission
+ various fixes
2013-04-27 13:43:01 +02:00
erihel a693e87293 * Patch for issue #167 2013-04-27 13:03:20 +02:00
erihel 45f06cec51 * Fix for issue #71: division by zero on init resulted in bad value after 2013-04-26 16:51:17 +02:00
erihel adb4b06550 * Issue #173 2013-04-26 15:55:06 +02:00
erihel 1828e60c92 * Changed order of reading Audio and AudioChange (issue #173) 2013-04-26 15:34:02 +02:00
erihel 88478990b9 * Fix a problem with CleanUp function trying to clean up music cache twice 2013-04-26 14:15:11 +02:00
Erihel eb37da86ce Merge pull request #187 from xiendev/Programs-list-size
Fixes size of a programs list control
2013-04-26 04:56:58 -07:00
XienDev 02cb9a6993 Fixes programs list size 2013-04-25 22:11:36 +03:00
XienDev b8d2ce2e4e Welcome screen blinking fix 2013-04-25 22:05:27 +03:00
erihel 6a1dba0f15 * Resetting arm position on abort for sniffer (issue #162) 2013-04-23 12:05:04 +02:00
erihel 1932cfbfd0 Merge branch 'dev' of github:colobot/colobot into dev 2013-04-20 19:42:05 +02:00
erihel 32fdf993ea * Changed order of libs in cmake for clipboard 2013-04-20 19:41:39 +02:00
krzys-h 364482f022 Fix for #180 (bug in commit dd180dd887) 2013-04-20 15:17:40 +02:00
krzys-h dd180dd887 Added powermin= and powermax= parameters
Issue #174
2013-04-20 12:08:48 +02:00
krzys-h 81fcde4d67 Fix for "Ability to select the object in Vault"
Issue #170
2013-04-20 11:17:21 +02:00
krzys-h ec68802136 Fix for not saving robot programs
It was Windows-only bug.
issue #137
2013-04-20 10:57:42 +02:00
krzys-h 90c691ab0f Small fix to music cache 2013-04-20 09:33:54 +02:00
erihel af24aba899 * Key repeating in edit fields 2013-04-18 21:02:25 +02:00
krzys-h 6ea0031d83 Added loading from custom files for Audio 2013-04-13 16:35:35 +02:00
krzys-h cdba398d29 Added music files cache 2013-04-13 16:34:52 +02:00
krzys-h e3b92fb9d8 Some optimalizations to AudioChange 2013-04-13 15:07:27 +02:00
krzys-h ebffda717b Implemented AudioChange (partially)
There is some issues due to #173
Issue #172
2013-04-13 11:44:16 +02:00
krzys-h 69e52e5f24 Removed find() & repeat() functions
Issue #168
2013-04-12 23:28:44 +02:00
krzys-h 7b2e0e6519 Added cheats "all" & "allbuildings" (#163) 2013-04-12 22:53:03 +02:00
erihel 8a0383c9f0 * More work on sound 2013-04-12 01:46:30 +02:00
erihel 82fdc2ba23 * Fixed problem with 2D sound mode 2013-04-11 23:16:32 +02:00
erihel bc760e3513 * Added X11 to libs in CMakefiles for linux build 2013-04-11 21:55:49 +02:00