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

9712 Commits (qteditor)
 

Author SHA1 Message Date
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
Lukas Werling abef0da0aa Fix RestartApplication on Linux 
(and hopefully don't break it on Windows)
 2016-08-11 22:11:15 +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
Lukas Werling 4f5ba57170 Allow scenario saving as editor client 2016-08-09 18:55:43 +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
Sven Eberhardt 9d715387f2 Qt editor: Store and restore window layout (docked dialogues, etc.) 2016-08-08 23:57:24 -04:00
Sven Eberhardt 60240ac05b Qt editor: Fix material size slider when adjusting with a method other than dragging 2016-08-08 17:39:10 -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 4581022411 Fix an aul preparser crash on DirectExec functions parsing 
GetLastRetType doesn't work because the preparser does not generate code.

The code looks a bit like this line just got lost somehow?
 2016-08-08 15:26:25 -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
Lukas Werling ec128bede4 Qt editor: Fix freeze during lobby and loading on Linux 2016-08-08 17:24:44 +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 4c349b8c17 Qt editor: Fix enum parameter delegate initial value assignment 2016-08-07 23:42:41 -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
Lukas Werling 05d5d128c7 Qt editor: Disable scoreboard windows to fix Linux crash 
These windows should be reimplemented as Qt windows.
 2016-08-08 00:32:31 +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 b69576ed73 Merge branch 'master' of https://github.com/openclonk/openclonk 2016-08-07 18:19:03 +02:00
Lukas Werling f3b2ff1295 Merge branch 'gamepad-controls' 2016-08-07 18:10:24 +02:00
Sven Eberhardt eafa2e9305 Fix game coordinates for keyboard controls that request a cursor pos 2016-08-07 18:03:56 +02:00
Sven Eberhardt 231a0ba9b4 Send mouse coordinates directly with control if SendCursorPos is true 2016-08-07 18:03:55 +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
Sven Eberhardt 159d0811d6 Fix game coordinates for keyboard controls that request a cursor pos 2016-08-07 11:08:42 -04: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
Sven Eberhardt e5c6ca990b Send mouse coordinates directly with control if SendCursorPos is true 2016-08-07 10:48:54 -04:00
Sven Eberhardt 08d2e3f521 Qt editor: Fix material selection sorting and remove duplicates 2016-08-07 10:33:21 -04:00
Maikel de Vries 809172e74c new world: rapid refining 2016-08-07 14:24:28 +02:00