openclonk.git
14 months agoMerge branch 'master' into qteditor qteditor
Sven Eberhardt [Sun, 14 Aug 2016 03:42:59 +0000 (23:42 -0400)]
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

14 months agoSequence: Add "<" operator to contents count trigger
Sven Eberhardt [Sun, 14 Aug 2016 03:24:33 +0000 (23:24 -0400)]
Sequence: Add "<" operator to contents count trigger

14 months agoAdded a helmet by pluto. Wear and get 20% off damage*!
Clonkonaut [Fri, 12 Aug 2016 16:25:01 +0000 (18:25 +0200)]
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.

14 months agoAdded Library_Wearable for clothing or other worn items.
Clonkonaut [Fri, 12 Aug 2016 16:22:50 +0000 (18:22 +0200)]
Added Library_Wearable for clothing or other worn items.

14 months agoFix RestartApplication on Linux
Lukas Werling [Thu, 11 Aug 2016 20:11:15 +0000 (22:11 +0200)]
Fix RestartApplication on Linux

(and hopefully don't break it on Windows)

14 months agoAllow joining to editor games through startup network dialogue
Sven Eberhardt [Wed, 10 Aug 2016 23:35:07 +0000 (19:35 -0400)]
Allow joining to editor games through startup network dialogue

14 months agoAdded a slight helper for corner scaling when just pressing up (#1770, #1630).
Clonkonaut [Tue, 9 Aug 2016 23:19:11 +0000 (01:19 +0200)]
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.

14 months agoFix Brick density in VolcanoEscapeEx (#1781).
Clonkonaut [Tue, 9 Aug 2016 23:07:42 +0000 (01:07 +0200)]
Fix Brick density in VolcanoEscapeEx (#1781).

14 months agoRenamed coconut tree (#1752).
Clonkonaut [Tue, 9 Aug 2016 22:08:01 +0000 (00:08 +0200)]
Renamed coconut tree (#1752).

14 months agoExpand ObjectInteractionMenu search radius one pixel lower (#1788).
Clonkonaut [Tue, 9 Aug 2016 22:01:27 +0000 (00:01 +0200)]
Expand ObjectInteractionMenu search radius one pixel lower (#1788).

I don't think this pixel will hurt too much.

14 months agoObjectInteractionMenu: don't create infinite ExtraSlotTracker effects.
Clonkonaut [Tue, 9 Aug 2016 21:45:48 +0000 (23:45 +0200)]
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.

14 months agoDynamite Box is now a container holding 5 sticks of dynamite. Can be taken out separa...
Clonkonaut [Tue, 9 Aug 2016 21:44:14 +0000 (23:44 +0200)]
Dynamite Box is now a container holding 5 sticks of dynamite. Can be taken out separately (and put back in).

14 months agoAllow scenario saving as editor client
Lukas Werling [Tue, 9 Aug 2016 16:53:06 +0000 (18:53 +0200)]
Allow scenario saving as editor client

14 months agoFix user action "Cast objects" speed property name
Sven Eberhardt [Tue, 9 Aug 2016 04:12:45 +0000 (00:12 -0400)]
Fix user action "Cast objects" speed property name

14 months agoFix "triggering clonk" user action evaluator in "a clonk dies" to point to the clonk.
Sven Eberhardt [Tue, 9 Aug 2016 04:09:07 +0000 (00:09 -0400)]
Fix "triggering clonk" user action evaluator in "a clonk dies" to point to the clonk.

14 months agoFix user action evaluator: Find contents with ID given
Sven Eberhardt [Tue, 9 Aug 2016 04:03:51 +0000 (00:03 -0400)]
Fix user action evaluator: Find contents with ID given

14 months agoUserAction: Fix typo in US strings
Sven Eberhardt [Tue, 9 Aug 2016 04:01:10 +0000 (00:01 -0400)]
UserAction: Fix typo in US strings

14 months agoPlayerStart: Default crew to one clonk
Sven Eberhardt [Tue, 9 Aug 2016 04:00:17 +0000 (00:00 -0400)]
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.

14 months agoQt editor: Store and restore window layout (docked dialogues, etc.)
Sven Eberhardt [Tue, 9 Aug 2016 03:57:24 +0000 (23:57 -0400)]
Qt editor: Store and restore window layout (docked dialogues, etc.)

14 months agoQt editor: Fix material size slider when adjusting with a method other than dragging
Sven Eberhardt [Mon, 8 Aug 2016 21:39:10 +0000 (17:39 -0400)]
Qt editor: Fix material size slider when adjusting with a method other than dragging

14 months agofix boiling lava name
Maikel de Vries [Mon, 8 Aug 2016 21:04:15 +0000 (23:04 +0200)]
fix boiling lava name

14 months agoUserAction: Add missing SetCondition setter function
Sven Eberhardt [Mon, 8 Aug 2016 20:24:06 +0000 (16:24 -0400)]
UserAction: Add missing SetCondition setter function

14 months agoUser action script: Fix script error if a context returns nil.
Sven Eberhardt [Mon, 8 Aug 2016 19:34:06 +0000 (15:34 -0400)]
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.

14 months agoFix an aul preparser crash on DirectExec functions parsing
Sven Eberhardt [Mon, 8 Aug 2016 19:26:25 +0000 (15:26 -0400)]
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?

14 months agoReorder some user action parameters
Sven Eberhardt [Mon, 8 Aug 2016 19:03:40 +0000 (15:03 -0400)]
Reorder some user action parameters

14 months agoFix parkour checkpoint initialization when loaded form scenario
Sven Eberhardt [Mon, 8 Aug 2016 18:56:57 +0000 (14:56 -0400)]
Fix parkour checkpoint initialization when loaded form scenario

14 months agoJetStream: Editor-friendly and scenario savable
Sven Eberhardt [Mon, 8 Aug 2016 18:39:20 +0000 (14:39 -0400)]
JetStream: Editor-friendly and scenario savable

14 months agoHotIce: Balloon spawn added for extra fairness.
Clonkonaut [Mon, 8 Aug 2016 16:25:15 +0000 (18:25 +0200)]
HotIce: Balloon spawn added for extra fairness.

14 months agoQt editor: Fix freeze during lobby and loading on Linux
Lukas Werling [Mon, 8 Aug 2016 15:23:26 +0000 (17:23 +0200)]
Qt editor: Fix freeze during lobby and loading on Linux

14 months agorapid refining: fix pumping into refinery drain
Maikel de Vries [Mon, 8 Aug 2016 14:54:28 +0000 (16:54 +0200)]
rapid refining: fix pumping into refinery drain

14 months agoFix sequence suspension
Sven Eberhardt [Mon, 8 Aug 2016 04:49:17 +0000 (00:49 -0400)]
Fix sequence suspension

14 months agoQt editor: Fix enum parameter delegate initial value assignment
Sven Eberhardt [Mon, 8 Aug 2016 03:41:48 +0000 (23:41 -0400)]
Qt editor: Fix enum parameter delegate initial value assignment

14 months agoAdd sequence triggers: Interval and object count in container
Sven Eberhardt [Mon, 8 Aug 2016 03:37:48 +0000 (23:37 -0400)]
Add sequence triggers: Interval and object count in container

14 months agoDynamite: Make FuseTime a local to make changes possible
Lukas Werling [Sun, 7 Aug 2016 23:43:19 +0000 (01:43 +0200)]
Dynamite: Make FuseTime a local to make changes possible

14 months agoQt editor: Disable scoreboard windows to fix Linux crash
Lukas Werling [Sun, 7 Aug 2016 22:32:31 +0000 (00:32 +0200)]
Qt editor: Disable scoreboard windows to fix Linux crash

These windows should be reimplemented as Qt windows.

14 months agoFix user action sequence check interval and make it configurable
Sven Eberhardt [Sun, 7 Aug 2016 21:33:51 +0000 (17:33 -0400)]
Fix user action sequence check interval and make it configurable

14 months agoFix user action dialogue message options
Sven Eberhardt [Sun, 7 Aug 2016 20:24:23 +0000 (16:24 -0400)]
Fix user action dialogue message options

14 months agoFix sequence scenario saving
Sven Eberhardt [Sun, 7 Aug 2016 20:09:40 +0000 (16:09 -0400)]
Fix sequence scenario saving

14 months agopump only activates when drain is free or accepts liquid
Maikel de Vries [Sun, 7 Aug 2016 19:26:15 +0000 (21:26 +0200)]
pump only activates when drain is free or accepts liquid

14 months agoMerge branch 'master' of https://github.com/openclonk/openclonk
Lukas Werling [Sun, 7 Aug 2016 16:19:03 +0000 (18:19 +0200)]
Merge branch 'master' of https://github.com/openclonk/openclonk

14 months agoMerge branch 'gamepad-controls'
Lukas Werling [Sun, 7 Aug 2016 15:57:57 +0000 (17:57 +0200)]
Merge branch 'gamepad-controls'

14 months agoFix game coordinates for keyboard controls that request a cursor pos
Sven Eberhardt [Sun, 7 Aug 2016 15:08:42 +0000 (11:08 -0400)]
Fix game coordinates for keyboard controls that request a cursor pos

14 months agoSend mouse coordinates directly with control if SendCursorPos is true
Sven Eberhardt [Sun, 7 Aug 2016 14:48:54 +0000 (10:48 -0400)]
Send mouse coordinates directly with control if SendCursorPos is true

14 months agorapid refining: add waterfall as additional power source
Maikel de Vries [Sun, 7 Aug 2016 15:27:17 +0000 (17:27 +0200)]
rapid refining: add waterfall as additional power source

14 months agorenamed "Gaya" to "Gaia"
David Dormagen [Sun, 7 Aug 2016 15:26:36 +0000 (17:26 +0200)]
renamed "Gaya" to "Gaia"

This is necessary to not draw the attention of Zeus and find an end through a dramatic lightning strike.

14 months agoFix game coordinates for keyboard controls that request a cursor pos
Sven Eberhardt [Sun, 7 Aug 2016 15:08:42 +0000 (11:08 -0400)]
Fix game coordinates for keyboard controls that request a cursor pos

14 months agoremoved Libraries/Animal/CreatureControl (and thus the automatic script player)
David Dormagen [Sun, 7 Aug 2016 15:04:21 +0000 (17:04 +0200)]
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.

14 months agoSend mouse coordinates directly with control if SendCursorPos is true
Sven Eberhardt [Sun, 7 Aug 2016 14:48:54 +0000 (10:48 -0400)]
Send mouse coordinates directly with control if SendCursorPos is true

14 months agoQt editor: Fix material selection sorting and remove duplicates
Sven Eberhardt [Sun, 7 Aug 2016 14:30:37 +0000 (10:30 -0400)]
Qt editor: Fix material selection sorting and remove duplicates

14 months agonew world: rapid refining
Maikel de Vries [Sun, 7 Aug 2016 12:19:31 +0000 (14:19 +0200)]
new world: rapid refining

14 months agoHot Ice: Handicap teams with more players
Lukas Werling [Sun, 7 Aug 2016 11:56:04 +0000 (13:56 +0200)]
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.

14 months agoFix non-editor build (this time for real!)
Sven Eberhardt [Sun, 7 Aug 2016 06:18:01 +0000 (02:18 -0400)]
Fix non-editor build (this time for real!)

14 months agoGoal_Parkour: Also reset last respawn checkpoint on "reset all" editor action
Sven Eberhardt [Sun, 7 Aug 2016 06:07:27 +0000 (02:07 -0400)]
Goal_Parkour: Also reset last respawn checkpoint on "reset all" editor action

14 months agoAdd user action evaluator: If
Sven Eberhardt [Sun, 7 Aug 2016 06:06:15 +0000 (02:06 -0400)]
Add user action evaluator: If

14 months agoAdd user action evaluators: X/Y component of position
Sven Eberhardt [Sun, 7 Aug 2016 05:50:29 +0000 (01:50 -0400)]
Add user action evaluators: X/Y component of position

14 months agoFix non-editor build
Sven Eberhardt [Sun, 7 Aug 2016 05:42:10 +0000 (01:42 -0400)]
Fix non-editor build

14 months agoUserActions: Prioritize some action main arguments
Sven Eberhardt [Sun, 7 Aug 2016 05:16:27 +0000 (01:16 -0400)]
UserActions: Prioritize some action main arguments

14 months agoParkour checkpoint US string fix
Sven Eberhardt [Sun, 7 Aug 2016 05:14:23 +0000 (01:14 -0400)]
Parkour checkpoint US string fix

14 months agoQt editor: Fix object selection on EditorAction in network
Sven Eberhardt [Sun, 7 Aug 2016 05:13:24 +0000 (01:13 -0400)]
Qt editor: Fix object selection on EditorAction in network

14 months agoFix dialogue creation through EditorAction
Sven Eberhardt [Sun, 7 Aug 2016 05:06:26 +0000 (01:06 -0400)]
Fix dialogue creation through EditorAction

Silence a warning and make sure the name is valid.

14 months agoMake parkour checkpoint and respawn management more robust to runtime editor development
Sven Eberhardt [Sun, 7 Aug 2016 05:02:23 +0000 (01:02 -0400)]
Make parkour checkpoint and respawn management more robust to runtime editor development

14 months agoAdd "Reset all cleared" editor command to parkour goal
Sven Eberhardt [Sun, 7 Aug 2016 04:28:53 +0000 (00:28 -0400)]
Add "Reset all cleared" editor command to parkour goal

14 months agoItemSpawn: Add spawn_id EditorProp name and help.
Sven Eberhardt [Sun, 7 Aug 2016 04:18:28 +0000 (00:18 -0400)]
ItemSpawn: Add spawn_id EditorProp name and help.

14 months agoReset item spawn points on clonk death
Sven Eberhardt [Sun, 7 Aug 2016 04:16:50 +0000 (00:16 -0400)]
Reset item spawn points on clonk death

14 months agoAdd ItemSpawn name and description.
Sven Eberhardt [Sun, 7 Aug 2016 04:11:09 +0000 (00:11 -0400)]
Add ItemSpawn name and description.

14 months agoUserAction: Fix some US string table entry names
Sven Eberhardt [Sun, 7 Aug 2016 03:59:07 +0000 (23:59 -0400)]
UserAction: Fix some US string table entry names

14 months agoQt editor: Make completer in script input box case sensitive
Sven Eberhardt [Sun, 7 Aug 2016 03:54:47 +0000 (23:54 -0400)]
Qt editor: Make completer in script input box case sensitive

14 months agoAuto re-number and re-assign start and finish checkpoints when points get deleted
Sven Eberhardt [Sun, 7 Aug 2016 03:41:50 +0000 (23:41 -0400)]
Auto re-number and re-assign start and finish checkpoints when points get deleted

14 months agoQt editor: Fix viewport titles and decorations
Sven Eberhardt [Sun, 7 Aug 2016 03:39:44 +0000 (23:39 -0400)]
Qt editor: Fix viewport titles and decorations

The custom title bar caused a lot of problems. Particularly turning it on and off between docked and undocked modes caused some internal trouble with the rendering going off. It also didn't have a close button.

Fortunately, the desired font and highlight effect of selected viewports can also be achieved with style sheets on the dock.

14 months agoAdd distinct graphics for parkour start
Sven Eberhardt [Sun, 7 Aug 2016 02:24:59 +0000 (22:24 -0400)]
Add distinct graphics for parkour start

It used to be the same as the end (flag), which was a bit confusing

14 months agoDo not auto-deactivate clients without players in editor
Sven Eberhardt [Sun, 7 Aug 2016 02:05:25 +0000 (22:05 -0400)]
Do not auto-deactivate clients without players in editor

14 months agoMerge branch 'master' into qteditor
Sven Eberhardt [Sun, 7 Aug 2016 01:45:19 +0000 (21:45 -0400)]
Merge branch 'master' into qteditor

14 months agoFix OnMouseOver / OnMouseOut parameter warnings
Sven Eberhardt [Sun, 7 Aug 2016 01:42:21 +0000 (21:42 -0400)]
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.

14 months agoFix restart rule creation in parkour goal
Sven Eberhardt [Sun, 7 Aug 2016 01:34:01 +0000 (21:34 -0400)]
Fix restart rule creation in parkour goal

Was created at a large offset and multiple copies could be created.

14 months agoQt editor: Better placement of PlayerStart object in new scenario
Sven Eberhardt [Sun, 7 Aug 2016 01:29:26 +0000 (21:29 -0400)]
Qt editor: Better placement of PlayerStart object in new scenario

14 months agoQt editor: Allow creation of larger map in new scenario
Sven Eberhardt [Sun, 7 Aug 2016 01:28:53 +0000 (21:28 -0400)]
Qt editor: Allow creation of larger map in new scenario

14 months agoQt editor: Clear definition list on game close
Sven Eberhardt [Sun, 7 Aug 2016 01:19:24 +0000 (21:19 -0400)]
Qt editor: Clear definition list on game close

14 months agoQt editor: Enable play button to start game in lobby
Sven Eberhardt [Sun, 7 Aug 2016 01:16:28 +0000 (21:16 -0400)]
Qt editor: Enable play button to start game in lobby

14 months agoQt editor: Fix net menu
Sven Eberhardt [Sun, 7 Aug 2016 01:12:04 +0000 (21:12 -0400)]
Qt editor: Fix net menu

It didn't work, had the wrong labels and crashed.

14 months agoTry to space out two items on the back better.
Clonkonaut [Sun, 7 Aug 2016 01:04:04 +0000 (03:04 +0200)]
Try to space out two items on the back better.

Mainly concerns scaling / hangling and it isn't perfect but better than before.

14 months agoFix net menu popping up out of nowhere all the time
Sven Eberhardt [Sun, 7 Aug 2016 00:29:15 +0000 (20:29 -0400)]
Fix net menu popping up out of nowhere all the time

14 months agoRemove some outdated todo comments in C4ConsoleQt
Sven Eberhardt [Sun, 7 Aug 2016 00:28:50 +0000 (20:28 -0400)]
Remove some outdated todo comments in C4ConsoleQt

14 months agoFix chatting in editor lobby
Sven Eberhardt [Sun, 7 Aug 2016 00:22:33 +0000 (20:22 -0400)]
Fix chatting in editor lobby

14 months agoDo not abort network round due to insufficient player count in editor mode
Sven Eberhardt [Sat, 6 Aug 2016 19:45:56 +0000 (15:45 -0400)]
Do not abort network round due to insufficient player count in editor mode

14 months agoAdd respawn material setting to player spawn
Sven Eberhardt [Sat, 6 Aug 2016 19:24:25 +0000 (15:24 -0400)]
Add respawn material setting to player spawn

14 months agoUpdate GetConditionalIDList to new array delegate syntax
Sven Eberhardt [Sat, 6 Aug 2016 19:24:03 +0000 (15:24 -0400)]
Update GetConditionalIDList to new array delegate syntax

14 months agoFix crash on uninitialized pointer in Qt GL window initialization
Sven Eberhardt [Sat, 6 Aug 2016 19:22:58 +0000 (15:22 -0400)]
Fix crash on uninitialized pointer in Qt GL window initialization

14 months agoAdd cleared and respawn user callback actions to parkour goal and checkpoints
Sven Eberhardt [Sat, 6 Aug 2016 18:50:43 +0000 (14:50 -0400)]
Add cleared and respawn user callback actions to parkour goal and checkpoints

14 months agoAdd property to auto-save EditorProps in scenarios
Sven Eberhardt [Sat, 6 Aug 2016 18:49:48 +0000 (14:49 -0400)]
Add property to auto-save EditorProps in scenarios

14 months agoUnify rule picture size display in the editor to 32x32
Sven Eberhardt [Sat, 6 Aug 2016 14:32:21 +0000 (10:32 -0400)]
Unify rule picture size display in the editor to 32x32

14 months agoLimit rule placement in editor to one per rule type
Sven Eberhardt [Sat, 6 Aug 2016 14:27:56 +0000 (10:27 -0400)]
Limit rule placement in editor to one per rule type

14 months agoAuto-update checkpoint assignment to parkour goal in editor
Sven Eberhardt [Sat, 6 Aug 2016 06:38:01 +0000 (02:38 -0400)]
Auto-update checkpoint assignment to parkour goal in editor

14 months agoLimit goal placement in editor to one per goal type
Sven Eberhardt [Sat, 6 Aug 2016 06:37:25 +0000 (02:37 -0400)]
Limit goal placement in editor to one per goal type

14 months agoAdd EditorPlacementLimit property
Sven Eberhardt [Sat, 6 Aug 2016 06:36:53 +0000 (02:36 -0400)]
Add EditorPlacementLimit property

Limits the number of object instances that can be placed of a given def.

14 months agoName parkour checkpoints by index
Sven Eberhardt [Sat, 6 Aug 2016 05:13:35 +0000 (01:13 -0400)]
Name parkour checkpoints by index

14 months agoInventory slot selection is back on key down.
Clonkonaut [Fri, 5 Aug 2016 17:36:26 +0000 (19:36 +0200)]
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.

14 months agoBasements combine in all four directions when constructing!
Clonkonaut [Fri, 5 Aug 2016 16:21:34 +0000 (18:21 +0200)]
Basements combine in all four directions when constructing!

14 months agoForceConstruct() added to ConstructionSite for better debugging.
Clonkonaut [Fri, 5 Aug 2016 16:19:05 +0000 (18:19 +0200)]
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.

14 months agoIsHammerBuildable added to WoodenBridge.
Clonkonaut [Fri, 5 Aug 2016 16:18:00 +0000 (18:18 +0200)]
IsHammerBuildable added to WoodenBridge.

14 months agoAdd parkour checkpoint EditorProps and EditorActions
Sven Eberhardt [Fri, 5 Aug 2016 05:09:34 +0000 (01:09 -0400)]
Add parkour checkpoint EditorProps and EditorActions