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

241 Commits (03d0bb49dc83ac553e02608dcc1399b78e69e481)

Author SHA1 Message Date
Armin Burgmeier 8cd4086a97 Drop all but first texture coordinate set from mesh files 
The second set is not used in any mesh, and it is not implemented engine-wise
anyway. This gets rid of the FIXMEs message when a mesh with more than one
texture coordinate set is being loaded.
 2012-10-28 12:18:18 +01:00
Maikel de Vries db5ce4ffd9 Fixed gravestone rule and added it to the arenas 2012-10-22 20:05:23 +02:00
Sven Eberhardt b01ee77095 Fix Clonk skin selection for skin==0 2012-10-15 10:55:40 +02: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
Charles Spurrill c28ef14f00 #752: Gravestones Rule Added. On clonk death, a gravestone is created (collecting the clonk's corpse to hide it) 2012-07-26 15:01:23 -07: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 24bfd6345d Use Action.Attach even when Action.Procedure is not nil 
But default to the previously used value when Attach is not set. Use 0 to
override the default.
 2012-06-16 03:01:47 +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
Felix Wagner 36e55443e1 GetPlrClonkSkin returns nil on NO_OWNER, fixed clonk's gender setting. 2012-05-12 15:56:41 +01:00
Charles Spurrill bf8ae0f0e9 Steampunk's eyelids work now 2012-04-30 06:36:43 -07: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
Maikel de Vries 37b5bb9c6d Clonk closes eyes on death (#752) 2012-04-29 13:27:50 +02:00
Maikel de Vries 4a56f8d7c1 Replaced defcore values related to fire with properties 2012-04-28 16:17:38 +02:00
Bernhard Bonigl 367af8ba9f Fixed error when updating attach before attaching 2012-04-14 16:51:01 +02:00
Martin Plicht a4194c22e9 Replace 0 with nil wherever string/object/array is expected 2012-04-12 11:48:23 +02:00
David Dormagen a78d8a1858 IsJumping now returns true only for actions that contain "Jump" (used to return true for Tumble) 2012-04-10 23:29:31 +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
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
Armin Burgmeier cebbacd3f4 Remove "Picture" DefCore entry in objects having mesh graphics 2012-02-25 17:04:00 +01:00
Maikel de Vries b1adfde389 Allow clonk to use tools during wall jumps 2012-02-13 20:13:13 +01:00
Felix Wagner cdd1f5f358 CrewExtraData overrides GetPlrClonkSkin 2012-01-31 13:58:43 +00:00
Felix Wagner 5a28794482 +GetPlrClonkSkin(iPlr) 2012-01-29 02:17:00 +00:00
Felix Wagner 93e70838ee Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
Charles Spurrill d9a02eaf14 Carry-Heavy system added 2011-10-26 14:03:12 -07:00
Charles Spurrill 4ce3b0d477 Clonk can't turn around whilst rolling 2011-10-25 15:01:27 -07:00
Charles Spurrill 3349a485bb Retopologized steampunk's face 2011-10-15 02:59:44 -07:00
Charles Spurrill b585d25295 Gender-neutral munching sounds 2011-10-14 01:44:54 -07:00
Charles Spurrill 334ded8a00 BowAimArms animation blending fix 2011-10-13 11:32:51 -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
Charles Spurrill 046d6d558f Club doesn't switch hands when used from right slot 2011-10-12 14:19:10 -07:00
Charles Spurrill f5654b15bb Normalize all clonk textures to 512x 2011-10-12 12:08:30 -07:00
Charles Spurrill ea449b00bb Fixed bow aiming animation during jump 2011-10-09 16:02:11 -07: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
Charles Spurrill f39fbdd311 Fixed farmer clonk's eyelids 2011-10-08 16:29:40 -07: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
Felix Wagner 07ad0805a4 Eat(object) for clonk, munch sound! 2011-10-08 20:48:18 +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
Charles Spurrill 8302ef74bf Fix farmer clonk mesh (mid-line edge-loop merged properly) 2011-10-08 09:37:55 -07:00
Charles Spurrill 2f77fa18df Newcomer: The Farmer Clonk! (skin index is 3) 2011-10-08 08:30:02 -07:00
Felix Wagner 15d8caead4 imported patch Footsteps.diff 2011-10-08 05:16:35 +01:00
Charles Spurrill 0469fe5c81 Drive animation/pose for plane; clonk doesn't swim inside containers 2011-10-01 08:34:35 -07:00
Charles Spurrill cf720b8bc8 update other clonk's skeletons to current data as well 2011-10-01 04:43:56 -07:00
Maikel de Vries 59c1aefad9 Objects: All Versions to 5,2,0,1 2011-10-01 10:54:15 +02:00
Charles Spurrill 677ff6b691 fixed wall-jump 2011-09-20 11:04:48 -07:00
Richard Gerum 0d051873c1 #644: Clonk now moves his legs again when walking while aiming with the bow 2011-09-19 15:55:06 +02:00
Richard Gerum 1fc5addd10 655#: no jumping backwards 2011-09-19 12:53:58 +02:00
Charles Spurrill 1a3b8aef94 Fixed bug where spawned clonks used default skin instead of the defined one: 
moved the skin-setting script to Recruitment instead of Construction, since it is crew data queried
 2011-09-18 18:30:24 -07:00
David Dormagen e3a1cdcc3f the HUD optimizations now mostly use the old callbacks 2011-09-18 19:15:31 +02:00
David Dormagen 170c61226d performance optimizations for the backpack and health/breath tubes 2011-09-18 10:56:43 +02:00
David Dormagen 85a3e55df3 Clonk doesn't burn as easily anymore 2011-09-18 10:55:30 +02:00
Charles Spurrill 0d24c6835b #328: Animation-glitch for kneelUp animation -Fixed!- 2011-09-13 08:03:22 -07:00
Charles Spurrill 1b22905492 Update clonk data to work with catapult 2011-09-13 00:22:40 -07:00
Tobias Zwick b81d40ddcb a few license updates 2011-09-10 15:36:36 +02:00
Charles Spurrill 415aae6c53 Save selected skin to crew-member extra-data 2011-09-10 00:51:47 -07:00
Tobias Zwick 23a3dafd3a license updates for sound effects 
(now with all sources linked and a few changed to CC-BY 3.0)
 2011-09-08 23:08:16 +02:00
Charles Spurrill 6524f5b9d5 Updated all clonk meshes/fixed animation bugs 2011-09-07 04:13:00 -07:00
Charles Spurrill 6555edab8a Fully implemented clonk alchemist skin 2011-09-06 10:53:25 -07:00
Charles Spurrill 5cac8cf475 added clonk alchemist skin data folder (needs graphics.mesh and skeleton file) 2011-09-06 00:22:58 -07:00
Tobias Zwick 330a80c1cb update authors and license information 2011-08-31 17:20:25 +02:00
Tobias Zwick 258c82604d moved RelaunchPlayer callback to engine 2011-08-02 15:46:24 +02:00
Tobias Zwick 480ff384f8 refactored most effects to use meaningful names for their variables 2011-07-31 17:59:51 +02:00
Richard Gerum 3cd964b3bd fixed jump animation again (thanks to ringwaul for the merge) 2011-07-25 10:06:15 +02:00
Maikel de Vries 964ba3a62a Objects: Fixed wave color for liquids other than water 2011-07-20 17:27:35 +02:00
Richard Gerum 2a0ddd34f9 added graphic rotation during scaling and animation for scaling top corners 2011-07-20 17:09:41 +02:00
Maikel de Vries e2db1bc85a Actions default to COMD_Stop, Decel for float and swim procedures 
With this change everything should behave as normal, still not a fan of these numerous float hacks.
 2011-07-06 19:11:12 +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
Maikel de Vries eb530c6017 Removed Defcore:Prey and OCF_Prey 
Had no use in the engine, should therefore be defined in C4Script if deemed necessary.
 2011-07-05 13:40:40 +02:00
Charles Spurrill b39adeb566 Tweaked musket animations 2011-06-08 03:06:49 -07:00
Charles Spurrill b7bc9bc755 Clonk can jump off walls (with new animation). 2011-06-03 12:11:23 -07:00
Charles Spurrill 6a901fa9c0 Tweak: Clonk rolls a shorter distance 2011-05-31 06:27:34 -07:00
Charles Spurrill 2c4196a02d Add skin changer function; differentiate gender for vocal sounds 2011-05-31 03:20:02 -07:00
Charles Spurrill 15c61d3216 The Clonk can roll! Oh my god! 2011-05-31 03:08:45 -07:00
Charles Spurrill 0760763a47 same as previous changeset for steamclonk 2011-05-29 23:41:10 -07:00
Charles Spurrill 648ca5ce43 Animation overhaul for jump and kneel. Roll animation added, though not yet used. 2011-05-29 23:34:30 -07:00
Charles Spurrill e8643c3b04 Animation blending works for Steampunk skin 2011-05-22 16:21:47 -07:00
Tobias Zwick 54bd6ca4f5 adjust clonk's backpack display a bit 2011-05-20 15:38:28 +02:00
Tobias Zwick 0f1c572c56 adjusted size of clonk's backpack 2011-05-14 21:53:58 +02:00
Maikel de Vries cbbee52179 Objects: Fixed a few warnings 
Removed some MaxUserSelects and another superfluous function parameter.
 2011-05-13 12:45:26 +02:00
Charles Spurrill cd90b5d4e9 Added steampunk skin to game data 2011-05-12 19:39:18 -07:00
Charles Spurrill 04cc6a26b9 Merge of late commit 2011-05-12 19:33:01 -07:00
Charles Spurrill e7b567863e Created and implemented backpack-graphic for clonks in-game. 2011-05-12 19:11:03 -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
Charles Spurrill c5dc03879b added chop animation, dive animation, and fixed some other anims like the landing-crouch, and improved others that I've since forgotten 2011-03-15 02:37:02 -07:00
Armin Burgmeier 675c077ed2 Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00