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

176 Commits (54ec5629cd03b536c6d9df95b6a572eb3b7ff285)

Author SHA1 Message Date
Bernhard Bonigl 981ce396ec Made ConstructionSite less filled. 2012-04-23 23:19:52 +02:00
Bernhard Bonigl 83ad05b3c0 GUI now takes inventory-size directly from the clonk. 
Renamed backpack-stuff to inventory in Controller.
 2012-04-23 21:07:11 +02:00
Bernhard Bonigl 12ffe6ab9c Removed overlooked Tube-Updates 2012-04-22 18:48:38 +02:00
Bernhard Bonigl b52dafc7b2 Cleaned up ClonkControls a bit and added more Comments. 
Removed unused function HUDShowItems
 2012-04-22 18:44:28 +02:00
Felix Wagner e9010b81e9 Construction preview: combining, Elevator: combine two for SUPER elevator 2012-04-22 00:00:41 +01:00
Bernhard Bonigl de19c7432e Made ConstructionSites display material below 
Added Stringtables for ConstructionSite
 2012-04-17 18:18:28 +02:00
Bernhard Bonigl fa46079626 Added wireframe preview for Construction Site 2012-04-17 18:08:39 +02:00
Bernhard Bonigl e8ef7a9537 Made ConstructionSite compatible with dir-flipping-preview 
Fixed ConstructionSite not removing on build fail
 2012-04-17 18:08:23 +02:00
Bernhard Bonigl 4c38caaf27 Merged default into Controls 2012-04-17 17:37:52 +02:00
Bernhard Bonigl c6fe70d251 Fixed plants continuing growing after beeing chopped down 2012-04-17 14:28:37 +02:00
Felix Wagner 5ba322b417 Fixed mixed up language 2012-04-16 21:36:52 +01:00
Felix Wagner 366d96680a Rotate your buildings in the construction preview using Space! 2012-04-16 16:31:38 +01:00
Bernhard Bonigl b7fba5ee29 Introduce RefuseTransfer(object) callback. Allows to refuse transfer out of a Container via ContentsMenu. 2012-04-15 18:32:38 +02:00
David Dormagen 6517b230e6 added NoPowerNeed rule, made requesting 0 power possible 2012-04-15 17:02:47 +02:00
Bernhard Bonigl 9236cde273 Fixed faulty productio-time in Producer-Library 2012-04-15 15:11:18 +02:00
Bernhard Bonigl 1c91495eb5 Merged default into Controls 2012-04-15 13:22:38 +02:00
Tobias Zwick cdaabca574 deleted descriptions for libraries 2012-04-15 13:13:41 +02:00
Tobias Zwick 038ef1b4b6 descriptions for structures 2012-04-15 13:13:14 +02:00
Bernhard Bonigl b5f099be79 Hardcoded Construction-Site Intersections. 2012-04-15 00:29:38 +02:00
Bernhard Bonigl a687b0f85c Added simple construction-site-blocking check 2012-04-14 23:37:12 +02:00
Bernhard Bonigl a56c684a19 Fixed Construction sites moving containers into them, instead of their contents. 2012-04-14 23:16:17 +02:00
Bernhard Bonigl 75ec1ed63c Changed ConstructionSite Icon 2012-04-14 22:54:18 +02:00
Bernhard Bonigl 9da6d67c80 Space now also closes menus 2012-04-14 22:53:36 +02:00
Bernhard Bonigl c4e782e713 Moved Close() into Menu.ocd 2012-04-14 22:53:17 +02:00
Bernhard Bonigl 83a972cced Introduced GetInteractionCount(object) to prevent infinite loops 2012-04-14 22:53:02 +02:00
Bernhard Bonigl fefb8b4de8 Added Multi-Interaction-Support for Script (Objects can have multiple interactions) 2012-04-14 22:30:02 +02:00
Bernhard Bonigl e025aed501 Merged default into Controls 2012-04-14 21:55:16 +02:00
Bernhard Bonigl b4fb51249e Controls now tries to handle first actionbar-item before using hardcoded behaviour on pressing Space 2012-04-14 18:41:56 +02:00
Bernhard Bonigl deec6a902a Fixed Bug with CarryHeavy-Display and reaction 2012-04-14 16:51:30 +02:00
Bernhard Bonigl 0bac82bcc3 Fixd UI-Updates with CarryHeavy on Clonk-Selection 
Added CarryHeavy to the Contentsmenu
 2012-04-13 20:24:41 +02:00
Bernhard Bonigl 71dd5fc64d Fixed display-problems with CarryHeavy 2012-04-13 19:14:55 +02:00
Bernhard Bonigl 9a4295f745 Fixed beeing able to drop carryheavy in non-walk 2012-04-13 17:49:09 +02:00
Martin Plicht 7ffa6e58bc Base.ocd: Call Sell with correct? parameters 2012-04-12 20:12:36 +02:00
Martin Plicht a4194c22e9 Replace 0 with nil wherever string/object/array is expected 2012-04-12 11:48:23 +02:00
David Dormagen 99638db4c9 fixed shield exploit: limited the maximum damage of the sword on one target to 9 damage every 15 frames 2012-04-10 23:31:46 +02:00
Felix Wagner 5247e5e769 Merge with default 2012-04-08 22:49:06 +01:00
Bernhard Bonigl de3e9ed9aa Fixed Carryheavy-Animation bugs 
Re-enabled beeing able to grab stuff with carryheavy
 2012-04-08 01:43:15 +02:00
Bernhard Bonigl 45cf4ff147 Reworked Carryheavy: 
* It doesn't need inventory-slots
* It has HUD-Support
* It has a drop-button in the interaction bar
 2012-04-07 23:31:59 +02:00
Maikel de Vries 35f8d6a454 Removed Goal.c and reimplemented effect in Goal library 2012-04-03 20:21:49 +02:00
Bernhard Bonigl 6bece40590 Forgot to add necessary files for ConstructionSites. Fix when merging to default! 2012-04-02 23:57:27 +02:00
Bernhard Bonigl 6ecb036554 Changed Construction-Sites to be containers where material needs to be put into. 
They still construct themselves.
 2012-04-02 23:49:39 +02:00
Bernhard Bonigl 1f41511289 Merged default into Controls 2012-04-02 21:21:21 +02:00
Felix Wagner 527bac9d85 Fixed construction preview in front of tunnel material 2012-04-03 15:11:27 +01:00
Felix Wagner b8be22d9e3 Uncloseable menu for weapon chooser. 2012-04-03 14:51:38 +01:00
Felix Wagner bf795164f2 Resolved all warnings due to global function in included scripts. 2012-04-03 02:12:44 +01:00
Benjamin Herr cdaee93c94 Rename all the drag/drop script callbacks to OnMouseDr* 
MouseDrag is already a property, and would overwrite the callback
functions. Renamed MouseDragDone and MouseDrop for consistency.
 2012-04-01 20:42:14 +02:00
Bernhard Bonigl 093c169a1e Constructions sites removed. You need all ressources on-site to create a construction. 
Locations taken into account: Clonk Inventory, stuff lying around, containers/lorries
 2012-03-29 22:08:54 +02:00
Bernhard Bonigl 71061c8d4b Allowed movement during construction-preview (for better positioning) 2012-03-28 19:39:00 +02:00
Felix Wagner 98f422a2ac Construction preview for the hammer. 2012-03-27 19:10:44 +01:00
David Dormagen 3788bada43 plants will now stop growing for ten seconds after taking damage 2012-03-24 16:18:55 +01:00