immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,923 Commits
19 Branches
15 Tags
59 MiB
Commit Graph

1571 Commits (34e4fb4508a655f4e4cab4c039f3015305b2b48b)

Author SHA1 Message Date
krzys-h 868b592706 Added -proto to options[] 2013-06-17 16:26:25 +02:00
Piotr Dziwinski b4700e3bed Fix for #133 
* objects are now copied and textures are updated correctly
 * also added function to debug objects
 2013-06-17 11:48:57 +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
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
erihel 593be3b776 * Fix for bad file listing (issue #60) 2013-04-11 21:37:19 +02:00
erihel b0919139bd * Fix for issue #161: function checking for radar didn't check if it's finished 2013-04-11 15:34:03 +02:00
erihel 01309c8bd0 * Added clipboard support (issue #60) 
* Fixed keyboard shortcuts while code editing in game
 2013-04-11 13:37:15 +02:00
erihel 99d386b61a * Fixed problem with MuteAll and some sounds not playing after muting other sounds (like game menu sound) 2013-04-09 13:20:31 +02:00
erihel a66abd4990 * Loading 3D sound settings from profile 2013-04-09 12:20:40 +02:00
erihel 7146cf8ee6 * Issue #60: Fix for "(null)" instead of time on windows platform 2013-04-08 12:58:00 +02:00
erihel 846e7b6578 * Adjusted pan computing function from original game (2D sound should work correctly) 
* Set max sound distance to 110.0f to match original colobot (for issue #123)
 2013-04-08 01:42:12 +02:00
erihel 7513bc5864 * Set distance model to fix issue #123 2013-04-07 16:26:15 +02:00
erihel f4b1cabbde * Sound are too quiet in 3D mode, for now added support for 2D sound option in menu. In 2D mode sounds are normal (Issue #123) 2013-04-07 13:35:39 +02:00
erihel 926126d5ad * Changed loading of scene and player info (there's problem with locales using , as comma separator). Issue #137 
* Changed way of saving files. Now it's not based on slot (from 000 to 999) but it uses save name as a base.
* Changed way of displaying saved games. Listing directory instead of checking from 000 to 999. Issue #138
 2013-04-01 18:24:12 +02:00
krzys-h 9485e1a95f Improved log levels 2013-04-01 12:58:55 +02:00
Piotr Dziwinski ff97de5477 Fixed graphics objects after reset 
Should fix #120 and perhaps some other bugs as well
 2013-03-31 13:06:38 +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 2f7ff844d3 Small fix to CObject::ExploObject 2013-03-31 11:15:45 +02:00
krzys-h a6d68d58e5 And it compiled and worked? o.O 2013-03-31 10:26:37 +02:00
krzys-h 0625f064a7 Merge branch 'dev' of github.com:colobot/colobot into dev 2013-03-31 10:22:08 +02:00
krzys-h 90301e24c0 Added field "item" to class "object" in CBot 2013-03-31 10:21:22 +02:00
erihel 5a60a7a219 Merge branch 'dev' of github:colobot/colobot into dev 2013-03-30 16:04:58 +01:00
erihel b7b5f002a6 * Removed warning while compiling brain.cpp 
* Fix for issue #130
* Fix for issue #128 with wrong sound pitch
 2013-03-30 16:03:25 +01:00
krzys-h 845c8e9437 Merge branch 'dev' of github.com:colobot/colobot into dev 2013-03-30 15:43:39 +01:00
krzys-h 040a7e8f24 Added function destroy(rank) 2013-03-30 15:43:09 +01:00
Piotr Dziwinski e607fed265 Fixed power cell bug (#120) 2013-03-30 14:45:55 +01:00
krzys-h 8777c126de Added SatCom translations 2013-03-29 10:03:35 +01:00
krzys-h b284fd74f3 Changes to fix multilanguage on Windows 
Issue #118
 2013-03-28 15:59:13 +01:00
krzys-h 8659fb984f Added option to lock SatCom 2013-03-27 22:20:50 +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
Piotr Dziwinski 8301a3639b Moved boost flags to CMakeLists 2013-03-27 20:54:04 +01:00
krzys-h 672abbbbca Removed "X" button 2013-03-27 20:38:36 +01:00
krzys-h 3402219438 Changed savegame & profile dir on Windows 2013-03-27 20:24:05 +01:00
krzys-h 8f379e5cf1 Changes to Scribbler interface 2013-03-27 19:55:27 +01:00
krzys-h 0691460682 Added button for grab()/drop() for AlienWasp 2013-03-27 15:30:34 +01:00
erihel e93ed747c2 * Another define to fix linker problems 2013-03-27 15:13:51 +01:00
Didier Raboud 4c1a7057bb Add Linux-specific savegame and profile settings according to the XDG Base Directory Specification 
http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 2013-03-27 10:29:58 +01:00
Didier Raboud 991dbd1e37 Add profile and savegame fetchers in SystemUtils 
This breaks the tests compilation. :/
 2013-03-27 10:20:06 +01:00
krzys-h df5edc703c Added interface button for AlienSpider explosion 
Issue #142
 2013-03-26 15:33:54 +01:00
krzys-h 43c39f60cd Added option "zoom=x;y;z" to CreateObject in mission files 2013-03-25 16:12:18 +01:00
krzys-h 5810fdd717 In Retro mode, robot's lights always blink. 2013-03-24 21:31:31 +01:00
krzys-h f4e222248f Retro mode now disables possibility of writing and running programs 2013-03-24 19:05:20 +01:00
krzys-h 5deb68e698 Small fix in mission files code 2013-03-24 16:35:00 +01:00
krzys-h 5eb4e10c2b Reverted "Fix for issue #149" 
because it was broken again after commit 7ebba6abaa
 2013-03-24 16:05:21 +01:00
Piotr Dziwinski 195d6cded0 Fixed timer functions on win32 
* changed win32 implementation to QueryPerformaceTimer system function
 * refactored system utils code
 * proper tests for time utils and update event creation in application
 * should fix issue #134
 2013-03-24 12:00:12 +01:00
erihel 7ebba6abaa * Changed ending screen (issue #129) 2013-03-23 21:22:44 +01:00
erihel 956efb1feb * Blocked cheat input in SatCom, intro movie and while editing cbot (issue #130) 2013-03-23 20:33:14 +01:00
krzys-h 25c3ba0d3b Basic detection of syntax errors in mission levels 
+ option to enable Retro mode (for now doesn't do enything)
 2013-03-23 19:06:49 +01:00
Piotr Dziwinski 4a30800cf1 Fixes for compiling on MSYS 
* fixed SDL_main() and putenv() issues
 * disabled desktop subdir for MSYS
 * disabled building CBot_console for now
 2013-03-22 19:17:08 +01:00
erihel 1406464f0c * Changed Set/Get HilateCap to Set/Get HighlightCap 
* Changes ReadText in CEdit to fix problem with SatCom links
* Filenames when loading/saving scripts should be fixed on mxe
 2013-03-20 21:50:44 +01:00
erihel 64be7a5df6 * Fix for mxe with boost path 2013-03-20 20:27:19 +01:00
Piotr Dziwinski 3bb83e5595 Changed Linux time function 
With CLOCK_MONOTONIC_RAW, the timer should never go back in time.
 2013-03-19 23:08:39 +01:00
Piotr Dziwinski 025bedecfb Refactored platform-specific code 
Moved functions from .h to .cpp files
 2013-03-19 23:07:39 +01:00
erihel 4abcaae0f7 * Changes std::stoi to atoi as gcc does not support it on windows platform 2013-03-17 23:16:26 +01:00
erihel 0cd64113aa * Implemented CStudio::UpdateDialogList() function for listing saved files 2013-03-17 20:23:57 +01:00
erihel e5aadfdaac Merge branch 'dev' of github:colobot/colobot into dev 2013-03-17 19:05:29 +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 f88e74f887 Fix for issue #129 
Text on exit screen is improperly placed
 2013-03-17 15:05:53 +01:00
erihel 9f5bef030d * Adjusted sound volume to game settings 
* Added fabs to remove logs about pitch having negative values
 2013-03-14 23:03:03 +01:00
erihel 6c783b9033 * Fix for issue #122 with sound not being played in menu after playing mission 2013-03-14 21:30:32 +01:00
Piotr Dziwinski bc859c4c59 VBO override option; argv parsing using getopt 
* added -vbo option to override autodetection of OpenGL VBO extension
 * refactored argument parsing to use getopt()
 * fixed failing UTs
 2013-03-10 15:44:21 +01:00
krzys-h 1f565fdf38 "allmission" default value depends on build type 2013-03-09 15:28:36 +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 Dziwinski f729686539 Fixed segfault in light manager 
Also fixed minor memory leak
 2013-02-28 22:56:44 +01:00
Piotr Dziwinski 08c646bb92 Fixed stupid error, tweaked ambient light colors 
* fixed stupid error in light manager
 * tweaked ambient light colors to 0.1 of diffuse;
   colors should not be oversaturated now
 2013-02-28 22:06:22 +01:00
Piotr Dziwinski b361d27d33 Removed unnecessary print 2013-02-28 20:29:16 +01:00
Piotr Dziwinski b0d86ebe5a Better light sorting 
Should fix lighting issue (#62)
 2013-02-25 21:58:01 +01:00
erihel 3a594dc3a8 * Changed AdjustFrequency formula 
* Changed SetVolume to match orginal game formula
 2013-02-24 18:04:38 +01:00
erihel ba2df2cb42 * Fix for satcom freeze 2013-02-24 01:40:55 +01:00
Piotr Dziwinski 64af5f5be0 Reverted RotateAngle to old formula 
This should solve incontinuities in angle calculations, possibly
fixing the "teleportation bug"
 2013-02-21 12:26:01 +01:00
krzys-h c42515927e Music restarting on PHASE_WELCOME2 2013-02-17 13:28:04 +01:00
krzys-h c79c176e46 Show compilation date in main menu 2013-02-17 13:20:18 +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 551d6c4d95 Additional parameter for function aim(x, y). 2013-02-13 02:59:40 +01:00
PaweX 34e758a9da Additional parameter for function aim(x, y) 2013-02-13 02:44:43 +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
adiblol d3106c73ff More camera distance from AlienQueen 2013-02-11 22:59:51 +01:00
erihel c7371da676 * Fixed crash when inputing cheats 2013-02-11 20:17:43 +01:00
erihel 3f6a6a9eef * Syntax highlighting in cbot editor (needs to be tested) 2013-02-09 23:49:38 +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 209c6412ae Refactoring in tests infrastructure 
* all tests are now in /test/ subdirectory
 * unit tests concatenated to one executable (TODO: ui, common)
 * preparation for test environments (OpenGL and others)
 * removed old TestCBot
 2013-02-03 20:03:36 +01:00
Piotr Dziwinski a937a7b6ec Changed model min/max to LOD levels 2013-01-27 11:43:53 +01:00
Didier Raboud b1360231ca In manpage, correct first header to be 'NAME' not 'COLOBOT' 2013-01-20 14:28:33 +01:00
Piotr Dziwinski b50f9ae8b7 Fixed some clang warnings 2013-01-17 20:54:35 +01:00
Piotr Dziwinski 4421430bae Fixed edit_test linking issue 2013-01-17 20:54:23 +01:00
erihel 9f75a29e88 * Fixed sound pitch causing segfault 
* Sound support should now compile fine with MXE
* Added cache for 3 music files to speedup loading
* Updated howto
 2013-01-16 01:45:38 +01:00
erihel 01c39c88f6 * Cleaning player list before getting new one (entering user menu several times appended user to existing list) 2013-01-15 22:52:37 +01:00
erihel 58f35e44ae * Removed alut 
* Using libsndfile to load sounds and music
* Added support for playing music files
 2013-01-14 22:55:16 +01:00
erihel 08578c4015 Merge branch 'dev' of github:colobot/colobot into dev 2013-01-09 23:21:37 +01:00
erihel 983373f150 * Fixed pitch calculation (sound in cut scenes will work as well as robot tracks sound) 
* Fixed applying effects to sounds
* Changed volume to range 0.0-1.0 except for values in UI
 2013-01-09 23:19:10 +01:00
krzys-h 9a9cfc51c1 Merge pull request #112 from OdyX/dev-levels-fallback 
In levels' lists, fallback to english
 2013-01-09 04:33:47 -08:00
Piotr Dziwinski 1285712aa2 CMakeLists enhancements 
- compiler detection (clang and gcc version check)
 - compile flags only for src/ subdir
 - system and local include paths
 - fix for clang compilation
 2013-01-08 22:12:09 +01:00
Piotr Dziwinski 5a6b3f005a Merge dev and dev-graphics 2013-01-07 19:43:04 +01:00
Piotr Dziwinski edb1c0cbd6 GLEW fix for some graphics drivers 2013-01-06 23:13:05 +01:00
Marcin Zawadzki ff5c890854 Small fix in detecting language. Fixes needed to compile code using clang 2013-01-05 23:03:26 +01:00
Piotr Dziwinski 8818a8e5db Corrected OpenGL extension detection 
- corrected multitexture and VBO detection
- GLEW is now a required library
- minor CMakeLists refactoring
 2013-01-05 23:03:06 +01:00
erihel fff9d235e4 * Fixed problem with freeing buffers while conneted to a source resulting with "Unable to unload buffer message" 
* Fixed posible segfault while trying to play sound after not loading file properly
 2013-01-04 21:44:16 +01:00
Piotr Dziwinski d1942e1216 Correct font scaling with resolution 2013-01-04 00:29:19 +01:00
Piotr Dziwinski 89a3f586a2 Merge branch 'dev' into dev-graphics 2013-01-04 00:05:28 +01:00
Piotr Dziwinski c9335534d6 Fix for #113 2013-01-04 00:02:13 +01:00
Piotr Dziwinski 2c0c5ddda1 Fixed stupid debug code 
Terrain VBOs should work now
 2013-01-03 23:50:17 +01:00
Didier Raboud ba0679a1d7 Add categories to Desktop Entry file 
As per the "Desktop Menu Specification" 1.0, especially Appendix A.
 2013-01-02 19:00:38 +01:00
Didier Raboud 3fa5e9c9cc In levels' lists, fallback to english 
- Implemented in a naive way: Take the English version if found, but
  continue until the translated version is found. This has the drawback
  of letting the loop reach its end if the level has no translation.
 2013-01-02 12:24:51 +01:00
erihel ea3e97b26d * Fixed problem with scrolling down text fields with mouse scroll 
* Fixed problem with scroll bar not updating position properly in text fields
 2012-12-29 13:32:11 +01:00
erihel 03f232f0f6 Merge branch 'dev' of github:colobot/colobot into dev 2012-12-29 13:00:59 +01:00
Piotr Dziwiński e625665f02 Merge pull request #108 from OdyX/dev-central-cmake-version 
Create a central version
 2012-12-29 02:44:03 -08:00
Didier Raboud 1b4208cdc5 Implement language Char for level files 
This currently lacks fallback to an existing entry for non-translated entries
 2012-12-28 23:06:12 +01:00
Didier Raboud f4c6f49b2f Move language initialisation in SetLanguage 2012-12-28 22:31:47 +01:00
erihel c9ca8f2b62 * Fixed segault when could not set sound pitch (bad logger call) 
* All 81 audio files should be loaded instead of 69 high quality
* Changed volume ajustment formula to proper one
 2012-12-28 21:19:50 +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 2ebe1fbcb6 Fixed spider and worm model loading 2012-12-28 13:23:49 +01:00
Piotr Dziwinski 4cbb63f5b7 Fixed path for loading sounds 2012-12-28 12:06:37 +01:00
Didier Raboud e62996858b Create a central version 
Make it 0.1.0~pre-alpha for now.

- Add it to runtime program
- Add it to -help option
- Add it to manpage
- Update translations
 2012-12-27 17:12:42 +01:00
Piotr Dziwiński b046c33206 Merge pull request #106 from OdyX/dev-fix-translations 
Fix translations
 2012-12-27 07:37:28 -08:00
Piotr Dziwiński 0a0e536d65 Merge pull request #105 from OdyX/dev-desktop-file-man 
Add manpage for colobot
 2012-12-27 07:36:58 -08:00
Piotr Dziwinski 45bee618f9 Fixed unicode rendering bug 2012-12-27 16:32:46 +01:00
Didier Raboud 0d825ed613 Fix locale's loading 
- Always inherit LC_ALL from environment;
- Enforce environment only if the runtime options require it;
 2012-12-27 16:13:26 +01:00
Piotr Dziwinski 3582f107a5 Fixes and refactoring 2012-12-27 14:18:16 +01:00
Didier Raboud 85283a76be Update translations 
In particular, update french
 2012-12-27 14:09:19 +01:00
Didier Raboud 7a5e41e1ec Update colobot.pot using update-pot 2012-12-27 13:54:40 +01:00
Didier Raboud 877774a226 Update translation pot-file and build-target 2012-12-27 13:52:47 +01:00
Didier Raboud afea08d570 Always build manpages 
solves #105
 2012-12-27 13:13:16 +01:00
Didier Raboud 778ae32c12 Add manpage for colobot 
- Translate it with po4a
- Use POD-format as source, and pod2man for building
 2012-12-27 11:05:02 +01:00
Didier Raboud c2ebd5551f Add SVG colobot icon 
- Refer to the icon in the desktop file
- Use rsvg-convert to get scaled PNG versions
- Add librsvg2-bin to travis
 2012-12-27 10:02:18 +01:00
Didier Raboud a75f02089c Add translated freedesktop 'Desktop Entry' file 
- Add po4a as build-dependency for travis
  (but it fallsback to english-only if not found)
- Add (easy) french translation
 2012-12-27 09:56:38 +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
erihel c793d2d4c6 * Changed Ret to Get methods in sound module 
* Added video settings to profile
* Resolution change is now posibble but restart is required
 2012-12-25 21:36:50 +01:00
erihel 1fa5f7a96f * Changed log level in sound module 
* Fixed warnings in sound module
* Fixed problem with map loading when locale with different number separator
 2012-12-25 17:46:48 +01:00
erihel 6d607e3ae8 latest changes 2012-12-21 17:31:55 +01:00
erihel f0e76ad446 sound fix 2012-12-20 21:57:57 +01:00
erihel a6ff654ae3 removing plugins for gold version (for mxe cross compiling) 2012-12-20 20:59:11 +01:00
Piotr Dziwinski f77734e01c Installation path fixes and CMakeLists refactoring 
make && make install should now give a working installation.
 2012-12-20 00:23:12 +01:00
Didier Raboud 7e9ef0c042 Put common CXX flags in common variables 
CMAKE_CXX_FLAGS is taken into account in all builds; build-type-specific
flags are appended to it.
 2012-12-19 16:55:00 +01:00
Didier Raboud 3c976c040b Don't enforce CMake build type on users. 
Only set CMAKE_BUILD_TYPE to Debug when no value is provided.
 2012-12-19 16:52:17 +01:00
Didier Raboud c6c57c0e99 Fix RPath in installed colobot 2012-12-19 08:50:46 +01:00
Didier Raboud a7d837460f Minor cmake grammar fix 
It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them.
 2012-12-18 09:11:57 +01:00
Didier Raboud e062b74a3a Install libCBot to a private directory 
closes #90

- Make it configurable;
- Move stanzas above the src directory inclusion, otherwise the value
  doesn't propagate.
 2012-12-17 10:15:14 +01:00
Didier Raboud 4827440e73 Merge branch 'dev' into dev-use-installed-i18n 
Conflicts:
	src/common/config.h.cmake
 2012-12-16 22:26:29 +01:00
Didier Raboud a266692615 Use default installation paths for i18n. 
This finishes the work started in
19b75e1743 by actually using the
translation where they are installed.
 2012-12-16 21:56:55 +01:00
Didier Raboud c190c3efae Set a default datadir, in sync with the data installation path. 2012-12-16 21:53:48 +01:00
Piotr Dziwinski 56a170391f Split gtest and gmock, fixed using system packages 
- split the bundled gtest and gmock libraries
- allowed the use of system gmock
- refactoring in CMakeLists
 2012-12-16 13:22:58 +01:00
Piotr Dziwinski 72ce040054 Merge branch 'master' into dev 2012-12-15 20:23:58 +01:00
Piotr Dziwinski 4811defca2 Static objects using OpenGL VBOs and display lists 2012-12-14 21:30:35 +01:00
Michał Zieliński 3f79167323 Merge pull request #85 from OdyX/cmake_find_ltdl 
Add FindLTDL cmake module
 2012-12-14 10:10:07 -08:00
Didier Raboud 9b127fc0a3 Add FindLTDL cmake module 
As mentionned in FindLTDL.cmake, this is code that is hereby relicensed
under GPLv3.

closes #68
 2012-12-14 15:50:11 +01:00
Didier Raboud 6946155a56 Inherit translation setting from environment. 
This ensures that users with a correctly-defined locale don't need to
explicitely set the locale.

- By dropping the setlocale content, it fixes the loading of translations.
- Add a Debug log message to check what is put in the environment.
 2012-12-14 15:17:23 +01:00
Didier Raboud 4f9bd4bd77 Update translations with newer colobot.pot. 2012-12-13 22:14:54 +01:00
Didier Raboud 19b75e1743 Handle translations with CMakes. 
closes #81
 2012-12-13 22:10:49 +01:00
Didier Raboud 41cacbc654 Sort translation files. 
This will ease future updates.
 2012-12-13 21:05:49 +01:00
Piotr Dziwinski 3ce488307f Performance counters 2012-10-25 23:29:49 +02:00
Piotr Dziwinski 3845efbbff Main loop enhancement 
Frame updates were posted one frame behind in event queue
 2012-10-25 20:27:40 +02:00
Piotr Dziwinski 688315ab76 ComputeSphereVisibility and fixes in CEngine TODOs 
- view frustum culling with ComputeSphereVisibility - game should run
  faster now
- resolved/removed most TODOs from CEngine
- fixed OpenGL tests
 2012-10-20 23:06:56 +02:00
Piotr Dziwinski 728e7e405d Transparent plant textures 2012-10-20 18:40:24 +02:00
Piotr Dziwinski 40e065aea9 Ground spot texture drawing 2012-10-20 16:34:22 +02:00
Piotr Dziwinski 6d06c9f722 Flare textures should work now 2012-10-19 23:05:41 +02:00
Piotr Dziwinski be4654c63b Fix track mapping and sphere particle position 2012-10-19 22:43:18 +02:00
Piotr Dziwinski a90cd304ba Track texture mapping 2012-10-19 22:37:11 +02:00
Piotr Dziwinski 0305e0ba17 Restext rewrite to runtime initialized arrays 2012-10-17 23:16:19 +02:00
Piotr Dziwinski f6e27099b2 Doxygen/comment fixes and some #include refactoring 2012-10-17 21:55:45 +02:00
Piotr Dziwinski 9738631e5e Removed unnecessary dynamic_casts 2012-10-17 21:48:40 +02:00
Zaba999 0ca089f4d0 Saving scripts on game save should work. Added stub for particle. 2012-10-11 23:30:37 +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
Michał Zieliński dfe21c5a9c Removed Gfx:: from license notice (introduced in 8ad15c0e) 2012-10-08 21:50:38 +02:00
Piotr Dziwinski 97f44035f1 Changing and saving input bindings 2012-10-07 00:46:46 +02:00
adiblol f608828761 Fixed stupid coding mistake in CBotString.cpp 2012-10-07 00:10:20 +02:00
adiblol 70dae8796e Fixed stupid coding mistake in CBotString.cpp 2012-10-07 00:09:50 +02:00
adiblol 7818d5d096 Setting speed now works. Added ability to set 4x and 8x using "speed4" and "speed8" cheat codes respectively. 2012-10-06 23:35:27 +02:00
Piotr Dziwinski 2414861175 Merge branch 'dev' of github.com:colobot/colobot into dev 2012-10-05 23:36:07 +02:00
Piotr Dziwinski fbe19c49c5 Merge branch 'dev-graphics' into dev 2012-10-05 23:27:26 +02:00
Michał Zieliński ec32b1df35 Commented out profile_test 2012-10-05 23:26:13 +02:00
Piotr Dziwinski b68c903747 Disabled window resize 2012-10-05 22:34:22 +02:00
Michał Zieliński b7667cef35 Added "make install" target. 2012-10-05 22:07:58 +02:00
adiblol 0c6b6fccd9 Merge remote-tracking branch 'origin/dev' into dev-graphics 2012-10-05 20:39:23 +02:00
adiblol b5a7708f99 Refactoring: changed UNIT to g_unit in CRobotMain class 2012-10-05 20:37:20 +02:00
Piotr Dziwinski 6fdaf5de46 CParticle rewrite 2012-10-05 18:59:49 +02:00
Piotr Dziwinski ff99b74b25 Some CPyro docs 2012-10-05 18:59:03 +02:00
Piotr Dziwinski 37302a2504 CLightning rewrite 2012-10-05 15:26:24 +02:00
Piotr Dziwinski 703f03f316 CPyro rewrite 2012-10-03 00:30:17 +02:00
Piotr Dziwinski 858b1e35ae Spot light angle fix 2012-10-03 00:29:59 +02:00
Piotr Dziwinski 3f7f013168 Merge branch 'dev' into dev-graphics 2012-10-02 22:17:30 +02:00
Zaba999 4b7ca3f262 Further work on saving profile and directory listing. 2012-10-02 21:44:14 +02:00
adiblol ba3dce3aed Merge remote-tracking branch 'origin/dev' into dev-graphics 2012-09-30 17:10:40 +02:00
adiblol ac1472621a Fixed not working message(...) CBot function 2012-09-30 17:09:49 +02:00
adiblol 8f99efd861 Merge remote-tracking branch 'origin/dev' into dev-graphics 2012-09-30 16:01:39 +02:00
adiblol cb634db2ec Fixed segfault when using empty strings with CBotString::operator+ 2012-09-30 16:00:34 +02:00
Piotr Dziwinski 85d253b094 Fixed bugs in texture coloring 2012-09-30 11:26:59 +02:00
Piotr Dziwinski 8ea4736a46 Font coloring; fix for resize hack 
- added font coloring and changed default color to black
- fixed resize hack incorrectly changing video config,
  but font resizing will not work for now
 2012-09-30 10:56:35 +02:00
adiblol af4ff31b4e Merge remote-tracking branch 'origin/dev' into dev-graphics 2012-09-30 03:20:52 +02:00
adiblol 923616ccac Dirty hack to allow window resizing or even full screen. 
Currently makes text buggy!
(full screen must be initiated by window manager, for example Alt+F11 in Fluxbox)
 2012-09-30 03:18:11 +02:00
adiblol dd8c2d8d92 Merge branch 'dev' of github.com:colobot/colobot into dev 2012-09-30 02:23:49 +02:00
adiblol c36d0c8ed2 Fixed invradar cheat code. 
Replaced CRobotMain::GetCheatRadar with CRobotMain::GetRadar.
Changed logger level of "invalid m_motion" messages.
 2012-09-30 01:51:37 +02:00
Piotr Dziwinski b46dc3850f Map texture painting 2012-09-30 00:23:26 +02:00
Zaba999 95e1d101c8 Merge branch 'dev' of https://github.com/colobot/colobot into dev 2012-09-29 23:53:57 +02:00
Zaba999 aa9df8b1f0 #48 Adding new users works. 2012-09-29 23:52:30 +02:00
Piotr Dziwinski a8554cfae3 Texture coloring 2012-09-29 23:37:38 +02:00
adiblol 4f097c10b3 Merge branch 'dev-graphics' of github.com:colobot/colobot into dev-graphics 2012-09-29 22:49:31 +02:00
Piotr Dziwinski 4193f8a3a9 Fix for transparent objects and fadeouts 2012-09-29 22:44:05 +02:00
Piotr Dziwinski c8f39a4c96 Fixed CEdit delete[] issues 2012-09-29 22:04:39 +02:00
Piotr Dziwinski 86109a8c1e CBotVar SetVal() fix 2012-09-29 21:46:34 +02:00
Piotr Dziwinski caf8e08a8d Enabled CBot (experimental) 2012-09-29 20:27:23 +02:00
Piotr Dziwinski 5a751d9c0d Fixed texture regression 
There was a bug in texture modesetting but only visible after certain
mode changes.
 2012-09-29 19:35:14 +02:00
Piotr Dziwinski 1fa7053ac0 Fixed object selection by clicking 2012-09-29 19:29:51 +02:00
Piotr Dziwinski a38d60d191 Fixed CEdit cursor 2012-09-29 19:29:17 +02:00
Piotr Dziwinski e7e8954384 MXE support and CMake files refactoring 
- added support for cross-compiling with MXE (http://mxe.cc/)
 - refactored CMake files, adding some options and moving definitions
   to more suitable places
 2012-09-29 17:19:23 +02:00
Piotr Dziwinski e9660c47c6 Merge branch 'dev' into dev-graphics 2012-09-29 12:19:00 +02:00
Piotr Dziwinski 677ce3960c Some fixes and optimizations 
- fixed 2nd texture setting
- added padding to some structs for faster access
- changed rendering primitives to glDrawArrays()
- optimized texture modesetting calls
- fixed some valgrind errors
 2012-09-29 10:40:11 +02:00
Zaba999 df4e3dfb6e Small fix in profile + profile_test rewritten to gtest. 2012-09-28 21:03:28 +02:00
unknown 38ebf4c398 Merge branch 'master' of https://github.com/colobot/colobot into dev 2012-09-28 20:17:56 +02:00
erihel 099f6c4f0b * Fixed Issue #54: flags don't show in 3D view 2012-09-28 00:05:49 +02:00
adiblol 77952a85e6 Merge remote-tracking branch 'origin/dev' into dev-graphics 2012-09-27 23:55:13 +02:00
erihel 9f4c1454dc * Ingame help should now display correctly 2012-09-27 23:42:52 +02:00
Piotr Dziwinski 6d0ed0d26a Completely fixed light issues 
Directional and spot lights are now set properly
 2012-09-27 23:18:12 +02:00
Piotr Dziwinski a394c9efec Updated docs and some Doxygen fixes 2012-09-27 20:43:20 +02:00
Piotr Dziwinski 2ef1c8b6f8 Fixed blinking light problem 
- temporarily commented out misbehaving code in CPhysics
- some fixes in CLightManager
- minor refactoring in CRobotMain
 2012-09-27 20:36:52 +02:00
Zaba999 cc9a507054 Profile rewritten to boost. Read/write to ini should work. 
Load/Save should work.
 2012-09-27 00:30:47 +02:00
Piotr Dziwinski 80d3a9bff1 Lighting fix (experimental) 
- changed fixed light allocation to prioritized per-use basis
- minor refactoring in CPlanet and CWater
 2012-09-26 23:18:57 +02:00
Zaba999 400869ff86 Merge branch 'master' of git://github.com/colobot/colobot 2012-09-26 22:59:37 +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
Piotr Dziwinski 2fa4d7b0db Refactored resource and relief loading 
- now loading can be from any image format
- added IntColor struct for precise pixel operations
 2012-09-26 19:18:33 +02:00
Piotr Dziwinski 00acce25d1 Fixed CEdit text input and drawing issues 2012-09-26 17:45:15 +02:00
Piotr Dziwinski 6bdc1e8ac1 Merge master & dev 2012-09-26 16:40:27 +02:00
Piotr Dziwinski 45fd8aad33 Fog color fix; refactoring 
- fixed fog color setting
- removed unused glSecondaryColor and altered struct VertexCol
- minor refactoring in CText
 2012-09-26 16:31:04 +02:00
Michał Zieliński dad42df4c7 made graphics/engine/text cleaner, I hope 2012-09-25 18:44:43 +02:00
erihel 2db419a1e0 * Building should work now without 'ground not flat' message 2012-09-25 18:26:16 +02:00
Michał Zieliński b06544871a made graphics/engine/text cleaner, I hope 2012-09-24 23:55:52 +02:00
Piotr Dziwinski 6cce7ec6fd Removed metafile editor and loader 2012-09-22 21:07:23 +02:00
Piotr Dziwinski b1edcc822f Various fixes 
- disabled UserDir() in path lookup
 - fixed crashes on loading missions in CObject
 - fixed texture bug in CTerrain
 - changed mouse move event handling to avoid flooding event queue
 - enabled all missions for testing
 2012-09-22 17:36:10 +02:00
Piotr Dziwinski fd09071c29 Data dir paths 
- changed access to paths in data directory in CApplication
- models now load from data directory
 2012-09-22 14:40:13 +02:00
erihel 37e7c73f43 * Removed some warnings 2012-09-22 11:48:41 +02:00
Piotr Dziwinski 0ff419560d Event fixes & refactoring 
- added new state tracking to Event
- removed old fields from Event
- fixed some issues with Events and fps counter
 2012-09-22 00:38:17 +02:00
erihel 15ff1d512b * Fixed audio problems 
* Added colobot.ini to CApp in Create function
* Fixes to plugin manager
* Fixed CProfile segfault
 2012-09-22 00:11:16 +02:00
Piotr Dziwinski f5bc8e12d4 Alpha operation fix 2012-09-21 00:14:26 +02:00
Piotr Dziwinski 60c37aac3a robotmain, restext and engine fixes 2012-09-21 00:01:03 +02:00
Zaba999 34a11021da changed paths for models and levels. Now it's possible to load level. Merged with latest trunk 2012-09-20 23:04:37 +02:00
Zaba999 191fdc614e changed paths for models and levels. Now it's possible to load level. 2012-09-20 22:58:00 +02:00
Piotr Dziwinski e25823f984 Checkbox fix; main dialog buttons 2012-09-20 21:47:53 +02:00
Piotr Dziwinski e896b83bcf Whitespace fix 2012-09-20 20:38:14 +02:00
Piotr Dziwinski bd36d76b31 Mouse pos setting, low cpu mode, stats display 2012-09-20 20:37:37 +02:00
Piotr Dziwinski 7b6bbf79c4 Namespace and styling fix 2012-09-19 23:50:28 +02:00
Piotr Dziwinski 7479f486b6 Forgotten fix in dev-graphics 2012-09-19 22:53:06 +02:00
Michał Konopacki 57d33d79ea Changes in Ui, solves part of #47 2012-09-19 22:17:28 +02:00
Piotr Dziwinski 1a79137e90 Mouse wheel fixes 2012-09-19 21:45:41 +02:00
Piotr Dziwinski 10c9d92cd2 Mouse wheel events, motion vectors 
- added mouse wheel events
- added motion vectors to CRobotMain
- other minor changes in event.h
 2012-09-19 21:23:42 +02:00
Piotr Dziwinski 51884cef8e Input bindings rewrite 
- moved input bindings to CRobotMain
- added virtual keymod and joystick button key presses
- fixed putenv error; other minor fixes
 2012-09-19 18:32:18 +02:00
Zaba999 4a639cf543 Fixed includes in ui. 2012-09-19 00:04:21 +02:00
Zaba999 7bce8f073c Merge branch 'dev' of https://github.com/adiblol/colobot into dev 
Conflicts:
	src/ui/slider.cpp
 2012-09-18 22:39:10 +02:00
Zaba999 36ae984ac7 Warnings cleaned, left only those connected to commented out code. 2012-09-18 22:33:28 +02:00
Piotr Dziwinski da5d4edeb3 Fixed invalid text alignment 2012-09-18 17:52:36 +02:00
Zaba999 a397922e8d warnings fight in progress. 2012-09-18 00:01:00 +02:00
Piotr Dziwinski 4b67386a69 Change of background image handling 
- removed old 4 quarter backgrounds
- fixes in texture loading
- other minor fixes
 2012-09-17 23:41:53 +02:00
Zaba999 844e11db4f changes needeto to cimpile on windows. 2012-09-17 20:47:27 +02:00
Piotr Dziwinski 050f9d2542 Fix max lights error 2012-09-16 20:39:32 +02:00
Piotr Dziwinski 2e21435f43 Some memory leaks fixed 2012-09-16 20:00:25 +02:00
Piotr Dziwinski 6a0d150539 Interface works 
- removed mock of CInterface and fixed event passing to CRobotMain
- changed texture names from tga and bmp to png
- UI now works but interaction is still broken
 2012-09-16 10:38:08 +02:00
Piotr Dziwinski af9af56bb0 Successful compilation & running 
- temporarily mocked CSoundInterface and CPluginInterface
- added CRobotMain to application
- successfully compiles & runs, but doesn't display correctly at the
  moment
 2012-09-15 22:19:32 +02:00
Michał Konopacki 2847aad51f Merge branch 'dev' of github.com:adiblol/colobot into dev 2012-09-15 22:07:14 +02:00
Michał Konopacki c439964d28 [src/ui] CStudio compiles 2012-09-15 22:06:10 +02:00
Piotr Dziwinski 8ad15c0ef7 CMainDialog rewrite 
- rewritten CMainDialog and updated CRobotMain
 2012-09-15 21:47:19 +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 95d2f8da2c Merge branch 'dev-object' into dev 
Conflicts:
	src/object/robotmain.cpp
	src/object/robotmain.h
 2012-09-15 16:54:35 +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
Piotr Dziwinski a1400f496b CRobotMain rewrite 
- rewritten CRobotMain
- won't compile yet because of dependencies to CMainDialog
 2012-09-15 15:33:08 +02:00
Piotr Dziwinski 94e7fd9203 Locale settings and translation fixes 
- added locale setting
- removed unused translations
- updated .po files
 2012-09-13 23:28:06 +02:00
Michał Konopacki 8b9954fff4 brain.* mainmovie.* : Partially rewritten 
The remaining part will be revised and rewritten after merge with dev and dev-ui branches
 2012-09-13 22:14:40 +02:00
Piotr Dziwinski 87c87c2c06 Image pixel read/write 2012-09-13 20:40:07 +02:00
Michał Konopacki 9bfdcacc52 Fixes in [object/auto] 2012-09-13 18:28:50 +02:00
Michał Konopacki 8f285465e8 [object/motion] Folder compiles 2012-09-13 17:40:39 +02:00
Piotr Dziwinski 34d7dcf3be Simulation timestamps and input bindings 
- added new simulation time calculations in CApplication
- added simulation frame updates
- rewritten old input binding code and input state tracking
 2012-09-12 23:43:04 +02:00
Zaba999 8b223eb096 all tasks compile. 2012-09-12 22:34:40 +02:00
Michał Konopacki 44e4bcef45 Merge branch 'dev-object' of github.com:adiblol/colobot into dev-object 2012-09-11 23:29:00 +02:00
Zaba999 064fedb814 commented part of tasks that does not compile. 2012-09-11 23:14:55 +02:00
Zaba999 1bb1eb7b87 half of task compile. 2012-09-11 23:11:34 +02:00
Michał Konopacki 68d9c61e97 [src/object] motion.* motionant.* motionbee.* should compile 2012-09-11 22:45:48 +02:00
Piotr Dziwinski 6c21dceb35 Tests rewrite and Doxygen in src/math 
- rewritten tests to use new framework
- updated/reformatted Doxygen
- removed legacy conversions
 2012-09-11 21:14:32 +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 e57be247c2 commented new part in cmakelist and reverted stubs in camera.cpp. Will be commited later after implementation is finished in dev-object branch. 2012-09-10 23:39:22 +02:00
Zaba999 479a67a731 Merge with changes from Zaba999 fork. 2012-09-10 23:29:38 +02:00
Piotr Dziwinski 901f10b2ba Fixed old model format bugs 2012-09-09 23:34:52 +02:00
Piotr Dziwinski cf2295d08d Commenting out src/object/auto temporarily 2012-09-09 17:58:09 +02:00
Piotr Dziwinski efe4f0badd Refactoring in src/common 
- refactored CInstanceManager and some headers
- removed old headers
 2012-09-09 17:51:10 +02:00
Michał Konopacki 6892d37a4f [src/object/auto] Folder rewritten 2012-09-09 14:28:19 +02:00
Piotr Dziwinski b3d5491af4 Merge branch 'dev' into dev-graphics 2012-09-09 13:05:41 +02:00
Piotr Dziwinski c6673b9aee Texture format detection; minor fixes 
- detection of texture format
- fixed depth mask bug
- minor refactoring
 2012-09-09 12:56:09 +02:00
Piotr Dziwinski c2c1294ec9 CTerrain refactoring & fixes 
- refactored CTerrain code
- fixed some minor bugs
 2012-09-08 23:44:14 +02:00
Piotr Dziwinski 31c29ea482 CModelFile fixes; test framework 
- fixes in CModelFile IO
- added Google Test framework for automatic testing
- rewrote modelfile_test in the new framework
 2012-09-08 03:05:12 +02:00
Piotr Dziwinski 08f1b68ffd Fix 2012-09-03 22:37:28 +02:00
Piotr Dziwinski 09fd0e205e Fix 2012-09-03 19:21:37 +02:00
erihel 5903e400d4 Merge branch 'dev' of https://github.com/adiblol/colobot into dev-ui 
Conflicts:
	src/common/restext.cpp
	src/common/restext.h
 2012-09-03 18:26:51 +02:00
erihel 6ba0f42f22 latest changes; few more classes should compile now 2012-08-31 22:28:07 +02:00
Piotr Dziwinski 01fd19d2cd Fix 2012-08-31 21:51:28 +02:00
Piotr Dziwinski e94e26ae1e New model file format 
- added new binary and text formats for models
- fixes and improvements in CModelFile
- tool for converting model files
- minor additions and fixes
 2012-08-31 20:55:16 +02:00
Piotr Dziwinski 7f277c9ab9 Whitespace fix 2012-08-27 01:05:59 +02:00
Piotr Dziwinski 3e52ae4ca9 Fixes in terrain rendering 2012-08-27 01:02:25 +02:00
Alexander Monakov 896291b769 Add translation files 2012-08-25 14:37:51 +04:00
Alexander Monakov 9b4628fd02 Move strings out of restext. Add i18n via gettext 2012-08-25 14:37:51 +04:00
Alexander Monakov 5ff4ce146a Move ResTextType enum to a separate file 2012-08-25 13:51:17 +04:00
Alexander Monakov f5a8a92050 Move ObjectType enum to a separate file 2012-08-25 13:47:48 +04:00
Alexander Monakov 43f7b384e9 Move Error enum to a separate file 2012-08-25 13:46:49 +04:00
Alexander Monakov 5b2bc48986 Move EventType enum to a separate file 2012-08-25 13:45:40 +04:00
erihel 5408fe9252 * added nullptr 
* changed Ret to Get function names
* minor changes
 2012-08-21 21:38:13 +02:00
erihel 4faa1b9c44 merged changes from michkon 2012-08-21 20:55:03 +02:00
erihel 75a76e8252 latest changes 2012-08-21 20:53:39 +02:00
Michał Konopacki 1997682808 added ui/shortcut.* 2012-08-21 15:23:59 +02:00
Michał Konopacki 60950ce66b Typo fix 2012-08-20 21:45:17 +02:00
Michał Konopacki af45bc399f added ui/scroll.* 2012-08-20 21:42:07 +02:00
Michał Konopacki 59ec83c409 added ui/slider.* 2012-08-20 21:35:11 +02:00
Michał Konopacki 02dc368a38 added ui/target.* 2012-08-20 21:31:16 +02:00
Michał Konopacki bd9c581ced added ui/window.* -- not fully ported 2012-08-20 21:22:24 +02:00
Michał Konopacki 7a4ec2adc4 Merge remote-tracking branch 'erihel/dev-ui' into dev-ui 
Conflicts:
	src/ui/button.h
	src/ui/color.h
	src/ui/compass.h
	src/ui/control.h
	src/ui/displayinfo.h
	src/ui/displaytext.h
	src/ui/edit.h
	src/ui/editvalue.h
	src/ui/gauge.h
	src/ui/group.h
	src/ui/image.h
	src/ui/slider.h
 2012-08-20 15:12:26 +02:00
Michał Konopacki 8666d35f7c UI porting 2012-08-20 14:05:36 +02:00
Michał Konopacki 574c07e388 Further improvements in UI porting 2012-08-18 22:56:42 +02:00
erihel 8d4a3ed579 * wrong enum used for text alignment 
* wrong event function used
 2012-08-18 21:04:51 +02:00
erihel 48ad79a03c * minor changes to control.cpp to compile it without errors 2012-08-18 11:30:29 +02:00
erihel c02ac93379 * list.cpp compiles 2012-08-17 23:56:29 +02:00
erihel a00032d075 * ui/label.cpp compiles 2012-08-17 23:05:59 +02:00
erihel ea6269c411 * ui/key.cpp compiles 
* csoundinterface to ccontrol
 2012-08-17 23:03:52 +02:00
erihel 6ff8706d04 * last commit should not include sound changes 2012-08-17 22:49:16 +02:00
erihel c2464d4c71 * changes to ui classes 2012-08-17 22:43:07 +02:00
Michał Konopacki 10b2c562fb First approach to port 2D UI Interface 
- changes in src/ui ; be CAREFUL, not every file is changed in a proper way -> bugs
- necessary changes in object/robotmain.h and common/misc.h/.cpp in order to compile
 2012-08-15 01:48:49 +02:00
Piotr Dziwinski 8b2bca72dd Merge branch 'dev-graphics' into dev 
Documentation, rendering functions & fixes
 2012-08-13 23:13:10 +02:00
Piotr Dziwinski 5b45911856 Improved error messages 
Added some logging and improved error messages displayed to user
 2012-08-13 23:09:30 +02:00
Piotr Dziwinski a2dd39960b Fix 2012-08-13 18:17:54 +02:00
Piotr Dziwinski b68dfcd155 Test fix 2012-08-13 18:03:12 +02:00
Piotr Dziwiński dc3cadd309 Merge pull request #37 from konopackim/dev 
Fixes and console interpreter
 2012-08-13 08:46:03 -07:00
Michał Konopacki e154e654f1 Reduced amount of warnings in CBot library 
Changed most of C-style casting to C++ casting
Commented unused variables
 2012-08-13 01:45:35 +02:00
Piotr Dziwinski 712154bc4f Rendering functions, documentation 
- rewrote the render functions for CEngine, CCloud and CWater
- added documentation
 2012-08-13 00:14:42 +02:00
Piotr Dziwinski 146ad47e4a Merge branch 'dev-graphics' into dev 
CEngine object handling
 2012-08-12 19:30:31 +02:00
Piotr Dziwinski 45a5e1e865 Object handling in CEngine 
- finished rewriting CEngine object, shadow, etc. handling
- refactored texture code
- added new log levels
 2012-08-12 19:28:22 +02:00
erihel 62b545128f * Final changes to plugin interface 
* Added doxygen comments to plugin manager and plugin loader
 2012-08-12 18:37:11 +02:00
erihel f01296690e Merge branch 'dev-opengl' into dev 2012-08-12 17:09:11 +02:00
erihel 5e271e550d * New CPluginManager class for managing plugins based on colobot.ini 
* Moved sound plugin into sound dir
* Minor changes in logger and profile
 2012-08-12 15:00:37 +02:00
Piotr Dziwinski b4b74c30e9 Fixes & testing in CEngine 
- fixed bugs in settings modes, etc.
- some additions and minor refactoring
 2012-08-12 10:45:04 +02:00
Michał Konopacki a9186d1960 Changed GivAttrName() to GetAttrName() 2012-08-11 20:59:35 +02:00
Piotr Dziwinski 1996507fd3 Documentation update 
- updated Doxyfile
- added/changed file, dir and namespace descriptions
- fixed some errors in doxygen tags
 2012-08-11 18:39:16 +02:00
Piotr Dziwinski 7f80ca2971 Render mode setting, refactoring 
- finished SetState in CEngine
- refactored Size and IntSize back to Point and IntPoint
- other minor changes in CEngine
 2012-08-11 17:17:04 +02:00
Piotr Dziwinski 63257034c9 Partial CEngine implementation 
- added rewritten implementation for basic modesetting in CEngine
- started rewriting proper rendering and object handling in CEngine
 2012-08-10 23:31:42 +02:00
erihel 9946459c0c * changed 0, NULL to nullptr 
* changed profile.cpp to use SimpleIni to load config files
* added new CProfile singleton class for loading config
* added SimpleIni to lib/ dir
* added config loading tests
 2012-08-09 23:04:29 +02:00
Piotr Dziwinski c3ab23ac9d Graphics stubs 
- added stubs for functions in CLightning, CParticle and CPyro
- cleaned object.h and physics.h headers
- created temporary stubs to compile CCamera
- other necessary changes to compile successfully
 2012-08-09 22:50:04 +02:00
Piotr Dziwinski acff306cc1 CPlanet implementation 
Added rewritten CPlanet implementation
 2012-08-09 22:49:13 +02:00
Michał Konopacki 7b03a6a2ac CBot console interpreter 
Based on program found in sources
 2012-08-09 22:13:10 +02:00
Michał Konopacki ef7e297efe CBotString.cpp Bug resolve 2012-08-09 22:05:42 +02:00
erihel f1d1cdceee Changes after merge 2012-08-09 21:21:14 +02:00
erihel 611680a72e Merge branch 'dev' of https://github.com/adiblol/colobot into dev 
Conflicts:
	src/sound/sound.h
 2012-08-09 20:20:47 +02:00
Piotr Dziwinski c1936514c0 CWater and CCloud basic implementation 
Added rewritten implementation for CWater and CCloud
Won't link yet because of missing functions
 2012-08-08 23:51:19 +02:00
Piotr Dziwinski bc24b9f9e5 Whitespace fix 2012-08-08 22:35:17 +02:00
Piotr Dziwinski 878eec8eea CTerrain implementation 
Added rewritten CTerrain implementation
Compiles OK, but functions are missing from other classes
Also needs testing
 2012-08-08 21:32:44 +02:00
Michał Konopacki a760e8a749 Cleanups 2012-08-08 02:23:38 +02:00
Michał Konopacki 0919796df7 Transation of comments complete 2012-08-08 02:01:06 +02:00
Michał Konopacki 0844a0f7bd Further CBot translations 2012-08-07 15:46:04 +02:00
Michał Konopacki a1c83c7d0a CBot library comments further translations 2012-08-07 12:46:19 +02:00
Piotr Dziwinski f7e78b21e9 Font rendering 
- implemented rest of CText interface excluding some minor features
 2012-08-06 20:20:50 +02:00
Piotr Dziwinski 61bfb22f27 Basic font rendering 
- added basic font rendering
- minor refactoring & fixes
 2012-08-03 23:23:13 +02:00
Michał Konopacki bf3f9e1860 Commentary translation 2012-08-03 00:50:25 +02:00
Michał Konopacki d00a283519 Comments translation 2012-08-02 19:41:13 +02:00
Piotr Dziwinski 5e637ca028 Switched to new style casts 
- rewrote old C-style casts to new ..._cast<>
- corrected some dangerous casts
- added -Wold-style-cast to compile flags
 2012-07-30 22:59:18 +02:00
Piotr Dziwinski d8a0c8d32e Lines and line strip primitives 
Will probably be useful
 2012-07-30 22:32:28 +02:00
Piotr Dziwinski 220ff9fe52 CCamera rewrite 
Rewritten old code; doesn't compile yet because changes in other
modules are needed.
 2012-07-29 18:42:56 +02:00
Piotr Dziwinski 7c5a3514dd Video mode changing 
- added video mode querying & changing
- added joystick querying & changing
- cleaned up CApplication interface
 2012-07-29 15:09:53 +02:00
Piotr Dziwinski 72c0188ec3 GLEW 
Added GLEW for loading OpenGL extensions
 2012-07-28 23:36:12 +02:00
Piotr Dziwinski db0b880674 Updated Doxygen main page 2012-07-27 18:50:29 +02:00
Piotr Dziwinski 851300d61d Whitespace fix 2012-07-27 18:44:43 +02:00
Piotr Dziwinski ab8e55a651 Merge branch 'dev' into dev-opengl 
Pulled changes & resolved conflicts
 2012-07-27 18:09:50 +02:00
Piotr Dziwinski 4ddcd9f810 Change of paths in src/graphics 
- moved abstract core to src/graphics/core
- moved proper graphics engine to src/graphics/engine
 2012-07-26 22:26:19 +02:00
Piotr Dziwinski 045f17a274 Dynamic light manager 
- rewrote old CLight as CLightManager
 2012-07-26 21:35:04 +02:00
Piotr Dziwinski d1fe0d2dcc Lighting 
- fixed problems with lighting
- added light_test
 2012-07-26 19:05:09 +02:00
Piotr Dziwinski 6b846aa629 Compile fixes 
Fixed some compiling issues
 2012-07-26 00:18:02 +02:00
Piotr Dziwiński 92bcec10c5 Merge pull request #33 from Zaba999/dev 
Changes in CBot
 2012-07-25 15:09:09 -07:00
Piotr Dziwinski bc1c9b5284 Fixed bug in texturing 2012-07-25 20:27:13 +02:00
Piotr Dziwinski 9cd28e26e9 Fix in CMakeLists.txt 2012-07-25 00:28:56 +02:00
Piotr Dziwinski 42963b341f Refactoring of texture code 
- refactored texture structs & functions
- added note about OpenGL extensions
- removed device.cpp as unnecessary
- minor changes in CEngine
 2012-07-25 00:27:01 +02:00
Piotr Dziwinski 9d59204531 Cursor drawing 
- fixed cursor drawing in CEngine
- changed event loop to generate more events
 2012-07-23 21:41:27 +02:00
Piotr Dziwinski 8797569d33 Texture & mouse functions; refactoring & fixes 
- cleaned up and added documentation to engine.h
- refactored CEngine interface and associated structs
- added mouse handling functions in CApplication & CEngine
- fixed bugs in projection matrix setting
- changed texture loading & handling
- added const-values in CDevice & CGLDevice
- changed event management in CApplication
- other minor changes & bugfixes
 2012-07-22 22:05:12 +02:00
Zaba999 26f9149947 Further translations and doxygen comments. 2012-07-20 23:13:02 +02:00
erihel d56db5f4e4 * Chaned plugin interface 
* Added plugin class for plugin loading
* Added plugin loading test
 2012-07-19 19:19:21 +02:00
Piotr Dziwinski 86ea086790 ComputeSphereVisibility function 
- borrowed implementation of ComputeSphereVisibility from libwine
- added -lrt to Linux libs
 2012-07-18 21:47:47 +02:00
Piotr Dziwinski f364f378cf Fixed OpenGL transformations 
- fixed wrong order of transformations
- added transform_test
 2012-07-18 19:08:34 +02:00
Piotr Dziwinski 68a7bafe37 Fixes in texture loading 
- added other texture formats: BGR and BGRA
- fixed texture loading in model viewer
- moved code from texture.cpp module to texture.h
 2012-07-16 19:17:26 +02:00
Piotr Dziwinski 54f4da8792 Fix in model loading; simple model viewer 
- fixed model loading code
- added simple model viewer (model_test) in src/graphics/opengl/test
- added system time stamp code
- split the code in app/system modules to separate headers
- added debug messages in model loading
- minor fixes in OpenGL engine
 2012-07-15 19:17:49 +02:00
Piotr Dziwinski eca6d26459 Minor changes 
- moved mainpage src/doc/docmain.doc.txt to src/app/main.cpp
- removed old modfile modules from src/common
- removed Snd namespace in engine.h
 2012-07-11 20:56:09 +02:00
Piotr Dziwinski 2383a42347 Rewritten model loading 
- written new implementation of CModelFile (old CModFile)
- added stringutils and ioutils in src/common
- removed old CModel (model viewer)
 2012-07-11 20:50:42 +02:00
Zaba999 1910219518 Dependency on WINAPI completely removed. 2012-07-10 22:58:52 +02:00
Piotr Dziwinski 3204360515 Refactoring in math & texture modules 
- moved texture-related structs to texture.h & code to texture.cpp
- cleaned up texture test code
- added Math:: namespace qualifiers to math modules for clarity
 2012-07-06 19:00:22 +02:00
Piotr Dziwinski e8c9945e13 Fixed bug with texturing 
- moved creation-time tex params to Gfx::TextureCreateParams
- fixed bug with texture creation
- added simple test for multitexturing
 2012-07-05 23:47:29 +02:00
Zaba999 dbd62c96aa Fixed code compilation without fpermissive flag. 
Removed Winapi, but now library don't work - work in progress.
Some translations.
 2012-07-04 22:14:28 +02:00
erihel 0e4b070b5f just some fixes 2012-07-04 20:03:17 +02:00
Piotr Dziwinski af3057df7e Merged changes from dev 
Resolved conflicts & added fixes.
 2012-07-04 19:56:22 +02:00
erihel ecab9761d4 * Added OpenAL sound plugin 
Plugin needs some more work and tests. It doesn't support playing music
yet as sound interface is propably going to change a bit.
 2012-07-04 19:38:18 +02:00
Piotr Dziwinski 092e4ae75e Enabled logging & minor fixes 
- added logger to main()
- removed reference to Snd namespace and renamed back to sound.h
- fixed minor issues
 2012-07-04 19:20:22 +02:00
erihel 4a839d8734 * Added CLogger class for loggin info to console or file 
* Added CSoundInterface
* Added basic plugin interface
 2012-07-04 18:04:34 +02:00
Piotr Dziwinski f95df35dc5 Multitexturing support 
- added CImage class for loading/saving images and a simple test for it
- added libpng library to build
- added Gfx::Texture struct
- updated the Gfx::CDevice interface to include new features
- implemented the new features in Gfx::CGLDevice
 2012-07-04 00:04:53 +02:00
Zaba999 fd6147bea0 translations plus small fixes 2012-07-02 21:41:24 +02:00
Piotr Dziwinski d9c5a439d0 CGLDevice implementation 
- extended Gfx::CDevice interface
  - written OpenGL implementation in Gfx::CGLDevice
  - rewrote color and light module
  - added Gfx::VertexCol
  - added array casts to Math::Vector, Math::Matrix and Gfx::Color
 2012-07-01 22:59:22 +02:00
Piotr Dziwinski 9bd4ec03b2 CDevice interface and stub of implementation 
- added CDevice abstract interface
- began implementation of CGLDevice
- added stub for Texture struct
- created CGLDeviceConfig
- changed particule -> particle & other minor changes
 2012-07-01 01:37:30 +02:00
Programerus ca254d70b6 Deleted #include "ClassFILE.cpp" code. 2012-07-01 01:00:27 +02:00
Piotr Dziwinski 00c737b880 Joystick polling with timer 
- added joystick polling through timer
- updated documentation on CApplication class
 2012-06-30 12:26:40 +02:00
Piotr Dziwinski 9a268f5538 Switched back to old standard; addded -Wall 
- removed -std=c++11
- added -Wall and removed most reported warnings
 2012-06-30 10:16:52 +02:00
Piotr Dziwinski e37019943c Event handling, CApplication and switch to c++-11 
- added/changed event structs and event queue in common/event.h
 - added event handling and some minor functions in CApplication
 - switched to --std=c++11 because of union in Event struct
 2012-06-30 00:12:04 +02:00
Piotr Dziwinski 1b83929487 Pulled changes from master branch 2012-06-28 22:54:53 +02:00
Piotr Dziwinski e738c55b73 Removed old code and build target 
- removed directory with old target
- changed CMakeLists.txt to new target only and temporarily commented
  out reference to CBot
- updated README
 2012-06-26 23:39:31 +02:00
Piotr Dziwinski c2a7375788 Removed trailing whitespace 2012-06-26 23:01:17 +02:00
Piotr Dziwinski cf312c0b87 Fixed brief Doxygen description 2012-06-26 22:50:55 +02:00
Piotr Dziwinski bf06998ece Forgotten language change 2012-06-26 22:36:52 +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 b08a63790c SDL project 
- added (very basic) SDL template in CApplication and CEngine
- split project into two targets: colobot_old (dependent on DirectX and WinAPI)
  and colobot_new (dependent on SDL and OpenGL)
- moved sound.h/cpp to old/ and created new template in Snd namespace
- added platform-independent dialog boxes in app/system.h/cpp
 2012-06-25 19:59:17 +02:00
Programerus f58918031c Declarations for graphics/common 2012-06-25 16:37:03 +02:00
Piotr Dziwinski 3478978c21 CApplication and Gfx::CEngine interfaces & other 
- added CApplication and Gfx::CEngine interfaces
- added Gfx::Material struct
- added Math::IntPoint struct
- added template for Gfx::CDevice class
- added templates for Gfx::CGLDevice and Gfx::CGLEngine classes
 2012-06-24 15:41:56 +02:00
Piotr Dziwinski 11c947f212 Fix in light.h 2012-06-22 16:54:02 +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 4531ac88d3 Moved old implementations to src/old 2012-06-22 15:54:16 +02:00
Piotr Dziwinski 11df0ebf94 Vertex and Light structures 2012-06-20 19:34:54 +02:00
Programerus 4ecc4bb4c0 Add functions to namespace. 2012-06-20 20:17:00 +03:00
Programerus d709f9ecaa . 2012-06-20 20:08:21 +03:00
Programerus 81468f8dc9 Struct ColorHSV copied to color.h 2012-06-20 20:07:54 +03:00
Programerus f244921ba9 Struct ColorHSV copied to color.h 2012-06-20 20:01:05 +03:00
Piotr Dziwinski c0461add5f Refactoring of #includes and forward declarations in object/ 2012-06-20 17:00:16 +02:00
Programerus 918f677ae8 Color functions 2012-06-20 17:44:27 +03:00
Programerus 1415bf0bd2 Struct Color 2012-06-20 17:38:27 +03: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 b8027ce9a7 Tests and fixes in math geometry.h module 2012-06-15 16:58:04 +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 b5d16ef340 Fixes in math module 
- rewritten RotateAngle() function and test for it in geometry_test.cpp
- added conv.h - conversion functions
- added comments in math3d.h and d3dmath.h pointing to new functions
- other minor fixes
 2012-06-12 13:48:17 +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 d6525b5661 Changes from master 2012-06-08 20:30:57 +02:00
Piotr Dziwinski 6d754dc45e Moved old math files 2012-06-07 13:35:59 +02:00
Piotr Dziwinski 5dee2731e6 Finished implementation of math functions 2012-06-07 13:35:23 +02:00
Piotr Dziwinski f67a62fb28 Structs continued 2012-05-03 13:35:32 +02:00
Piotr Dziwinski ea442a887d Structs continued 2012-05-02 22:39:43 +02:00
Piotr Dziwinski 2513f6556e Structs continued 
Basic functions finished and tested for matrix and vector.
 2012-05-01 20:05:48 +02:00
Piotr Dziwinski 7369b10a87 Structs continued 2012-04-29 23:21:35 +02:00
Piotr Dziwinski b5b9fdb680 Structs continued 2012-04-28 22:56:07 +02:00
Piotr Dziwinski 1c275dbd78 Structs continued 2012-04-28 22:32:37 +02:00
Piotr Dziwinski d57258ae1c Split math functions; beginning of common structures 2012-04-28 21:46:26 +02:00
Piotr Dziwinski 449cc186d5 Source files split into modules 2012-04-28 17:53:17 +02:00
Piotr Dziwinski eeb69b34d2 Moved docmain.doc.txt 2012-04-28 16:39:30 +02:00
Programerus 0d3564a245 Unneeded files deleted. 2012-04-17 17:01:25 +02:00
Piotr Dziwinski 330972d96b Removed MSVC project files and binary files 2012-04-17 00:52:46 +02:00
Piotr Dziwinski 7cd9f49e59 Merge branch 'master' into mingw_dev 2012-04-17 00:31:16 +02:00
Piotr Dziwinski 698932646a Fixed graphics bug (#18) 2012-04-16 23:34:59 +02:00
Programerus 658226a6f7 Merge branch 'master' of github.com:adiblol/colobot 2012-04-16 23:31:27 +02:00
Programerus 0c2073a80b Fixed graphics bug on MSVC 2010 and MinGW. 2012-04-16 23:27:10 +02:00
Piotr Dziwinski 6d6faaa19d Fixes in file descriptions 2012-04-16 20:51:10 +02:00
Piotr Dziwinski 6b7bfedab2 Merge branch 'master' into mingw_dev 2012-04-16 20:25:03 +02:00
Piotr Dziwinski 121054c6b7 Main documentaion file, fixes in Doxyfile 
* added docmain.doc.txt with Doxygen \mainpage
* fixed paths in Doxyfile
* disabled some graph generation (for now)
 2012-04-16 19:07:17 +02:00
Piotr Dziwinski 45b75ee37b Adding new MinGW branch 2012-04-15 01:02:51 +02:00
Piotr Dziwinski 011d86ed66 Pulled changes from test mingw branch 
* include fixes
* syntax fixes for MinGW
* fixed encoding of restext.cpp
* temporary fix for MinGW in joystick.cpp

Successfully compiles under MinGW :)
 2012-04-15 00:50:13 +02:00
Programerus b2589d2f6a Unneeded files deleted. 2012-04-11 23:16:24 +02:00
Programerus 30d8e6a182 Comment fix. 2012-04-11 23:16:01 +03:00
Programerus 445825e653 Comments translated from French to English. 2012-04-11 23:15:32 +03:00
Programerus 130eb60ba9 Comments translated from French to English. 2012-04-11 21:25:19 +03:00
Programerus e7a6d78cdd Comments translated from French to English. 2012-04-11 21:22:02 +03:00
Programerus 1085c04204 Comment fix. 2012-04-11 21:12:58 +03:00
Programerus b486cfde48 Comments translated from French to English. 2012-04-11 21:12:26 +03:00
Programerus 52fb7f5154 Comments translated from French to English. 2012-04-11 20:47:38 +03:00
Programerus 198f5444df Comments translated from French to English. 2012-04-11 20:43:20 +03:00
Programerus ecd78ea715 Comments translated from French to English. 2012-04-11 17:04:01 +03:00
Programerus b33691f490 Comment fix. 2012-04-11 00:23:03 +03:00
Programerus 18de129d54 Comments translated from French to English. 2012-04-11 00:22:44 +03:00
Programerus bbb83ec2af Comment fix. 2012-04-11 00:20:50 +03:00
Programerus 38d01af159 Comments translated from French to English. 2012-04-11 00:20:26 +03:00
Programerus e6ba3f08dc Comments translated from French to English. 2012-04-11 00:18:19 +03:00
Programerus 5e86333bde Comments translated from French to English. 2012-04-11 00:17:16 +03:00
Programerus 8145215c62 Comments translated from French to English. 2012-04-11 00:12:14 +03:00
Programerus 401197721e Comments translated from French to English. 2012-04-11 00:10:24 +03:00
Programerus 8d7dfc5c3e Comment fix. 2012-04-10 20:49:35 +03:00
Programerus e82a8c52bd Comments translated from French to English. 2012-04-10 20:49:15 +03:00
Programerus 4197469659 Comments translated from French to English. 2012-04-10 20:46:56 +03:00
Programerus 121248c58e Comments translated from French to English. 2012-04-10 20:44:49 +03:00
Programerus 525bfb41ba Comments translated from French to English. 2012-04-10 20:33:08 +03:00
Programerus 08597353ec Comments translated from French to English. 2012-04-10 20:31:41 +03:00
Programerus 216d8ba95a Comments translated from French to English. 2012-04-10 20:22:25 +03:00
Programerus d8afd8dab5 Comments translated from French to English. 2012-04-10 20:20:46 +03:00
Programerus 22b6606c2b Comments translated from French to English. 2012-04-10 20:17:31 +03:00
Programerus 580dde77e4 Comments translated from French to English. 2012-04-10 20:15:18 +03:00
Programerus 6cbd517739 Comments translated from French to English. 2012-04-10 20:09:57 +03:00
Programerus eadbe30bf0 Comments translated from French to English. 2012-04-10 20:08:55 +03:00
Programerus 30d4724c6b Comments translated from French to English. 2012-04-10 20:00:21 +03:00
Programerus a7f74edaea Comments translated from French to English. 2012-04-10 19:57:37 +03:00
Programerus ea4c7e7034 Comment fix. 2012-04-10 19:29:25 +03:00
Programerus 200e139c5c Comments translated from French to English. 2012-04-10 19:28:46 +03:00
Programerus cf01920a4e Comment fix. 2012-04-10 19:22:19 +03:00
Programerus 19c300b17a Comments translated from French to English. 2012-04-10 19:08:47 +03:00
Programerus 5545f232c7 Comments translated from French to English. 2012-04-10 19:00:27 +03:00
Programerus d8cebd443d Comments translated from French to English. 2012-04-10 18:59:24 +03:00
Programerus cacf81e852 Comments translated from French to English. 2012-04-10 18:57:16 +03:00
Programerus bfbdcf297a Comments translated from French to English. 2012-04-10 18:47:27 +03:00
Programerus d49b06a7cb Comments translated from French to English. (partially) 2012-04-10 16:54:20 +03:00
Programerus 4d744862e7 Comments translated from French to English. 2012-04-10 00:45:19 +03:00
Programerus 0b60904b95 Comments translated from French to English. 2012-04-10 00:44:29 +03:00
Programerus aebce55a61 Comments translated from French to English. 2012-04-10 00:39:18 +03:00
Programerus d6101829b6 Comments translated from French to English. 2012-04-10 00:37:56 +03:00
Programerus 76cfe9e923 Comment fix. 2012-04-10 00:33:41 +03:00
Programerus 17c7ffef65 Comments translated from French to English. 2012-04-10 00:33:07 +03:00
Programerus 5d08432a53 Comments translated from French to English. 2012-04-10 00:28:31 +03:00
Programerus 235f767de7 Comments translated from French to English. 2012-04-10 00:24:15 +03:00
Programerus caddc90327 Comment fix. 2012-04-10 00:09:55 +03:00
Programerus 83d188c2b3 Comments translated from French on English. 2012-04-10 00:09:29 +03:00
Programerus 60e7df156d Comments translated from French to English. 2012-04-10 00:06:28 +03:00
Programerus 356e9ef5e0 Comments translated from French to English. 2012-04-10 00:05:01 +03:00
Programerus 265f694241 Comment fix. 2012-04-10 00:03:33 +03:00
Programerus de658d1952 Comments translated from French to English. 2012-04-10 00:03:09 +03:00
Programerus 1919cb2776 Comment fix. 2012-04-09 23:59:27 +03:00
Programerus 20edb7a379 Comments translated from French to English. 2012-04-09 23:58:41 +03:00
Programerus 3dbd661218 Comment fix. 2012-04-09 23:32:50 +03:00
Programerus eca81da72d Comments translated from French to English. 2012-04-09 23:31:24 +03:00
Programerus b69151e06d Comments translated from French to English. 2012-04-09 23:25:37 +03:00
Programerus b8d2d56dca Comment fix. 2012-04-09 19:17:17 +03:00
Programerus bc0eff4895 Comments translated from French to English. 2012-04-09 19:15:33 +03:00
Programerus 82a9a1b233 Comment fix. 2012-04-09 17:37:07 +03:00
Programerus 688157ad2c Comments translated from French to English. 2012-04-09 17:36:45 +03:00
Programerus f7dafb1b9d Comment fix. 2012-04-09 17:34:59 +03:00
Programerus 65a279bba8 Comments translated from French to English. 2012-04-09 17:34:16 +03:00
Programerus 2d01c8b649 Comments translated from French to English. 2012-04-09 17:00:24 +03:00
Programerus f2da16756e Comments translated from French to English. 2012-04-09 16:56:41 +03:00
Programerus 8df6f9c1f0 Comments translated from French to English. 2012-04-08 23:28:16 +03:00
Programerus a69af4f845 Comments translated from French to English. 2012-04-08 23:21:11 +03:00
Programerus a70b3ebfa8 Comments translated from French to English. (partially) 2012-04-08 00:02:06 +03:00
Programerus 00fddf5169 Comments translated from French to English. 2012-04-07 17:07:32 +03:00
Programerus 558a3cb125 Comments translated from French to English. 2012-04-07 17:04:32 +03:00
Piotr Dziwinski dcd5bf8609 Better fix for #17 2012-04-07 15:58:46 +02:00
Programerus b1bf48e9fd Comment fix. 2012-04-07 16:30:51 +03:00
Programerus 699187758d Comments translated from French to English. 2012-04-07 16:29:14 +03:00
Programerus b3fd18d133 Comments translated from French to English. 2012-04-07 00:36:22 +03:00
Programerus 8c0dd5ced2 Comment fix. 2012-04-06 22:13:01 +03:00
Programerus 155c6c151c Comment fix. 2012-04-06 22:12:38 +03:00
Programerus 80cb8c399f Comments translated from French to English. 2012-04-06 22:11:02 +03:00
Programerus 9c03ff837f Comments translated from French to English. 2012-04-06 22:09:00 +03:00
Programerus 6071aea68c Comments translated from French to English. 2012-04-06 22:05:02 +03:00
Programerus cfddac0e46 Comments translated from French to English. 2012-04-06 21:57:20 +03:00
Programerus bb21367eea Comments translated from French to English. (partially) 2012-04-06 02:45:33 +03:00
Programerus b4ddfeacfa Comments translated from French to English. 2012-04-06 00:46:21 +03:00
Programerus 4511a636e0 Comments translated from French to English. 2012-04-06 00:19:43 +03:00
Piotr Dziwinski f25f8229a0 Temporary fix for #17 2012-04-05 22:49:31 +02:00
Piotr Dziwinski 99d42707cb Merge branch 'master' of https://github.com/adiblol/colobot 2012-04-05 22:30:48 +02:00
Piotr Dziwinski 5bd2688eb0 Fixes for GCC and removal of extern inline (#12) 2012-04-05 22:29:50 +02:00
Programerus 346d310b7a Comments translated from French to English. 2012-04-05 23:26:09 +03:00
Piotr Dziwinski 33a5a93728 GCC include and syntax fixes 2012-04-05 22:23:14 +02:00
Programerus c2b493259d Comments translated from French to English. 2012-04-05 02:07:55 +03:00
Programerus a2077103ef Comments translated from French to English. 2012-04-04 20:40:30 +03:00
Programerus 3f00d622fc Comments translated from French to English. 2012-04-04 00:40:00 +03:00
Programerus c24db84ea6 Comment fix. 2012-04-02 23:00:17 +03:00
Programerus 7986a634f2 Comments translated from French to English. 2012-04-02 22:58:35 +03:00
Programerus 4cda4c89a3 Comment fix. 2012-04-02 22:48:47 +03:00
Programerus ce14764127 Comments translated from French to English. 2012-04-02 22:47:08 +03:00
Programerus 6ba74f96a7 Comments translated from French to English. (partially) 2012-04-02 18:11:17 +03:00
Programerus 628f4bce3a Comment fix. 2012-04-02 00:14:04 +03:00
Programerus 4e9460c4bf Comments translated from French to English. 2012-04-02 00:07:39 +03:00
Programerus f1fec6dc80 Comment fix. 2012-04-01 23:44:50 +03:00
Programerus fecacb06e4 Comments translated from French to English. 2012-04-01 23:44:23 +03:00
Programerus e01bc6cb3f Comment fix. 2012-04-01 23:29:01 +03:00
Programerus 6d9bff8ef9 Comments translated from French to English. 2012-04-01 23:26:42 +03:00
Programerus cdb0b4728b Comment fix. 2012-04-01 01:37:19 +03:00
Programerus c9367b4c51 Comments translated from French to English. 2012-04-01 01:25:14 +03:00
Programerus 1067d21b6e Comment fix. 2012-03-31 19:23:33 +03:00
Programerus 637e3f5d19 Comments translated from French to English. 2012-03-31 19:22:46 +03:00
Programerus 298c6952aa Comment fix. 2012-03-31 19:00:56 +03:00
Programerus 5dbb34f3c3 Comments translated from French to English. 2012-03-31 19:00:24 +03:00
Programerus 1fea38ffb6 Comments translated from French to English. (partially) 2012-03-25 23:53:04 +03:00
Programerus 305946e1b4 Comments translated from French to English. 2012-03-25 22:26:41 +03:00
Programerus 43b4667805 Comments translated from French to English. 2012-03-25 22:17:02 +03:00
Programerus 2985717fc2 Comments translated from French to English. 2012-03-25 22:00:31 +03:00
Programerus 6c3bc12f0c Comments translated from French to English. 2012-03-25 21:52:29 +03:00
Programerus 2bfc74ffcb Comments translated from French to English. 2012-03-25 21:43:24 +03:00
Programerus de04994bbb Comments translated from French to English. (partially) 2012-03-24 23:34:39 +01:00
Programerus 1884fc60b9 Comment fix. 2012-03-24 17:20:40 +01:00
Programerus 0d98e01cf9 Comments translated from French to English. 2012-03-24 16:22:51 +01:00
unknown afd53928df Comments translated from French to English. 2012-03-23 23:18:28 +01:00
Piotr Dziwinski ea046a32ee Fixed includes and GCC syntax errors 2012-03-23 22:08:59 +01:00
Programerus f3a6e6c313 TEST. 2012-03-23 21:47:40 +01:00
Programerus 0bfc0a0009 Comments translated from French to English. 2012-03-23 21:46:56 +01:00
Programerus 128f7c06de Comments translated from French to English. 2012-03-23 21:43:30 +01:00
Programerus c0b77d38eb Comments translated from French to English. 2012-03-23 21:37:55 +01:00
Piotr Dziwinski 39f32f2a14 Fixes for CControl derived classes 
CControl has a virtual destructor and constructor without
side effects, so problem of double calls can be fixed
(unlike issue #8)
 2012-03-23 21:19:34 +01:00
Piotr Dziwinski 57a51c7a29 Merge branch 'master' of https://github.com/adiblol/colobot 2012-03-23 21:03:22 +01:00
Piotr Dziwinski fe7a90ac34 Fixed includes and GCC syntax errors 2012-03-23 21:02:53 +01:00
Programerus e5532f83d3 Comment fix. 2012-03-23 21:02:43 +01:00
Programerus 519efddc9b Comment fix. 2012-03-23 20:36:00 +01:00
Programerus b3c54a29d1 Comments translated from French to English. 2012-03-23 20:34:43 +01:00
Piotr Dziwinski 820966a98d Merge branch 'master' of https://github.com/adiblol/colobot 2012-03-23 20:05:10 +01:00
Programerus b2658b47e7 Comments translated from French to English. 2012-03-23 20:04:38 +01:00
Piotr Dziwinski 037821a271 Removed extra d3denum includes 2012-03-23 20:02:44 +01:00
Programerus 955436f5c2 Comment fix. 2012-03-23 19:53:39 +01:00
Programerus 87c34869ef Comment fix. 2012-03-23 19:49:51 +01:00
Piotr Dziwinski 97edcc1674 Fixes in auto* modules 
- fixed missing #includes and case in file names
 - fixed syntax errors reported by GCC
 - did not fix issues #8 and #17
 2012-03-23 19:43:42 +01:00
Programerus 02f1ec0b4a Comments translated from French to English. 2012-03-23 18:48:51 +01:00
Programerus 2bb9f16528 Comment fix. 2012-03-22 20:45:28 +01:00
Programerus 7f0f4bb0c1 Comments translated from French to English. 2012-03-22 20:44:56 +01:00
Programerus e074385906 Comment fix. 2012-03-22 20:38:17 +01:00
Programerus 7b506bb7c8 Comments translated from French to English. 2012-03-22 20:37:53 +01:00
Programerus b65b48052c Comment fix. 2012-03-22 20:35:12 +01:00
Programerus d8d720c533 Comments translated from French to English. 2012-03-22 20:34:46 +01:00
Programerus 094eb45b3a Comments translated from French to English. 2012-03-22 19:52:58 +01:00
Programerus a4fd441aa7 Comments translated from French to English. 2012-03-22 19:50:43 +01:00
Programerus a9ae60e3f5 Comments translated from French to English. 2012-03-22 19:33:57 +01:00
Programerus ef0b306899 Comments translated from French to English. 2012-03-22 19:32:12 +01:00
Programerus 2bf05e5d14 Comments translated from French to English. 2012-03-22 17:32:38 +01:00
Programerus 6648fd5dbf Comment fix. 2012-03-22 17:27:40 +01:00
Programerus 242051ac39 Comments translated from French to English. 2012-03-22 17:27:15 +01:00
Programerus 9f49265776 Comment fix. 2012-03-22 17:25:32 +01:00
Programerus 79f4241333 Comments translated from French to English. 2012-03-22 17:24:58 +01:00
Programerus 3faad2b525 Comment fix. 2012-03-22 17:10:52 +01:00
Programerus 0d38773350 Comment fix + DIRECTINPUT_VERSION set. 2012-03-22 17:10:02 +01:00
Programerus 5ae68dbecf Comment fix. 2012-03-22 17:06:19 +01:00
Programerus 728e670672 Comments translated from French to English. 2012-03-22 16:37:28 +01:00
Programerus 96c020a0ea Comment fix. 2012-03-22 16:31:50 +01:00
Programerus cafa6ded34 Comments translated from French to English. 2012-03-22 16:31:20 +01:00
Programerus 7e73ad95d8 Comment fix. 2012-03-22 16:27:40 +01:00
Programerus 959bdb70c8 Comments translated from French to English. 2012-03-22 16:27:14 +01:00
Programerus 4e5196d9c0 Comments translated from French to English. 2012-03-22 16:24:02 +01:00
Programerus a4a87366eb Comments translated from French to English. 2012-03-22 16:22:26 +01:00
Programerus feeb7e44af Comments translated from French to English. 2012-03-21 22:33:22 +01:00
Programerus e114e48fad Comment fix. 2012-03-21 22:24:37 +01:00
Programerus 372401861b Comments translated from French to English. 2012-03-21 22:21:08 +01:00
Programerus 3a5f1eec40 Comments translated from French to English. 2012-03-21 22:05:52 +01:00
Programerus 66d84132e1 Comments translated from French to English. 2012-03-21 21:34:46 +01:00
Programerus 768d8ccdd7 Comments translated from French to English. 2012-03-21 21:32:45 +01:00
Programerus 69b4e8dd1d Comments translated from French to English. 2012-03-21 21:29:41 +01:00
Programerus e4d9bb4ec8 Comments translated from French to English. 2012-03-21 21:24:29 +01:00
Programerus 5982aaece6 Comments translated from French to English. 2012-03-21 21:09:59 +01:00
Programerus 3c30fc6625 Comments translated from French to English. 2012-03-20 22:52:44 +01:00
Programerus 90ebc96fbd Comment fix. 2012-03-20 22:39:02 +01:00
Programerus 92803833f9 Comments translated from French to English. 2012-03-20 22:38:12 +01:00
Programerus 7dda7a0ac5 Comments translated from French to English. 2012-03-20 18:47:17 +01:00
Programerus a708159d0f Comment fix. 2012-03-20 18:43:29 +01:00
Programerus fd8517c1b3 Comment fix. 2012-03-20 18:43:01 +01:00
Programerus 507108ae30 Comment fix. 2012-03-20 18:42:12 +01:00
Programerus 4856b98310 Comment fix. 2012-03-20 18:41:22 +01:00
Programerus 32da233476 Comment fix. 2012-03-20 18:40:18 +01:00
Programerus cc70174fa2 Comment fix. 2012-03-20 18:39:37 +01:00
Programerus b576a4a2df Comment fix. 2012-03-20 18:38:34 +01:00
Programerus 78fd384dcd Comment fix. 2012-03-20 18:37:21 +01:00
Programerus 2f2a1874f1 Comment fix. 2012-03-20 18:36:11 +01:00
Programerus 2882ad5a9e Comment fix. 2012-03-20 18:32:46 +01:00
Programerus 6758e3f6a2 Comments translated from French to English. 2012-03-20 17:01:08 +01:00
Krzysztof H 93537652b3 Deleting unused files 2012-03-20 13:17:00 +01:00
Programerus 30927a1d84 Comments translated from French to English. 2012-03-19 20:27:47 +01:00
Programerus b327f33bb5 Comment fix. 2012-03-19 16:49:58 +01:00
Krzysztof H 70e0a81458 Compile error caused by translation 2012-03-19 14:51:09 +01:00
Krzysztof H b2fbcbe787 We need to fix translated files, too. 2012-03-19 14:37:59 +01:00
Krzysztof H f7d892cf4e Last coding fix ;) 2012-03-19 12:44:39 +01:00
Krzysztof H 343cb0ce66 Coding fix 2012-03-19 11:51:09 +01:00
Krzysztof H 81f46cfab6 Coding fix 2012-03-17 21:59:13 +01:00
Programerus 2fdcf1c1a6 Comments translated from French to English. 2012-03-17 21:54:11 +01:00
Programerus 795610502d Comments translated from French to English. 2012-03-17 20:07:14 +01:00
Programerus e6e5aa687c Comments translated from French to English. 2012-03-17 19:55:15 +01:00
Programerus 1e11b76874 Comments translated from French to English. 2012-03-17 19:31:48 +01:00
Programerus 5433c7e6f3 Comments translated from French to English. 2012-03-17 19:24:37 +01:00
Programerus 05a3673236 Comments translated from French to English. 2012-03-17 19:22:05 +01:00
Programerus 29a5bb55be Comments translated from French to English. 2012-03-17 19:19:53 +01:00
Programerus 95f8791d74 Comments translated from French to English. 2012-03-17 16:31:23 +01:00
Programerus 2dd7ece799 Comments translated from French to English. 2012-03-17 16:23:21 +01:00
Programerus 6dae6866d3 Comments translated from French to English. 2012-03-17 16:17:24 +01:00
Programerus 787414f36b Comments translated from French to English. 2012-03-17 16:14:34 +01:00
Programerus aa8c5521eb Comments translated from French to English. 2012-03-17 16:11:57 +01:00
Programerus 61db325d15 Comments translated from French to English. 2012-03-17 15:00:28 +01:00
Programerus 8c52b6717f Comments translated from French to English. 2012-03-17 14:34:51 +01:00
Programerus 2fe1b40750 Comments translated from French to English. 2012-03-17 00:26:01 +01:00
Programerus 18776e6610 Comments translated from French to English. 2012-03-16 23:57:42 +01:00
Programerus 8c8bcb82e4 Comments translated from French to English. 2012-03-16 23:49:27 +01:00
Programerus 65eb675b32 Comments translated from French to English. 2012-03-16 17:29:12 +01:00
Programerus a0e7c86136 Comments translated from French to English. 2012-03-16 15:42:11 +01:00
Programerus f81813598c Comments translated from French to English. 2012-03-15 20:43:38 +01:00
Programerus 0ecf349cf9 Comments translated from French to English. 2012-03-15 20:42:06 +01:00
Programerus 2400ca1de0 Comments translated from French to English. 2012-03-15 20:33:43 +01:00
Programerus 329f70abb6 Comments translated from French to English. 2012-03-15 20:26:15 +01:00
Programerus 6bdbc3bb76 Comments translated from French to English. 2012-03-15 20:09:40 +01:00
Programerus 28c1915b57 Comments translated from French to English. 2012-03-15 20:02:30 +01:00
Programerus a1a17c3a19 Comments translated from French to English. 2012-03-15 19:58:58 +01:00
Programerus cfba346523 Comments translated from French to English. 2012-03-15 19:45:56 +01:00
Programerus 0d331f321e Comments translated from French to English. 2012-03-15 19:38:40 +01:00
Programerus beed490c12 Comments translated from French to English. 2012-03-15 19:00:07 +01:00
Programerus a547b40a30 Comments translated from French to English. 2012-03-15 18:58:37 +01:00
Programerus 604893320c Comments translated from French to English. 2012-03-15 18:45:19 +01:00
Programerus 69396730b1 Comments translated from French to English. 2012-03-15 18:38:18 +01:00
Programerus 6c9bb9c71d Comments translated from French to English. 2012-03-15 18:26:59 +01:00
Programerus 2ce7ddaa71 Comments translated from French to English. 2012-03-15 18:20:15 +01:00
Programerus 66b298f8f3 Comments translated from French to English. 2012-03-15 18:13:06 +01:00
Programerus fd9d06ab46 Comments translated from French to English. 2012-03-15 18:11:48 +01:00
Programerus 34c717dd02 Comments translated from French to English. 2012-03-15 18:06:18 +01:00
Programerus a185e48244 Comments translated from French to English. 2012-03-15 17:34:49 +01:00
Programerus d4aea7d1fe Comments translated from French to English. 2012-03-14 19:17:01 +01:00
Programerus 39b5fe2c7a Comments translated from French to English. 2012-03-14 19:08:37 +01:00
Programerus 1740a82f0d Comments translated from French to English. (correction) 2012-03-14 19:01:06 +01:00