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

5329 Commits (f3f475e38a6b2a156cc196a3f39f393ade02791f)

Author SHA1 Message Date
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