Julius Michaelis
64dd72c380
Fix dedicated: Load JPEG surfaces so the texture shape information can be correctly generated
2016-10-30 21:36:29 +01:00
Julius Michaelis
e61dcbe4c3
Extend the netpuncher: clients can ask hosts for a connection initiation to circumvent port restricted NATs
2016-10-23 22:34:43 +02:00
Julius Michaelis
078ac47780
Add CMake option for headless-only build.
2016-10-23 22:34:42 +02:00
Julius Michaelis
072c4a3475
Fix windows build: link libpng to libopenclonk
...
Attempt #2
2016-10-22 21:33:10 +02:00
Julius Michaelis
b658f6aeed
Fix windows build
...
Attempt #1
Make that 26 compilation units saved.
2016-10-22 19:59:23 +02:00
Julius Michaelis
f72bfc72a3
Add a libopenclonk target to save compiling some units twice
...
Unfortunately, only 27 units could be deduplicated with the current state of USE_CONSOLE.
2016-10-22 18:28:25 +02:00
Julius Michaelis
376ca5a9df
Prevent using USE_CONSOLE in lib{misc,c4script}
2016-10-22 17:42:23 +02:00
Julius Michaelis
34a9a1de8d
Twiddle with header organization: lib{misc,c4script} do no longer include GL/glew.h
...
(Yes, it is just that complicated.)
2016-10-20 18:46:32 +02:00
Nicolas Hake
e2fd7095c1
Merge branch 'ast'
...
# Conflicts:
# src/C4Include.h
# src/script/C4AulCompiler.cpp
# src/script/C4AulParse.cpp
# src/script/C4AulParse.h
# src/script/C4ScriptHost.cpp
# src/script/C4ScriptHost.h
# tests/CMakeLists.txt
2016-10-20 17:33:02 +02:00
Nicolas Hake
6a6f4520d3
Merge pull request GH #25 from Mailaender/appdata
...
Added a Linux AppData file
2016-09-17 11:55:43 +02:00
Linus Heckemann
355b6fe070
Require Qt 5.4+ for editor — needs QOpenGLWidget
2016-09-17 08:23:07 +01:00
Lukas Werling
c41f93a2f6
Fix c4script and mape build
2016-09-08 21:45:30 +02:00
Lukas Werling
7177c261b3
Bring back and fix the netpuncher
...
As carrier-grade NATs are becoming common, many players cannot host
Clonk games at all. The simple STUN-like netpuncher from Clonk Rage
which was removed three years ago is already effective against some
DS-Lite NATs.
With some extensions, we should be able to make it work with more
restrictive NATs as well.
This reverts commit 72002cc366
.
2016-09-08 21:10:06 +02:00
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
092a23c2f7
Aul: Parse scripts into an AST, then generate bytecode from that
...
This commit contains a fairly substantial rewrite of the C4Script code
generator. Instead of generating bytecode while parsing the script,
we're now parsing the script into a syntax tree, and have any further
processing happen on that instead of the raw source.
At this time, the code generator emits the same bytecode as the old
parser; there are several optimization opportunities that arise from the
new possibility to emit code out of order from its specification by the
author.
Compared to the old compiler, this one is still rather deficient when
dealing with incorrect code; it's also not emitting several warnings
that used to be diagnosed.
2016-05-12 19:43:48 +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