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

7383 Commits (e196ddcb2ccef92216b56a4532bb3e4e48856cc2)
 

Author SHA1 Message Date
Armin Burgmeier f54067c819 DetachMesh: remove mesh from direct parent, not from top-level parent 
This fixes a crash in calls to DetachMesh() on nested attached meshes.
 2015-09-13 16:46:27 -04:00
Armin Burgmeier 77ad9c89b5 Fix parameter order when calling StdMeshInstance::AttachMesh in FnAttachMesh 
I don't like default parameters.
 2015-09-13 16:46:27 -04:00
Armin Burgmeier dc38e61139 Fix rendering of colorfade (non-bitmap) sky 2015-09-13 16:46:27 -04:00
Sven Eberhardt 94f278ce7f Fix bucket carry transform. 
It was upside down.
 2015-09-13 13:41:17 -04:00
Sven Eberhardt 4b29c83477 Pass coordinates to ControlThrow. 2015-09-13 13:09:28 -04:00
Sven Eberhardt 0e085e435b Add ControlThrow callback into objects that want to implement custom throwing or even non-throw actions on the throw key. 2015-09-13 13:04:18 -04:00
Sven Eberhardt 889a8dbdf9 Tutorial 00002: Respawn with contents. 
Otherwise it's very easy to lose your shovel in the acid lake and fail.

(You can still fail by throwing it in though)
 2015-09-13 12:53:06 -04:00
Sven Eberhardt eb9e640b67 Fix igniter picture in tutorial 0001. 2015-09-13 11:24:28 -04:00
Sven Eberhardt a687f35a7b Installer: Remove old Tutorial.ocf folder on installation. 2015-09-13 09:34:46 -04:00
Maikel de Vries dd0a01f3df fix oc_groups for cmake after tutorial folder change 2015-09-13 15:32:35 +02:00
Maikel de Vries 225f4b1559 add tutorial 2 2015-09-13 15:03:15 +02:00
Maikel de Vries 78f7b76b0e add playground scenario as reward for completing all tutorials 2015-09-13 13:38:56 +02:00
Maikel de Vries 80d5525ed9 add tutorial 1 2015-09-13 13:38:56 +02:00
Maikel de Vries ace8ad48d6 add wipf (placeholder) as clonk friend in tutorials 2015-09-13 13:38:55 +02:00
Maikel de Vries 395f0d3f15 add method to disable controls in tutorials 2015-09-13 13:38:55 +02:00
Maikel de Vries 7cdf3e6d1f add tutorial guide 2015-09-13 13:38:55 +02:00
Maikel de Vries d9cf76401a add tutorial goal 2015-09-13 13:38:55 +02:00
Maikel de Vries f4cd257df1 add tutorial arrow 2015-09-13 13:38:55 +02:00
Maikel de Vries 4c58ee2f5f add tutorial main folder 2015-09-13 13:38:55 +02:00
Maikel de Vries bb703d46c7 remove old tutorials 2015-09-13 13:38:55 +02:00
Maikel de Vries 89838bf63f add uniform sphere particle 2015-09-13 13:38:47 +02:00
Mark 722a5ad448 Explode: DoShockwave 
Added the global function DoShockwave. Updated documentation. Changed the way explosions deal damage: Every object at the center of the explosion gets full damage. Every object inside the explosion radius gets half damage.

(cherry picked from commit 22298a6d1389b5344ebe7aea56f3c371b5ad845f)

Conflicts:
	planet/System.ocg/Explode.c
 2015-09-13 13:01:28 +02:00
Mark 15056b823f Explode: Damage override 
Added damage override parameter to the explosion functions. Updated the documentation as well.

(cherry picked from commit 59f802c2d3f269d54c12489ac9659ee3ca57a857)

Conflicts:
	planet/System.ocg/Explode.c
 2015-09-13 13:01:24 +02:00
Mark 055196155f Explode: if-order 
Merged the three if-blocks in DoExplosion() into one if-block. If there was no container in the first if, there should be no container in the following calls.

(cherry picked from commit d504b1109de115f507a09e9e895104bd9552ac53)
 2015-09-13 13:01:20 +02:00
Sven Eberhardt de7db461fa Fix cave reverb in multiplayer (#1397). 2015-09-13 01:03:26 -04:00
Sven Eberhardt 34a4586a16 Reduce default music volume. 
The music is beautiful but it's louder than all the other sounds somehow.
 2015-09-13 00:34:18 -04:00
Sven Eberhardt 4e56d94f6f Show interaction menu for crate. 2015-09-13 00:27:14 -04:00
Sven Eberhardt 821124a23e Crash landing: Remove broken catapult. 
Add some flowers instead.
 2015-09-13 00:19:06 -04:00
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