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

50 Commits (f327ee7c120b83e75451bee5f89b6f0924daa241)

Author SHA1 Message Date
Bernhard Bonigl c601231960 Added Interaction for flipping construction sites during placement 2012-05-08 20:27:24 +02:00
Bernhard Bonigl 43deb1fc37 Extra-Interactions can now be placed at every position in the actionbar 2012-05-08 20:26:50 +02:00
Bernhard Bonigl 90fdc232fa InteractionBar now can display additional interactions from the Clonk via GetExtraInteractions callback. 
Also moved carryheavy-dropping from hardcoded to that callback.
 2012-05-07 22:57:52 +02:00
Bernhard Bonigl 6a885d33aa Fixed incorrect Selection call to selected item when switching left and right hand. 
Sometimes also caused errors.
 2012-05-06 18:24:56 +02:00
Bernhard Bonigl 5ae4496d7f Clonk now aborts usage if a related inventory-slot is changed. (e.g. when aiming the bow) 2012-04-29 16:26:32 +02:00
Bernhard Bonigl 56809d9e43 Fixed a carryheavy-bug with Collect(x,x, pos) 2012-04-29 15:05:29 +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
Bernhard Bonigl 9da6d67c80 Space now also closes menus 2012-04-14 22:53:36 +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 9a4295f745 Fixed beeing able to drop carryheavy in non-walk 2012-04-13 17:49:09 +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 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 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
Bernhard Bonigl 25fec934d6 Removed all Hacks with Interaction. Enter/Exit also works now. 2012-03-22 20:26:06 +01:00
Bernhard Bonigl b6731b1dc8 Inventory now updates when an object is removed (Loam, Constructing stuff,...) 2012-03-21 21:55:34 +01:00
Bernhard Bonigl 46a1f003b6 Fixed Collecting putting an item onto the selected AND the last slot. 2012-03-18 22:50:03 +01:00
Bernhard Bonigl bd7dd4ec63 Fixed items beeing picked up into the wrong slot when hand was empty. 2012-03-18 21:46:08 +01:00
Bernhard Bonigl aee33ae415 Added a temporary hack for grabbing stuff with space alone until Controls are fixed (for playtests) 2012-02-28 20:57:57 +01:00
Bernhard Bonigl 893746f641 Clicking or selecting a slot via hotkey that already is assigned to the other hand switches hands now. 2012-02-28 20:18:52 +01:00
Bernhard Bonigl e76ba4076c Removed Backpack-Control (Q-Key) 2012-02-28 19:53:47 +01:00
Bernhard Bonigl 8924d1ae10 Cleaned up ClonkControls and refactored collecting 2012-02-28 19:52:15 +01:00
Bernhard Bonigl cd30fbaeb2 Merge with default 2012-02-27 21:51:08 +01:00
Bernhard Bonigl 9480a701c4 ContentsMenu takes order in clonk-inventory into account 2012-02-27 21:17:23 +01:00
Bernhard Bonigl b8b4ee03f8 Changed Shift+Hotkey to Space+Hotkey for Interaction 
Space now interacts on release instead of press
Shift now works as a drop/throw modifier
Shift+Hotkey now drops that inventory slot
Non-Forced Throws/Drops (without Shift) now automatically select the next non-selected non-free Slot
 2012-02-27 16:24:34 +01:00
Bernhard Bonigl ee3913714e Items now can't be held in both hand at the same time 2012-02-27 14:07:47 +01:00
Bernhard Bonigl db53603396 Hotkeys select the item at release now 
Holding hotkey + left/right mouse button selects it into the corresponding hand
 2012-02-26 16:19:52 +01:00
David Dormagen 1963fa61ba fixed dropping of stuff 2012-02-26 15:54:09 +01:00
Bernhard Bonigl a0e9ef1406 Fixed Actionbar-Hotkeys not working (Shift+(1-0)) 2012-02-26 14:26:23 +01:00
Bernhard Bonigl f8200180ab Clonk collects items automatically if HandSlot is empty now 2012-02-26 14:13:14 +01:00
Bernhard Bonigl 5587ed0618 Backback and Hands share one Inventory now 
New Inventory Display at the left side
Inventory fades out if not locked
Inventory fades in if something changes, or mouse hovers there
Left/Right Mouse Click on an Inventory-Slot selects it for the corresponding hand
Icons to show which Slot is selected by left/right hand
Inventory can be reordered via Drag&Drop
Dragging an Item from a Slot onto the Landscape drops it
Changed Shift+Number to Ctrl+Number for selecting crew
Changed Number to Shift+Number for using Action-Bar
Changed Number to select inventory-slots now
 2012-02-26 01:48:58 +01:00
Felix Wagner eb6b7be7ee Fixed various unused vars 2012-02-20 11:58:58 +00:00
Maikel de Vries c68b5b2920 Menus: implemented closing when clicked in the landscape 2012-02-01 22:29:49 +01:00
Felix Wagner d8f852b56a Fixed throwing on backpack closing 2012-01-19 14:03:36 +00:00
Maikel de Vries 6ab411ac78 Only slightly agitated http://wiki.openclonk.org/w/C4Script_Style_Guidelines 2012-01-06 21:37:25 +01:00
Tobias Zwick baa9cfd06b clonk's contents are not displayed stacked but for each object one menu item 2012-01-06 00:48:37 +01:00
Tobias Zwick 0a8731affc fix interacting doesn't hold as handled control 2012-01-05 22:10:41 +01:00
Maikel de Vries 17bf15adb1 Fixed opening and closing of menus 
Also reduced the amount of local variables in ClonkControl.ocd, which makes sense at this location, cause additional menus my implemented similar to the production menu.
 2012-01-02 00:00:13 +01:00
Maikel de Vries 1d994a32b9 Fixed disabling CON_GUICursor after closing backpack 
This caused problems with grabbing and pushing vehicles.
 2011-12-30 18:53:25 +01:00
Maikel de Vries 85cbefe808 Content menu can now handle the clonk's backpack 
Also did some cleanup
 2011-12-28 11:49:38 +01:00
Tobias Zwick 682e59ac2d preliminary commit of content menus 2011-12-08 19:57:14 +01:00
Tobias Zwick 32e95ff61d c4script menu: cursor updates optional 2011-11-20 22:09:53 +01:00
Charles Spurrill d9a02eaf14 Carry-Heavy system added 2011-10-26 14:03:12 -07:00
Felix Wagner 324d27f412 The HUD now works with cursors that do not have breath or healt and as well not 
"GetItem". Cursors wanting to show their items need to have HUDShowItems()
implemented with return value true.
Otherwise every non-clonk cursor object causes a lot of errors!
 2011-09-04 18:42:43 +01:00
Tobias Zwick c2cefe2e4f new control: collect (into backpack) 2011-08-11 16:37:46 +02:00
Charles Spurrill b7bc9bc755 Clonk can jump off walls (with new animation). 2011-06-03 12:11:23 -07:00
Maikel de Vries 971b330288 Objects: Removed superfluous parameters in function calls 
Caused a few warnings recently.
 2011-05-12 17:01:54 +02:00
Armin Burgmeier 675c077ed2 Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00