Commit Graph

1571 Commits (34e4fb4508a655f4e4cab4c039f3015305b2b48b)

Author SHA1 Message Date
krzys-h 7d28b9a6da Fixed #340 2014-10-25 12:01:21 +02:00
krzys-h 4c865322f0 Fixed #341 2014-10-25 11:30:38 +02:00
Tomasz Kapuściński 1aebe8af03 Added support for VBO in OpenGL older than 1.5 if ARB extension is present 2014-10-24 00:29:26 +02:00
krzys-h 2d043d46bb Merge branch 'vieux-blood_mode' into dev
Conflicts:
	src/common/restext.cpp
	src/ui/maindialog.cpp
2014-10-22 17:52:17 +02:00
Victor Vieux d019a4990f add option to disable blood 2014-10-21 21:44:17 -07:00
Tomasz Kapuściński d3a722a0c5 Improved VBO support detection 2014-10-22 00:53:35 +02:00
CoLoRaptor 1ab5746ca7 Disabled active window resizing that crashes in some software/hardware configurations 2014-10-21 22:22:32 +02:00
krzys-h 97b7c0cab1 Fixed map turning gray after resizing window 2014-10-20 21:54:52 +02:00
krzys-h c0ac60e4fa Fixed save directories in things not yet refactored to use PHYSFS 2014-10-20 21:15:39 +02:00
krzys-h cf7be276dc Possibly fixed goto() by changing safety margin
TODO: More testing

Closes #326
2014-10-20 20:48:03 +02:00
krzys-h 0245fdc6c3 Merge branch 'dev-physfs' into dev
Conflicts:
	src/app/app.cpp
2014-10-19 16:18:36 +02:00
krzys-h d7ef0a1a5f Implemented "Apply changes" button (issue #141) 2014-10-19 15:45:59 +02:00
krzys-h c001c46cb5 Small fix to 72b4228abe 2014-10-19 15:27:00 +02:00
krzys-h 9ea0b37408 Possible fix for #331 2014-10-19 14:21:55 +02:00
krzys-h 0fb1cb11d4 Changed max and default font size
Min font size is 9, max is now 24 (previously 21)
Default size is now 19 (previously 9)

Closes #330
2014-10-19 13:33:19 +02:00
krzys-h 83abb8ca8e Fixed program saving 2014-10-19 13:18:31 +02:00
krzys-h 7af92cc4ce Added portable build flag 2014-10-18 20:00:30 +02:00
krzys-h b85a41b42a Also fixed the same thing in file writing code 2014-10-15 21:31:43 +02:00
krzys-h 63b6aa56b0 Fixed crash when colobot.ini doesn't exist 2014-10-15 21:28:40 +02:00
krzys-h 47ea8a1175 Updated some more license headers 2014-10-15 21:16:06 +02:00
krzys-h f65b00089a Merge branch 'dev' into dev-physfs
Conflicts:
	data
2014-10-14 15:42:19 +02:00
krzys-h 9fd6cf5449 Changed all occurences of PPC in the code to TerranovaTeam 2014-10-14 15:26:18 +02:00
Piotr Dziwinski 343504168f Clean up translations
* translate only marked strings from restext.cpp
 * update and clean pot and po files
 * remove redundant POT-Creation-Data
2014-10-09 00:32:58 +02:00
Piotr Dziwinski 342210b062 GCC 4.6 compilation fixes 2014-10-07 23:25:37 +02:00
krzys-h 72b4228abe Fixed CBot debugger (#325) 2014-10-07 22:28:32 +02:00
Piotr Dziwinski 12feb49098 Fixes in unit tests 2014-10-07 22:22:59 +02:00
Piotr Dziwinski 5274acd624 Merge with dev 2014-10-07 22:15:40 +02:00
krzys-h 2770ee8927 Fixed issue #324 2014-10-07 21:40:51 +02:00
krzys-h 3ef2f976df Added %chap% for current chapter directory 2014-09-29 21:53:21 +02:00
krzys-h c2b8787453 On development builds store savegame data in current directory 2014-09-29 21:39:21 +02:00
krzys-h f2c6b322dd Replaced std::to_string with boost::lexical_cast<std::string>
MXE has problems with std::to_string
2014-09-28 19:25:28 +02:00
krzys-h ad79babbc1 Made proxyDistance optional 2014-09-27 18:34:08 +02:00
krzys-h b3fa72c007 Moved effect??.png textures and made pos= in GroundSpot optional 2014-09-27 18:26:29 +02:00
krzys-h 32504be8a9 Fixed TerrainLevel bug 2014-09-27 17:46:52 +02:00
krzys-h 8fab044bcd Removed more unused variables 2014-09-27 17:16:58 +02:00
krzys-h c29ef4ec41 Fixed some warnings
Removed unused variables and fixed signed/unsigned comparation warnings
2014-09-27 16:49:00 +02:00
krzys-h d3eaf2e1ce Merge branch 'dev-physfs' into dev-physfs-levels 2014-09-26 21:05:55 +02:00
krzys-h 71f84d1e16 Fixed human.png texture 2014-09-26 21:02:54 +02:00
krzys-h de375548ad Userlevel listing 2014-09-26 20:53:11 +02:00
krzys-h 3b1cfdbfb4 Don't use physfs in saving code for now
This requires too much refactoring and we want to release 0.1.5 soon.
We'll need to rewrite saving/loading code to fully implement new level parser anyway.
2014-09-26 19:50:27 +02:00
krzys-h 740036e430 New level parser
Known issues:
* TerrainLevel for some reason doesn't work
* %lvl% is not yet implemented everywhere because of hardcoded directories in functions
2014-09-24 22:56:19 +02:00
Piotr Dziwinski 9f2d544b27 Fix zenity version checking problems 2014-09-21 21:28:59 +02:00
Piotr Dziwinski 2b86e6e9d9 Rewrite CMainDialog to use physfs 2014-09-21 12:29:06 +02:00
Piotr Dziwinski 6a1ceba8c0 Some cleaning up 2014-09-21 12:29:06 +02:00
krzys-h f0b38721e0 Loading all mods found in "mods" directory 2014-09-21 12:29:01 +02:00
Piotr Dziwinski e4d52d9afb CProfile refactoring 2014-08-12 21:24:33 +02:00
Piotr Dziwinski 74312b0405 Better CMake organization and unit test cleanups
* created a static library containing most source modules
  to avoid compiling source modules twice in code and unit tests
* moved profile_test to main unit tests executable
* removed image_test and edit_test as not really useful
2014-08-12 20:58:55 +02:00
Piotr Dziwinski 4bdfa0aa4e Remove unused accessors from CDevice 2014-08-12 18:18:30 +02:00
Piotr Dziwinski 360b72ac5a Fix task stopping checks in CBrain
This possibly fixes some issues resulting from improperly
stopping tasks (CTask::Abort() not called before deleting the task).
Found while looking for instances of #318.
2014-08-10 18:00:40 +02:00
Piotr Dziwinski 9de086390b Remove some more delete checks (#318) 2014-08-10 17:51:47 +02:00
Piotr Dziwinski ac019c263d Remove unnecessary delete checks (#318) 2014-08-09 22:45:07 +02:00
krzys-h ea0615ee05 Fixed #315 2014-08-08 14:03:43 +02:00
krzys-h 4a202a086f Fixed #314 2014-08-06 17:18:52 +02:00
krzys-h a56e69883f Removed some unused code 2014-08-06 16:58:36 +02:00
krzys-h 0b2f25a6e3 Restored -datadir and -langdir arguments, added -savedir
Also, fixed some crashes when unable to open file
2014-08-06 12:27:17 +02:00
krzys-h 9a3cd67c3b Saving colobot.ini through physfs 2014-07-24 23:38:13 +02:00
krzys-h 17041e718b Added -mod commandline argument to add additional locations to physfs 2014-07-24 22:46:47 +02:00
krzys-h 7131abd385 Fixed SatCom image loading
Now LoadTexture/SetTexture functions require full path with "textures/" directory
2014-07-24 22:17:49 +02:00
Mohamed Waheed 117a5289ea fixed issue #223 about disabling shadows/ground textures 2014-07-12 19:37:34 +00:00
krzys-h 02ba358a89 Help file loading 2014-07-11 16:40:07 +02:00
krzys-h 96d49d84aa Merge branch 'dev' into dev-physfs
Conflicts:
	data
	src/app/gamedata.cpp
	src/ui/control.cpp
	src/ui/edit.cpp
	src/ui/maindialog.cpp
2014-07-11 15:24:44 +02:00
krzys-h 9a6c06665c Removed some old stuff related to Ceebot-Teen 2014-07-10 17:39:45 +02:00
krzys-h c22e55b99a Removed some unused code related to Quit button
The button itself has been removed a long time ago
2014-07-10 16:52:29 +02:00
krzys-h 5223ef1fb1 Fixed mission description loading 2014-07-10 16:36:00 +02:00
krzys-h 106ec014b8 Fixed texture and script loading 2014-07-10 16:25:40 +02:00
krzys-h 7b04f67358 Fixed music loading 2014-07-10 15:38:37 +02:00
krzys-h 1ee0c0e8fe Fixed level list 2014-07-10 15:27:43 +02:00
Krzysztof Dermont aa190bb59b Last changes 2014-06-30 17:40:40 +02:00
krzys-h 1835d2ae58 Removed old code based on #ifs (issue #55) 2014-06-27 19:52:09 +02:00
Piotr Dziwinski 0fbc05b96c Fix test compilation 2014-06-26 22:36:57 +02:00
krzys-h 092e7cc68d Fixed tests 2014-06-26 22:14:30 +02:00
krzys-h fd8ea13cbb Fixed not destroying CGameData
This also fixed failing assertion in tests
2014-06-26 21:38:02 +02:00
krzys-h bc3b7ef283 Fixed negative parameter in fire() (issue #305)
Also fixed checking parameter count and type for ants, spiders and shooters
2014-06-26 21:06:53 +02:00
Mohamed Waheed f5ba2a27d4 fixed savefile screenshot loading bug 2014-06-24 20:31:17 +03:00
Mohamed Waheed b7125a5b24 formatting and enhancements for savefile screenshot feature 2014-06-24 20:27:31 +03:00
Mohamed Waheed 613e1d74c4 implemented savefile screenshot feature 2014-06-24 01:35:05 +03:00
Krzysztof Dermont 68d41d3b21 More work on streams 2014-06-23 23:19:55 +02:00
Krzysztof Dermont 3aca1de731 More work on levels 2014-06-22 21:30:23 +02:00
Krzysztof Dermont 0556b5dfbc Added Exist() to resource manager, updated model 2014-06-22 16:29:26 +02:00
Krzysztof Dermont 754154341d More work on PhysFS support
* added output stream
* fixed music loading
2014-06-22 15:01:06 +02:00
Krzysztof Dermont 1630cf0ed2 Implemented libsndfile loader in PhysFS 2014-06-21 02:59:26 +02:00
Krzysztof Dermont 2260f6bf4f Big part of PhysFS support
* removed -mod argument
* removed -datadir argument
* removed -lang argument
* removed some dead ui code
* added resource manager and file loaders (stream and SDL)
* changed interface textures location to match new directory structure
* removed CGameData for mod support
* added PhysFS support
2014-06-20 23:51:28 +02:00
Piotr Dziwinski ba62e6f8be Remove dead code 2014-06-01 13:02:08 +02:00
krzys-h f0d97bfdb9 Better datadir mod support 2014-05-18 12:12:47 +02:00
krzys-h f71658e38d Random relief generator 2014-04-10 21:50:26 +02:00
Oleg Kosmakov a181ba9bbf Fixes #271 2014-03-25 22:56:40 +02:00
Oleg Kosmakov a2a4eb75cb Whitespace 2014-03-21 13:22:02 +02:00
Oleg Kosmakov 119fce546a Issue #295 - continue
Renamed the method, fixed typo in comments
2014-03-21 13:18:28 +02:00
Oleg Kosmakov 4491f51839 Whitespace 2014-03-21 13:15:15 +02:00
Oleg Kosmakov 7485ed790c Fixes #295
When cannon cannot turn at specified angle, it will still reach the edge angle, but return the error code
2014-03-21 13:08:36 +02:00
Oleg Kosmakov 2cf84ad214 Added spaces to align values 2014-03-21 09:34:52 +02:00
MrSimbax e569fd6c39 Fix for #294 2014-03-16 15:25:49 +01:00
MrSimbax 244ca93cf7 Fixed bug with fall damage
If you change the height after overheat, you get damage like you didn't change it at all. For example: overheat when you are 10 meters above the ground, and you fall to place 20 meters deeper, but you get the damage like you fell from 10 meters instead of 30. This commit fix this.
2014-03-12 19:43:20 +01:00
MrSimbax 2ee0702d69 Made some improvements to fall damage from a61da740
Fall damage on:
- no energy
- overheat
Fall damage off:
- underwater
2014-03-09 14:36:39 +01:00
MrSimbax 3dd400810f Fixed bug from a61da7404b
Moved ExploObject to CPhysics::EventFrame, it shouldn't crash anymore.
2014-03-08 23:20:39 +01:00
MrSimbax a61da7404b Added fall damage
+ changed window title
2014-03-08 22:36:35 +01:00
krzys-h fbe2bf8bc7 Added special mode in scene for bots to build more buildings than they usualy can
Will be used in "Leaving Earth" missions for making decorative bots building base
2014-03-03 21:55:28 +01:00
krzys-h a806d4257c Check if pause music is defined in scene before trying to play it 2014-03-02 16:10:02 +01:00
andreymal 1a0dcedf83 fixed m_oldMusic.push_back(nullptr) and segfault 2014-03-02 18:00:02 +04:00
andreymal e9960f5373 GetStringWidth fix 2014-03-02 04:15:59 +04:00
krzys-h 14709427c4 Fixed compile warning 2014-02-21 14:33:56 +01:00
krzys-h bb2a9bcfd3 Added option to set pause audio in Scene 2014-02-21 14:19:58 +01:00
erihel 2433cb595a Added a check when trying to play a music file 2014-02-21 10:13:48 +01:00
erihel f21ab91184 Changed max channels to fix compilation error 2014-02-02 02:01:42 +01:00
erihel 93582536de Merge branch 'dev' of github:colobot/colobot into dev 2014-02-02 01:51:14 +01:00
erihel d84d38280b Changed max number of sound channels 2014-02-02 01:50:34 +01:00
Piotr Dziwinski 70b18cc4c0 Move engine frame update after game state update
This should finally fix #225
2014-01-18 21:35:32 +01:00
Piotr Dziwinski 181a404930 Fixed warnings about unknown commands in scene files 2014-01-18 19:24:08 +01:00
erihel c5ae2610b5 Minor changes to sound support.
* changed channel limit from 64 to 2048 that will decrease if error is found while trying to play sound
* added id to each channel to avoid collisions when more than 1 object tries to modify a sound
* minor formatting changes
2014-01-18 03:42:07 +01:00
krzys-h 652dc6081d Removed some unused objects 2014-01-11 23:43:10 +01:00
krzys-h d855586674 Fixed a bug from 59935b4706
Cmd() now checks if length of token we're looking for is equal to token we've found
2014-01-11 18:22:37 +01:00
krzys-h 082989a413 Changed main menu title to "COLOBOT: Gold Edition" 2014-01-01 19:49:29 +01:00
krzys-h 59935b4706 Changed comments in ObjectType to be object categories; removed unused SEAWEED 2014-01-01 17:33:19 +01:00
krzys-h 130c4fd941 Fixed log level in 8d30791595 2014-01-01 16:46:28 +01:00
krzys-h 90437d1765 Fixed two bugs in dc81cda4b1
* win/end scene animations
* produce() was producing empty cells
2014-01-01 16:45:08 +01:00
krzys-h 3d7017525b Added camerafocus() for changing camera 2013-12-31 19:09:54 +01:00
krzys-h 8d30791595 Ability to set language via ini file
If language autodetection doesn't work, someone might want to manually force the game to use correct language without using -language parameter every time
2013-12-31 17:20:03 +01:00
krzys-h 999490e88b Code for changing music in pause mode
As requested by @Emxx52. Only code for now, we don't have the music yet. Temporairly in developements builds music will change to Prototype (in CBot editor) and Constructive Destruction (in SatCom)
2013-12-31 16:58:21 +01:00
krzys-h 4a237f5925 CPauseManager 2013-12-31 13:24:09 +01:00
krzys-h 3536f1c7cc Added CObjectManager::Flush()
Possible fix for #275
2013-12-30 10:51:29 +01:00
krzys-h 12e17224b3 Added nullptr shecks to object.factory()
Trying to fix #275
2013-12-29 16:31:32 +01:00
krzys-h a36450a6da Added tool= i drive= 2013-12-29 15:03:21 +01:00
krzys-h dc81cda4b1 Cleaned up creating objects 2013-12-29 12:08:59 +01:00
krzys-h 9631f26270 Don't stop music when SatCom or pause menu is opened 2013-12-28 16:45:11 +01:00
krzys-h e9addb5a5e Added smooth transition in music - issue #205 2013-12-28 12:30:46 +01:00
krzys-h 0ff7e55b33 Fix for #177 - save list sorting 2013-12-27 22:28:25 +01:00
krzys-h 1b73893678 Temporary fix for #232 - don't try to show the buttons
This makes SatCom usable for now
2013-12-27 21:46:16 +01:00
krzys-h 246b7e107e Removed prototypes support 2013-12-27 20:36:11 +01:00
krzys-h 9a741a66a4 Changed version display in bottom-right corner to be actually version number instead of date 2013-12-27 11:15:36 +01:00
krzys-h 8b5b2eeaa1 Added error message when CEdit is unable to read a file 2013-12-27 10:50:52 +01:00
krzys-h 555c486fc6 Disable immediat SatCom when scene test is enabled 2013-12-26 22:33:17 +01:00
krzys-h 01cbc4177e Whoops 2013-12-26 22:14:53 +01:00
krzys-h 0f57809f51 Added scene test mode
... and fixed a "small" bug in previous commit ;)
2013-12-26 22:13:04 +01:00
krzys-h 3a78d587bd Exit the game after finishing the mission while using -runscene 2013-12-26 21:54:05 +01:00
krzys-h 32c55297c4 Fix for building physics.cpp on some systems
Why is it working on my local machine but it's crashing on MXE on my server?
2013-12-26 21:14:36 +01:00
krzys-h 16842b5e83 Changed default loglevel on dev builds to Debug 2013-12-26 21:09:19 +01:00
krzys-h fcda183b96 Hide userlevels menu in release version
Userlevels aren't working right now (issue #219)
2013-12-26 21:05:58 +01:00
krzys-h 07901341a6 Fix for #71 - infinite energy 2013-12-26 20:37:39 +01:00
krzys-h 3eec21895e Renamed "New player" to "Change player" (#220) 2013-12-26 19:48:44 +01:00
krzys-h 8b121910c1 Indentation fixes 2013-12-26 19:39:32 +01:00
krzys-h 46a7aa98b0 Added error message when unable to load script from file specified in CreateObject 2013-12-26 19:36:17 +01:00
krzys-h 0d31f59b12 .takeoff() for SpaceShip (#265) 2013-12-26 18:50:05 +01:00
krzys-h a79bd6c5c7 Fixed build of stringutils.cpp
/var/www/colobot_compiled/colobot/dev/colobot/src/common/stringutils.cpp:33:51: error: 'vsnprintf' was not declared in this scope
2013-12-25 23:41:50 +01:00
krzys-h c8ec3f2020 Added "E" as a secondary action button
As requested by @Emxx52 on IRC
2013-12-25 19:43:11 +01:00
krzys-h 5661f5a413 Fixed "default controls" button (#263) 2013-12-25 19:41:15 +01:00
krzys-h 55fd03ade3 Added WSAD as secondary controls (#231) 2013-12-25 19:34:34 +01:00
krzys-h f1e267b18e Fixed bug #240 - CAuto in produce() 2013-12-25 19:13:15 +01:00
krzys-h d0285d6886 Fixed AudioChange 2013-12-25 18:53:32 +01:00
Piotr Dziwinski 3966e3fce0 Merge branch 'dev-string-in-restext' into dev
Merging branches after code review

This should fix buffer overflow problems with translation strings
2013-12-20 20:22:51 +01:00
Piotr Dziwinski 95661918ce Some further refactoring and test corrections 2013-12-20 20:18:30 +01:00
erihel fe3f9ea38c Sound support changes
* removed 2d sound
* fixed listener orientation (propably issue #235)
* removed unused code and minor refactoring
2013-12-19 22:46:29 +01:00
Didier 'OdyX' Raboud 114cbec8a9 Never cache Data, Sound and Music paths
Let them always be either auto-detected, defined on the command-line
or written in the configuration file
2013-12-09 17:39:39 +01:00
Piotr Dziwinski 8deb130572 Changed char[] to std::string in restext
Experimental changes
2013-12-04 00:15:39 +01:00
Didier Raboud 343fa8f0cb Add a PLATFORM_GNU global variable matching all GNU systems such as Debian's Linux, kFreeBSD and Hurd 2013-11-27 18:53:28 +01:00
Piotr Dziwinski fdd7c22591 Updated README and INSTALL files 2013-11-26 00:38:32 +01:00
Piotr Dziwinski aab79c6b5d Changed ASM_TRAP() to assert(0) 2013-11-25 20:03:06 +01:00
Piotr Dziwiński 8ed542a881 Merge pull request #250 from OdyX/dev-platform-enhancements-and-installers
MacOSX and Windows platform enhancements and installers
2013-11-22 15:16:12 -08:00
Didier 'OdyX' Raboud 89e2855f95 Consolidate SYSTEM_CPP_MODULE in the main CMakeLists.txt 2013-11-20 10:39:06 +01:00
Didier Raboud 3bcf80a82a Tweak tooltip margin and correct french jargon comment 2013-11-19 17:22:25 +01:00
Didier Raboud f4355b8b8e Fix tooltip to display as white and not transparent 2013-11-19 17:12:16 +01:00
Piotr Dziwinski 81b940cc25 Fix for crash when loading PNG in indexed mode
For example, some icons in SatCom
2013-11-15 10:22:49 +01:00
Piotr Dziwinski 418f57f8be Buffer overflow fix 2013-11-13 18:51:52 +01:00
Didier 'OdyX' Raboud d7af8204ce On MacOSX, assume we do have CFLocaleCopyCurrent to detect the actual locale by hard-coding the fact in config.h.cmake
This circumvents the fact that we are using localename.c directly instead of relying on the autotools-generated config.h
2013-11-13 17:41:41 +01:00
Didier 'OdyX' Raboud bea84f0af4 Don't set rpath if libCBot is compiled statically 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud aeefdbd1be On MacOSX, define the LangPath as being i18n in the Resources path of the bundle 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud b32f87bac7 Abstract the definition of LangPath to CSystemUtils 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud 93727a3fdf On MacOSX, don't cache the Data, Sound and Music paths
As users can potentially move the bundle around, it doesn't make sense to cache these

(It would probably make sense to drop this caching on all architectures, but it's only on MacOSX where it hurts most)
2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud e78d2cce18 On MacOSX, define the DataPath as being the Resources path in the bundle 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud 17ad3e5a90 Abstract the definition of DataPath to CSystemUtils 2013-11-13 09:35:31 +01:00
Didier 'OdyX' Raboud 8f7f56f1ea On Mac OS X, write colobot.ini and savegames to Application Support directories 2013-11-13 09:35:31 +01:00
Didier 'OdyX' Raboud 8b65e9b56f Add russian language support 2013-11-07 14:44:12 +01:00
Didier Raboud 2acc338c3a Drop now-useless display of licenses.txt in PHASE_GENERIC
The content of licenses.txt in data has gotten useless as the
restrictions got waived, displaying it is useless.
2013-10-30 21:51:05 +01:00
Piotr Dziwiński 816f4e91b9 Merge pull request #245 from OdyX/dev-platform-fixes
Platform fixes (Windows Icon and Mac OSX SDL_Main fix)
2013-10-29 14:12:07 -07:00
Piotr Dziwinski cd97feabb0 Revert back "Merge pull request #243 from OdyX/dev-fix-textures-loading"
False alarm, was caused probably by faulty build bot.
This definately should work on all platforms.
2013-10-29 22:04:12 +01:00
Didier 'OdyX' Raboud 9e9a9937ba Revert "Include SDL.h in main.cpp to make sure the main loop is SDL's main loop"
This was the wrong fix for the problem.

This reverts commit f31a570d96.
2013-10-29 14:43:29 +01:00
Didier 'OdyX' Raboud ee90f02bc4 Add an icon and executable information to the colobot.exe when build in MXE 2013-10-29 14:40:58 +01:00
Piotr Dziwinski 70af33e45d Revert "Merge pull request #243 from OdyX/dev-fix-textures-loading"
Looks like it doesn't work on all platforms
2013-10-28 19:36:43 +01:00
Didier Raboud c2a717d5c9 Let mouse.png's format be detected
Fixes the mouse cursor on Mac OS X
2013-10-28 15:25:14 +01:00
Didier 'OdyX' Raboud 9e439d88bf Fix the detection of alpha-channel in textures as created by IMG_Load
This fixes the textures loading under Mac OS X
2013-10-28 15:23:56 +01:00
Didier 'OdyX' Raboud f31a570d96 Include SDL.h in main.cpp to make sure the main loop is SDL's main loop
This allows the MacOSX program to start.
2013-10-26 13:19:13 +02:00
Didier 'OdyX' Raboud 97baf7242e Fix system_other implementation by adding an Init() and fixing the wrong const 2013-10-24 21:12:52 +02:00
Didier 'OdyX' Raboud 591ba30a00 Include the OpenAL headers using the "al.h" form, as recommended by its CMake finder script 2013-10-24 21:12:52 +02:00
Didier 'OdyX' Raboud b3b6a40d9e MacOSX: Add initial support in CMake build infra 2013-10-24 21:12:52 +02:00
Piotr Dziwinski 9017dbbbdb Fixed CTerrain-related memory leaks 2013-10-13 14:44:12 +02:00
Piotr Dziwinski ccb63bd29e Fixed memory leaks in CText 2013-10-12 21:14:33 +02:00
Piotr Dziwinski 5d0d9b5aa5 Fixed some CBot-related memory leaks
* fixed leaks in CScript::CheckToken()
 * fixed leaks in CInterface
 * commented out unused function in robotmain.cpp
2013-10-12 18:50:30 +02:00
krzys-h d70d31acc1 Fix for #232 - Images in SatCom
Only images, icons still don't work
2013-09-28 11:13:45 +02:00
krzys-h 39866db502 Fixed @Emxx52 's fail :P
Merge branch 'master' into dev
Conflicts:
	src/app/app.cpp
2013-09-08 17:55:48 +02:00
Emxx52 2891c2ea4c Added '-game' launch option 2013-09-08 17:05:11 +02:00
erihel b5e87aa91f Datadir in command line didn't work with config.
Values from config file overwrote datadir
2013-07-16 16:00:06 +02:00
Piotr Dziwinski f8a6c6750a Fix for #228
* "empty" objects were wrongly handled in CPyro
2013-06-26 20:44:17 +02:00
erihel 41fa8458c2 Some Ui refactoring 2013-06-24 22:09:39 +02:00
Piotr Dziwinski 81a6de41a5 Some further changes in CMakeLists
* removed DEV_BUILD autodetection (could be confusing)
 * ignore desktop subdirectory on Windows
 * some refactoring
2013-06-24 14:17:28 +02:00
Piotr Dziwinski 3e989c96df Fixed auto-detecting locale on Windows
* localename library is now used to determine the actual locale used
 * added patched version of FindGettext.cmake to fix
   installation path of translation files
2013-06-24 14:16:39 +02:00
Piotr Dziwinski 9f819088a6 gitignore update
* git should now ignore all generated files when building without
   separate build directory
2013-06-22 22:44:03 +02:00
Piotr Dziwinski bfcce26f89 Changes in build organization
* targets are now created in top-level build directory
 * more things are now configured through CMake options
 * changed debug build detection from NDEBUG to DEV_BUILD
 * moved po and desktop directories
 * moved last unit test out of src directory
2013-06-22 01:17:19 +02:00
Piotr Dziwinski 1377e48910 Reverted enum values to fix UT regression 2013-06-22 01:17:19 +02:00
Piotr Dziwinski 28b4e9a634 Fixed terrain light priorities (fix for #139)
* lights illuminating the terrain specified in scene file are now
   always moved to front of light ordering
2013-06-20 23:14:37 +02:00
Piotr Dziwinski 4c33172e17 Fixed string formats in light debug prints 2013-06-17 20:52:56 +02:00
Piotr Dziwinski 366d3a551e Added debug aids for lighting
* displaying positions of current lights (F11)
 * dumping info to console (F10)
 * added assert() in suspicious place in CPyro
2013-06-17 18:17:21 +02:00
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