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

528 Commits (c1d1e0a43792c2850e38cf0db1e6751febf7e00a)

Author SHA1 Message Date
Matthias Mailänder c1d1e0a437 Add a Linux AppData file. 2016-08-27 12:28:48 +02:00
Lukas Werling b7359e0c27 Remove the GTK platform (USE_GTK) 
The GTK code does not work with the Qt editor. The simpler SDL2 platform
does, so we have little reason to keep the GTK code.

Note that GTK is still a dependency for mape.

Discussion: http://forum.openclonk.org/topic_show.pl?tid=3328
 2016-08-03 16:25:46 +02:00
Nicolas Hake 77c6baff3f Revert "CMakeLists.txt: Disable framework bundling because I can't deal with the emotional trauma of looking at a bash script" 
This reverts commit fa8b56b40a.

This commit message was completely and utterly useless so I'm sure the
commit couldn't have been important.
 2016-07-24 11:24:41 +02:00
Martin Plicht fa8b56b40a CMakeLists.txt: Disable framework bundling because I can't deal with the emotional trauma of looking at a bash script 2016-07-23 18:20:36 +02:00
Martin Plicht 5570d8d521 cmake: USE_COCOA: Remove .mm editor sources, append qt ones if WITH_QT_EDITOR 2016-07-23 18:20:35 +02:00
Martin Plicht 9dbe734f17 CMakeLists.txt: mac: Throw in some -headerpad_max_install_names because Xcode told me so 2016-07-23 18:16:28 +02:00
Lukas Werling 440751691d Fix build with CMake >= 3.1.0 and Qt 5.7 2016-06-26 16:57:26 +02:00
Sven Eberhardt 62d3817d6a Merge branch 'master' into qteditor 2016-06-24 18:23:34 -04:00
Lukas Werling 622360c359 Set default build type to RelWithDebInfo 2016-06-24 23:55:57 +02:00
Lukas Werling b771baae28 SDL: Fix missing -lX11 2016-06-24 23:41:03 +02:00
Nicolas Hake ef5b39a290 OS X: Pass CMAKE_SYSROOT through to osx_bundle_libs 2016-06-24 19:20:33 +02:00
Sven Eberhardt a7aa89f168 Merge branch 'master' into qteditor 
Conflicts:
	planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c
	src/platform/C4WindowSDL.cpp
	src/script/C4AulParse.cpp
	src/script/C4Effect.cpp
 2016-06-20 22:27:03 -04:00
Lukas Werling 07e8c75bac Replace libupnp with miniupnpc 
- The new code works with my router while libupnp didn't. :)

 - There are some unexplainable crashes in libupnp: #1640

 - Using miniupnpc seems to be less complex than libupnp.

 - Apparently, miniupnpc also works on Windows, so we may be able to use
   it for all platforms.

Disadvantage: UPnP queries aren't asynchronous anymore, but they seem to
be pretty fast (< 1 s).
 2016-05-29 23:38:12 +02:00
Nicolas Hake 792e12adad C4AulCompiler: Split into separate file 2016-05-09 12:21:33 +02:00
Sven Eberhardt 881534bee0 Qt Editor: Shape properties 2016-04-25 16:17:10 -04:00
Nicolas Hake cfdb1142b8 Move C4AulParse declaration into separate header 2016-04-24 14:01:23 +02:00
Nicolas Hake 8e11bbfd4c Add pcg headers to IDEs 2016-04-22 00:15:30 +02:00
Nicolas Hake 598f9c10a0 MSVC: Use incremental LTCG 
Incremental LTCG tries to reuse compiled functions from previous links,
which speeds up link times quite a lot.
 2016-04-18 13:50:17 +02:00
Nicolas Hake 9dddf289db Merge branch 'master' into qteditor 2016-04-03 21:06:32 +02:00
Nicolas Hake eabca223f5 Update all copyright notices for 2016 2016-04-03 20:24:42 +02:00
Nicolas Hake 493c276126 Rewrite header inclusions to #include "path/to/file.h" style 2016-04-03 20:24:42 +02:00
Nicolas Hake 9e9c5d0c06 CMake/MSVC: Interpolate the right variable into CMAKE_CXX_FLAGS_DEBUG 
Instead of discarding all previous debug CXXFLAGS and replacing them
with generic ones, actually interpolate CMAKE_CXX_FLAGS_DEBUG into a
value to assign to CMAKE_CXX_FLAGS_DEBUG.
 2016-04-02 02:41:50 +02:00
Nicolas Hake 0c6fee1442 CMake: Enable LTCG/LTO 2016-03-31 23:05:00 +02:00
Nicolas Hake d3d41721f0 CMake: Disable plain "Release" builds 
Having a build type that's called "Release" makes people thing they
should use it when they want optimized builds. They shouldn't. They
should be using RelWithDebInfo instead, so at least trying to debug
errors isn't entirely futile.
 2016-03-31 23:01:37 +02:00
Nicolas Hake 3922e7c5ee CMake: Stop the OC_*_FLAGS song and dance 
CMake handles adding un-cached flags properly, so we don't have to force
flags into the cache.
 2016-03-31 23:01:36 +02:00
Nicolas Hake 0abef8dac5 Remove "High-res landscape" option 
We're requiring shaders for everything else we render, so there's no
point in having a shader-free landscape renderer around.
 2016-03-31 19:22:17 +02:00
Lukas Werling 6eecf34e18 Build with SDL/Qt instead of GTK per default 
This is necessary to make the autobuild server build the relevant Qt
editor code on Linux while we're on the qteditor branch.
 2016-03-28 22:14:00 +02:00
Lukas Werling f2b6897065 Qt Editor: Fix broken icons 2016-03-26 23:22:51 +01:00
Lukas Werling ea36b4f4a0 CMake: Add a QT_EDITOR_SOURCES list 2016-03-26 21:42:24 +01:00
Lukas Werling 6d9aef33c2 Merge branch 'qteditor-sdl' into qteditor 2016-03-26 20:57:10 +01:00
Sven Eberhardt b1ac208249 Qt Editor: Add "File->New" menu entry 2016-03-22 23:08:05 -04:00
Lukas Werling 19caa65b7b Merge branch 'sdl-gamecontroller' (pull request GH-17) 2016-03-21 16:39:28 +01:00
Lukas Werling 75f62e52f2 Make Qt editor work with the SDL engine 
Viewport rendering doesn't quite work yet, though.
 2016-03-20 21:16:52 +01:00
Sven Eberhardt f6ce50e9e7 Qt Editor: Use qt widgets for viewports 2016-03-10 00:07:17 -05:00
Sven Eberhardt 80549ca2cc Qt Editor: Add object creator 2016-03-06 13:06:29 -05:00
Günther Brammer b54ddc7663 Merge branch script 2016-03-01 03:04:17 +01:00
Lukas Werling 1147d1a154 Fix openclonk-server build 
SDL usage is masked with HAVE_SDL checks so it should work without SDL,
but SDL has to be linked when it's available.
 2016-02-21 18:26:43 +01:00
Sven Eberhardt a4d28c383b Qt Editor: Implement object list view 2016-02-18 00:11:35 -05:00
Sven Eberhardt 2af22ee824 New editor (Qt-based) 
Work in progress. So far only for Windows.
 2016-02-15 08:38:06 -05:00
Günther Brammer 544c1cbb4b CMake: Remove unused HAVE_X11_KEYSYM_H 2016-02-13 22:36:41 +01:00
Nicolas Hake acafce33b0 CMake: Use target_compile_definitions instead of setting the property 2016-02-13 21:56:34 +01:00
Lukas Werling bd3f020068 Replace Joystick controls with SDL GameController 2016-02-13 21:03:19 +01:00
Nicolas Hake 3fb3f45a35 MSVC: Disable non-conforming conversion from string literal to char* 
C++11 forbids conforming compilers from performing the deprecated
conversion from a string literal to non-const char* or wchar_t*. Most
compilers however still do it by default because not doing it breaks
lots of legacy code. We don't have any of this legacy code anymore, so
we can disable the conversion.
 2016-02-08 17:36:50 +01:00
Günther Brammer 4b4b8781a0 Make GTK+ and SDL2 work together 
If the gamepad code initialized the SDL video subsystem, GTK+ crashed in
libX11. Or something along those lines.

Making the optional subsystems using SDL for gamepads and audio use
SDL_InitSubSystem and only the SDL Application port do the full SDL_Init
is the proper way to do things in any case.
 2016-02-06 21:12:56 +01:00
Günther Brammer 934b519bb4 Update the SDL port to SDL2 
SDL2 is a much closer match to the other platform code, and
allows the creation of OpenGL 3 core contexts, which is
now required.
 2016-02-06 16:48:21 +01:00
Günther Brammer 70d25b0b91 gtk: Fold contents of C4AppGTKImpl.h into C4AppGTK.cpp 
C4WindowGTK.cpp no longer needs anything from it.
 2016-02-03 03:17:16 +01:00
Günther Brammer 2fe0beebdb Move contents of src/gamescript into other directories 
C4Effect will get moved into the ScriptEngine, and just three source files
is a bit too little for one directory.
 2016-02-02 02:57:46 +01:00
Günther Brammer 8425169dd6 Rename C4Script.h to C4GameScript.h 2016-01-24 12:27:23 +01:00
Günther Brammer 4c01592196 Move C4AulScriptFunc into its own source file 2016-01-24 12:27:23 +01:00
Günther Brammer e790d2c327 Remove duplicated stubs for the scriptengine from mape 2016-01-24 02:09:14 +01:00