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

8314 Commits (44f913d0e5c3f8ae07b6cd4fa3a75dcfd26b07fb)
 

Author SHA1 Message Date
Armin Burgmeier 8766f5123b Remove other usages of built-in GL matrices 
Primarily for the FoW rendering, which now also uses (simple) shaders
without ftransform() everywhere. This also removes all GLU calls.
 2015-12-31 17:30:21 -08:00
Maikel de Vries eaf66850b1 tutorial 3: fine-tuning and title image 2015-12-31 15:07:22 +01:00
Clonkonaut fa4512c5ea Guardians, slight improvements. 
Removed the windbag from the chest (might also remove it from the buy menu).
The chest below the base will now sometimes contain a gold bar, giving extra money to the player picking it up.
Made sure that no airship remains after fade out.
 2015-12-31 12:45:13 +01:00
Maikel de Vries 34fa60feeb dialogue: fix finding by name and public interface to get the target 2015-12-31 12:07:36 +01:00
Maikel de Vries 03ef09135e scenarios: some fine-tuning to clonkomotive 2015-12-31 10:33:27 +01:00
Maikel de Vries b5a00b69af fix whitespaces in tutorial scenario descriptions 2015-12-30 21:44:05 +01:00
Maikel de Vries a6efefaecc fix float physics for objects moving out of a liquid surface (#1523) 
This also fixes objects which previously jumped out of the water continuously, by adding an extra check to also capture faster moving objects. It could be made speed dependent, but that seems to be overkill for the situation.
 2015-12-30 12:54:04 +01:00
Maikel de Vries 64af1e2a8a stars: fix placement and allow scenarios to change placement 2015-12-30 11:36:30 +01:00
Clonkonaut 4a26a7e8ad Increased bounty for several enemies. 2015-12-30 03:25:51 +01:00
Clonkonaut ef48a60b27 Fix possible null pointer. 2015-12-30 03:21:53 +01:00
Clonkonaut 1416887a22 Fix possible null pointer when shooting the balloon. 
I suspect that when the clonk gets send tumbling, OnUnmount might get called and nil rider.
 2015-12-30 03:21:35 +01:00
Maikel de Vries c8dff941dc worlds descriptions: fix whitespace and typos 2015-12-29 23:14:01 +01:00
Maikel de Vries 568c57900b add new world: Clonkomotive (thanks to Pyrit) 
Based on a round made by Pyrit, changed to fit into the worlds folder.
 2015-12-29 22:40:52 +01:00
Maikel de Vries ede6078c75 move out of solidmask as structure library function 2015-12-29 22:40:52 +01:00
Maikel de Vries 5a95f215a7 add wooden bridge 
Parts of the scripts by Pyrit and graphics by Randrian.
 2015-12-29 22:40:52 +01:00
Maikel de Vries 5b1d7d86a5 remove double initialization of wealth HUD in GoldRush 2015-12-29 22:40:52 +01:00
Nicolas Hake 9b34bf2634 Remove arbitrary inline forward declarations of StdBuf (and derivatives) 2015-12-29 21:42:46 +01:00
Nicolas Hake 93df9ba532 Docs: Desc??.rtf is now Desc??.txt 2015-12-29 19:17:48 +01:00
David Dormagen 7fce9071e3 lower interaction priority of dead Clonks 2015-12-29 18:28:23 +01:00
Nicolas Hake ae490dff11 Replace untranslated sentence in Tutorials/DE (#1522) 
Translation provided by K-Pone.
 2015-12-29 18:03:06 +01:00
Nicolas Hake 2723ef5516 Remove definition-local descriptions 
These descriptions wouldn't be displayed anywhere anyway, so we don't
need them.
 2015-12-29 17:58:44 +01:00
Nicolas Hake c0befc6ba0 Remove C4RTF 
The only use of C4RTF in its final moments was parsing out plain text
from RTF files anyway, so why even go to all the trouble instead of just
storing plain text in the beginning?
 2015-12-29 17:51:43 +01:00
Günther Brammer 77a71c39d3 Require some C++14 support (make_unique, index_sequence) 2015-12-29 15:47:55 +01:00
Günther Brammer b8953d8a09 CMake: Simplify precompiled header support for MSVC 
Instead of conditionally adding src/C4Include.cpp, simply add it always. It
doesn't do anything with other compilers, but the tiny speedup from not
compiling it isn't worth the additional complexity.
 2015-12-29 15:47:55 +01:00
Günther Brammer 16ef28e05f Drop unused C4VERSIONBUILDNAME and C4ENGINEINFO 
This was used to name snapshot releases of the Network2 branch, and has
seen almost no use since.

C4ENGINEINFO(LONG) was a duplicate of C4ENGINENAME and C4ENGINECAPTION.
 2015-12-29 15:47:55 +01:00
Nicolas Hake 0ef4e71363 MSVC 2015: Add natvis file to solution 
This employs a rather ugly hack to make CMake do what we want. CMake
doesn't allow us to add items directly to the solution (as opposed to
one of the projects inside it), and thus requires us to abuse its lack
of parameter validation to manually add the file.
 2015-12-29 13:58:15 +01:00
Nicolas Hake 500229c302 C4Extra: Make ownership of ExtraGroups more explicit 2015-12-29 13:56:06 +01:00
Nicolas Hake d0cd244077 C4Extra: Merge ctor/Default, dtor/Clear 2015-12-29 02:59:02 +01:00
Nicolas Hake 3da14127a4 C4TransferZone: Merge ctor/Default, dtor/Clear 2015-12-29 02:59:01 +01:00
Nicolas Hake 63ab46e293 C4Player: Merge ctor/Default, dtor/Clear 2015-12-29 02:59:00 +01:00
Günther Brammer 475ec23ef5 OS X: Use the same compiler flags code as the other stuff 
Also remove redundant and inconsistent setting of the
XCODE_ATTRIBUTE_GCC_PFE_FILE_C_DIALECTS property, and a dead variable.
 2015-12-29 01:48:41 +01:00
Günther Brammer 78f806f03c CMake: Fix check for getopt.h 2015-12-29 01:48:41 +01:00
Günther Brammer 4f64d13fc0 CMake: Remove broken addition of GLEW_DEFINITIONS to openclonk 
This only didn't break earlier because this code was located before
find_package(GLEW). The add_definitions(${GLEW_DEFINITIONS}) call that
actually adds the macro is a bit broad, but the macro doesn't harm the
targets that do not use GLEW.
 2015-12-29 01:48:41 +01:00
Nicolas Hake 6051c3e171 OS X: Stop overriding C++ version 2015-12-28 21:45:22 +01:00
Nicolas Hake 90293d019d C4FoWRegion: Make more private 
Code outside of C4FoWRegion should not care about the internals of the
class. Therefore, we remove direct access to the backing surface (and
secondary buffer surface) and replace it instead with accessors that
return those few values that are required by outside code.
 2015-12-28 21:45:21 +01:00
Nicolas Hake 5a9baeddbf C4FoWRegion: Turn some owned pointers into std::unique_ptr 2015-12-28 21:45:19 +01:00
Nicolas Hake 46abecded7 C4FoWRegion: Merge Clear() into dtor 2015-12-28 21:45:15 +01:00
Nicolas Hake ddd068c830 C4Viewport: Turn some owned pointers into std::unique_ptr 2015-12-28 21:45:14 +01:00
Nicolas Hake 3590dda85a C4Viewport: Merge ctor/Default, dtor/Clear 2015-12-28 21:43:03 +01:00
Günther Brammer 3d00540311 CMake: Check that getopt.h works without additional libraries 
Since there's already a getopt library in thirdparty/, there's no need to
guess about ways to make it work with a system header without support in
the C library itself.
 2015-12-28 20:12:35 +01:00
Günther Brammer bb5f4c9440 Switch gcc to C++14, if supported 
Keep the check for C++0x/C++11 for now. Remove that flag instead of not
adding it, because it most likely still is in the CMAKE_CXX_FLAGS, which
are cached.
 2015-12-28 18:50:32 +01:00
Günther Brammer 6a53066c36 Include config.h only from PlatformAbstraction.h 
In order to avoid duplication, PlatformAbstraction.h has to be included at
the start of every source file, so that various headers can rely on it
being there. To avoid confusion, always rely on that, instead of sometimes
randomly including it or parts of it again.
 2015-12-28 18:50:31 +01:00
Günther Brammer f07038d3ac CMake: Move Mac OS bundle contents near the generated header commands 
Both contain resources for the editor GUI, so they fit together.
 2015-12-28 18:50:31 +01:00
Günther Brammer 715cdd009f CMake: Move the headers and libraries checks before source lists 
This way, the source lists are nearer to the executable definitions, which
also contain source lists.
 2015-12-28 18:50:31 +01:00
Günther Brammer 9c241f507e CMake: Move commands to generate headers from bitmaps into a section 2015-12-28 18:50:31 +01:00
Günther Brammer c3f67cae5a CMake: Arrange the CMakeLists.txt a bit more clearly 2015-12-28 18:50:29 +01:00
Günther Brammer 4b672c3518 CMake: Move vasprintf check to the other compiler checks 2015-12-28 18:48:46 +01:00
Günther Brammer 1ae9343c46 CMake: Silence warnings from GTK+ header files 2015-12-28 18:48:46 +01:00
Günther Brammer 5271b038db CMake: Remove remnants of USE_CONSOLE option 
It wasn't set anymore, except as a C++ macro, so checking it doesn't do
anything.
 2015-12-28 18:48:46 +01:00
Günther Brammer 30e0cdb418 CMake: Re-enable readline support for openclonk-server 2015-12-28 18:48:45 +01:00