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

2129 Commits (3989baedbd8c6185cd278139affdc0bc42404b10)

Author SHA1 Message Date
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
Tobias Zwick b85c4d6001 show tooltips from Description property for content menu items 2012-04-15 12:18:40 +02:00
Tobias Zwick 3333160efa show tooltips from UsageHelp property for backpack items 2012-04-15 12:17:50 +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 219bceefcd Added Helper-Functions returning the left/right/top/bottom Edge of an object 2012-04-14 23:36:54 +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 c366f33fad Fixed Carryheavy having wrong constant in ObjectSelector 2012-04-14 22:30:19 +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 912f8bd313 Added new Ok and Cancel icons 2012-04-14 22:29:25 +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 c75f70e387 Fixed error message with boompack 2012-04-14 16:51:11 +02:00
Bernhard Bonigl 367af8ba9f Fixed error when updating attach before attaching 2012-04-14 16:51:01 +02:00
Bernhard Bonigl 1d51575b67 Fixed Dialogue not continuing 2012-04-14 16:02:10 +02:00
Bernhard Bonigl 0d53a16a21 Backed out changeset: b48412700d66 2012-04-14 15:38:18 +02:00
Armin Burgmeier eca25614fe Increase max. player size in settlement scenarios 2012-04-14 16:39:45 +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 0dda1f59f5 Fixed ContentsMenu Transfer from leftmost clonk to selected clonk if no containers were present. 2012-04-13 19:27:58 +02:00
Bernhard Bonigl f5d88c0da5 Backed out changeset: 9ed36a2c6ab2 
Making stuff unintuitive is not a "fix".
 2012-04-13 19:18:39 +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
Felix Wagner 57c0dec3f5 Earthquake sound 2012-04-12 21:49:41 +01:00
Maikel de Vries e7f770923b Fixed setting frequency of disasters 2012-04-12 22:15:54 +02:00
Martin Plicht 7ffa6e58bc Base.ocd: Call Sell with correct? parameters 2012-04-12 20:12:36 +02:00
Martin Plicht 67f697c94b Don't pass 0 for the effect when calling RemoveEffect with effect name 2012-04-12 20:02:53 +02:00
Martin Plicht a4194c22e9 Replace 0 with nil wherever string/object/array is expected 2012-04-12 11:48:23 +02:00
Maikel de Vries d0e2b08041 Added Meteor 
Can be used in the same way as earthquakes via definition calls.
 2012-04-11 22:41:08 +02:00
Maikel de Vries 3b84fdb582 Earthquake uses definition call in scenarios 
Somehow I like this method, and I will use it for all disasters and maybe other environment objects as well.
Launching earthquakes is still possible via a global function though. Still needs sound...
 2012-04-11 22:32:01 +02:00
Armin Burgmeier ad3a19008d MtBrame.ocs: Some minor map adjustments 2012-04-11 22:20:53 +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
David Dormagen a78d8a1858 IsJumping now returns true only for actions that contain "Jump" (used to return true for Tumble) 2012-04-10 23:29:31 +02:00
David Dormagen fc0a9f1630 fire damage to living objects doubled 
incendiary material (lava) burns you twice as fast
 2012-04-10 23:28:41 +02:00
Felix Wagner 2179adae7c (boni wtf?); fixed wrongful usage of GetItemPos() to determine carry_bone due to 
change of the functions return value
 2012-04-10 04:17:57 +01:00
Felix Wagner 9548c1979d Stupid me should have removed testing stuff... 2012-04-10 04:12:22 +01:00
Felix Wagner b0b561a25c Added cooldown for sword strike (#560); fixed clonk getting slowed if 
WeaponStrikeExpired isn't called
 2012-04-10 04:10:21 +01:00
Felix Wagner 7fbefbeb67 Fixed grappler rope acceleration (#476) 2012-04-10 03:14:26 +01:00
Armin Burgmeier e325aa6835 MtBrame.ocs: Rework map a bit to prevent reaching the goal via dyna jump 2012-04-09 15:41:40 +02:00
Armin Burgmeier 6a2b058a6d MtBrame.ocs: Make sure there is a shovel for all players 2012-04-09 14:30:37 +02:00
Maikel de Vries 0a0e16a6af Fixed moving stuff in content menus and first item is in the middle 2012-04-09 15:18:00 +02:00
Felix Wagner 4bb8cebafc Fixed clonk getting stuck when falling off the bottom of (flying) liquid 2012-04-09 02:50:31 +01:00
Felix Wagner 91a1108873 Fixed underwater digging 2012-04-09 02:50:06 +01:00
Armin Burgmeier 9c9db94a96 MtBrame.ocs: Remove some loam so that it's not trivially solvable 2012-04-08 23:54:22 +02:00
Felix Wagner 5247e5e769 Merge with default 2012-04-08 22:49:06 +01:00
Julius Michaelis a07ef70acf Use array slice operator in Array.c 
There is no Easter egg hidden in this commit message :Þ
 2012-04-08 16:22:43 +02:00
Maikel de Vries 21ba812d06 Moved Vegetation from Environment to Objects 2012-04-08 20:55:03 +02:00
Armin Burgmeier a0b13ad238 Add MtBrame.ocs, a cooperative scenario for BeyondTheRocks 2012-04-08 19:56:14 +02:00
Bernhard Bonigl db4ad404b1 Removed wrong written Definition from Cannon 2012-04-08 01:43:29 +02: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 061a96e514 Standardized variable-names in Clonk-Animations and put them into a "Namespace"-Proplist. 
More info in UpdateMenu-Implementation-Fail.
 2012-04-07 23:32:57 +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
Felix Wagner cce5d109ef no_dig2objects parameter for DigFree / DigFreeRect 2012-04-05 16:49:47 +01:00
Felix Wagner de2dbceaf2 Added bucket to knowledge in GoldRush & IronPeak (Crash, Skylands?) 2012-04-05 03:05:48 +01:00
Felix Wagner 234ed3c6b1 + Bucket.ocd 
You can gather earth with the bucket to use it as a material for bridge or similar tasks. Press [Use] to collect or dump earth.
 2012-04-05 03:02:35 +01:00
Felix Wagner 8338a8674a Earth/Sand - no chunks dug out anymore 2012-04-05 03:01:50 +01:00
Maikel de Vries 35f8d6a454 Removed Goal.c and reimplemented effect in Goal library 2012-04-03 20:21:49 +02:00
Maikel de Vries 32baccea4f Clouds are created via definition calls in scenarios 
This to get rid off NoRain.c appendtos, see scenarios for examples. Maybe we should also use this interface for other environment objects.
 2012-04-03 19:13:07 +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
Maikel de Vries 7b8800356a Removed Precipitation from engine 
Will be implemented through clouds and definition calls.
 2012-04-01 23:03:52 +02:00
Felix Wagner 38af458e05 Fixed/inserted various hit sounds. 2012-04-03 18:20:41 +01:00
Felix Wagner 4a40d7782c Converted WoodHit? to mono 2012-04-03 18:19:59 +01:00
Felix Wagner 4343f85eaf Authors for the added sounds 2012-04-03 18:19:37 +01:00
Felix Wagner 1fdb899897 + GlassHit? 2012-04-03 18:19:20 +01:00
Felix Wagner 84d3bf76ca + GeneralHit? 2012-04-03 18:19:08 +01:00
Felix Wagner 7f4360c88c + DullWoodHit? 2012-04-03 18:18:57 +01:00
Felix Wagner 6e3debbf16 + LightMetalHit? 2012-04-03 18:17:12 +01:00
Felix Wagner 2b8660cbdc + DullMetalHit? 2012-04-03 18:16:56 +01:00
Felix Wagner 527bac9d85 Fixed construction preview in front of tunnel material 2012-04-03 15:11:27 +01:00
Felix Wagner 237091cbaa Resolved unused var 2012-04-03 14:51:46 +01:00
Felix Wagner b8be22d9e3 Uncloseable menu for weapon chooser. 2012-04-03 14:51:38 +01:00
Felix Wagner caee67e9cd Function list for System.ocg 2012-04-03 03:00:18 +01:00
Felix Wagner bf795164f2 Resolved all warnings due to global function in included scripts. 2012-04-03 02:12:44 +01:00
Felix Wagner 6e303c4e2c Resorted the functions from C4.c, Commits.c amd Helpers.c 2012-04-03 01:55:55 +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 cc4b1ce763 Cleaned up controls. Controls-Dialogue should be more usable now. 2012-04-01 19:27:42 +02:00
Maikel de Vries a0f8f6bc51 Fixed interchange of weapons in tutorial 3 and 4 on death (#665) 2012-04-01 16:49:03 +02:00
Bernhard Bonigl 0ea2f7e46d Lowered Rock needed for foundry to 4 from 6 2012-03-30 00:11:52 +02:00
Maikel de Vries 6a2d0aa901 Removed log from team account rule... 2012-03-31 18:34:00 +02:00
Maikel de Vries be02f5bdc1 Fixed multiple team account rules giving too much money 
Also removed three copies in Skylands.ocs
 2012-03-31 18:27:14 +02:00
Maikel de Vries 78fd5fd166 Implemented Callbacks to containers when content menus are opened and closed 
The chest now also plays its animation and sound again.
 2012-03-31 17:34:03 +02:00
Maikel de Vries 03109201cc Fixed some NoRain.c appendtos 2012-03-31 17:27:26 +02:00
Maikel de Vries 2da24e0ca3 MenuOK is now on Return 
This was already in the comments and it makes much more sense, cause it interferes with interact (Space)
 2012-03-31 14:19:39 +02:00
Maikel de Vries 84e5f04cd3 Fixed shooting items with cannon (#733) 
Also minor cleanup in code
 2012-03-31 12:46:24 +02:00
Bernhard Bonigl f5504f7497 Fixed Hand-Size. 
Turned Hand-Indicators into one layer
 2012-03-29 22:27:42 +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
Tobias Zwick 1abe406ae2 descriptions and usagehelp for weapons 2012-03-28 21:14:58 +02:00
Tobias Zwick ad59d353af descriptions & usagehelp for materials and foodstuff 2012-03-28 20:16:12 +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 182889bfe4 lorry: fixed collection limit when collecting via collection zone 2012-03-24 16:33:15 +01:00
David Dormagen 3788bada43 plants will now stop growing for ten seconds after taking damage 2012-03-24 16:18:55 +01:00