3f6a6a9eef
* Syntax highlighting in cbot editor (needs to be tested)
2013-02-09 23:49:38 +01:00
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
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
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
a937a7b6ec
Changed model min/max to LOD levels
2013-01-27 11:43:53 +01:00
83a89fc304
Updated blender script
...
* now script can be installed as add-on
* model rotation is upright
2013-01-26 19:15:42 +01:00
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
0ef831429a
In travis, add libsndfile-dev as build-dependency
2013-01-20 15:15:55 +01:00
b1360231ca
In manpage, correct first header to be 'NAME' not 'COLOBOT'
2013-01-20 14:28:33 +01:00
b50f9ae8b7
Fixed some clang warnings
2013-01-17 20:54:35 +01:00
4421430bae
Fixed edit_test linking issue
2013-01-17 20:54:23 +01:00
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
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
58f35e44ae
* Removed alut
...
* Using libsndfile to load sounds and music
* Added support for playing music files
2013-01-14 22:55:16 +01:00
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
0f74cf96b7
In travis, add boost backport from Mapnik to succeed clang build
2013-01-10 11:55:43 +01:00
e39e802d83
Also test intallation
2013-01-10 11:55:43 +01:00
f7f4bd945c
In travis, do out-of-tree build
2013-01-10 11:55:43 +01:00
d221233436
Enable clang build in travis
2013-01-10 10:13:41 +01:00
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
3c94a69870
Added GLEW to travis config
2013-01-09 23:41:18 +01:00
08578c4015
Merge branch 'dev' of github:colobot/colobot into dev
2013-01-09 23:21:37 +01:00
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
cf72246243
Disabled travis e-mail notifications
2013-01-09 21:55:34 +01:00
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
9a9cfc51c1
Merge pull request #112 from OdyX/dev-levels-fallback
...
In levels' lists, fallback to english
2013-01-09 04:33:47 -08:00
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
5a6b3f005a
Merge dev and dev-graphics
2013-01-07 19:43:04 +01:00
edb1c0cbd6
GLEW fix for some graphics drivers
2013-01-06 23:13:05 +01:00
ff5c890854
Small fix in detecting language. Fixes needed to compile code using clang
2013-01-05 23:03:26 +01:00
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
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
d1942e1216
Correct font scaling with resolution
2013-01-04 00:29:19 +01:00
89a3f586a2
Merge branch 'dev' into dev-graphics
2013-01-04 00:05:28 +01:00
c9335534d6
Fix for #113
2013-01-04 00:02:13 +01:00
2c0c5ddda1
Fixed stupid debug code
...
Terrain VBOs should work now
2013-01-03 23:50:17 +01:00
1d42c71645
Merge pull request #115 from OdyX/dev-add-categories-to-desktop-file
...
Add categories to Desktop Entry file
2013-01-02 10:09:41 -08:00
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
ffb4d9ff4f
Let CMake rely on data's CMakeLists.txt if it exists
...
- Also update data to latest 'dev', where the CMakeLists exists
2013-01-02 14:35:46 +01:00
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
16d97f9121
Revert "Minor cmake grammar fix"
...
It appears I was really wrong. Damn.
This reverts commit 277629f9fe
2012-12-30 12:16:43 +01:00
28b9e83093
Merge branch 'master' into dev
2012-12-29 15:05:40 +01:00
a134cb75c5
Merge of master and dev
2012-12-29 15:01:57 +01:00
e1325dc364
Fix for TEST_VIRTUAL
2012-12-29 14:35:14 +01:00
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
03f232f0f6
Merge branch 'dev' of github:colobot/colobot into dev
2012-12-29 13:00:59 +01:00
e625665f02
Merge pull request #108 from OdyX/dev-central-cmake-version
...
Create a central version
2012-12-29 02:44:03 -08:00
89296b20bd
Merge pull request #109 from OdyX/dev-more-language-fixes
...
Some more language fixes
2012-12-29 02:43:00 -08:00
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
f4c6f49b2f
Move language initialisation in SetLanguage
2012-12-28 22:31:47 +01:00
erihel