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

5833 Commits (73b52a15ced23c28b1f2a5a547a401441f43310e)

Author SHA1 Message Date
Fulgen301 73b52a15ce Remove StringToInteger function 2017-06-14 21:11:39 +02:00
Maikel de Vries bfe9449256 lava core: only have solid mask when frozen 
This causes less lag.
 2017-06-11 14:50:35 +02:00
Mark 16c2fd80d5 Animations: Rolling when hitting the landscape as a separate function 
The logic for rolling can now be overloaded. Runtime overload is not intended yet.
 2017-06-09 21:43:35 +02:00
Maikel de Vries 7b4ba0245b fix script error on basement attachment to scaffold (#1917) 2017-06-03 15:41:03 +02:00
Maikel de Vries 2b88e77254 adapt System.ocg headers to style guidelines and small clean ups 2017-06-02 17:15:08 +02:00
Maikel de Vries f3cadedff1 add effects to block damage and fire 2017-06-02 17:15:08 +02:00
Mark b19e083495 Fixed a typo 2017-05-31 21:59:04 +02:00
Nicolas Hake 9d6d873156 Merge GH-43 from Fulgen301/OCMilestoneProject 
Torch: Add new mesh
  Torch: Emits light when held, remove DoKneel() animation
 2017-05-31 18:13:39 +02:00
Mark 3f9687c1a0 Assert: New assertion for definition context 2017-05-29 21:56:06 +02:00
Sven Eberhardt 04ec41b54c Hide Wearable and RangedWeapon libraries in object creator 2017-05-27 16:34:33 +09:00
Sven Eberhardt 9c2fa297ca Move LavaChunk from volcano to items/resources 
This simplifies editor placement
 2017-05-27 16:33:22 +09:00
Sven Eberhardt a2d6b65668 Add Title.txt for group folders in Objects.ocd and Decoration.ocd 2017-05-27 16:31:46 +09:00
Sven Eberhardt cb86124d78 Ladder: Add editor handles to drag length 2017-05-22 12:15:45 -04:00
Maikel de Vries 0ed4d484fc prevent kill logs rule from creating the relaunch rule 2017-05-15 12:17:17 +02:00
Maikel de Vries 9e9e664581 only show entering interaction if actually standing at the entrance of an object 2017-05-13 15:04:02 +02:00
Maikel de Vries 496c73a50f add a method to calculate the area to the shape library 2017-05-13 14:59:14 +02:00
Maikel de Vries fd734330d6 first try to enter pushed vehicle when entering objects 
There was no possibility to enter vehicles into yet, so this would be my first attempt to solve this, we can evaluate this and improve if needed.
 2017-05-12 14:38:36 +02:00
Mark 70a89ce4f8 GUI: More robust calculation 2017-05-11 21:52:20 +02:00
Mark 1362494790 Fixed accidental redeclaration existing constant 2017-05-11 21:19:47 +02:00
Sven Eberhardt 9abf0d156e Add editor drag handle to extend tunnel support decoration 2017-05-10 18:42:56 -04:00
Mark 739ddc2be3 Additional GUI layout 
I found it a lot easier to create GUIs with these functions, so I decided to add them. If something can be simplified, please tell me so.
 2017-05-10 22:33:38 +02:00
Mark 631c239717 Merge function for proplists 2017-05-10 22:03:57 +02:00
Mark 03dc2cb84f Some common assertions 
An attempt in reducing duplicate code :)
 2017-05-10 21:52:54 +02:00
Sven Eberhardt 1b4fd9abe3 Editor: Add translation overview table (Tools menu) 2017-05-09 22:43:56 -04:00
Sven Eberhardt 7d535ac6db Fix US name of Goal_RubyHunt 2017-05-07 15:29:42 -04:00
Sven Eberhardt fec7a7c084 Fix localized description display in script goal 2017-05-07 15:28:37 -04:00
Sven Eberhardt 94669cebe4 Merge branch 'master' of ssh://git.openclonk.org/openclonk 
Conflicts:
	src/editor/C4ConsoleQtPropListViewer.cpp
 2017-05-07 15:16:01 -04:00
Sven Eberhardt bc4425462c Add localization support for string evaluators, gravestone and signpost inscriptions and custom game goal texts 2017-05-07 15:03:11 -04:00
Sven Eberhardt 4fac960cf4 Editor: Add localized string support 2017-05-07 14:26:30 -04:00
Maikel de Vries 77dca569fe Switch: properly process and save editor actions 2017-05-06 18:55:27 +02:00
Fulgen301 2c15422c2e Torch: Add new mesh 2017-05-05 17:53:36 +02:00
Clonkonaut d750a57410 Hatch: combine with basements even if the construction preview hasn't been properly combined. 
The hatch will automatically attach itself onto basements it finds around its center after it has been built. This makes it easier to use since people probably tend to forget combining the construction preview. Especially since basements are very slim. The hatch will reposition itself in order to attach. This means it is not right where the player placed it. The alternative would be to move the basement and I guess that even more unwanted.
 2017-05-03 09:42:25 +02:00
Clonkonaut fd55514279 Fixed shape of tunnel supports. 2017-05-02 23:48:50 +02:00
Clonkonaut 861b0bc08e Added a simple static ladder to be used by scenario designers. 
This thing is a lot faster than the rope ladder.
 2017-05-02 22:57:01 +02:00
Clonkonaut 649c61cd2a New decoration object: tunnel support (graphics by Ringwaul, from a long time ago). 
Can be stretched using the Extend() function.
 2017-05-02 22:53:49 +02:00
Clonkonaut ad6a986d10 Scripted the Hatch that Ringwaul made ages ago. Can be built on top of basements (or without) to make a vertical opening. 2017-05-02 22:50:32 +02:00
David Dormagen 0d32d924dc InteractionMenu: fix script error when custom entry extra_data contains something different from a proplist 
The check was only meant for inventory menus (where extra_data always is a proplist); it was not in the right if-clause below, though.
 2017-05-02 19:13:48 +02:00
Maikel de Vries 34f736081c fix relaunch time and unwanted initial relaunch 2017-05-02 14:50:27 +02:00
Maikel de Vries 3e0f18f4f3 reinstate relaunch container functionality 
This has been used by external scenarios and there is no reason to put this into the relaunch rule script.
 2017-05-01 21:26:01 +02:00
Fulgen301 1d92b47141 Torch: Emits light when held, remove DoKneel() animation 2017-05-01 15:38:35 +02:00
Maikel de Vries cc480be3eb relaunch rule: add option to prevent round start relaunch 2017-05-01 11:46:34 +02:00
Maikel de Vries f3291bb84f clean up and document relaunch rule 
Also fix script errors in melting castle.
 2017-05-01 11:00:51 +02:00
Maikel de Vries 18057587d6 fix relaunching in CTFs 2017-04-30 18:42:44 +02:00
Maikel de Vries 0fead04978 fix relaunching problems in missions 2017-04-30 16:13:57 +02:00
Maikel de Vries 3b1ebdcdb0 do not move seaweed by tele glove or windbag 2017-04-25 20:12:44 +02:00
Maikel de Vries 6f1470dbbd correctly update barrel graphics when emptied onto existing stack 2017-04-25 14:04:43 +02:00
Maikel de Vries afe4d5a91e fix overcast teleport scroll (#1909) 2017-04-25 11:52:50 +02:00
Maikel de Vries cb68f9b26b fix parkour in combination with new relaunch rule 2017-04-25 10:26:27 +02:00
Maikel de Vries a863845ed4 add missing variable to relaunch rule 2017-04-25 09:45:12 +02:00
Maikel de Vries 7ffbeac9a9 Merge branch 'master' into Rule_Relaunch 2017-04-24 21:46:05 +02:00