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

10430 Commits (6937969175874261615df4dc0539976128ed1805)
 

Author SHA1 Message Date
Lukas Werling 1925f47440 Fix C4NETIO_DEBUG option 2017-01-09 20:35:04 +01:00
Lukas Werling 6c7d8b7bbb Clarify discovery error message 2017-01-09 20:35:04 +01:00
Lukas Werling 592ef85672 Fix local IPv6 address discovery 2017-01-09 20:35:04 +01:00
Nicolas Hake 102047f537 Implement IPv6 support to C4NetIO 2017-01-09 20:34:43 +01:00
Martin Strohmeier 0fd9d1f40b Updated descriptions for scenario: I am rich 2017-01-07 18:40:28 +01:00
Martin Strohmeier daf23b9b32 New scenario: I am rich 2017-01-07 18:19:52 +01:00
Maikel de Vries e6819bf020 use no friendly fire rule in defense scenarios 2017-01-07 17:13:46 +01:00
Maikel de Vries 918e5ded0d add rule to prevent friendly fire 2017-01-07 15:39:34 +01:00
Nicolas Hake c73fed8aa6 C4Group: Make more stuff private 
C4Update needs to access some internal data of C4Group and uses a
special derived class (C4GroupEx). Make everything it doesn't want to
tamper with private so it's more obvious what is and isn't accessed from
outside the class.
 2017-01-07 13:41:50 +01:00
Nicolas Hake aef2705825 C4Group: Delete some dead code 
The pByChild parameter to C4Group::AdvanceFilePtr was never used except
to pass it to itself recursively, and C4Group::ProcessOut was never used
at all.
 2017-01-07 13:41:48 +01:00
Nicolas Hake 561e083181 Win32: Fix build with MSVC's Clang-based toolset 
Well, somewhat. I can't get Clang/C2 to build Qt so I can't build OC
with Qt support.
 2017-01-07 13:41:47 +01:00
Nicolas Hake c2ae62975a Win32: Fix build without Qt 2017-01-07 13:41:46 +01:00
Nicolas Hake b0b0533227 Make c4script binary use our private getopt library if necessary 
Systems that don't come with getopt/getopt_long in their runtime library
need to link to our private copy; link that and use the right const-ness
for its prototype.
 2017-01-07 13:41:45 +01:00
Nicolas Hake eeea131674 Aul: Enable better for loop generation 
Instead of jumping forward and back repeatedly per iteration, we're
moving the incrementor past the body, which is when it's supposed to be
executed anyway.
 2017-01-07 13:35:51 +01:00
Maikel de Vries 220d427915 silence warning for chippie inherited death calls 2017-01-07 07:52:25 +01:00
Mark 8aa442cb2c Defense: Fix typo 2017-01-07 02:22:37 +01:00
Mark 4b33beb9db MoltenMonarch: Clean code 
The king size weapons overloaded entire functions from their original objects. This was replaced by adding interfaces that allow for the manipulation of the desired values.
 2017-01-07 02:21:22 +01:00
Mark db9451dcce MoltenMonarch: Fix musket/blunderbuss 2017-01-07 02:10:00 +01:00
Mark dfc4483ae9 Hideout: Fix typos 2017-01-07 01:35:08 +01:00
Mark 80b3ceb560 Hideout: Make code more readable 
Avoiding duplicate code.
 2017-01-07 01:33:46 +01:00
Mark df031f600e Hideout: Fix warnings (shadowing local variable e), clean code 2017-01-07 01:09:55 +01:00
Mark 172613e0c9 Clonk Control / Ladder: Add possibility of triggering a jump with ydir 
This was part of a bugfix in the ladder for Hazard: The ladder lets the Clonk execute a jump with Clonk.JumpSpeed / 2 at the top. This is useful for extra jumps and other things where you want to force the clonk to jump.

Regarding the ladder: The most of the problems with ladders arise from the OC implementation. Further commits may follow.
 2017-01-06 21:58:13 +01:00
Mark 2168a6948a Base Material: Remove more duplicate code 2017-01-06 15:38:16 +01:00
Mark 879f21acaf Base Material: Add brackets. 2017-01-06 15:34:25 +01:00
Mark 65850d4015 Base Material: Extracted function for accessing the player's base material 
Reduces duplicate code.
 2017-01-06 15:27:11 +01:00
Mark 32245bfb20 Base Material: Rename 'def' to 'material' 2017-01-06 15:19:15 +01:00
Mark 2b5a2740b4 Base Material: Rename 'cnt' to 'amount' 2017-01-06 15:18:11 +01:00
Mark 548d2a7b13 Base Material: Rename 'plr' to 'player' 2017-01-06 15:16:02 +01:00
Maikel de Vries 1d211c9466 fix burning and destruction of vines 2017-01-05 21:06:17 +01:00
Maikel de Vries 948ef66723 fix AI scaling on ladders 2017-01-05 21:05:28 +01:00
Maikel de Vries 1ad0cb7cab remove unused object bigboomattack 2017-01-05 13:47:33 +01:00
Clonkonaut dad7156f6a Airplane now has just one fire button (Mouse Left / CON_Use), Mouse Right (CON_UseAlt) instead cycles through the firing modes. 
As suggested by Maikel (http://forum.openclonk.org/topic_show.pl?pid=32751#pid32751).
 2017-01-05 01:18:34 +01:00
Clonkonaut e4cfd39fdc Let plants grow less crowded, especially different kinds of plants (#1607). 
This will need some testing whether all scenarios are still playable.
 2017-01-04 03:33:28 +01:00
Clonkonaut 3fe83986ce Crash: made airplane invincible (#1754). 2017-01-03 23:03:51 +01:00
Clonkonaut fc9a25d215 Fixed fuse positioning when creating a new one. 
Fuses were created at 0,0 and everything looked ugly!
 2017-01-03 22:45:20 +01:00
Clonkonaut b7771d6906 Krakatoa: fix goal icon. 2017-01-03 22:35:24 +01:00
Clonkonaut 92f5eda3e9 Locomotive: fixed goal icon. 2017-01-03 22:33:45 +01:00
Clonkonaut a8d0f8f75e Chine: fix goal icon. 2017-01-03 22:30:33 +01:00
Clonkonaut d901a8952a Acid Rift: fixed superfluous declaration of global vars. 2017-01-03 22:25:50 +01:00
Clonkonaut 0eed215bbd Clonkomotive: fixed (deprecated) implicit declaration of for loop var. 2017-01-03 22:11:00 +01:00
Clonkonaut 06151bc5e5 Clonkomotive: fixed superfluous declaration of global vars. 2017-01-03 22:09:52 +01:00
Clonkonaut c423ec5de2 Made airplane touchable (#1663). 
Made it untouchable in all missions.
 2017-01-03 22:04:48 +01:00
Maikel de Vries 2ac4f2aa97 move windmill defense sounds to general folder 
So that other rounds can use them as well.
 2017-01-03 18:16:32 +01:00
Mark 83486fceb8 Control: Format scripts 2017-01-03 18:04:10 +01:00
Mark fa28a7a643 Control: Extract library for using menus 
External packs use this functionality without using the whole default Clonk control.
 2017-01-03 18:03:49 +01:00
Mark 39c54c323c Control: Extract library for using objects 
External packs use this functionality without using the whole default Clonk control.
 2017-01-03 18:03:32 +01:00
Maikel de Vries 577da1566a fix defense home base menu buy icon 2017-01-03 17:56:03 +01:00
Maikel de Vries 422207b54d add icons for buying and selling 2017-01-03 17:56:03 +01:00
Clonkonaut e6af3d216a Treasure Hunt: fixed superfluous declaration of global vars. 2017-01-03 16:50:13 +01:00
Clonkonaut b984704812 Raid: fixed superfluous declaration of global vars. 2017-01-03 16:38:47 +01:00