ed514b7716
Added option for ignoring contents in the interaction menu
...
Also ignore Clonks as "inventory items" if they are contained.
2018-12-21 09:01:20 +01:00
16adcfff73
Detach any visible objects upon Death ( #1974 ).
2018-01-14 14:48:03 +01:00
ebd2eeae4b
Don't burn objects inside the Clonk when submerged in Lava
2018-01-09 18:00:35 -08:00
6e52963828
Fix tools attached to Clonks after their deaths ( #1974 )
2018-01-08 19:42:59 +01:00
06cd643d15
Clonk: Adjust mesh position while diving
...
This matches the vertex position better
2017-11-23 21:16:12 +01:00
f8f9a38ee3
Clonk: Constants for SetMeshTransformation layers
2017-11-23 20:38:11 +01:00
963285eee5
NoBurnDecay is a boolean
2017-11-11 09:49:52 +01:00
3fcee70f60
Fix breathing sound
2017-07-27 21:51:07 +02:00
2da7768a8e
Remove if-block in Eat()
...
The check should be made in the object that call Eat()
2017-07-13 21:49:07 +02:00
b7297c1358
Eat: Use existing function call instead of hardcoded comparison
...
Should the criteria for walking change then eating will still work
2017-06-28 19:36:39 +02:00
94ec4e336b
Fix inherited(...) calls
...
The named parameters have to be handed down, because the ... operator only passes all the unnamed parameters.
2016-11-26 17:56:41 +01:00
4b508134f8
Add clonk EditorAction: Turn around
2016-11-20 13:15:03 -05:00
61b75f002f
Add extra clonk skins to skin selection menu in editor props
2016-08-27 19:04:50 -04:00
e18cee3a46
turn musket into blunderbuss
...
The musket was not a very popular and useful weapon, being inferior to the bow. It now shoots 5 weaker bullets in one shot with less damage per bullet, this might require some further testing and fine-tuning. Also the weaker bullets mean that they can be used in a gatling-gun (WIP) and in the airplane as well.
2016-08-22 16:32:48 +02:00
192ccc0203
prevent hitting self with reverse throw ( #1759 )
2016-08-15 19:20:08 +02:00
bce903ee04
Merge branch 'master' into qteditor
...
Conflicts:
planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Animal.ocd/CreatureControl.ocd/DefCore.txt
2016-08-13 23:42:59 -04:00
f3b2ff1295
Merge branch 'gamepad-controls'
2016-08-07 18:10:24 +02:00
5db45c0f47
Merge branch 'master' into qteditor
2016-08-06 21:45:19 -04:00
cb8086cff7
Try to space out two items on the back better.
...
Mainly concerns scaling / hangling and it isn't perfect but better than before.
2016-08-07 03:04:04 +02:00
3eb106dd85
Add SetMaxEnergy function to clonk
2016-08-04 19:14:39 -04:00
70b124c9d4
Added carry mode CARRY_Sword. Similar to CARRY_Belt but attached to a bone which doesn't move while running.
2016-08-05 01:08:03 +02:00
4bd48242cf
Fixed CarrySpear animation.
...
I deserialised the skeleton file and removed some bone positions that I guess were wrongfully included because they concerned the left (non-carrying) arm. I think I didn't break anything but if so, this patch is to be reverted.
2016-08-04 16:18:26 +02:00
74636c11a6
Added CARRY_Belt as a new carrying method for items.
2016-08-04 15:56:44 +02:00
729489e40d
Add user action: Set clonk inventory size
2016-08-03 23:50:35 -04:00
28d2172b78
Qt Editor: Move editor props from EditorProp_* to an EditorProp proplist
2016-07-13 17:18:08 -04:00
a7aa89f168
Merge branch 'master' into qteditor
...
Conflicts:
planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c
src/platform/C4WindowSDL.cpp
src/script/C4AulParse.cpp
src/script/C4Effect.cpp
2016-06-20 22:27:03 -04:00
6aa926bffa
Add Clonk EditorProp to set skin
2016-06-18 10:46:19 -04:00
af3e3bb6c8
Add EditorProps for EnemyAI effect
...
Also remove old object-based editor controls.
2016-06-18 10:45:06 -04:00
a52da814fa
Play short rumble when a Clonk gets hurt
2016-03-22 20:19:08 +01:00
ac8d40418c
Refactoring: Stackable: Renamed TryPutInto() to MergeWithStacksIn()
...
The previous name suggested that the object actually gets put into another object. In fact it merges the stack count with other stacks, and it does not only try to (and reverts the state if it fails), but it actually changes other objects even if the function returns false.
2016-03-16 18:19:55 +01:00
9266157a1e
clonk: don't play doubt sound when exit command fails
2016-02-19 22:13:09 +01:00
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
38dad0dd9d
Prevent jump action during crew creation to avoid command failure sounds in intro sequences with contained clonks.
2016-01-17 23:01:57 -05:00
af5d9903bd
Fix Pyrit falling out of plane in some mission sequences.
2016-01-17 22:01:03 -05:00
729712fa2f
Allow use of bucket, pickaxe, bow, club, grenade launcher, javelin and musket during scale/hangle.
...
Temporarily disables scale/hangle during usage of these items.
2016-01-17 14:31:51 -05:00
4493bfc3ab
interaction menu: disallow interaction with outside world when contained ( #1541 )
...
The interaction with IsContainer objects is still flawed in a way: when a lorry is inside a (IsContainer-)hut, you can take the lorry into your hands. Since we don't have that possibility in the normal game, I leave it unchanged for now.
However, it is now possible to add a Chest (or a cupboard!) into a WoodenCabin and then store stuff inside of it.
2016-01-14 13:03:18 +01:00
77180efbdd
Move dead clonks from interaction tabs to simple boxes in surrounding #1581
2016-01-11 18:19:01 -05:00
e2acb8b9bb
Add missing sounds for Grab/UnGrab #1585
2016-01-10 21:17:06 -05:00
bdc0274e3d
CommandFailure: Route missing sound effect to failure function playing clonk skin sound.
2016-01-10 21:16:34 -05:00
075fcca74f
clonk: added "Diving Loop" sound (by ala)
...
It's a bit quiet, but I guess that's not really a problem. It's also out of sync with the arm movement, but it's all I got (and it's so quiet you don't notice it anyway!).
2016-01-04 20:52:11 +01:00
00a4c6c428
Replace BorderBound DefCore value with BorderBound object property
2016-01-01 22:18:41 +01:00
ce0f1498a8
Clonk vocals: use GetSoundSkinName instead of skin_name when checking for available sounds
...
Previously, PlaySoundShock was defective with the "Adventurer" skin.
2015-12-20 19:17:33 +01:00
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
dcfb986e34
moved sounds into subfolders
...
This completes http://forum.openclonk.org/topic_show.pl?tid=3215
2015-12-13 22:14:55 +01:00
7a0b170075
interaction menu: made menu-rejection errors a callback
...
Objects that prevent interaction just in some situations (hostility, dead Clonks, ..) should always be shown in the interaction menu (because otherwise players might suspect bugs) and TELL the player WHY they want no interaction.
For that, they might need to specify own error messages.
Known issues:
* The "OnOpen" callback is done even if interaction is disallowed, however just simply removing the callback might not be sufficient, because we might get a callback disbalance if objects change their attitude while the menu is opened and the menu is closed again.
* Some objects (which should) do not include the Library_Ownable. However, we have no base melees atm and since this might introduce new errors, postpone it to 8.0.
2015-12-06 21:28:03 +01:00
c02cce2c0c
interaction menu: allow transfer of items only into IsContainer ( #1484 )
2015-12-06 16:55:48 +01:00
cb4dbc3609
Foodstuff heals the Clonk over time.
2015-10-29 11:33:31 +01:00
e2c5158275
rename S2AI to AI
...
This in preparation for a more general AI (in the far future).
2015-10-14 20:44:38 +02:00
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
a8c85ff766
Made elevator more usable when swimming.
2015-10-07 01:10:32 +02:00
Mark