Commit Graph

20 Commits (3b0891ba89f7a75f832032036a6aefa2573e325d)

Author SHA1 Message Date
David Dormagen 825ad64afd AimManager: fixed incorrect use of PauseUse leading to aiming without holding CON_Use (#1691)
PauseUse can be called between ControlUseStart and ControlUseStop/Cancel. In this case ControlUseStop set aim_stop=1 but didn't actually stop reloading (which is somewhat fine). However, this led to PauseUse being called when e.g. tumbling or climbing.
And this again would lead to CON_Use being reissued even though the mouse button was not held down, leading to the Clonk being in aim mode.

The functional change here is that you will not continue reloading after tumbling/climbing when you are not holding down CON_Use anymore, which is consistent with other stuff.
2018-01-13 16:05:46 +01:00
Maikel de Vries 8d56434fc5 fix possible script runtime error in aim manager library 2017-02-02 21:47:55 +01:00
Nicolas Hake 8e18a3fc96 Change (int)0 to nil where deprecated 2016-05-13 17:13:34 +02:00
Clonkonaut b2ecfcfc48 Slight improvements to Guardians.
A single player now receives four times more wave bounty than before, scaling up to four players. It's still challenging but I believe now doable.
Enemies should no longer jump off airships when being shot at.
Fixed a typo in the airship appendto script.
Fixed a possible null pointer when changing weapons.
2016-01-03 01:53:55 +01:00
Clonkonaut ef48a60b27 Fix possible null pointer. 2015-12-30 03:21:53 +01:00
Sven Eberhardt 6b5bd38cc8 Fix aim cancellation by spear AI (#1474) 2015-12-05 21:13:37 -05:00
David Dormagen af9fe24dac AimManager: catch a nil-pointer
..which could happen if you RemoveObject()'ed an item from the Clonks hands.
2015-11-29 22:25:38 +01:00
Clonkonaut 1178d8f0ce Prevent dead clonks from sitting upright (#1358).
Also added convenient constants defining the animation slots to use for clonk animation.
2015-10-11 14:08:14 +02:00
David Dormagen 36544bd56c Merge branch 'master' into Controls
Conflicts:
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c
	planet/Objects.ocd/Vegetation.ocd/Branch.ocd/Script.c
	planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c
	planet/System.ocg/FindLocation.c
2015-08-02 19:24:04 +02:00
Armin 0c288d3b3a Fix error when throwing spear out of the map (#1334)
Signed-off-by: Maikel de Vries <mdt.maikel@gmail.com>
2015-07-26 21:24:15 +02:00
David Dormagen 6d197b80d3 disable loading bar on reloading for now
But keep as a separate commit to make it easier to re-enable it in the future.
2015-04-04 11:25:17 +02:00
David Dormagen 0ef6bb306b added new progress bar style to replace old pie-chart in inventory slot (when f.e. reloading) 2015-04-04 11:23:25 +02:00
David Dormagen 07088b22bf added GetAimPosition which returns the current aiming-angle as a counterpart for SetAimPosition 2014-02-15 14:32:51 +01:00
David Dormagen 299cc7e478 when not able to execute an Use-command (f.e. shield when not walking), the command is remembered and executed when possible 2012-12-29 18:42:19 +01:00
David Dormagen 4cdb4a6f3d fixed possible zero pointer error 2012-11-12 18:58:39 +01:00
David Dormagen 5b4e8c887c when loading (f.e. bow and musket) the inventory slot displays a small loading bar 2012-07-05 20:09:32 +02:00
David Dormagen a697016c58 reset some more internal variables to nil when cancelling aiming
they could get in the way when re-aiming quickly after a shot
2012-06-19 21:30:14 +02:00
David Dormagen a28cf7008b allow successive calls of CancelAiming (which do not do anything) 2012-06-19 19:55:51 +02:00
Bernhard Bonigl c576a7bd3f Allow turning while jumping during aiming 2012-04-29 18:09:37 +02:00
Armin Burgmeier 675c077ed2 Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00