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
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
39cfd4a0fe
Fix non-editor build (this time for real!)
2016-08-07 02:18:01 -04: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
0b5e8723c2
Fix non-editor build
2016-08-07 01:42: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
3a6a7aceaa
Qt editor: Fix object selection on EditorAction in network
2016-08-07 01:13:24 -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
62fb460180
Qt editor: Make completer in script input box case sensitive
2016-08-06 23:54:47 -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
5c70c2aa42
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.
2016-08-06 23:39:44 -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
769fa0fbdc
Do not auto-deactivate clients without players in editor
2016-08-06 22:05:25 -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
40abe71a8c
Qt editor: Better placement of PlayerStart object in new scenario
2016-08-06 21:29:26 -04:00
Sven Eberhardt
3553cd54b5
Qt editor: Allow creation of larger map in new scenario
2016-08-06 21:29:09 -04:00
Sven Eberhardt
a7fffcfd77
Qt editor: Clear definition list on game close
2016-08-06 21:19:24 -04:00
Sven Eberhardt
b6e45daa24
Qt editor: Enable play button to start game in lobby
2016-08-06 21:16:28 -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
c0f95d97f7
Fix net menu popping up out of nowhere all the time
2016-08-06 20:29:15 -04:00
Sven Eberhardt
6dc4cb7f1d
Remove some outdated todo comments in C4ConsoleQt
2016-08-06 20:28:50 -04:00
Sven Eberhardt
20eaaa97b3
Fix chatting in editor lobby
2016-08-06 20:22:33 -04:00
Sven Eberhardt
1c90f9b2da
Do not abort network round due to insufficient player count in editor mode
2016-08-06 15:45:56 -04:00
Sven Eberhardt
5cbbd0d05b
Add respawn material setting to player spawn
2016-08-06 15:24:25 -04:00