marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,394 Commits
27 Branches
0 Tags
318 MiB
Commit Graph

282 Commits (b6a01b62aaca66bf33a1a3671cc59c658766b80f)

Author SHA1 Message Date
Nicolas Hake 8709b841bf cmake: Also look for static libraries 2013-10-08 22:02:39 +02:00
Nicolas Hake 59ee0ed090 cmake: Get FindFreetype to look for versioned libraries 
Since FindFreetype.cmake already extracts the version of freetype
from its header files, I have no idea why they're not automatically
using that info to look for the proper library name in lieu of
hardcoding a single version.
 2013-10-08 21:23:07 +02:00
David Dormagen 4032a161ea CMakeList: added entries for dynamic particle source files 2013-10-07 20:56:55 +02:00
Maikel de Vries 7f9f40a1f5 Renamed Settlement.ocf to Missions.ocf 2013-10-05 17:39:14 +02:00
Martin Plicht 31119f1b88 cmake: Add Worlds.ocf to OC_C4GROUPS 2013-10-05 13:19:59 +02:00
Nicolas Hake 9ceb69236b Remove unused Base64 codec 2013-08-04 18:10:10 +02:00
Martin Plicht 524fe879aa Make DEBUGREC define a commandline option 2013-05-25 22:51:32 +02:00
Martin Plicht 928ecc1892 mac: Lazy cmake fix 2013-05-25 20:11:21 +02:00
Nicolas Hake 7a8352e672 CMake: Allow dynamic linking of Ogg/Vorbis 
Previously, MSVC builds did only allow static linking of libogg,
libvorbis and libvorbisfile. If there was a reason to do so, I have no
idea what it was, because it isn't documented in either VCS or a
comment. So I'll allow both dynamic and static linking.
 2013-05-20 16:10:17 +02:00
Nicolas Hake 459fce0758 Replace std::auto_ptr with std::unique_ptr 
std::auto_ptr has awkward copy semantics and is deprecated in C++11.
 2013-03-26 15:43:01 +01:00
Sven Eberhardt 57e63a5275 Added support for scripted maps (Map.c) and documentation. 2013-03-19 00:36:06 +01:00
Günther Brammer 814f809885 cmake: USE_GTK3 defaults to off for now 
The defaults should follow the settings the binary downloads use where
reasonable.
 2013-03-12 02:12:26 +01:00
Günther Brammer 169b3750d4 cmake: Also search for freetype version 2.4.11 2013-03-10 14:01:38 +01:00
Günther Brammer 2ef47af689 cmake: Default to a deps folder in CMAKE_CURRENT_BINARY_DIR 2013-03-10 14:01:35 +01:00
Günther Brammer 1075822af3 cmake: Don't try to create openclonk.png without convert 2013-03-10 14:01:26 +01:00
Günther Brammer 12c8b31a10 cmake: Use CMAKE_DEPENDENT_OPTION to structure the various options 2013-03-10 14:01:15 +01:00
Günther Brammer 159cfb9885 cmake: Explicitly instead of indirectly link openclonk with pthread 
In practice, other libraries pulled pthread in, except for the USE_CONSOLE
build. But since there are direct calls to pthread in our code, we really
shouldn't rely on that.

Also, this should fix the USE_CONSOLE build on windows.
 2013-03-10 14:00:01 +01:00
Julius Michaelis 06d4db2d72 Remove need for freetype and jpeg libraries building with USE_CONSOLE 2013-03-03 15:22:48 +01:00
Julius Michaelis 2df3b20a20 CMake: Adjust precompiles headers to new build division 2013-02-17 17:00:33 +01:00
Günther Brammer 2a9d63cb2a gtk: Use higher-resolution logo as window icon 
Metacity started to display bigger icons in the window list, so the higher
resolution is now actually useful for me. While at it, use gdk-pixbuf-csource
to generate the .h at build time from the .ico instead of duplicating the
data in the repository.
 2013-02-12 01:08:02 +01:00
Martin Plicht 6217a62c8d mac: cmake: Fix compilation of libmisc 2013-02-11 11:39:24 +01:00
Oliver Schneider c43a682785 tests: Compile gtest from source, add a few new tests 
GTest does not ship precompiled binaries anymore. They are now compiled
using the CMakelists.txt from gtest.

Add basic unit tests for C4Value, DirectExec and C4StringTable.
 2013-01-29 01:07:22 +01:00
Oliver Schneider e45a569aa3 cmake: Use libraries to avoid compiling files multiple times 2013-01-29 01:02:05 +01:00
Oliver Schneider 14369b509f cmake: Check for convert at configure step 2013-01-29 01:01:58 +01:00
Nicolas Hake f897e95071 Rename game binary to "openclonk" (#830) 
Since the name of the game is OpenClonk, having the binary named
differently is at least confusing. At worst it conflicts with the
trademark license granted by RedWolf Design.

The Mac build will still have to be fixed because the installer
template .dmg file is not editable on non-Macintosh systems.
 2013-01-28 13:57:29 +01:00
Armin Burgmeier 2a1ba0f8fe Split the mesh drawing into C4DrawMeshGL.cpp 2013-01-27 23:52:57 +01:00
Günther Brammer db81cf193d gtk: Bump minimum required versions to the oldest versions we test with 2013-01-24 19:36:59 +01:00
Nicolas Hake 8a9926ccc4 CMake: Ensure compatibility with cmake <2.8.6 2013-01-20 22:10:26 +01:00
Nicolas Hake 6bb595f842 CMake: Use GTK+ cflags as reported by pkg-config 
Ignoring CFLAGS/LDFLAGS makes GTK+ not work correctly
if the libraries are compiled with -mms-bitfields (as
is the case with the prebuilt binaries from gnome.org).
 2013-01-20 21:53:56 +01:00
Günther Brammer 211634cf15 mape: Even more windows fixes 2013-01-20 20:36:51 +01:00
Armin Burgmeier e1ccbddd5e Fix configure error when mape build is not enabled 2013-01-16 23:24:14 +01:00
Armin Burgmeier 2cd91a56c4 Add support for algo=script overlays 2013-01-14 02:25:15 +01:00
Armin Burgmeier 9a6d545f94 Use the OpenClonk version as the mape version 2013-01-14 02:25:13 +01:00
Armin Burgmeier 926a3afdd4 Restore original formatting of CMakeLists.txt 2013-01-14 02:25:13 +01:00
Armin Burgmeier abfdd12501 Build mape always when the dependencies are available 2013-01-14 02:25:12 +01:00
Armin Burgmeier aa2f3df779 Make mape link only against the part of the Clonk engine that is needed 
and not against the whole engine. This avoids pulling in unnecessary
dependencies like SDL or OpenGL.
 2013-01-14 02:25:11 +01:00
Armin Burgmeier 3420b2a9a2 Move C4ScenarioSection code from C4Scenario.cpp into C4ScenatioSection.cpp 
This allows compiling and linking with C4Scenario.cpp without having to
pull in whole C4Game.
 2013-01-14 02:14:37 +01:00
Armin Burgmeier b2be39b576 Handle-ify the random seed setting 2013-01-14 01:41:21 +01:00
Armin Burgmeier 4b4da8646b Handle-ify the mapgen call 2013-01-14 01:40:54 +01:00
Armin Burgmeier 662d9bc4f4 Use the icons that come with OC for mape 
gdk-pixbuf-csourcing them from the .ico files in a build step.
 2013-01-14 01:40:47 +01:00
Armin Burgmeier 257db99165 Merge remote-tracking branch 'new/master' into mape 
Conflicts:
	CMakeLists.txt
	src/graphics/C4Draw.h
 2013-01-14 01:38:03 +01:00
Günther Brammer b5ae4f1f9d Move CStdInProc to its own source file 
It should be usable without USE_CONSOLE, even though only the dedicated server
uses it at the moment.
 2012-11-30 22:18:38 +01:00
Günther Brammer 7967d94a59 Merge StdFont.cpp and C4Fonts.cpp 2012-11-12 02:30:16 +01:00
Günther Brammer 4dffefe8c9 X11: Remove support for the xf86vidmode extension 
In practice, only the xrandr code path received any testing. Since Clonk
works fine without changing the resolution, this will not terribly
inconvenience anybody still stuck on old systems without xrandr.

Also only minimize the window when the resolution was changed.
The minimization is there to prevent accidental focus restoration
resulting in unwanted resolution switching.
 2012-11-17 18:07:37 +01:00
Tobias Zwick f7f734d2bb fix: don't try to load OpenAL if option is turned off 2012-11-16 17:30:52 +01:00
Tobias Zwick 348fb8c7a9 clean up mouse controls, reduced cursor graphics to the used ones 2012-11-16 17:29:42 +01:00
Günther Brammer a8dfeeaf7e win32: Make USE_CONSOLE compile again 
There's even a plausible implementation of CStdInProc::GetEvent.
 2012-11-15 23:01:24 +01:00
Philipp Kern cbf6f37996 change the OpenClonk data directory to obey the FHS 
The FHS specifies /usr/share/games as the place for static game data files.
Hence move the OpenClonk data directory to /usr/share/games/openclonk.
 2012-10-21 15:03:24 +02:00
Nicolas Hake 8b7a4a8023 CMake: Update list of C4Groups to build to match refactoring changesets 2012-10-10 21:28:25 +02:00
Sven Eberhardt 00349f045a SoundSystem: Implement non-apple wav loading when using OpenAL 2012-10-07 13:18:28 +02:00