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

24 Commits (aca1bcce34683008f93b79c4b7ddc5922b68718f)

Author SHA1 Message Date
Maikel de Vries 01fb44fd49 fix script error when shifting cursor with zero crew members 2015-09-07 16:55:08 +02:00
David Dormagen e9a69c4252 collect objects solely via CTRL now 
The player can also choose which object to collect by holding CTRL and navigating left/right.
 2015-08-30 20:39:50 +02:00
Maikel de Vries 126ae5b179 fix C4Script runtime error in ShiftCursor 2015-06-05 19:16:43 +02:00
David Dormagen 7d1d70f017 removed NoCollectDelay from engine; it's now handled by script 
Which allows a lot more fine-grained controls as all the control and UI stuff is now also in script anyway.
 2015-03-26 12:23:20 +01: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 f89b8c8319 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/DefCore.txt
	planet/Objects.ocd/Libraries.ocd/PowerConsumer.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/PowerProducer.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/System.ocg/ClonkControl.c
	src/gui/C4MouseControl.cpp
	src/landscape/C4PXS.cpp
 2014-12-25 15:24:19 +01:00
Sven Eberhardt d80ef4ae5e Fix nil pointer if a dragged object is deleted between control creation and control execution. 2014-10-18 01:22:47 +02:00
David Dormagen 5c17b48bc2 Merge branch 'master' into Controls 2014-03-26 23:58:24 +01:00
David Dormagen 537846d76d menus: fixed two possible null-reference errors 2014-02-28 22:39:14 +01:00
David Dormagen 0da9293686 allow Clonk::SetMenu to also take a custom GUI ID; cleaned up some menu-related mess (like not handling unclosable menus correctly) 2014-02-26 12:03:27 +01:00
Tobias Zwick 3a8c8d7c3b selecting the clonks via hotkey was all backwards (#1031) 
e.g. pressing ctrl+3 selected 1st clonk if there are 3 in the crew
 2014-02-16 13:15:07 +07:00
David Dormagen e6487533c2 added first version of object information dialogue on right-click 2013-01-30 21:27:09 +01:00
David Dormagen 4dcc784d35 do not pass controls to disabled cursor anymore (i.e. via SetCrewEnabled) 2012-12-22 17:11:06 +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 2a5c129c93 Implemented MouseHover-Callback. 
Calls OnMouseOver(player, draggedObject) in Objects beeing hovered over.
Calls OnMouseOut(player, draggedObject) in Objects that stop beeing hovered over.
 2012-02-26 01:36:38 +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
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
Maikel de Vries f47749c771 Content menu: fixed d&d, added background image 2011-12-11 15:50:51 +01:00
Tobias Zwick c2cefe2e4f new control: collect (into backpack) 2011-08-11 16:37:46 +02:00
Maikel de Vries d550f7c7da Differentiate between COMD_None and COMD_Stop 
Was necessary after 267ebb600481 and current abuse of FLOAT procedure. None keeps the current motion, Stop halts the current motion of a procedure.
 2011-07-06 18:13:39 +02:00
Charles Spurrill 806ea2cf4f Fixed water jump 2011-06-04 14:07:02 -07:00
Charles Spurrill b7bc9bc755 Clonk can jump off walls (with new animation). 2011-06-03 12:11:23 -07:00
Armin Burgmeier 41a1b5867d Change .c4g extension to .ocg 2011-03-13 16:16:45 +01:00