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

128 Commits (master)

Author SHA1 Message Date
Maikel de Vries aa152bf899 move mime skin/portrait from boomshire to decoration folder 
This makes it available for multiple rounds.
 2016-01-16 13:27:24 +01:00
Sven Eberhardt 56fa4c2c5d DarkMine+Maze: Ensure free spawn position #1578 2016-01-10 22:07:23 -05:00
Sven Eberhardt 3dad1c6d81 Turn MaxContentsCount and HandObjects into properties instead of callbacks (Possibly fixes #1553) 2016-01-10 10:41:34 -05:00
Nicolas Hake c0befc6ba0 Remove C4RTF 
The only use of C4RTF in its final moments was parsing out plain text
from RTF files anyway, so why even go to all the trouble instead of just
storing plain text in the beginning?
 2015-12-29 17:51:43 +01:00
Maikel de Vries 509bdac5bc remove unused Rebuy property from objects 2015-12-28 10:21:49 +01:00
David Dormagen 132d929675 boomshire: improved aesthetics of lever sparkles 2015-12-16 23:27:51 +01:00
David Dormagen 09bad5abb2 boomshire map: made some borders around granite thicker 
The new granite shape could make the material leak into door frames etc. This should now be fixed by just increasing the thickness of the walls in such cases.
 2015-12-16 23:01:28 +01:00
Maikel de Vries 6f799da14b remove local implementaion of SoundAt in BigVolcano.ocd 
The engine function now exists and does the exact same thing.
 2015-12-16 17:50:07 +01:00
David Dormagen ea90ccf3d9 boomshire: fixed chest 
For a long time, chests have not been opening with [Space] now. Thus, this was broken, denying eager players their confetti.
 2015-12-16 09:50:20 +01:00
David Dormagen dcfb986e34 moved sounds into subfolders 
This completes http://forum.openclonk.org/topic_show.pl?tid=3215
 2015-12-13 22:14:55 +01:00
Sven Eberhardt f12a07c447 Volcano Escape: Fix volcano bubbling sound. 2015-12-13 11:30:50 -05:00
Sven Eberhardt bf63f2ef17 Gidl+Windmill moved to new "Defense.ocf" (title picture missing) 
They aren't quite fitting at the moment and Clonko wants to share the buy menu.
 2015-12-12 12:06:25 -05:00
j 8e7326e0f9 Title images for two parkours. 2015-12-06 19:56:17 +01:00
Sven Eberhardt 7cf09196c6 Volcano Escape: Draw underground lava. 
It was initially set to sky to make lava glow. But now lava glows by itself.
 2015-12-05 21:21:30 -05:00
Maikel de Vries 338f3bca9d change airplane id (Plane -> Airplane) 
This is for a better distinguising between the Plane property and the airplane
 2015-11-21 20:53:19 +01:00
Sven Eberhardt 312e61ea4d Heart of the Mountain: Remove loam from starting materials. 
There were too many starting items for the limited inventory slots. Loam is just used for camping at the start/goal platform anyway.
 2015-11-15 15:27:12 -05:00
Clonkonaut 1178d8f0ce Prevent dead clonks from sitting upright (#1358). 
Also added convenient constants defining the animation slots to use for clonk animation.
 2015-10-11 14:08:14 +02:00
Sven Eberhardt 91d0a44f71 Boomshire: Fix target view, light and "SparklingAttention" on SpinWheels. 
* The sparkles were all drawn in the top left corner of the map.
* The second (useless) #appendto would overload the door control with an old version that didn't set the view cursor.
 2015-10-05 22:31:25 -04:00
Clonkonaut 77e5cf6263 Boomshire fixes: ParameterDefs added, firestone throwing effect reenabled. 2015-10-06 01:12:29 +02:00
Clonkonaut 7766eaadc6 Removed brick edges from Boomshire. 2015-10-05 23:50:56 +02:00
Clonkonaut 8054297cf3 Boomshire: Overhaul, added lights (#1269), map fixes (#1262), new decoration and ambience! 2015-10-05 23:48:29 +02:00
Clonkonaut 0aab3cf4e6 Added new material textures by Nachtfalter and Matthi. 2015-10-05 02:02:36 +02:00
Sven Eberhardt 074b51f47c Add light to ruby area in "Heart Of The Mountain". 2015-10-03 13:44:45 -04:00
Armin Burgmeier 41742219d1 Remove obsolete ColorAnimation values from materials 2015-10-03 11:56:54 -04:00
Armin Burgmeier b8ed577c0f Rotate the OGRE coordinate frame by 90 degrees in X 
Also rotate all meshes backwards so that everything keeps working. This should
make it more convenient for modellers to create new meshes.
See http://forum.openclonk.org/topic_show.pl?pid=29410#pid29410.
 2015-10-03 11:39:08 -04:00
Maikel de Vries 4c66cc4ad7 change time interface to remove connection between System.ocg and Objects.ocd 2015-09-22 23:31:17 +02: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
Sven Eberhardt ed2e56c3fa Fix Loc_Space and allow direction parameter instead of just horizontal/vertical. 
The old implementation was buggy as it would disallow the location if it had too much space (and PathFree2 returns nil). It also doesn't make sense to ask for a location that has space in either direction of a dimension because the location is not automatically adjusted to lie at the center of that space. For example, it would effectively cause fish to spawn directly at walls sometimes.
 2015-07-31 00:42:01 -04:00
Maikel de Vries 7ef3e9c13e add some title images for scenarios 2015-06-12 21:43:17 +02:00
Maikel de Vries 73ebce9f9a remove celestial environment object in favor of scenario callback 2015-04-08 20:18:24 +02:00
Sven Eberhardt 7b8ffd79a4 Make Lava/DuroLava emit ambient light as a material property. (#1205) 2015-01-28 22:35:14 +01:00
Sven Eberhardt 49c5b22591 Remove some empty graphics files. 2015-01-17 18:22:06 +01:00
Mark d7a88eea62 Use CreateObject() in scripts (#1214) 
Objects with id Rule_*, Goal_*, and Environment_* are created with CreateObject() now.
 2015-01-11 19:04:42 +01:00
Mark 850bf1b9d4 CreateObject/CreateObjectAbove (#1214) 
Renamed CreateObject() to CreateObjectAbove() and replaced all occurrences in script files.
Added CreateObject(), the function may need a rewrite though, see comment in code.
Updated documentation
 2015-01-11 19:02:03 +01:00
Maikel de Vries 8f6c8ae141 Cool Cavern: add torch 2015-01-05 19:55:39 +01:00
Maikel de Vries c92fb8b2fe Shiver Peak: add torch and fix chest placement 2015-01-05 19:54:19 +01:00
Sven Eberhardt 9092a42c65 Added missing Maze.ocs/ParameterDefs.txt file. 2015-01-04 15:56:28 +01:00
Sven Eberhardt 89c3f79398 Maze (Heart of the Mountain) parameters for map size and coop/race mode added. 
Medium (default) size is a bit smaller than the previous default, because the map got a lot harder due to fog anyway.

Also removed superfluous Landscape.txt.
 2015-01-04 15:55:23 +01:00
Sven Eberhardt 019b618623 Change DuroLava in VolcanoEscapeExtreme to always be overground. 
This makes it more visible.
 2015-01-01 17:38:53 +01:00
Maikel de Vries c6802b8776 increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
Sven Eberhardt 86bf3dcea0 Tweaked VolcanoEscapeEx: A bit harder in the end. Volcano doesn't leave as many gaps. 2014-09-19 21:35:46 +02:00
Sven Eberhardt 0d17310a7a Ruby and Amethyst material moved to main Material.ocg 2014-07-12 12:33:01 +02:00
Maikel de Vries 6ba0164c5b removed unnecessary defcore Value entries 
Completely unneeded for structures and many other objects.
 2014-05-26 21:38:32 +02:00
Sven Eberhardt 148e27ebce Minor changes to HeartOfTheMountain 
* starting platform area increased
* recreate tools instead of just moving them into clonk's inventory on respawn (to help with burned grapple bows)
* spawn clubs instead of swords [Maikel]
* do not kill clonk on Ctrl+F9
 2014-05-11 15:49:18 +02:00
Sven Eberhardt 445d759a72 Change == and != to do pointer comparison on arrays and proplists (formerly === and !==). Remove === and !=== and introduce function DeepEqual for contents comparison. 
There have been some bugs and crashes related to unwanted deep comparison (e.g. in the maze scenario). Scripters very rarely need deep comparison, so it should not be the default for the most commonly used operator.

This also changes behaviour of GetIndexOf to do pointer comparison.

This change has Guenther's seal of approval.
 2014-04-19 22:33:31 +02:00
Maikel de Vries e7eabe01a7 Fixed boomshire's door solidmasks (#1035) 2014-02-16 11:37:18 +01:00
Tobias Zwick 37d699c452 fix name and description of spray can 2014-01-26 01:54:17 +07:00
Tobias Zwick 13537812ef convert mesh of spray can to binary format 2014-01-26 01:54:16 +07:00
Tobias Zwick a423a62bb2 Proofreading and adding missing (German) descriptions of scenarios 2014-01-25 22:05:11 +07:00
Tobias Zwick 00ada6563c add icon for maze 2014-01-25 22:05:10 +07:00
Tobias Zwick 7420dba41b fix creation of particles when outside for ruby 2014-01-25 17:03:07 +07:00
Tobias Zwick cb32c3f93c maze.ocs: finetune to be more claustrophobic 2014-01-25 17:02:21 +07:00
Tobias Zwick 07616e1ac7 spraycan now has a model; can only be used up to 50px away from the clonk 2014-01-25 13:49:29 +07:00
Tobias Zwick 41e4121bed replace jar of winds with windbag in scenario description 2014-01-25 01:40:00 +07:00
Tobias Zwick 7023fed02d add a "story" and German description for maze.ocs (now aka Heart of the Mountain) 2014-01-25 01:39:06 +07:00
Tobias Zwick 0c09a3fdfe maze.ocs: add a little turbulence to tunnels and caves 
Enough turbulence to let it look more natural but not so much that it creates more than a few narrow passageways which must be mined through. This is quite a discreet change.
 2014-01-25 00:56:36 +07:00
Tobias Zwick 408f9fca79 maze.ocs: make rubies sparkle even when collected 2014-01-25 00:54:44 +07:00
Tobias Zwick f6e98d61e2 replace sulphur material with firestone material 2014-01-11 22:29:19 +07:00
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
David Dormagen 54fdb2cec1 updated some remainers of the old particle system to use the new one 2013-11-28 23:38:26 +01:00
David Dormagen 6844cbbc71 changed DrawParticleLine to use the new particle system 2013-11-28 23:27:56 +01:00
David Dormagen 4126fa7021 moved Straw particle to Effects.ocd 2013-11-28 23:24:34 +01:00
David Dormagen 1edd16985d changed Parkour/VolcanoEscapeEx/BigVolcano to use new particle system 2013-11-26 22:47:44 +01:00
Martin Plicht dd44c32e14 Remove some duplicate functions from scripts 2013-10-14 07:21:12 +02:00
Maikel de Vries 7f9f40a1f5 Renamed Settlement.ocf to Missions.ocf 2013-10-05 17:39:14 +02:00
Sven Eberhardt a21576a58c Made VolcanoEscapeEXTREME a bit harder by adding ore veins 2013-09-22 17:39:05 +02:00
Sven Eberhardt 8e82548746 VolcanoEscapeEXTREME: Close sides 
When sides are open and the volcano reaches the central mountain, lava tends to flow out of the map while the volcano continues to grow further up. This looks rather stupid.

The current solution may also look a bit weird (as the volcano now grows over the mountain top), but is preferable both visually and from a gameplay perspective.
 2013-09-22 13:52:34 +02:00
Sven Eberhardt 4266617b5a Added rubber-band effect to VolcanoEscapeEXTREME. 
The scenario is now a bit harder (and feels a lot harder) as the volcano speeds up whenever you gain a large distance from it.
 2013-09-21 19:55:14 +02:00
Martin Plicht a915cdb15f Make Eclipse happy by changing some zeros to nils and stuff 2013-05-26 00:01:08 +02:00
Tobias Zwick ba426651ad fix wind bag rename 2013-05-25 14:36:04 +02:00
Sven Eberhardt 3937fcd3b1 Sorted all playable scenarios from experimental folder into settlement/parkour/arena folders 2013-05-16 19:33:10 +02:00
David Dormagen 4f68081874 removed some completely arbitrary MaxPlayer entries 2012-10-23 23:28:18 +02:00
Russell 5782557a34 Clonk. Now with 65% better grammar. 2012-10-22 18:35:06 +01:00
Felix Wagner e2ee7a59bd Descriptions corrected and synchronised 2012-10-13 22:25:25 +02:00
Maikel de Vries df0096cd57 Order scenarios inside their folders 
There is no logic behind this ordering
 2012-10-13 16:45:13 +02:00
Felix Wagner 7130394cfb Scenario folder descriptions added and synchronised 2012-10-13 13:17:59 +02:00
Charles Spurrill a66f39f729 Title.pngs for Arena, Parkour, and Settlement scenario folders 2012-10-11 19:39:48 -07:00
Maikel de Vries 67589cf86a Refactor scenarios: Others 
blabla hg
 2012-10-09 21:05:50 +02:00