Commit Graph

47 Commits (6ad42ed24d43c292322217553fa61c981c36906e)

Author SHA1 Message Date
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
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 c8a76ce450 Use less annoying swim sounds when swimming on the surface.
The "splash" sounded more like the clonk was jumping into the water.
2016-01-14 22:32:54 -05:00
Sven Eberhardt 27f5cdc461 Fix black waves when swim timer is executed in same frame as clonk leaves the water. 2016-01-14 21:51:30 -05:00
Günther Brammer 9911a894df Fix FxRollingTimer parameter type for effect from int to effect 2016-01-03 00:22:36 +01:00
Clonkonaut e31b866e7f Fix animation error when scaling at unfavourably shaped walls (#1317).
The error rarely happened when the clonk was attached to a wall solely with its head vertex. CheckScaleTop (Animations.ocd/Script.c) only checked the shoulders and hip vertices.
I also made sure that this.dist (FxIntScaleTimer, line 616) cannot exceed the animation length of "ScaleTop" although that shouldn't have posed a problem.
2016-01-02 03:58:45 +01:00
David Dormagen d7b2ef9f75 prevent clonk idle animation when in dialogs and reduced frequency of idle sound (#1506)
This doesn't work for intros, though, because they use simple messages. We should unify the systems to only have one dialogue system that uses new-style-menus and implement required features in those menus..
2015-12-20 19:17:34 +01:00
David Dormagen 7f4f5fee58 added new vocals for three skins (by ala)
They are played e.g. when being hit by stuff, catching fire, killing teammates, idling, trying to put a shovel into the pump, and much more!
2015-12-16 23:01:29 +01:00
David Dormagen dcfb986e34 moved sounds into subfolders
This completes http://forum.openclonk.org/topic_show.pl?tid=3215
2015-12-13 22:14:55 +01:00
David Dormagen 0fc114c075 prevent rolling against movement direction
Previously, you would roll on landing when you had a movement key pressed. However, you would roll into your current direction even if you had the opposite movement key held down. This was one of the remaining possibilities of rolling into the void and being frustrated afterwards because the controls sucked.
2015-11-22 11:13:18 +01:00
David Dormagen eb2b18457e roll: only roll while direction key is held down
This means that you start a roll currently with walking left/right and tapping [down]. OR falling a great height and just holding left/right when landing. When you let go of left/right, you will instantly walk again. This reduces the possibility of the players rolling into an abyss.
2015-11-14 14:58:02 +01:00
David Dormagen 0a9b3ebd70 do not force ComDir when rolling (#1395)
Rolling works via SetXDir anyway, so the ComDir change is not necessary. It would just lead to issues because the ComDir would never be reset and the Clonk would keep on walking until the next key press.
2015-10-21 09:39:10 +02:00
Clonkonaut b083c6454e Adjusted footstep sound to running speed (#1124). 2015-10-13 15:11:11 +02: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
Sven Eberhardt dbe132e808 Fix clonk dig speed locking to animation.
Note this slows down dig speed. But you can optimize by using  animation canceling.
2015-09-08 18:23:34 -04:00
David Dormagen a27888a623 the Clonk now performs a roll when pressing [down] (even when walking)
People have complained that the implicit roll (if you don't know how it worked) could lead to death and severe injury. The roll is now explicit. Always and everywhere.
It doesn't have any other effect though; todo: reduce hit area and/or squash vertices of Clonk during roll
2015-08-07 16:12:41 +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
Maikel de Vries 213de4b40b fix updating clonk's vertices after swimming (#1354) 2015-07-14 19:14:27 +02:00
David Dormagen 196f528201 Merge branch 'master' into Controls
Conflicts:
	planet/Objects.ocd/HUD.ocd/FancyGridMenu.ocd/DefCore.txt
	planet/Objects.ocd/HUD.ocd/GridMenu.ocd/DefCore.txt
	planet/Objects.ocd/Helpers.ocd/Dummy.ocd/Graphics.png
	planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c
	planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Flag.ocd/Marker.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
	src/game/C4Game.cpp
	src/gamescript/C4GameScript.cpp
	src/gui/C4GameMessage.cpp
	src/landscape/C4Landscape.cpp
2015-06-03 22:32:36 +02:00
Maikel de Vries 9c60cf0949 fix vertex changing when swimming (#1176) 2015-03-26 19:52:25 +01:00
Sven Eberhardt 445d759a72 Change == and != to do pointer comparison on arrays and proplists (formerly === and !==). Remove === and !=== and introduce function DeepEqual for contents comparison.
There have been some bugs and crashes related to unwanted deep comparison (e.g. in the maze scenario). Scripters very rarely need deep comparison, so it should not be the default for the most commonly used operator.

This also changes behaviour of GetIndexOf to do pointer comparison.

This change has Guenther's seal of approval.
2014-04-19 22:33:31 +02:00
Günther Brammer f8226e3675 Use === to check whether proplists were already replaced 2014-04-19 19:02:22 +02:00
David Dormagen 06ac00ace8 Merge branch 'master' into Controls
Conflicts:
	CMakeLists.txt
	Makefile.am
	planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
	planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	src/control/C4Control.cpp
	src/control/C4Control.h
	src/gamescript/C4GameScript.cpp
2014-02-15 14:44:57 +01:00
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
David Dormagen 9f8190064c removed usage of non-existant "Splash" particle 2013-11-26 21:25:00 +01:00
David Dormagen c3c48b1456 adapted Wave particle and usages to new particle system 2013-11-26 21:25:00 +01:00
David Dormagen a4d27cd9a9 replaced Dust and Dust2 usages with new particle system 2013-11-26 21:24:56 +01:00
Maikel de Vries 7afc7f7266 Fixed throwing during wall jump (#986) 2013-11-03 15:32:30 +01:00
Maikel de Vries 9e8dd57dbb Disabled scaling and hangling under water, fixed vertices for swimming clonk
Please note that the dive animation is putting the clonk to low compared to its center this should be fixed by one of the OC modelers.
2013-10-06 14:55:48 +02:00
Nicolas Hake db9ee644eb Fix walking animation with xdir=0 (#887)
When trying to get the sign of the horizontal velocity, a calculation
erroneously assumed that it could never be 0. When it did, a #DE was
raised. This changeset replaces the calculation with the Sign() function
from Math.c, which handles a zero argument correctly.
2012-12-17 02:11:03 +01:00
David Dormagen 94c85d8609 hopefully fixed a script error related to animation replacements
the shield replaced the animation "Walk" with an array of two animations. Then when GetWalkAnimationPosition was queried from FxIntWalkTimer:476 it threw an error at GetAnimationLength
2012-10-14 19:39:40 +02:00
Günther Brammer f41590d71f Merge branch 'movement' 2012-07-13 23:27:14 +02:00
Sven Eberhardt fec75aa79d Fix subsisting com dir if hangle animation is aborted (#418) 2012-07-13 22:55:44 +02:00
Günther Brammer 944ca60910 Tweak the "corner scale" behaviour
Instead of teleporting from sticking with the left/rightmost vertex to the
want to standing on the lowest one at the same position, the Clonk can now
climb using the lowest vertex alone. That means the teleport only needs to
cover only one pixel each in x and y direction to go from sticking to the
side of the landscape pixel to sticking on top of the same pixel.

Also remove some unnecessary x/ydir resets and make comdir in the direction
of the wall the Clonk is scaling keep the up/down direction instead of only
going up.
2012-06-08 16:17:42 +02:00
Bernhard Bonigl a3c0c85b1a Don't divejump during aiming 2012-04-29 18:12:04 +02:00
Bernhard Bonigl c576a7bd3f Allow turning while jumping during aiming 2012-04-29 18:09:37 +02:00
Felix Wagner 4bb8cebafc Fixed clonk getting stuck when falling off the bottom of (flying) liquid 2012-04-09 02:50:31 +01:00
Bernhard Bonigl 061a96e514 Standardized variable-names in Clonk-Animations and put them into a "Namespace"-Proplist.
More info in UpdateMenu-Implementation-Fail.
2012-04-07 23:32:57 +02:00
Charles Spurrill 4ce3b0d477 Clonk can't turn around whilst rolling 2011-10-25 15:01:27 -07:00
Julius Michaelis 0f12b3485e Find sounds with all extensions instead of only wav, so Sound() does no longer require .ogg extensions
Do not replace * with ? in sound name wildcards anymore, adjust scripts
2011-10-12 23:09:22 +02:00
Richard Gerum c0a1e343c6 clonk can turn while on grappler rope 2011-10-09 15:26:52 +02:00
Richard Gerum 6bc3f0a3d5 removed unnamed effect variables in clonks animationscript 2011-10-09 10:58:58 +02:00
Richard Gerum fcc41c54ba fixed turn rotation when swinging the grappler to the right 2011-10-09 10:52:28 +02:00
Felix Wagner d29a81646e Proper eating animation 2011-10-08 22:28:49 +01:00
Felix Wagner 99143276bc More dust when running, kneeling, rolling 2011-10-08 21:44:24 +01:00
Richard Gerum 166e898852 fixed some errors of the exported animation script 2011-10-08 19:46:22 +02:00
Richard Gerum 3cde4e3922 seperated animations from clonks script 2011-10-08 19:04:57 +02:00