Commit Graph

1436 Commits (6d85db53140332170904502e030aa0681ec7f593)

Author SHA1 Message Date
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 and ) 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 () 2013-04-28 18:33:59 +02:00
krzys-h cde8653e60 Updated data submodule 2013-04-28 18:01:30 +02:00
krzys-h 5ee7082ef8 Merge pull request from xiendev/buildinfo-and-canbuild
Added functions "canbuild(category)" and "buildinfo(category)"
2013-04-28 08:06:48 -07: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
Piotr Dziwiński 0ce02b21f4 Merge pull request from xiendev/dev
Added "build (category)" instruction for ingame scripting
2013-04-27 08:29:34 -07:00
XienDev 41fb814e99 Added build
Third patch
2013-04-27 18:11:26 +03:00
krzys-h 22c3f44c61 Sorry, I've meant colobot_ut! 2013-04-27 14:01:22 +02:00
krzys-h 95eca71ec5 Commented out edit_test
because Travis is still failing
2013-04-27 13:54:42 +02:00
krzys-h 4f1e000cea Fix for when starting mission
+ various fixes
2013-04-27 13:43:01 +02:00
erihel a693e87293 * Patch for issue 2013-04-27 13:03:20 +02:00
erihel 45f06cec51 * Fix for issue : division by zero on init resulted in bad value after 2013-04-26 16:51:17 +02:00
erihel adb4b06550 * Issue 2013-04-26 15:55:06 +02:00
erihel 1828e60c92 * Changed order of reading Audio and AudioChange (issue ) 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 from xiendev/Programs-list-size
Fixes size of a programs list control
2013-04-26 04:56:58 -07:00
Erihel 837a97b65e Merge pull request from xiendev/welcome-screan
Fixes blinking of welcome screen (makes smooth animation)
2013-04-25 14:52:09 -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 ) 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 (bug in commit dd180dd887) 2013-04-20 15:17:40 +02:00
krzys-h dd180dd887 Added powermin= and powermax= parameters
Issue 
2013-04-20 12:08:48 +02:00
krzys-h 81fcde4d67 Fix for "Ability to select the object in Vault"
Issue 
2013-04-20 11:17:21 +02:00
krzys-h ec68802136 Fix for not saving robot programs
It was Windows-only bug.
issue 
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 
Issue 
2013-04-13 11:44:16 +02:00
krzys-h 69e52e5f24 Removed find() & repeat() functions
Issue 
2013-04-12 23:28:44 +02:00
krzys-h 7b2e0e6519 Added cheats "all" & "allbuildings" () 2013-04-12 22:53:03 +02:00
erihel f1873a52d5 * Minor changes to cmake files 2013-04-12 12:07:57 +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 ) 2013-04-11 21:37:19 +02:00
erihel b0919139bd * Fix for issue : 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 )
* 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