Commit Graph

8534 Commits (objectmenu)
 

Author SHA1 Message Date
Günther Brammer 6ad42ed24d Restore icons in the player join menu 2016-01-30 16:04:38 +01:00
Günther Brammer 7f75d09740 Increase height of dialog/menu title bars to the standard icon height 2016-01-30 16:04:37 +01:00
Günther Brammer 90860d3422 Use bigger icons for player menu where available 2016-01-30 16:04:37 +01:00
Günther Brammer d60f767f5c Increase all symbol sizes in player menu from 35 to 40 2016-01-30 16:04:22 +01:00
Günther Brammer dd49c5a2fe Increase the symbol size in the player menu items with labels 2016-01-30 16:04:06 +01:00
Günther Brammer 435e5a8eeb Simplify menu construction functions 2016-01-30 16:04:06 +01:00
Günther Brammer 66d78fddab Remove unused support for secondary menu command 2016-01-30 16:04:06 +01:00
Günther Brammer bddbc23354 Remove C4ObjectMenu
It's been superseded by other methods.
2016-01-30 16:04:05 +01:00
Günther Brammer 9741c1e853 Clonk: Don't play idle animations if Menu is open
At least, in theory. I only removed the plain GetMenu() call because the
engine GetMenu is going away.
2016-01-30 16:03:59 +01:00
Günther Brammer d3428003a8 Fix navigation in player menus with more than one column/row 2016-01-30 16:03:22 +01:00
Günther Brammer 23acdc6060 Use the same team id in view update as in team join 2016-01-30 16:02:31 +01:00
Maikel de Vries 4bcdfc451e block construction sites based on Exclusive and not on planes (#1534)
This makes more sense, exclusive object block all other construction sites, irrespective of their planes.
2016-01-30 14:46:14 +01:00
Maikel de Vries fb0932df26 fix additional preview overlay after combining with other structure
This caused an overlay warning in the previewer object when constructing an elevetor and combining it with another elevator and detaching it again.
2016-01-30 12:28:35 +01:00
Maikel de Vries 2d22022a20 correctly place/preview basement for elevator (#1534) 2016-01-30 12:28:35 +01:00
David Dormagen 447be6c91d Clonk control: moved "menu" local to "clonk.control.menu"
"menu" is an error prone name in one of the most frequently used/overloaded objects of the planet. Actually, there was a bug in some other thing which disappeared now. So I guess something, somewhere uses the name "menu", too.
Anyway, this is more consistent (because the other control stuff is in this.control, too) and less error prone. So it's a good change regardless of whether it actually fixes an existing bug.
2016-01-29 22:48:59 +01:00
David Dormagen a9ac0c85ab inventory bar: moved slot number to the top (#1639)
This separates the slot number visually from the item stack count.
2016-01-29 21:14:07 +01:00
Maikel de Vries ce6cbc1cf6 add more kill tracing tests 2016-01-29 18:56:09 +01:00
Maikel de Vries 707e0ec041 fix kill tracing for exploding compensator 2016-01-29 13:25:46 +01:00
Maikel de Vries 5927e55973 fix script error in power library when a foundry (not really a consumer) is removed 2016-01-29 11:40:08 +01:00
Maikel de Vries 4e73a84d18 make aerobatics intro failsafe
Also start the airship later to allow for a well timed dynamite jump to land on the airship and gain some advantage.
2016-01-29 09:56:17 +01:00
Sven Eberhardt 1b6d3ca770 Raid: Map tweaks to account for ShapeMap changes 2016-01-28 23:52:02 -05:00
Sven Eberhardt 1bb78ecd4f Remove some unnecessery animation weights.
These overwrite the animations in their slots while there are no other references to existing animations in the slot.
2016-01-28 23:47:53 -05:00
Sven Eberhardt 920ae9673f Fix animation leaks in bat, chest, grapple bow and tele glove #1647 2016-01-28 23:46:22 -05:00
Sven Eberhardt 1f81b87c33 PlayAnimation: Delete previous animations in same slot if no weight is given.
This will simplify fixing several animation leaks.
2016-01-28 22:02:27 -05:00
Sven Eberhardt 80b8879805 Fix SolidMask DensityProvider to return C4M_Vehicle, not C4M_Solid.
Fixes attached movement of objects with increased contact density.
2016-01-28 22:00:41 -05:00
Maikel de Vries 5a79eef10a remove airship hitbox in favor of projectile target implementation 2016-01-28 21:53:49 +01:00
Nicolas Hake f12afbc43c Fix some frankly ridiculous indentation
I know you like to think of yourself as something of an artiste, but
this isn't likely to get into MoMA's permanent collection.
2016-01-28 17:26:09 +01:00
Sven Eberhardt 380b6df2ac Make GetModifiedDigSpeed runtime-overloadable 2016-01-28 00:37:25 -05:00
Mark 41f00c6c17 Dig speed refactoring
Extracted the dig speed modification part to a separate function, so that other scenarios can easily overload this. Setting the value to 75% of the input speed provided a good handling in my tests. This is not included in this commit, feel free to experiment with it first.
2016-01-28 06:28:04 +01:00
Clonkonaut 29bfdf73ea Elevator construction preview shows placement of the case (#1534).
Structures can use the definition call ConstructionPreview(Previewer Object, Overlay, Direction) to add any overlay to the previewer. It will be coloured accordingly.
2016-01-28 00:31:22 +01:00
Maikel de Vries 9220c285c6 gui clock: add optional in screen countdown
And use it in Aerobatics.
2016-01-27 20:19:19 +01:00
Mark 931705d339 Change cloud color
Clouds can change their basic color with SetCloudRGB(r, g, b) now, for more ambient effects. This does not mess with the cloud shading, because the color is scaled appropriately.
2016-01-27 05:47:57 +01:00
Sven Eberhardt 88810fbb83 Butterfly: Fix animation leak #1647 2016-01-26 23:14:17 -05:00
Maikel de Vries ef1d7227f6 release rider from balloon earlier when deflating
This allows for a smoother transition into walking and scaling and leads to less annoying and unexpected deaths.
2016-01-26 23:02:32 +01:00
Maikel de Vries 2cc59cb336 change catapult aiming: power is such that trajectory goed through the cursor (if possible) 2016-01-26 22:38:25 +01:00
Maikel de Vries 7e1fe57440 catapult: remove trajectory preview when use is cancelled 2016-01-25 23:22:14 +01:00
Maikel de Vries 0e32757aa9 parkour: allow resetting pb with /resetpb 2016-01-25 22:44:05 +01:00
Maikel de Vries 08dfaeed9e parkour: clear checkpoint for team members by default 2016-01-25 22:44:05 +01:00
David Dormagen 2dc291f8f6 contents menu: fixed possible "use after deletion" error 2016-01-25 20:21:28 +01:00
David Dormagen 9e563e6d8c cannon: fix possible nil pointer access
In boomshire, the cannons are automatically filled with boompacks (and then fired). That means that there is no Clonk to be passed.
2016-01-25 20:13:51 +01:00
Sven Eberhardt 36489145b6 Fix automatic engine detection of melee-like scenarios to allow team selection. 2016-01-24 22:13:21 -05:00
Sven Eberhardt be12ca92c6 FightForGidl: Fix description. 2016-01-24 21:58:14 -05:00
Sven Eberhardt 4257b84f84 Fix HUD script errors when cursor does not include inventory control 2016-01-24 18:16:46 -05:00
Maikel de Vries 1cce689a67 boomrace: fix picking up boompacks (now instantly) 2016-01-24 23:28:05 +01:00
Sven Eberhardt 451ea87ab9 Fix another FoW crash 2016-01-24 17:23:20 -05:00
Sven Eberhardt 42d8885877 Fix crash in FoW rendering #1643 2016-01-24 14:44:00 -05:00
Maikel de Vries 488201181b improve collision detection of deployed balloon with the landscape 2016-01-24 20:36:17 +01:00
Maikel de Vries d1d019ab09 improve the hitbox of the balloon for projectile targets
This prevents the one hanging on the balloon from shooting himself down with e.g. a bow.
2016-01-24 20:36:17 +01:00
Mark 93ba7c5954 Vendor Library
Extracted the buy menu of the flagpole to a library, so that other objects can implement a buy menu without having to duplicate the code. An overview of the changes follows:

Library_Base:
- Moved auto-sell functionality to Library_Vendor
- Moved buy and sell functionality to Library_Vendor
- Removed the old engine menu for buying and selling

Library_Vendor:
- Added proplist for accessing local variables, avoiding variable clashes
- Added interfaces GetBuyValue, GetBuyableItems, GetBuyableAmount, ChangeBuyableAmount, GetSellValue
- Changed DoBuy: it uses the interface functions, instead of hardcoded base material
- Changed / merged the existing sell functionality and the flagpole sell functionality in DoSell:
   * does not sell items if QueryOnSell returns true
   * sell sound only audible to seller
   * the sold object tries selling its contents first (for example a bow, if it ever were sellable. This may not hold in the settlement games, but adventures would allow it)
   * the sold object ejects any contents before it is removed. These are usually unsellable objects. Previously they would just be removed together with the object. It has to be tested whether this places the items on the ground or at the center of the sold object
   * removed the "sell all" functionality on right-click for the moment.
- Still has some functions from the old base selling: CanStack and GetSellableContents, for the auto-sell functionality
- Fixed a logical error in AllowBuyMenuEntries
- Distinguish between buyer/seller and payer more, so that the logic can easily be changed in one line later
- Allow for runtime overloads of interface functions
- Changed inconsistent variable naming to a more consistent one
- Added namespaces to all sounds, the "UnCash" sound still does not exist
- Added localization strings for insufficient wealth
- Fixed property name error (missing 'e')
- Buy menu is active by default

Flagpole:
- Replaced the custom sell functionality (how many of these do we have actually??) with the sell functionality from Library_Vendor
- Buying menu is allowed if the rule is active

System.ocg/Object.c
- global functions Buy and Sell ask the target if it is a vendor, instead of whether it is a base, and do the callback there.
- renamed the argument so that it is no longer called "base", but "vendor"
2016-01-24 20:11:27 +01:00
Maikel de Vries c4fa92a6d2 Aerobatics: use jet streams, fix item spawn and restart rule 2016-01-24 18:18:12 +01:00