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

5465 Commits (d84c9b174f9730d0e58844a29d4d17a7895be189)

Author SHA1 Message Date
Sven Eberhardt 0e3b1865ea UserAction: Add more options for particle creation 
Also fix collision behaviour setting to work.
 2016-08-27 17:38:25 -04:00
Sven Eberhardt 147e70ace9 Fix sequence and dialogue progress mode saving 2016-08-27 17:17:48 -04:00
Sven Eberhardt 065d8536da UserAction evaluators: Sort constant value above other evaluators 2016-08-27 17:15:20 -04:00
Sven Eberhardt dfefa7df6f UserAction goto and log: Put parameters directly into enum 2016-08-27 17:14:51 -04:00
Sven Eberhardt 6b9df3118c Sort UserAction evaluators and groups by name 
Also merge effect group into ambience group.
 2016-08-27 16:46:59 -04:00
Sven Eberhardt e2e9248d89 UserAction: Clarify HideFullName property comment 2016-08-27 16:46:58 -04:00
Maikel de Vries 788ba6e0c4 allow swapping source and drain pipe at the pump 2016-08-27 17:10:30 +02:00
Maikel de Vries a15ac3742e add icon for swap 2016-08-27 17:10:30 +02:00
Sven Eberhardt dba7e773ab UserAction variable evaluators: Default name to empty string constant 2016-08-27 10:01:33 -04:00
Sven Eberhardt 4a14ce735e Fix UserAction type "Any" evaluators 
Their callback function was not registered if they weren't duplicates from a non-any type
 2016-08-27 09:59:25 -04:00
Sven Eberhardt 820b2a39a0 Fix display of some user actions 2016-08-27 02:04:02 -04:00
Maikel de Vries 49fa224bcd C4D_Vehicle to C4D_None for some non-vehicles 2016-08-26 22:11:18 +02:00
Maikel de Vries 96e8f0a12f fix fusing of dynamite box (#1816) 2016-08-26 19:54:19 +02:00
Maikel de Vries 07008af820 fix missing string table entry in UserAction.ocd 2016-08-25 19:07:24 +02:00
Maikel de Vries 4410e95cc2 tutorial 6: do not allow turning catapult while aiming (#1744) 2016-08-25 19:07:24 +02:00
Maikel de Vries 97c093ea0d tutorial 03: add welcome message to guide post 2016-08-25 19:07:24 +02:00
Sven Eberhardt 44022f840f Add CustomInitializationScript to all objects 2016-08-25 00:18:11 -04:00
Sven Eberhardt 540bd62ad3 Optimize torch timer 
The torch timer was #1 script in a profiler run of a scenario with 10 torches.

Reduce to 1/4th of the calls. Actually, I think it looks better now (less regular, more torch-y).
 2016-08-24 01:28:28 -04:00
Armin Schäfer 77790c7313 Add Shark: Squashed commit of the following: 
commit 1abfae50c6454c8f5bab10bff753fb472f0596d0
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Wed Aug 3 00:56:40 2016 +0200

    Make shark slower (only twice as fast as the Clonk) and reactivate FastSwim animation.

commit b35db07894be864978a6b03609eb3d754b622705
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Thu Jul 21 22:24:48 2016 +0200

    Shark: Fix shark not swimming for a while when Clonk was too near.

commit f1495371394796e4a2d984049c026eaa66a0d30e
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sun Jul 3 19:48:22 2016 +0200

    Shark: Revert wrong location of the shark.

commit 437f911629c8ec9ee1c587e653790378b0d8fd17
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sun Jul 3 19:44:49 2016 +0200

    Shark: Fix one turning bug, it can not be big enough to cause a mesh bug when turning around; shark is a bit slower when attacking (hopefully it can not jump out of the water now)

commit 28d0a9dfbad4e2b4c42295e73d8d42e5495b0e37
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sat Mar 26 01:28:19 2016 +0100

    Move shark to Objects.ocd and add sharks to Clonkomotive on hard settings.

commit 000d162fb5c36225fdd215d1d30336a1c926ec27
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sat Mar 26 01:09:55 2016 +0100

    Shark: Fix bugs.

commit be201ffd6424203bf2b9b3a2a8496b3d41ec3122
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sat Feb 20 14:48:12 2016 +0100

    Shark update. Fix animation when attacking.

commit 7dc24e93fa19f26cc2f3344ac8267b81b4fd3eee
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sat Jan 23 22:36:24 2016 +0100

    Delete the patch.txt from my last commit.

commit 36e828fb7545fb6c2538c728844f0b4dc97bfcc5
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sat Jan 23 17:38:29 2016 +0100

    Add experimental Shark scenario.
 2016-08-23 19:16:54 +02:00
Sven Eberhardt 83a5034f63 Add inscription property to guideposts 
Now you can set a guidepost message in the editor!
 2016-08-23 02:08:12 -04:00
Sven Eberhardt 4ce96cb892 Fix scenario saving of names when no name is assigned. 
It created SetName("") entries because def->GetName() has a fallback to the internal name while obj->GetName() does not.

Just use .Name instead. Objects with custom naming (overloaded GetName()) need to overload name saving anyway.
 2016-08-23 02:07:54 -04:00
Sven Eberhardt e4fad91d36 Fix user action sound in local context 2016-08-23 02:07:53 -04:00
Maikel de Vries 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
Maikel de Vries 7935f736fe make mooq firebomb C4D_None instead of C4D_Vehicle 2016-08-22 16:32:47 +02:00
Maikel de Vries 095a589842 clean up bullet trail and fix offset to bullet 2016-08-22 16:32:47 +02:00
Maikel de Vries 1fc7fea628 remove unused local variable from grenade launcher 2016-08-22 16:32:47 +02:00
Maikel de Vries 45bb9ab550 rename lead shot to lead bullet and clean up script 2016-08-22 16:32:47 +02:00
Sven Eberhardt d2557960ae Add user action: Give player knowledge 2016-08-21 15:40:38 -04:00
Sven Eberhardt f6b3a6efb8 Add magic wand as an editor-assignable usage item 2016-08-21 15:17:51 -04:00
Sven Eberhardt f9349721e4 Add user action: Cast particles 2016-08-21 14:49:23 -04:00
Sven Eberhardt c7b114139a Add user action: Change wealth 2016-08-21 14:49:22 -04:00
Sven Eberhardt 967a5730ed UserAction evaluator display: Invert full name display default 
Showing the full name is far more common than hiding it.
 2016-08-21 14:49:21 -04:00
Sven Eberhardt 237956e7ba Add user action: Fling object 2016-08-21 14:49:20 -04:00
Sven Eberhardt b553d69d25 Add user action: Game over 2016-08-20 11:30:45 -04:00
Sven Eberhardt 56adee6bb9 Add script goal editor properties and user actions 2016-08-20 01:55:22 -04:00
Sven Eberhardt 4df8679be2 Simplify saving of scenario properties in saved scenarios. 
Just need to set "Save" to an identifier now.
 2016-08-20 01:55:21 -04:00
Sven Eberhardt 947ca6af7c Add user action: Activate/deactivate sequence 2016-08-20 01:55:20 -04:00
Clonkonaut 6a80ce8edb Hot Ice Hotfix: Prevent grenade launcher from getting stuck uselessly in aim mode. 
This fix might be dangerous, I do not know it. I have no real idea what this line was supposed to do. But it certainly prevented the release use command from getting to the used item in certain corner cases (right between loading and aiming).
I tested a bunch of vehicle and they work fine so far. So maybe this line was useless and harmful after all.
 2016-08-20 00:56:50 +02:00
Clonkonaut 5518d0ca15 Forgot to make the diving helmet a tool product! 2016-08-17 20:28:26 +02:00
Clonkonaut d93b4d7b3a Do not show helmet on back (can't make it work properly with other items). 
The helmet is just too big and bulky. Same with the diving helmet.
 2016-08-17 20:25:05 +02:00
Clonkonaut 01232b61a5 Fixed taking off of helmet when putting on another. 2016-08-17 20:23:33 +02:00
Clonkonaut afe5cd3c24 Added diving helmet, must be connect to a pump! 
Rudimentary handling of air pumping added to the pump and of course the helmet. The functions of the helmet concerning air pumping can maybe later used for a library.
 2016-08-17 20:23:18 +02:00
Maikel de Vries 192ccc0203 prevent hitting self with reverse throw (#1759) 2016-08-15 19:20:08 +02:00
Sven Eberhardt 3a49a9c21d Add user action: Set object position 2016-08-15 01:19:14 -04:00
Sven Eberhardt a86576b763 Add TreasureHunt title image 2016-08-14 18:41:37 -04:00
Sven Eberhardt 1fe086a106 Add MtBrame title image 2016-08-14 18:39:48 -04:00
Sven Eberhardt 9be5379f73 Add MineRescue title image 2016-08-14 18:39:47 -04:00
Sven Eberhardt 343a4be8cc Add GoldenMountain title image 2016-08-14 18:39:47 -04:00
Sven Eberhardt 225b0a9444 Add FrostySummit title image 2016-08-14 18:39:46 -04:00
Sven Eberhardt 2415e0d7d3 Add DeadlyGrotto title image 2016-08-14 18:39:45 -04:00
Sven Eberhardt 42e6c3de3c Add DarkCastle title image 2016-08-14 18:39:45 -04:00
Sven Eberhardt 18437305ca Add AcidDrilling title image 2016-08-14 18:39:44 -04:00
Clonkonaut 1b76c31452 5 title picture by ala and K-Pone. 
https://clonkspot.org/forum/topic_show.pl?pid=14524#pid14524
 2016-08-15 00:32:01 +02:00
Sven Eberhardt 6ee3849b18 Fix "number of objects in container" sequence trigger 2016-08-14 14:16:03 -04:00
Sven Eberhardt 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
Sven Eberhardt 4a94c3598b Sequence: Add "<" operator to contents count trigger 2016-08-13 23:25:01 -04:00
Clonkonaut 1036bad7fb Added a helmet by pluto. Wear and get 20% off damage*! 
*: not all damage is reduced, does not help against explosions, fire, asphyxiation or corrosion. We assume no liability for any deaths or injuries occurred while wearing.
 2016-08-12 18:25:01 +02:00
Clonkonaut 43117a53bd Added Library_Wearable for clothing or other worn items. 2016-08-12 18:22:50 +02:00
Sven Eberhardt 4869eff787 Allow joining to editor games through startup network dialogue 2016-08-10 19:35:39 -04:00
Clonkonaut 825c0653e5 Added a slight helper for corner scaling when just pressing up (#1770, #1630). 
The problem occurred as soon as the clonk's leg vertices passed the edge. It seems the engine does not really align the bottom vertex to the material. However, the bottom vertex does have CNAT_Bottom & _Left & _Right, in theory it should be properly attached. Maybe this is a little bit broken engine-wise or maybe assigning both left and right to a vertex isn't supported?
Because the lower vertex (foot vertex) isn't attached, the clonk falls down onto its leg vertex and gets stuck in an endless loop of Scale, Jump, Walk, Scale, ...
When pressing left/right, this is no problem as the clonk will be pushed towards the edge when walking and soon touch it with its foot vertex (I assume at this point regular engine behaviour kicks in).

I added a little helper in the scale effect that sets COMD_UpLeft / UpRight whenever this situation is detected and only Up is pressed. 2 frames (1 is not enough) after the effect ended, the ComDir will reset to COMD_Up. It is then possible to climb an edge and stand still on top of it.

Maybe not a perfect solution (a perfect solution would probably be to fix attachment in the engine but I couldn't pinpoint the exact problem) but it works for now.
 2016-08-10 01:19:11 +02:00
Clonkonaut 7a56086d13 Fix Brick density in VolcanoEscapeEx (#1781). 2016-08-10 01:07:42 +02:00
Clonkonaut 52fdcec172 Renamed coconut tree (#1752). 2016-08-10 00:08:01 +02:00
Clonkonaut 51a18f42b2 Expand ObjectInteractionMenu search radius one pixel lower (#1788). 
I don't think this pixel will hurt too much.
 2016-08-10 00:01:27 +02:00
Clonkonaut 05a814461f ObjectInteractionMenu: don't create infinite ExtraSlotTracker effects. 
I think there's a bug in the effects system. It seems that effects are not removed properly if command_target is deleted. I will investigate.
 2016-08-09 23:45:48 +02:00
Clonkonaut 07ea0fe438 Dynamite Box is now a container holding 5 sticks of dynamite. Can be taken out separately (and put back in). 2016-08-09 23:44:14 +02:00
Sven Eberhardt 4fbeead744 Fix user action "Cast objects" speed property name 2016-08-09 00:12:45 -04:00
Sven Eberhardt ba9165d016 Fix "triggering clonk" user action evaluator in "a clonk dies" to point to the clonk. 2016-08-09 00:09:07 -04:00
Sven Eberhardt c5ecc3a2b1 Fix user action evaluator: Find contents with ID given 2016-08-09 00:03:51 -04:00
Sven Eberhardt d005c20f00 UserAction: Fix typo in US strings 2016-08-09 00:01:10 -04:00
Sven Eberhardt effec53f0a PlayerStart: Default crew to one clonk 
It's the most sensible setting for most scenarios (melee, parkour, etc.) and probably the best default for newbies.
 2016-08-09 00:00:17 -04:00
Maikel de Vries daf45a17f5 fix boiling lava name 2016-08-08 23:04:21 +02:00
Sven Eberhardt d5cc9c2a36 UserAction: Add missing SetCondition setter function 2016-08-08 16:24:06 -04:00
Sven Eberhardt be60b276d0 User action script: Fix script error if a context returns nil. 
If a context is defined but returns nil, the script now returns nil instead.
 2016-08-08 15:34:06 -04:00
Sven Eberhardt a713870f33 Reorder some user action parameters 2016-08-08 15:03:40 -04:00
Sven Eberhardt 0c31bc7985 Fix parkour checkpoint initialization when loaded form scenario 2016-08-08 14:56:57 -04:00
Sven Eberhardt 6811546dae JetStream: Editor-friendly and scenario savable 2016-08-08 14:41:52 -04:00
Clonkonaut e5d90c90c6 HotIce: Balloon spawn added for extra fairness. 2016-08-08 18:25:52 +02:00
Maikel de Vries 700d5c199f rapid refining: fix pumping into refinery drain 2016-08-08 16:54:28 +02:00
Sven Eberhardt b2bed04a7e Fix sequence suspension 2016-08-08 00:49:17 -04:00
Sven Eberhardt 7e87b62e3e Add sequence triggers: Interval and object count in container 2016-08-07 23:42:40 -04:00
Lukas Werling e6c483953a Dynamite: Make FuseTime a local to make changes possible 2016-08-08 01:43:19 +02:00
Sven Eberhardt 44999d550c Fix user action sequence check interval and make it configurable 2016-08-07 17:33:51 -04:00
Sven Eberhardt dd2e649825 Fix user action dialogue message options 2016-08-07 16:24:23 -04:00
Sven Eberhardt dd36e46f62 Fix sequence scenario saving 2016-08-07 16:09:40 -04:00
Maikel de Vries df098d2840 pump only activates when drain is free or accepts liquid 2016-08-07 21:26:23 +02:00
Lukas Werling f3b2ff1295 Merge branch 'gamepad-controls' 2016-08-07 18:10:24 +02:00
Maikel de Vries a9a2ffd95c rapid refining: add waterfall as additional power source 2016-08-07 17:27:31 +02:00
David Dormagen 51bab0b0b2 renamed "Gaya" to "Gaia" 
This is necessary to not draw the attention of Zeus and find an end through a dramatic lightning strike.
 2016-08-07 17:26:36 +02:00
David Dormagen a9b1b975d3 removed Libraries/Animal/CreatureControl (and thus the automatic script player) 
The script players was not treated correctly by the goals, so joining it automatically would break stuff. While I still like the implications of an automatic script player, it was too much of a hassle for now.
Find_AnimalHostile works around the main issue as it allows just using Find_AnimalHostile and automatically have the animal work for both neutral owners and as pets. It does not allow for the distinction of hostile neutral and friendly neutral, though.
 2016-08-07 17:05:53 +02:00
Maikel de Vries 809172e74c new world: rapid refining 2016-08-07 14:24:28 +02:00
Lukas Werling 00ee209eca Hot Ice: Handicap teams with more players 
In every team, the same number of players will now load their grenade
launcher before the round starts. If there's a team with more players,
some players won't be able to shoot immediately.
 2016-08-07 13:56:04 +02:00
Sven Eberhardt be58ef5ae1 Goal_Parkour: Also reset last respawn checkpoint on "reset all" editor action 2016-08-07 02:07:27 -04:00
Sven Eberhardt 17409ab4c1 Add user action evaluator: If 2016-08-07 02:06:15 -04:00
Sven Eberhardt 5babeba4d8 Add user action evaluators: X/Y component of position 2016-08-07 01:50:29 -04:00
Sven Eberhardt b1460398fb UserActions: Prioritize some action main arguments 2016-08-07 01:16:27 -04:00
Sven Eberhardt 009dc4221f Parkour checkpoint US string fix 2016-08-07 01:14:23 -04:00
Sven Eberhardt f6d1e6ed2b Fix dialogue creation through EditorAction 
Silence a warning and make sure the name is valid.
 2016-08-07 01:06:26 -04:00
Sven Eberhardt 7a9ff289f5 Make parkour checkpoint and respawn management more robust to runtime editor development 2016-08-07 01:02:23 -04:00
Sven Eberhardt 596d2a5e68 Add "Reset all cleared" editor command to parkour goal 2016-08-07 00:28:53 -04:00
Sven Eberhardt e471a98fe3 ItemSpawn: Add spawn_id EditorProp name and help. 2016-08-07 00:18:28 -04:00
Sven Eberhardt 84190e6685 Reset item spawn points on clonk death 2016-08-07 00:16:50 -04:00
Sven Eberhardt b7e0b9ba3f Add ItemSpawn name and description. 2016-08-07 00:11:09 -04:00
Sven Eberhardt f59b6c837f UserAction: Fix some US string table entry names 2016-08-06 23:59:22 -04:00
Sven Eberhardt c70a2e94f2 Auto re-number and re-assign start and finish checkpoints when points get deleted 2016-08-06 23:41:50 -04:00
Sven Eberhardt a993b6e1ec Add distinct graphics for parkour start 
It used to be the same as the end (flag), which was a bit confusing
 2016-08-06 22:24:59 -04:00
Sven Eberhardt 5db45c0f47 Merge branch 'master' into qteditor 2016-08-06 21:45:19 -04:00
Sven Eberhardt 90d813fc5a Fix OnMouseOver / OnMouseOut parameter warnings 
The callbacks from PlayerControl aren't used anywhere right now and there's only two unrelated internal functions in the GUI list menu with the same name. So the parameter checker emits a warning here.

Solve it by renaming the internal functions.
 2016-08-06 21:42:21 -04:00
Sven Eberhardt 1cdf22ae81 Fix restart rule creation in parkour goal 
Was created at a large offset and multiple copies could be created.
 2016-08-06 21:34:01 -04:00
Sven Eberhardt 5bb204d69b Qt editor: Fix net menu 
It didn't work, had the wrong labels and crashed.
 2016-08-06 21:12:04 -04:00
Clonkonaut 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
Sven Eberhardt 5cbbd0d05b Add respawn material setting to player spawn 2016-08-06 15:24:25 -04:00
Sven Eberhardt 714ff028c8 Update GetConditionalIDList to new array delegate syntax 2016-08-06 15:24:03 -04:00
Sven Eberhardt 8ec12d8490 Add cleared and respawn user callback actions to parkour goal and checkpoints 2016-08-06 14:50:43 -04:00
Sven Eberhardt e39b314239 Add property to auto-save EditorProps in scenarios 2016-08-06 14:49:48 -04:00
Sven Eberhardt db1e9abbe3 Unify rule picture size display in the editor to 32x32 2016-08-06 10:32:21 -04:00
Sven Eberhardt 7825931c95 Limit rule placement in editor to one per rule type 2016-08-06 10:27:56 -04:00
Sven Eberhardt 7aaa581908 Auto-update checkpoint assignment to parkour goal in editor 2016-08-06 02:38:01 -04:00
Sven Eberhardt a21a1a8051 Limit goal placement in editor to one per goal type 2016-08-06 02:37:25 -04:00
Sven Eberhardt fc24969899 Add EditorPlacementLimit property 
Limits the number of object instances that can be placed of a given def.
 2016-08-06 02:36:53 -04:00
Sven Eberhardt c15a821a51 Name parkour checkpoints by index 2016-08-06 01:13:35 -04:00
Clonkonaut 8d6d57089b Inventory slot selection is back on key down. 
This makes the selection of the Q slot slightly more awkward because you select the target slot in between. Or to say otherwise: it is kind of like it was before.
 2016-08-05 19:36:26 +02:00
Clonkonaut f4ca4466f1 Basements combine in all four directions when constructing! 2016-08-05 18:21:34 +02:00
Clonkonaut ad2bbbf5fd ForceConstruct() added to ConstructionSite for better debugging. 
Will construct the construction without the needed material. I often needed to test stuff with construction sites and always had to script-create all the material which is tedious.
 2016-08-05 18:19:05 +02:00
Clonkonaut 2032e0274b IsHammerBuildable added to WoodenBridge. 2016-08-05 18:18:00 +02:00
Sven Eberhardt e6b286b126 Add parkour checkpoint EditorProps and EditorActions 2016-08-05 01:09:34 -04:00
Sven Eberhardt 9bcef15b99 Add AddScenarioSaveDependency for scenario saving: Adds a dependency without forcing a name 2016-08-05 00:30:43 -04:00
Sven Eberhardt a06363b70b Fix restart rule graphics 2016-08-05 00:29:52 -04:00
Sven Eberhardt 693c0124b9 Update more goal icons for better editor size 2016-08-04 21:15:25 -04:00
Sven Eberhardt c14721523c Make standard goals and rules visible as icons in editor 2016-08-04 19:32:57 -04:00
Sven Eberhardt 3eb106dd85 Add SetMaxEnergy function to clonk 2016-08-04 19:14:39 -04:00
Clonkonaut 34af29fd7b Show quick slot item on clonk. 
All GetCarry* callbacks receive a parameter whether they are held in this slot and can then return a different display mode!

I also took the opportunity to restructure many scripts in a similar way.
 2016-08-05 01:14:13 +02:00
Clonkonaut 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
Sven Eberhardt 68700408ad Add max energy and max contents count settings to PlayerStart object 
Values are used for all starting clonks and all clonks created later in the game for this player (e.g. respawns) after spawning from the spawn point with these settings.
 2016-08-04 10:48:40 -04:00
Clonkonaut 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
Clonkonaut 74636c11a6 Added CARRY_Belt as a new carrying method for items. 2016-08-04 15:56:44 +02:00
Sven Eberhardt 729489e40d Add user action: Set clonk inventory size 2016-08-03 23:50:35 -04:00
Sven Eberhardt 71b337fd59 Add SetMaxContentsCount function to inventory library 
Makes sure the inventory buttons and hands are updated.
 2016-08-03 23:50:34 -04:00
Clonkonaut d1382f7244 Fixed inventory slot selection. 2016-08-02 23:59:15 +02:00
Clonkonaut 36e2e1ab3e Switch inventory slots by pressing number key (hold) + number key. 
This can be used to sort the inventory according to personal liking!
 2016-08-02 18:39:13 +02:00
Clonkonaut 89be1da072 Changed quick switch slot selection to Number + Q. 
As suggested by Zapper in this posting: http://forum.openclonk.org/topic_show.pl?pid=31073#pid31073.
This way is probably the only way item usage will ever work on Q. For now, this reverses the previous changes. Q will again react on key down.
 2016-08-02 17:49:34 +02:00
Sven Eberhardt c12c51b44d Update sequence editor prop priorities and name 2016-08-02 01:12:09 -04:00
Sven Eberhardt 1d566ec6c5 Add VIS_Editor visibility flag 2016-08-02 01:12:08 -04:00
Clonkonaut faf3add7e7 Quick Switch slot is now selectable using Q + number key. 
This makes a very fundamental change with quick switch: The switching action is now performed on the key release instead of the key press. Let's see if this performs badly for players.
 2016-08-02 00:37:40 +02:00
Clonkonaut 2713462cd2 Show quick switch key above quick switch item slot in HUD. 
This will prepare the quick switch system according to Maikel's suggestion (http://forum.openclonk.org/topic_show.pl?pid=31070). The highlighting method is open to discussion. Currently, font colour and style are similar to the interaction key above the action bar icon. But it is very well possible that this will look bad when the key name is very long.
 2016-08-01 17:14:34 +02:00
Sven Eberhardt 2d806772dd Add user action evaluators: Owner of object, controller of object 2016-07-31 22:57:34 -04:00
Sven Eberhardt 2f4ffa0a0c Add user action evaluators: Player wealth, clonk energy, object mass, object speed 2016-07-31 22:23:52 -04:00
Sven Eberhardt bf35f92228 Add arithmetic user action evaluators (+-*/%) 2016-07-31 21:31:53 -04:00
Clonkonaut 8966df8310 Grapple bow: Show hook in extra slot (#1768). 
This will give you visible feedback if the hook is fired or not. Perfect for dual hook handling situations. Library_HasExtraSlot is used to show this but IsContainer returns false. This will prevent hook extraction using the interaction menu. Removing the hook from the grapple bow will cause errors (this should probably be taken care of sometime).
 2016-08-01 00:03:14 +02:00
Sven Eberhardt d8b488aa98 Add user actions evaluators: Object/Player count 2016-07-31 17:31:18 -04:00
Sven Eberhardt ab954f65a8 Add user action evaluators to find single objects 2016-07-31 15:36:12 -04:00
Sven Eberhardt 27f9e15042 Add user action evaluators: Find objects in area or container 2016-07-31 15:09:05 -04:00
Sven Eberhardt 8163ffac8a User action message: Fix display of empty messages 2016-07-31 10:36:56 -04:00
Sven Eberhardt e57047f26a Add user action evaluators: Logic (not, and, or, ==, !=) 2016-07-31 10:36:22 -04:00
Sven Eberhardt 102032276b Fix grouping of typed user action evaluators 2016-07-31 09:04:25 -04:00
Sven Eberhardt 368aebb547 Simplify empty string handling in user actions 2016-07-31 09:02:19 -04:00
Sven Eberhardt 099c0e0bcf Add user action: Script 2016-07-31 08:56:38 -04:00
Sven Eberhardt 9b5c39a33f Add user action evaluator: Concatenate strings 2016-07-31 00:28:02 -04:00
Sven Eberhardt 404a578e5c Add user action: Log 2016-07-31 00:05:58 -04:00
Sven Eberhardt 04a7426e4f Add user action evaluator: Value to string 2016-07-30 23:59:09 -04:00
Sven Eberhardt de699080dc Add user action evaluator: Distance between positions 2016-07-30 23:49:45 -04:00
Sven Eberhardt 108f447b2b Dialogue user actions: Change text and options in message action to use evaluators 2016-07-30 23:00:18 -04:00
Sven Eberhardt f12c6dc3e7 Add user action variables 2016-07-30 22:39:22 -04:00
Sven Eberhardt 490e92bc4e Add sequence trigger: Object enters region (rectangle or circle) 2016-07-30 19:42:55 -04:00
Sven Eberhardt 30f62f6a43 Add user action evaluator: Type of object 2016-07-30 18:00:04 -04:00
Sven Eberhardt 8bc310c52a Add user action evaluator: Object exists 2016-07-30 17:47:45 -04:00
Sven Eberhardt a01c6d4db9 Add user action comparison evaluators 2016-07-30 17:39:15 -04:00
Sven Eberhardt ea3603b991 Add user action: Cast objects 2016-07-30 16:51:57 -04:00
Sven Eberhardt 95c556bb9a Shorten some user action display names 2016-07-30 14:50:22 -04:00
Sven Eberhardt 6f204d89f5 User action sound: User "Global" as name for nil sound source 2016-07-30 14:14:09 -04:00
Sven Eberhardt 323691eeca Add user actions: Open and close doors 2016-07-30 13:21:38 -04:00
Sven Eberhardt 9522fb7e42 Add user action evaluators: Random positions and offsets in rectangle or circle 2016-07-30 12:29:35 -04:00
Sven Eberhardt b1096786d8 Add user action evaluator: Difference between two positions 2016-07-30 11:26:34 -04:00
Sven Eberhardt 95e27e6a22 Add user action evaluator: Position of object 2016-07-30 11:14:12 -04:00
Sven Eberhardt 7eee5c4832 Add user action evaluator: Random integer 2016-07-30 11:03:26 -04:00
Sven Eberhardt 898aff0cc8 Add user action evaluators: Offsets and coordinate positions 2016-07-30 02:06:54 -04:00
Sven Eberhardt 7c094c3bf1 Add user action evaluator: Position (absolute and relative) 2016-07-30 01:06:21 -04:00
Sven Eberhardt bdea3876d6 Add user action: Remove object 2016-07-29 02:06:20 -04:00
Sven Eberhardt e19e5ce7ea Add user action: Create object 2016-07-29 01:43:35 -04:00
Sven Eberhardt 77a4916383 UserAction: Add Sound 2016-07-28 23:44:10 -04:00
Sven Eberhardt c70ee82068 Define localized help text strings for UserActions 2016-07-25 22:44:09 -04:00
Sven Eberhardt 11b317808f Qt Editor: Add toggle help button to "?" menu 2016-07-25 21:39:35 -04:00
Clonkonaut 042ee8b2e5 Changed the colours of the drain and source pipes to accommodate for people with red-green color blindness (#1757). 
The colours have been suggested by K-Pone.
 2016-07-25 18:03:44 +02:00
Clonkonaut 56f8372a68 Skylands: fix GetComponent when called in definition context on 'small 
trees' (#1781).

At some point someone might test if this breaks anything but I think it does not.
 2016-07-25 17:55:53 +02:00
Clonkonaut 786b248cdf Chine: Unstuck starting clonks if necessary (#1786). 2016-07-25 17:50:38 +02:00
Clonkonaut 48b5f27f14 Fix effect removal of 'IntUpgradeProductProgressBar' when closing the interaction menu of a producer (#1796). 2016-07-25 17:42:15 +02:00
Clonkonaut b3b8e01f60 Another decorative deciduous tree by Foaly. 2016-07-25 17:26:33 +02:00
Sven Eberhardt 5f9259c27f UserAction EditorHelp props 2016-07-25 01:42:23 -04:00
Sven Eberhardt aa68c7ee16 Add description and EditorHelp for dialogue properties and actions 2016-07-25 01:24:12 -04:00
Sven Eberhardt 35a5df6c9b Revert accidental commit from master merge 2016-07-25 01:08:49 -04:00
David Dormagen 2fc3dba47e zap: added guard to prevent accessing removed object 2016-07-24 18:25:18 +02:00
David Dormagen 66263b5bc8 Chippie: removed superfluous phase call 
..which led to an error ingame, because the function is not defined.
 2016-07-24 18:24:45 +02:00
Sven Eberhardt f47c31749a UserActions: Split triggering clonk and object 
Also fix goto.
 2016-07-24 10:50:39 -04:00
Sven Eberhardt 534e4cc745 Merge branch 'master' into qteditor 
Conflicts:
	src/script/C4AulParse.cpp
 2016-07-24 10:23:57 -04:00
Sven Eberhardt 4245f60e83 Qt Editor: Add help/description label for current selection 2016-07-24 10:12:38 -04:00
Sven Eberhardt 91873ca0ac Add graphics for sequence 2016-07-23 01:44:32 -04:00
Sven Eberhardt 58faf41068 Sequence: Add more triggers. 
* Player enters circular region
* Game starts (after player joins)
* Player joins
* Player removed
* All goals fulfilled
* Clonk death
* Construction of structure
* Production of item
 2016-07-22 01:51:29 -04:00
Clonkonaut 21ea0ff777 Shrunk down texture sizes to 512x512. 2016-07-21 18:23:10 +02:00
Sven Eberhardt 319392a779 UserAction: Rename OptionKey from Option to Function 2016-07-21 00:47:43 -04:00
Sven Eberhardt 626719194a Add trigger+action to sequence object. 
Sequences can be used to create triggered cutscenes, intros, outros, etc. in the future.
 2016-07-21 00:24:55 -04:00
Sven Eberhardt 5855140cd4 UserAction: Conditions and more triggering player/object options 2016-07-21 00:24:54 -04:00