Sven Eberhardt
288de8c89f
Fix /todo failing when launching from program folder without proper access permissions.
...
Write the TODO.txt at user path instead.
2015-09-13 00:14:42 -04:00
Armin Burgmeier
a40792013f
Add "AttachNumber" parameter to AttachMesh
...
This allows to create nested definition-based attached meshes.
2015-09-12 19:57:00 -04:00
Armin Burgmeier
380724a017
Choose attach mesh number uniquely from entire (owned) attach tree
2015-09-12 19:28:53 -04:00
Armin Burgmeier
20eb0615ee
Custom shader for drawing sky
...
Add a C4ShaderCall parameter to tho most important drawing functions, and
make C4DrawGL's CreateSpriteShader public with additional parameters to
specify additional defines and shader slices. C4Sky uses this to compile its
own shader with OC_SKY defined.
2015-09-12 18:15:34 -04:00
Maikel de Vries
329eaac691
fix foundry collection zone
2015-09-12 22:37:21 +02:00
Maikel de Vries
e64534b201
document ignore_ocf parameter of Collect
2015-09-12 22:37:21 +02:00
Armin Burgmeier
e0d7d44948
Optimize drawing of tiled surfaces
...
Instead of one draw call for each tile, do the whole operation with a single
draw call by setting GL_REPEAT on the texture. This affects sky, the upper
board and the background.
This also allows to remove some code that was making sure surfaces are big
enough.
2015-09-12 16:11:50 -04:00
Maikel de Vries
e94af5b87c
remove moving flag markers on border crossing
...
This can for example lead to infinitely moving markers when a border crossing rule is active, and the flag markers move from left to right for ever.
2015-09-12 20:51:16 +02:00
Sven Eberhardt
75d0eba402
Document attach_number in several animation-related script functions.
2015-09-12 12:26:03 -04:00
Sven Eberhardt
6face464aa
Document attach_mesh parameter of the PlayAnimation function.
2015-09-12 11:07:20 -04:00
Julius Michaelis
0df19491e7
Get rid of incorrect sRGB headers in png files.
...
libpng >1.6 keeps nagging because of that.
Quick bash script to do so:
find . -name *.png \
| while read f; do
n=$(pngcrush -ow -rem allb-reduce "$f" 2>&1 | grep -c 'incorrect sRGB');
if [[ $n -gt 0 ]]; then
git add "$f"
else
git checkout "$f"
fi
done
2015-09-12 21:27:53 +09:00
David Dormagen
cd82b41c06
particles: added CollisionDensity to specify with which kind of material a particle will collide
2015-09-12 10:53:23 +02:00
Sven Eberhardt
e229090141
Fix memory leak in GetWorkingDirectory.
...
It was just one leak per engine launch so it's not relevant. But there's no reason to do manual buffer management when StdStrBuf is used anyway.
2015-09-12 03:05:16 -04:00
Sven Eberhardt
d6751bff84
Fix crash on context or dropdown menu in GUI dialogues in editor mode ( #856 ).
2015-09-12 02:51:55 -04:00
Sven Eberhardt
6259cd22f9
Fix intro text in crash landing.
...
The plane doesn't actually land in the snow. It lands on the earth below (which is good because it's easier to fly away from there). But the message needs to be adjusted.
2015-09-12 00:34:59 -04:00
Sven Eberhardt
d1124f2f73
Add boiling lava to crash landing.
...
It boils like crazy during the intro and then a lot less during the game.
2015-09-12 00:34:18 -04:00
Maikel de Vries
a7480ba0ef
fix crash for Translate on strings without translation
...
Thanks to Isilkor
2015-09-12 00:11:24 +02:00
Maikel de Vries
ad95a39a1c
prevent bubble from growing infinitely large
2015-09-11 23:15:23 +02:00
Maikel de Vries
17d59de20d
fix pilot check in airplane for NPCs
2015-09-11 21:25:45 +02:00
David Dormagen
673243c9dd
properly handle QueryRejectDeparture everywhere ( #1382 )
2015-09-11 21:08:38 +02:00
David Dormagen
eda0f80a46
added description to Clonk to prevent displaying (null) in buy menu
2015-09-11 20:51:03 +02:00
David Dormagen
30bb5c15a7
moved Bubble sounds to global Sound.ocg folder and also made their names match our naming convention
2015-09-11 20:21:26 +02:00
Maikel de Vries
9dda8d34dc
fix splitting of lava bubbles
2015-09-11 20:02:09 +02:00
WinExploder
775820fd92
new alien meteor effect and adjusted meteor light
...
squashed:
alien meteor: removed commented out stuff in script
Added new particle effect for AlienMeteor
Added missing particle for Alien Meteor :x
Changed meteor light
2015-09-11 20:00:23 +02:00
Maikel de Vries
829837c881
fix loosing balloon on tumbling and reject dropping while hanging
2015-09-11 19:16:13 +02:00
David Dormagen
51bc8dd54d
made CastObjects not throw an error when an object removes itself in Construction
...
It obviously does not throw the object either, though.
2015-09-11 19:08:10 +02:00
WinExploder
f35a46c61f
added BoilingLava and BoilingAcid environmental rules
...
cleaned up boiling lava and boiling acid rule
-Made them adhere to the C4S guidelines, renamed some IDs and made some stuff in scripts more readable.
Prettied up the scripts for the boiling liquid environmental rule
Changed Bubble Behaviour slightly
Und nochmal weil's so schön war
Added BoilingAcid which causes bubbles to rise from Acid on the map
Dark bubbles are explosive
Added boiling Lava environmental rule
2015-09-11 19:08:10 +02:00
Maikel de Vries
358d282ec2
do not perform QueryRejectDeparture when pressing movement keys
2015-09-11 19:04:50 +02:00
Sven Eberhardt
2788724e83
Raid: Script error fix.
...
Another call to the removed CarryHeavy func Drop().
2015-09-10 22:55:16 -04:00
Sven Eberhardt
f48c7cc454
Fix source file name in error messages arising during compilation of ParameterDefs files.
2015-09-10 22:34:21 -04:00
Sven Eberhardt
80fe1aa658
Avoid some C4Group rewinds in scenario list and player loading.
2015-09-10 22:32:51 -04:00
Sven Eberhardt
8b155171b7
Raid: Fix script error in NPC.
...
Was caused by some internal changes in CarryHeavy and removal of the public Drop function.
2015-09-10 21:49:51 -04:00
Sven Eberhardt
753b570d29
DeepSeaMining: Use background water on all water pixels at landscape border to cause infinite ocean re-flow from the sides.
2015-09-10 21:03:34 -04:00
Armin Burgmeier
80791ec5ec
Add a low-level PerformMultiBlt function to C4Draw
...
This allows drawing with custom sprite shaders. Plan is to make the sky draw
with a separate shader.
2015-09-10 20:45:42 -04:00
Armin Burgmeier
f3da8525d0
Prefix most shader defines with "OC_"
2015-09-10 19:45:43 -04:00
Clonkonaut
d98134332c
Carry heavy objs draw special pickup symbol when holding Shift.
2015-09-11 01:08:54 +02:00
Sven Eberhardt
5b6ba5d980
Fix nil pointer in inventory HUD when inventory slot count of active target is reduced.
2015-09-10 18:52:49 -04:00
Sven Eberhardt
3b522e86ac
Fix script error and broken animations in catapult if left and right direction control is given in the same frame.
2015-09-10 18:35:04 -04:00
Sven Eberhardt
fe0b85870c
Fix division by zero in HUD on undefined health and breath values.
2015-09-10 18:35:04 -04:00
Sven Eberhardt
a0deca27b6
Make HUD controller reinitialization after section change more failsafe.
2015-09-10 18:35:03 -04:00
Maikel de Vries
0610cbda7d
document object layer setter and getter
2015-09-10 22:31:51 +02:00
David Dormagen
f333df2c73
always show interaction menu for pump & structures in general
...
The HasInteractionMenu callback of the pump was eaten by the merge. I checked.
2015-09-10 18:23:44 +02:00
Sven Eberhardt
e440df645b
Fix initial object selection and cycle order when picking up objects.
...
The check for initial selection was broken because GetIndexOf does not return nil when the index is not found. It returns -1.
The previously intended logic (that never worked) of selecting in direction of the clonk view first may sound intuitive, but is weird in practice when you're standing just on top of an object that is 1px behind you and it selects an item very far away instead. It's particularly counter-intuitive when picking up objects out of the earth while scaling.
2015-09-09 22:51:58 -04:00
Sven Eberhardt
9db8adf44e
Add flowers to The Raid.
...
Also made the rotatable.
2015-09-09 21:24:38 -04:00
Sven Eberhardt
0751a55218
Fix flower skin (the yellow flower skin was never set) and improve flower scenario saving.
...
Randomized flower colors are not saved in the scenario. Explicit skins (via SetSkin) and custom skins (via SetMeshMaterial) are saved.
2015-09-09 21:09:36 -04:00
Sven Eberhardt
3723024e2f
Added implicit layer check to local calls of FindObjects-family functions ( #1383 ).
...
Also fixed some docs links. Note that GetObjectLayer and SetObjectLayer are still not documented.
2015-09-09 20:19:45 -04:00
Sven Eberhardt
261bef7120
Ignore invisible objects for interaction menu.
...
They were creating invisible tabs, which was a bit weird.
2015-09-09 19:46:55 -04:00
Clonkonaut
b4905b2bcf
Rework of Carry Heavy Objects: Pick up with Shift.
...
No more interaction necessary!
2015-09-10 01:17:44 +02:00
Maikel de Vries
24e18bf7e2
fix clock countdown sound playing for all players
2015-09-09 23:09:26 +02:00
WinExploder
bea2ff5731
Updated torch particle effect
...
squashed:
improved some technical details about the new torch fire
Updated torch particle effect
2015-09-09 19:52:38 +02:00