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

6187 Commits (82e674ddb849789b7018d417e74ea50440d66525)

Author SHA1 Message Date
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