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

5738 Commits (fa6795370f7652767709adc135ad4d296f9a5154)
 

Author SHA1 Message Date
Maikel de Vries fa6795370f Decoration.ocd added and includes ruins from DarkCastle 
Please start using this folder for decorative objects other developers might want to use as well.
 2014-04-06 15:50:06 +02:00
Julius Michaelis ccb6bfbc81 Remove obsolete effect level slider and configuration option 2014-04-03 23:02:00 +02:00
Julius Michaelis e5b7ef5b80 AutoFrameSkip: Graphics option to reduce lag by slow 
Skips drawing every second frame if drawing the previous frame was too slow
Setting is controlled by game host
Default: on

Imported from Clonk Rage

From e6e680f49ac50a352e9a051ee21622e7f00648b6 Mon Sep 17 00:00:00 2001
From: sven2 <sven2@786b8e90-9c09-0410-89a9-bccc6ef1e79b>
Date: Sat, 21 Sep 2013 21:34:44 +0000
Subject: [PATCH] + AutoFrameSkip: Graphics option to reduce lag by slow
 clients in network games

git-svn-id: https://www.clonk.de:83/svn/clonk/stable@14501 786b8e90-9c09-0410-89a9-bccc6ef1e79b
 2014-04-03 14:53:12 +02:00
Julius Michaelis 405fc4f841 Fix dedicated 2014-04-02 20:53:12 +02:00
Julius Michaelis 66d11b459c Default-deactivate gcc precompiled headers in CMakeLists 2014-04-02 20:53:12 +02:00
Maikel de Vries 1c6f62466b Fixed Ametyst to Amethyst typos 2014-04-02 19:46:52 +02:00
Julius Michaelis 67a99a88d9 Proper shutdown on SIGINT/SIGTERM/SIGHUP 2014-04-01 18:03:36 +02:00
Julius Michaelis a06b7e3c23 Fix use after free and conditional jump on uninitialized 2014-03-31 12:07:58 +02:00
Julius Michaelis cfc5af7f9d Do not exit round on closing game over dialoge with ✗-button 2014-03-30 16:03:26 +02:00
David Dormagen 7d7308290f added missing SolidMask.png to Hideout/ShieldGem (fixes being able to pass through shield) 2014-03-29 18:58:10 +01:00
K-Pone d4707e2da3 Added Motorway to Music.ocg 2014-03-26 08:56:09 +01:00
Nicolas Hake 3c80a745b0 MinGW: Use __mingw_vasprintf if available 
Recent versions of MinGW do no longer declare vasprintf in <stdio.h>,
but they ship a compatible function called __mingw_vasprintf. Use this
function if vasprintf isn't available.
 2014-03-25 23:20:34 +01:00
Nicolas Hake dde5556105 cmake: Correctly check for vasprintf and iconv 
CheckFunctionExists only checks for the function to be linkable, it does
not require any declaration in a header. CheckSymbolExists requires a
declaration and also linking to succeed.
 2014-03-25 23:16:01 +01:00
Julius Michaelis f04d1163b1 Fix gcc precompiled headers 2014-03-25 19:11:22 +01:00
Nicolas Hake e230c90e0b Merge branch 'issue1060' 2014-03-25 18:30:53 +01:00
Nicolas Hake 6a5d738f03 Validate texmap entries on load (#1060) 
This makes sure texmap entries look correct, thus avoiding a crash that
happened when the entry referenced a material without specifying a
texture.

Closes #1060.
 2014-03-25 18:30:11 +01:00
Nicolas Hake 057743605d Add test case for #1060 2014-03-25 18:28:03 +01:00
Nicolas Hake 5c7e5446ba Move <regex> inclusion to C4Include 
Since multiple source files may want to use regular expressions, move
the header inclusion before setting up heap debugging.
 2014-03-25 18:28:02 +01:00
Clonkonaut b16bb3a917 Coconut Tree stops dropping coconuts when chopped (#1046). 2014-03-24 23:57:49 +01:00
Clonkonaut 7895caacd1 Changed link from GetViewMode to GetPlrViewMode (#1050). 2014-03-24 23:53:46 +01:00
Sven Eberhardt 75c5ac1465 Enable league button if an alternate server is set. To be re-enabled completely when an OC league exists (and when we have new button graphics). 2014-03-23 20:41:58 +01:00
Julius Michaelis c1a430c561 Replace sizzle sound for foundry, use foundry's sizzle for lava/water reactions 2014-03-23 15:59:13 +01:00
David Dormagen 7ab65f8618 the compensator's charge-indicator-helper is no vehicle anymore 2014-03-22 19:52:27 +01:00
Maikel de Vries d1485df38a Fixed grapple bow for shot while wall jumping 2014-03-22 19:41:37 +01:00
K-Pone 5d2750a7e4 Added IslandDreams to Music.ocg 
!! We have finally got our first music in OpenClonk !!
!! Thanks to  K-Pone !!
 2014-03-21 22:38:29 +01:00
Lorenz Schwittmann 7678ad8f17 fixed compensator charged indicator (#1056) 
- correct y offset
- show indicator in front of compensator
 2014-03-21 22:22:06 +01:00
Maikel de Vries 6a9063ff7e Fixed loam description (#1040) 2014-03-20 21:17:46 +01:00
Maikel de Vries db8e639b3e Fixed some Clonk 4 string occurrences in C4Console 2014-03-20 21:16:27 +01:00
Nicolas Hake 802cc8ece9 Fix some uses-after-free due to terrible StdBuf semantics 2014-03-19 14:21:23 +01:00
Julius Michaelis c49bc99efe Options/Graphics: tidy up 
Remove Config.Graphics.ShowAllResolutions
 2014-03-17 22:29:39 +01:00
Sven Eberhardt 9451a29768 Fix GoldenMountain multiple goal activation 2014-03-16 21:44:04 +01:00
Nicolas Hake 01d5507c22 lang/de: Don't use 'ü' as accelerator 
Taking over a player had the 'ü' key assigned as accelerator. Since that
doesn't work anyway, switch to a more conservative 'n'.
 2014-03-11 00:30:34 +01:00
Nicolas Hake 7a65ebade8 Warn on unsupported accelerator keys 
Chars outside the basic latin alphabet don't actually work as
accelerator keys. Emit a warning when encountering them.
 2014-03-11 00:26:13 +01:00
Nicolas Hake 4a3ece5f5d Don't split UTF8 when handling accelerators (#983) 
Marking up accelerator keys still assumed all characters were one byte
wide. Change this to accept multi-byte characters.
 2014-03-11 00:25:38 +01:00
Maikel de Vries adbe3c629b GemGrabbers: gems stalactites reappear to allow for more risky game play 2014-02-23 17:22:57 +01:00
Maikel de Vries 2cf42422b4 Improved information of SellGems goal 2014-02-23 17:15:39 +01:00
Maikel de Vries 65b54132ac Make sure LargeCaveMushroom does not burn forever 2014-02-22 15:08:05 +01:00
Sven Eberhardt fe20ef43a7 Fix AcidDrilling goal (#1038) 2014-02-18 22:56:44 +01:00
David Dormagen 6b25e54f0b PV_Step: added "maximumValue" parameter 2014-02-18 20:37:43 +01:00
David Dormagen b533d3b390 particles: minor documentation fixes 2014-02-18 20:37:16 +01:00
David Dormagen bc9b5c8bd7 added documentation for PV_Gravity 2014-02-18 19:13:51 +01:00
Nicolas Hake 7b495cdef4 C4Script: Allow more format flags 
In addition to field width and precision, also accept sign flags (+, -,
<space>) and the "alternate output" flag (#).
 2014-02-17 23:10:50 +01:00
Maikel de Vries c075103bb9 Added GetDescription to all goals 
This will be used by the new HUD on the controls branch.
 2014-02-17 20:41:02 +01:00
Martin Plicht 46df9d758c StdScheduler: Make DoScheduleProcs virtual, override it in C4AbstractApp and set isInManualLoop flag around the DoScheduleProcs call so the FlushMessages() of C4AbstractApp will happen when isInManualLoop is true 2014-02-16 14:54:32 +01:00
Martin Plicht e02b2d425f C4NetIO: #ifdef __APPLE__, not APPLE 2014-02-16 14:54:26 +01:00
Sven Eberhardt 085ec9de27 Fix DarkCatle null pointers and intro (#1034) 2014-02-16 13:55:46 +01:00
Maikel de Vries 5ebe30e77c Fixed the pickaxe creating huge amounts of earth (#1030) 2014-02-16 11:58:41 +01:00
Maikel de Vries e7eabe01a7 Fixed boomshire's door solidmasks (#1035) 2014-02-16 11:37:18 +01:00
Martin Plicht 61cd4271c9 C4NetIO: mac: To be on the safe side, only activate poll timeout cap when APPLE 2014-02-16 10:54:24 +01:00
Martin Plicht 90dec14601 cmake: mac: Re-add libs bundling, revert to LegacyFindFreeType for APPLE 2014-02-16 10:18:45 +01:00