Sven Eberhardt
7d535ac6db
Fix US name of Goal_RubyHunt
2017-05-07 15:29:42 -04:00
Sven Eberhardt
fec7a7c084
Fix localized description display in script goal
2017-05-07 15:28:37 -04:00
Sven Eberhardt
94669cebe4
Merge branch 'master' of ssh://git.openclonk.org/openclonk
...
Conflicts:
src/editor/C4ConsoleQtPropListViewer.cpp
2017-05-07 15:16:01 -04:00
Sven Eberhardt
bc4425462c
Add localization support for string evaluators, gravestone and signpost inscriptions and custom game goal texts
2017-05-07 15:03:11 -04:00
Sven Eberhardt
9eedfe268c
Editor: Reduce size of string localization button
2017-05-07 15:02:09 -04:00
Sven Eberhardt
206451eb6b
Add prototype in proplist string and JSON serialization
2017-05-07 14:27:19 -04:00
Sven Eberhardt
4fac960cf4
Editor: Add localized string support
2017-05-07 14:26:30 -04:00
Maikel de Vries
77dca569fe
Switch: properly process and save editor actions
2017-05-06 18:55:27 +02:00
Fulgen301
2c15422c2e
Torch: Add new mesh
2017-05-05 17:53:36 +02:00
Tushar Maheshwari
e58a7884e4
Automatic fixes using clang-tidy
...
See http://forum.openclonk.org/topic_show.pl?tid=3376 for discussion.
Close GH-41
2017-05-03 20:30:45 +02:00
Clonkonaut
d750a57410
Hatch: combine with basements even if the construction preview hasn't been properly combined.
...
The hatch will automatically attach itself onto basements it finds around its center after it has been built. This makes it easier to use since people probably tend to forget combining the construction preview. Especially since basements are very slim. The hatch will reposition itself in order to attach. This means it is not right where the player placed it. The alternative would be to move the basement and I guess that even more unwanted.
2017-05-03 09:42:25 +02:00
Clonkonaut
fd55514279
Fixed shape of tunnel supports.
2017-05-02 23:48:50 +02:00
Clonkonaut
861b0bc08e
Added a simple static ladder to be used by scenario designers.
...
This thing is a lot faster than the rope ladder.
2017-05-02 22:57:01 +02:00
Clonkonaut
649c61cd2a
New decoration object: tunnel support (graphics by Ringwaul, from a long time ago).
...
Can be stretched using the Extend() function.
2017-05-02 22:53:49 +02:00
Clonkonaut
ad6a986d10
Scripted the Hatch that Ringwaul made ages ago. Can be built on top of basements (or without) to make a vertical opening.
2017-05-02 22:50:32 +02:00
David Dormagen
0d32d924dc
InteractionMenu: fix script error when custom entry extra_data contains something different from a proplist
...
The check was only meant for inventory menus (where extra_data always is a proplist); it was not in the right if-clause below, though.
2017-05-02 19:13:48 +02:00
Maikel de Vries
34f736081c
fix relaunch time and unwanted initial relaunch
2017-05-02 14:50:27 +02:00
Maikel de Vries
3e0f18f4f3
reinstate relaunch container functionality
...
This has been used by external scenarios and there is no reason to put this into the relaunch rule script.
2017-05-01 21:26:01 +02:00
Fulgen301
1d92b47141
Torch: Emits light when held, remove DoKneel() animation
2017-05-01 15:38:35 +02:00
Maikel de Vries
cc480be3eb
relaunch rule: add option to prevent round start relaunch
2017-05-01 11:46:34 +02:00
Maikel de Vries
f3291bb84f
clean up and document relaunch rule
...
Also fix script errors in melting castle.
2017-05-01 11:00:51 +02:00
Maikel de Vries
18057587d6
fix relaunching in CTFs
2017-04-30 18:42:44 +02:00
Maikel de Vries
0fead04978
fix relaunching problems in missions
2017-04-30 16:13:57 +02:00
Nicolas Hake
33a0b41179
Trans_Rotate: disallow rotation around null vector ( #1908 )
...
Trans_Rotate will now raise at runtime if the user tries to generate a
rotation matrix around a null vector instead of crashing with #DE.
2017-04-29 14:45:10 +02:00
Maikel de Vries
3b1ebdcdb0
do not move seaweed by tele glove or windbag
2017-04-25 20:12:44 +02:00
Maikel de Vries
6f1470dbbd
correctly update barrel graphics when emptied onto existing stack
2017-04-25 14:04:43 +02:00
Maikel de Vries
afe4d5a91e
fix overcast teleport scroll ( #1909 )
2017-04-25 11:52:50 +02:00
Maikel de Vries
cb68f9b26b
fix parkour in combination with new relaunch rule
2017-04-25 10:26:27 +02:00
Maikel de Vries
a863845ed4
add missing variable to relaunch rule
2017-04-25 09:45:12 +02:00
Maikel de Vries
7ffbeac9a9
Merge branch 'master' into Rule_Relaunch
2017-04-24 21:46:05 +02:00
Mark
2b56f55da5
DarkCastle: Fix #1907
...
The name entries should be "Hörx" in German and "Harx" in English
2017-04-24 15:10:06 +02:00
Maikel de Vries
4c8b236ea4
fix relaunch finding no spawn
...
Use built-in FindLocation which works better and default to landscape center when really no place to spawn could be found.
2017-04-23 18:30:15 +02:00
Fulgen301
750d52e06d
Fix Missions.ocf scenarios in order to work with Rule_Relaunch
2017-04-22 21:08:40 +02:00
Fulgen301
7fed3ea1c0
Rule_Relaunch: Fix positioning and inventory transfer; add option to prevent initial "relaunch"
...
# Conflicts:
# planet/Objects.ocd/Rules.ocd/Relaunch.ocd/Script.c
2017-04-22 21:08:26 +02:00
Fulgen301
7064d4f6fb
Rule_Relaunch: Fix return value in SetFreeCrew and SetInventoryTransfer
2017-04-22 21:06:08 +02:00
Fulgen301
38daafc99b
Overcast: Fix script errors
2017-04-22 21:06:07 +02:00
Maikel de Vries
200780fba4
fix definition call to relaunch rule
2017-04-22 20:42:56 +02:00
Maikel de Vries
c75ffe3978
improve lavacore solidmask
...
This allows to stand on it more easily and should lead to less frustration for the player.
2017-04-22 16:11:00 +02:00
Nicolas Hake
95c31df9e9
Fix assertion-enabled build
2017-04-19 10:32:34 +02:00
Nicolas Hake
c41bd063bd
Stop disabling debugrec code by preprocessor
...
The optimizer is going to remove dead code anyway, and has the
additional advantage of doing syntax checking, so the code won't
silently break when someone changes something.
2017-04-19 09:47:21 +02:00
Nicolas Hake
81e49fe0f5
Fix several broken conversions from C4Fixed->bool->int ( #1904 )
...
This is why non-explicit operator bool is bad.
2017-04-19 09:24:27 +02:00
Nicolas Hake
fc1a7a59c8
Use C4Real instead of C4Fixed where representation is irrelevant
...
While C4Real is just a typedef for C4Fixed, it signifies more clearly
that we don't care about the memory representation at the point of use.
2017-04-19 09:14:39 +02:00
Fulgen301
b77e9a7755
RelaunchContainer: Fix using wrong locals due to 52bf2e65bbe497e7d897988765e031f56ce4a980
2017-04-17 17:18:17 +02:00
Fulgen301
85cfbc4065
DarkMine: Fix relaunch handling
2017-04-17 17:18:10 +02:00
Maikel de Vries
7c444e7f96
add lava core animal (made by Win)
...
Original by win, overhaul of script and behavior by Maikel.
2017-04-17 16:05:20 +02:00
Fulgen301
6030299201
ThunderousSkies: Fix wrong relaunch position and wrong default relaunches
2017-04-17 15:08:47 +02:00
Nicolas Hake
0df79f5ba3
Rule_Relaunch: use correct casing for translations
2017-04-13 19:06:36 +02:00
Nicolas Hake
fee85b8ddb
Merge pull request GH#38 from Fulgen301/Rule_Relaunch
2017-04-13 19:05:02 +02:00
Fulgen301
f1efb134aa
Remove hungarian notation and fix some errors
2017-04-13 18:58:10 +02:00
Fulgen301
9154ebf79f
CaptureTheFlag: Fix script errors
2017-04-13 18:35:50 +02:00