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

848 Commits (6ea0031d83db660946084a28dcf7d48eb3644a6d)

Author SHA1 Message Date
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 45040318b0 Merge pull request #127 from OdyX/dev-always-make-test 
Always run 'make test' in Travis
 2013-02-15 05:57:39 -08:00
Didier Raboud 22b7a1b1ad Revert "Temporairly disabled "test" in travis" 
This reverts commit 15682c27e3.
 2013-02-14 18:43:05 +01:00
Didier Raboud f0e0896c2b Comment the test that fails, with a TODO. 2013-02-14 18:42:50 +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 15682c27e3 Temporairly disabled "test" in travis 
It always fails.
 2013-02-14 15:59:24 +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 3f41f97fc4 Updated and improved Blender script 
* min/max -> lod level change in model format
 * split objects based on LOD
 * lod_level, state & var_tex2 saved as properties in Blender objects
 * UI dialogs
 2013-01-27 22:08:33 +01:00
Piotr Dziwinski a937a7b6ec Changed model min/max to LOD levels 2013-01-27 11:43:53 +01:00
Piotr Dziwinski 83a89fc304 Updated blender script 
* now script can be installed as add-on
* model rotation is upright
 2013-01-26 19:15:42 +01:00
Piotr Dziwiński f03af31cec Merge pull request #124 from OdyX/dev-OdyX-201301 
Makes dev build again in Travis + manpage fix
 2013-01-20 06:25:12 -08:00
Didier Raboud 0ef831429a In travis, add libsndfile-dev as build-dependency 2013-01-20 15:15:55 +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
Piotr Dziwiński 35faf628cf Merge pull request #117 from OdyX/dev-C++11-fixes 
C++11 fixes to get travis build
 2013-01-10 10:41:10 -08:00
Didier Raboud 0f74cf96b7 In travis, add boost backport from Mapnik to succeed clang build 2013-01-10 11:55:43 +01:00
Didier Raboud e39e802d83 Also test intallation 2013-01-10 11:55:43 +01:00
Didier Raboud f7f4bd945c In travis, do out-of-tree build 2013-01-10 11:55:43 +01:00
Didier Raboud d221233436 Enable clang build in travis 2013-01-10 10:13:41 +01:00
Didier Raboud 4444fde9d7 Use correct C++11/C++0x flags depending on the used compiler 
See http://gcc.gnu.org/projects/cxx0x.html for details.
 2013-01-10 10:13:21 +01:00
Piotr Dziwinski 3c94a69870 Added GLEW to travis config 2013-01-09 23:41:18 +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
Piotr Dziwinski cf72246243 Disabled travis e-mail notifications 2013-01-09 21:55:34 +01:00
krzys-h 871542abf5 Merge pull request #114 from OdyX/dev-update-cmake-with-data 
Let CMake rely on data's CMakeLists.txt if it exists
 2013-01-09 04:36:06 -08: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