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

42 Commits (f05345375c53089a16b2e528663f9f059d41fe00)

Author SHA1 Message Date
Maikel de Vries 91cd15c40c reimplement alt use on right mouse button 
This replaces throwing then controlling or inside a vehicle, throwing items remains on RMB as is.
 2015-06-28 09:44:50 +02:00
David Dormagen 379d189787 now always use on leftclick and throw on rightclick (drop if you click your Clonk or below); also removed some old references to the right mouse button (UseAlt) 2015-03-09 13:33:31 +01:00
David Dormagen 952f06b173 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
 2014-09-29 11:47:09 +02:00
Sven Eberhardt b1db0c7918 (Re)implement text completion in dialogue text windows as an async control. Default to Space, i.e. MenuOK. 2014-08-10 20:58:26 +02:00
David Dormagen 7eaef70af1 Merge branch 'master' into Controls 
Conflicts:
	planet/System.ocg/PlayerControls.txt
 2013-05-26 18:19:51 +02:00
David Dormagen 0c23d1b9a6 reimplemented the action bar to use the custom GUIs 
action bar now only shows shortly after hitting Interact
 2013-05-26 14:59:19 +02:00
Tobias Zwick fe5a29b198 throw out DVORAK keyboard layout (controls are keyboard layout independent now) 2013-05-25 14:41:58 +02:00
David Dormagen 6681a2cd7d Throwing on right-click, alt-use (temporarily) on Shift+Left 2013-05-24 23:26:00 +02:00
David Dormagen 04c8ad1cac removed CON_Collect (now collects only into empty slots) 
fixed inventory shifting
 2013-05-24 20:09:19 +02:00
David Dormagen 6c861f9165 removed the hold-number-and-click-mouse controls 2013-05-24 00:00:18 +02:00
David Dormagen c1d27bc3e9 mouse-wheel now scrolls through inventory (zoom is on shift+mouse-wheel) 2013-05-23 22:46:23 +02:00
David Dormagen 34fc771911 merged master into Controls 
Conflicts:
	planet/Objects.ocd/Libraries.ocd/Structure.ocd/Script.c
 2013-01-30 21:37:31 +01:00
Tobias Zwick 28e2bdbb92 fix #724: revers the order in which GetCrew(plr,index) returns the crew 2013-01-13 15:45:51 +01:00
David Dormagen 80ac9a9503 more one-hand cleanups 2012-12-29 14:08:53 +01:00
David Dormagen bc4fd5f9ed merged master into Controls 2012-12-23 15:17:23 +01:00
Bernhard Bonigl 1011c858cc Introduce QuickSwitch on Q (or Apostrophe for Dvorak) 
QuickSwitch changes the current selection of the Inventory to the last selected one.
 2012-10-07 15:44:01 +02:00
Tobias Zwick 63fcec3e8c fix controls: interact + down = ungrab doesn't work as intended: 
confusing situations can arise, e.g. while shoving a tree, one can use the foundry
 2012-10-14 13:26:30 +02:00
Tobias Zwick 2a228b11ed remove non-existing control def 2012-10-14 01:20:52 +02:00
Tobias Zwick c51ffb5a26 fix descriptions in control dialog 2012-10-14 01:04:49 +02:00
Armin Burgmeier cf159068b3 Fix warning about undefined backspace key on Linux 2012-10-13 16:15:01 +02:00
Tobias Zwick 8c5005bef9 I hate Mercurial 2012-10-10 23:47:30 +02:00
Bernhard Bonigl 9a91a4dfca Reduce Collect-Priority by 1. This fixes collecting when jumping. 2012-10-10 16:38:33 +02:00
Sven Eberhardt 08b495e43d PlayerControls: When the user changes a key assignment in his local config, all derived key assignments (Key=CON_*) change as well (#807). 
The "CON_" prefix is now mandatory when referencing other key assignments. Updated PlayerControls.txt to reflect that.
 2012-10-08 20:45:04 +02:00
Bernhard Bonigl 0d53a16a21 Backed out changeset: b48412700d66 2012-04-14 15:38:18 +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 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
Bernhard Bonigl 25fec934d6 Removed all Hacks with Interaction. Enter/Exit also works now. 2012-03-22 20:26:06 +01:00
Bernhard Bonigl 03729bdbf1 Experimental: Added Interaction-Hotkeys on <> to . (the row below the home row). 
Made the Keys <> on German Keyboards an \| and ;: on US Keyboards usable
 2012-03-21 21:52:32 +01:00
Bernhard Bonigl 3a7bc44da8 Experimental: Added Alt+# for rigth hand 2012-03-21 18:13:34 +01:00
Bernhard Bonigl 4c01b585d9 Removed dropping on Down+Mouse 2012-03-20 00:48:29 +01:00
Bernhard Bonigl 4c6b374dd7 Removed Interact = GrabNext. Use Actionbar-Hotkeys/Mouse for that. 
If something is grabbed, it'll always be ungrabbed by pressing Space now.
 2012-03-09 23:10:18 +01:00
Bernhard Bonigl 44ceefae9a Down+Space now Ungrabs if something is grabbed 2012-02-28 20:44:10 +01:00
Bernhard Bonigl 6dddb26b8e Fixed InteractionHotkey not beeing prioritized 2012-02-28 14:30:32 +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 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
Bernhard Bonigl a0e9ef1406 Fixed Actionbar-Hotkeys not working (Shift+(1-0)) 2012-02-26 14:26:23 +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
Tobias Zwick e2d1eb2d9f new control: E for show/hide contents menus 2011-11-20 23:09:47 +01:00
Sven Eberhardt c287c093cc PlayerControl: Mouse coordinate space (viewport vs landscape) is now a control property; not an assignment property. 
This is in preparation for proper custom control assignments
 2011-11-20 21:49:38 +01:00
Tobias Zwick c2cefe2e4f new control: collect (into backpack) 2011-08-11 16:37:46 +02:00
Sven Eberhardt b01cddc560 control config dialog improvements 2011-03-31 16:26:59 +02:00
Armin Burgmeier 41a1b5867d Change .c4g extension to .ocg 2011-03-13 16:16:45 +01:00