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

6256 Commits (master)

Author SHA1 Message Date
Maikel de Vries 5bb9fa228a ladder: climb up and down smoothly when grabbing ladder 
I don't know the reason for not having this, but now we mimic normal wall climbing behaviour which is much smoother and leads to faster game play.
 2018-06-23 10:05:45 +02:00
Maikel de Vries b11a25db4b fire: only reduce own fire strength if incineration of nearby object was successful 2018-06-23 10:05:45 +02:00
Maikel de Vries 446564f703 implement eternal flame saving 2018-06-23 10:05:45 +02:00
Martin Strohmeier a51560ce4f Add Nautilus to music folder 2018-04-21 15:13:32 +02:00
Maikel de Vries 899fbaa867 cable cars: let sawmill send empty hoist to pickup trees 2018-04-16 11:13:32 +02:00
Maikel de Vries a4d20d79d5 cable cars: extend order interface and let producer order more components at a time 2018-04-16 11:13:32 +02:00
Mark 75a82e172a Added a generic ambient sound object 
Is more versatile than Ambience_Zicadas. Could need some editor
functions. Backported from OC Classic.
 2018-04-14 14:12:52 +02:00
Maikel de Vries 1e060d6124 cable cars: improve deliveries and producer requests fuel 2018-04-12 09:21:00 +02:00
Maikel de Vries 618b4039b3 cable cars: fix finding crossing for power supply when previous fails 2018-04-12 09:21:00 +02:00
Maikel de Vries 051863db5f make cable crossing structure flippable 
This makes it easier for now to go around cliffs, a better solution where crossings can be rotated needs more work in the hammer script.
 2018-04-12 09:21:00 +02:00
Maikel de Vries f4991f9705 remove base respawn rule 
Is deprecated in 8.0 and can be removed now, all functionality is implemented in the relaunch rule.
 2018-04-12 09:21:00 +02:00
Maikel de Vries c00a8cf3c3 fix a bunch of suspicious assignment warnings 2018-04-09 11:53:55 +02:00
Lukas Werling d9f9a2a9a3 Find_Property: Implement searching for specific value (#2021) 2018-04-08 15:00:27 +02:00
Mark 5dc4282b56 Replaced old calls to GainMissionAccess 2018-04-05 19:36:50 +02:00
Mark 4212310a9f Renamed *MissionAccess functions 
Added legacy wrappers and updated the documentation.
 2018-04-05 19:34:16 +02:00
Sven Eberhardt 065c8b7d96 Fix zoom setting by PlayerStart object 2018-04-04 19:59:32 -07:00
Mark a987f87181 Add version parameter to legacy warning 2018-04-04 21:49:39 +02:00
Mark 75bfef6b06 Use SetNextScenario() in the scenarios 2018-04-04 21:22:04 +02:00
Mark 1682f62df8 Function: SetNextScenario 
Renamed and documented the former function SetNextMission. Added a script wrapper for the old function that issues a warning. Renaming is based on the fact that the docu speaks of scenarios, and other functions, such as GainScenarioAchievement already use this terminology
 2018-04-04 21:17:16 +02:00
Maikel de Vries 82e674ddb8 cable cars: make crossing proper structure and resource chute upgrade 2018-04-02 16:03:52 +02:00
Maikel de Vries a70ab8b843 cable cars: let steam engine request coal when needed 2018-04-01 20:54:12 +02:00
Maikel de Vries 7178cf6a0a cable cars: improve hoist destination selection 2018-04-01 20:54:12 +02:00
Maikel de Vries 42a62aa730 cable car: make car a power consumer via crossings 2018-04-01 20:54:12 +02:00
Maikel de Vries 3085bfd264 power system: add functions to check if production and consumption is registered 2018-04-01 20:54:12 +02:00
Mark b12e54ef21 New coal texture 2018-04-01 20:29:54 +02:00
Lukas Werling 1382478774 Extract Goal_MultiRoundMelee from HotIce 
There are currently multiple multi-round scenarios in development that
all copy most of HotIce's >500-line scenario script for the multi-round
logic. This commit isolates that logic in a goal with an easy-to-use
interface.
 2018-03-31 16:08:29 +02:00
Maikel de Vries 07e66279be cable cars: scenario saving for cable car 2018-03-31 11:33:08 +02:00
Maikel de Vries 816754a3de cable cars: improve tests and script clean up 2018-03-31 11:32:42 +02:00
Maikel de Vries c629661af2 cable reel: fix connecting, max cable length, ensure straight cables 2018-03-31 10:44:36 +02:00
Maikel de Vries a28b3b9ca1 cable cars: fix network recreation when cable has broken 2018-03-30 10:54:41 +02:00
Maikel de Vries d8736a56ac cable cars: improve network deletion and recreation + clean up 
This is a rather chaotic commit and does not solve all problems of network creation yet, but is an improvement over the old system where deletion of a cable line would fail the network. However, we probably need a cleaner method to construct a network properly.
 2018-03-29 21:28:07 +02:00
Maikel de Vries 49d03e52c6 improve cable car test scenario 2018-03-29 21:28:07 +02:00
Maikel de Vries 2b9c96de30 make hoist target move more fluently 2018-03-29 21:28:07 +02:00
Maikel de Vries ff21dc3cfa improve destination selection menu a bit 2018-03-29 21:28:07 +02:00
Maikel de Vries 330e275b3d cable hoist: new type effect, prevent interactions when attached, complete menu texts 2018-03-29 21:28:07 +02:00
Maikel de Vries 85f1c714f7 add material costs to cable car components 2018-03-29 21:28:07 +02:00
Maikel de Vries 7768e6c992 fix script error when accessing non-initialized cable request queue 2018-03-29 21:28:07 +02:00
Maikel de Vries abfeb86e30 add cable cars test scenario 2018-03-29 21:28:07 +02:00
Maikel de Vries d7e3a4acd6 cable car: not ready for a new delivery if currently doing one 2018-03-29 21:28:07 +02:00
Maikel de Vries b1d1079d88 prevent script error in cable station if other station could not be found 2018-03-29 21:28:07 +02:00
Maikel de Vries e603bce240 add interaction menu tooltip and description for disengaging a cable car 2018-03-29 21:28:07 +02:00
Maikel de Vries 2a344b4543 fix hide in editor for cable car objects 2018-03-29 21:28:07 +02:00
Mark 6aa72c1bdd Fix axe 2018-03-22 22:12:00 +01:00
Mark 21102bb4ef Melee Weapons: Code formatted for remaining melee weapons 
No actual changes, just added spaces and brackets for improved readability
 2018-03-20 21:13:45 +01:00
Mark 69d6b2e8d2 Melee Weapons: Code formatted 
No actual changes, just added spaces and brackets for improved readability
 2018-03-19 20:51:29 +01:00
Mark aea27f8758 Construction site: Take missing materials as interaction 2018-03-18 19:53:57 +01:00
Clonkonaut 6f521a0805 Tutorial 8: fix in German language dialogue (#2009). 2018-03-17 17:21:18 +01:00
Clonkonaut 80b3a08770 Removed my stupid debug log. 2018-03-17 16:41:27 +01:00
Clonkonaut 4b0bca3c0d Tutorial 2: Tell the player about Roger a bit earlier (when entering the junction), so you do not miss him and mess up the scenario. 2018-03-17 16:31:43 +01:00
Maikel de Vries 52d8fdbafd warn about deprecated use of base respawn rule 2018-03-16 18:16:05 +01:00
Maikel de Vries 81b060ffb3 fix king of the hill graphics in editor mode 2018-03-16 14:00:04 +01:00
Maikel de Vries ffbda90130 convert paths to backslashes for Scenario.txt Definition entries 2018-03-16 13:54:52 +01:00
Maikel de Vries 3da209462e moving brick: fix movement graph saving 
Did not test all corner cases but this improves the situation for sure.
 2018-03-14 17:54:25 +01:00
Maikel de Vries 6efb292fa7 flame: option to make eternal for editor mode 2018-03-14 16:50:57 +01:00
Maikel de Vries f81d41ba84 correctly update active fire effect when NoBurnDecay changes 2018-03-14 16:38:33 +01:00
Maikel de Vries 017960cbc2 do not show compensator burning battery in editor creation list 2018-03-14 16:35:11 +01:00
Maikel de Vries 9ffab151c6 remove duplicate cloud effect object 
The particle had the same graphics as the real Cloud object and the script does not seem to have any uses. Also unused for more than 4 years.
 2018-03-14 11:49:02 +01:00
Maikel de Vries 3808c22df4 make time object more editor friendly 2018-03-13 22:32:03 +01:00
Maikel de Vries e084947bcd fix meteor graphics 2018-03-13 20:40:33 +01:00
Maikel de Vries d01aaa20bd waterfall: implement editor interface 2018-03-13 20:37:46 +01:00
Maikel de Vries b534bbb5f9 hide some more objects in editor creation list 
The burned object may be creatable, but must then be moved such that the libraries parent folder remains invisble in the editor.
 2018-03-12 22:30:02 +01:00
Maikel de Vries e7b4ce7bf2 relaunch rule: fix scoreboard updating and scenario overloading 2018-03-11 17:06:02 +01:00
Maikel de Vries 9fc94509c4 remove playground scenario 
Sandbox is the new playground.
 2018-03-11 17:06:02 +01:00
Maikel de Vries 0e535f880e sandbox: more scenario options and better map generation 2018-03-11 17:06:02 +01:00
David Dormagen 29a1a21526 club respects Rule_NoFriendFire and IsProjectileTarget (#1993) 
Not recommended for 8.1, because there are semantic changes: The club can now also hit targets (IsProjectileTarget) while before it could only hit OCF_Alive and C4D_Object. It's similar to the sword now.
Oh, and before it could also not hit livings that were stuck.
 2018-03-11 15:04:59 +01:00
Maikel de Vries 1748797172 treasure hunt: fix wrong dialogue translation of Dagobert to Scrooge 2018-03-05 10:40:14 +01:00
Maikel de Vries 2d0221b8d0 add wooden sign object 
Graphics made by Foaly.
 2018-03-04 09:43:44 +01:00
Maikel de Vries 478a4e7f85 signpost and stone sign: clean up scripts and lessen code duplication 2018-03-04 09:37:20 +01:00
Maikel de Vries 03d0bb49dc c4script: some fixes for style guidelines and typos 2018-03-03 12:27:34 +01:00
Maikel de Vries e9f87ca028 add stone sign object 
Graphics made by Foaly.
 2018-03-03 12:22:19 +01:00
Maikel de Vries 65daa55156 fix guide post pictures and interaction icons 2018-03-03 12:19:03 +01:00
Maikel de Vries a2d7374302 prevent floor switch from making object stuck while moving 2018-02-28 10:35:17 +01:00
Maikel de Vries a023b63fda item spawn: prevent pickung up two carry heavy objects 2018-02-26 12:25:00 +01:00
Maikel de Vries f199169c8f item spawn: instantly pick carry heavy items 2018-02-25 21:32:27 +01:00
Maikel de Vries 0c12b02727 keypad: save code hashed, so that they can't be read off in editor mode 2018-02-25 11:31:39 +01:00
Nicolas Hake e3de9f1003 Add BLAKE2 library and expose its a CS hash algorithm to script 
The crypto "library" only consists of a single function at the
moment because that's all that users have asked for so far. It is
also highly experimental. We will make an attempt to keep the public
interface (i.e. the interface provided by Library_Crypto.c) stable,
but it might still change if necessary. The internal interface
(provided via the global _Crypto proplist) is not for public
consumption and will probably change at some point.
 2018-02-25 10:23:30 +01:00
Maikel de Vries 3224e2c5cd fix dialogue image size for use as icon 2018-02-21 17:15:41 +01:00
Maikel de Vries 1f1149861a add star icon 2018-02-21 15:30:48 +01:00
Mark b0a790c747 Volcano: Fix copy & paste error 2018-02-13 23:28:38 +01:00
Mark c792833d98 Volcano: Additional script possibilities 
Added settings for minimal and maximal strength, reset to defaults if passing nil as a parameter, possibility to overload chunk effects on eruption
 2018-02-13 23:23:00 +01:00
Mark f62050cf5b Docu: Volcano strength 2018-02-13 23:03:11 +01:00
Maikel de Vries 18dce041e1 floor switch: improve object detection and save switch mass 2018-02-09 11:30:58 +01:00
Maikel de Vries 3ad91ee02b add stalactites to hot ice as decoration (#1564) 2018-02-05 16:54:02 +01:00
Maikel de Vries 42310548d8 stalactite: fix raindrop, allow placing in sky, fix stalagmite, clean up 2018-02-05 16:53:07 +01:00
Maikel de Vries e94a0b3c36 molten monarch: fix fire particles and fade out gravestones (#1560) 2018-02-05 15:04:46 +01:00
Maikel de Vries 81abbce77a flammable library: burned object copies motion from inflamed object 2018-02-04 21:20:39 +01:00
Maikel de Vries 369e2d0b0c sandbox: remove god mode objects on departure 
This ensures that their too large graphics do not appear for the player, the only departure is when the clonk dies or is removed.
 2018-02-03 09:34:45 +01:00
Maikel de Vries 1113761679 sandbox: use spraycan and overload functionality 2018-02-01 21:38:24 +01:00
Maikel de Vries 3a866caa73 maze: fix warning for declaration of variables and move spray can to Decoration.ocd 2018-02-01 21:23:14 +01:00
Maikel de Vries 22ca0513cc remove strange pixel artefacts from signpost graphics 2018-02-01 20:58:13 +01:00
Maikel de Vries d65dd96851 sandbox: add english translations and clean up scripts 2018-02-01 20:55:24 +01:00
Maikel de Vries 9e01a861ce fix some more structure vertices, also for asymmetric ones when flipped (#1979) 2018-01-31 19:59:41 +01:00
Maikel de Vries 18bb8371d3 ... and remove log used to find the problem 2018-01-30 21:29:45 +01:00
Maikel de Vries 041597971f fix typo in ladder library that adds an infinite amount of effects to the clonk over time 2018-01-30 21:28:30 +01:00
Maikel de Vries 8889a68127 horrid highway: fade out trains if they are taking too long 2018-01-29 10:16:14 +01:00
Lukas Werling 53f29ccb96 Update remaining Version entries from 7 to 8,0 
Maikel missed some in aa89217 ("update version to 8.0 in DefCore.txt,
Scenario.txt and Version.txt").
 2018-01-28 23:09:06 +01:00
Arne Schauf 8ad13a4d51
Fix german description typo 2018-01-28 17:54:47 +01:00
Lukas Werling 0f78e63f02 Add warning for broken runtime join (#1109) 
This also fixes the "no runtime join" error appearing for pre-lobby
games, where joining usually works anyways.
 2018-01-28 17:34:45 +01:00
Lukas Werling 223ab6f77b Add warning about unfinished gamepad controls 2018-01-28 17:18:20 +01:00
Maikel de Vries aa892171fb update version to 8.0 in DefCore.txt, Scenario.txt and Version.txt 2018-01-28 13:18:46 +01:00