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

103 Commits (376ca5a9dfb6b51ad02253a429ef0bd935d85799)

Author SHA1 Message Date
Maikel de Vries 0e76c85531 make line overlap check a global function 
This avoids code duplication and really is a Math.c function.
 2016-09-24 17:30:19 +02:00
Maikel de Vries e18cee3a46 turn musket into blunderbuss 
The musket was not a very popular and useful weapon, being inferior to the bow. It now shoots 5 weaker bullets in one shot with less damage per bullet, this might require some further testing and fine-tuning. Also the weaker bullets mean that they can be used in a gatling-gun (WIP) and in the airplane as well.
 2016-08-22 16:32:48 +02:00
Maikel de Vries 45bb9ab550 rename lead shot to lead bullet and clean up script 2016-08-22 16:32:47 +02:00
Clonkonaut 1b76c31452 5 title picture by ala and K-Pone. 
https://clonkspot.org/forum/topic_show.pl?pid=14524#pid14524
 2016-08-15 00:32:01 +02:00
Sven Eberhardt bce903ee04 Merge branch 'master' into qteditor 
Conflicts:
	planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Animal.ocd/CreatureControl.ocd/DefCore.txt
 2016-08-13 23:42:59 -04:00
Clonkonaut 7a56086d13 Fix Brick density in VolcanoEscapeEx (#1781). 2016-08-10 01:07:42 +02:00
Sven Eberhardt 36685a3119 Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
David Dormagen 092b012430 chest: stay open when empty (#1699) 
This is debatable. Let's see how this feels ingame and revert it in case we don't like it.
I like it because I think it gives valuable feedback to the players (and thus can reduce frustration coming from unnecessary actions). But it might also feel like a bug to players.
 2016-05-30 10:19:49 +02:00
Maikel de Vries 1df322b7ff adapt objects and scenarios to new component implementation 2016-05-21 13:34:34 +02:00
Maikel de Vries fd36babdfd add vine to aerobatics and gem grabbers 2016-04-13 22:04:16 +02:00
Maikel de Vries 1615284bd1 fine tune weapons and items in aerobatics 2016-04-04 22:23:34 +02:00
Maikel de Vries 26f030f18a remove airship solid mask in aerobatics after intro has finished 2016-03-23 15:24:38 +01:00
Nicolas Hake 5f895c14fc Materials: Fix misspelling of "Incendiary" (#1680) 
The wrong spelling will still be accepted as a material value, as long
as no value with the correct spelling exists.
 2016-02-09 23:45:02 +01:00
Sven Eberhardt 79897ce777 Move ItemSpawn from Aerobatics to main Objects. 2016-02-07 10:43:24 -05:00
Maikel de Vries 4e73a84d18 make aerobatics intro failsafe 
Also start the airship later to allow for a well timed dynamite jump to land on the airship and gain some advantage.
 2016-01-29 09:56:17 +01:00
Sven Eberhardt 1bb78ecd4f Remove some unnecessery animation weights. 
These overwrite the animations in their slots while there are no other references to existing animations in the slot.
 2016-01-28 23:47:53 -05:00
Maikel de Vries 9220c285c6 gui clock: add optional in screen countdown 
And use it in Aerobatics.
 2016-01-27 20:19:19 +01:00
Maikel de Vries 1cce689a67 boomrace: fix picking up boompacks (now instantly) 2016-01-24 23:28:05 +01:00
Maikel de Vries c4fa92a6d2 Aerobatics: use jet streams, fix item spawn and restart rule 2016-01-24 18:18:12 +01:00
Sven Eberhardt 7b7b791442 Add [Game] Mode to parkour and arena scenarios to fix league evaluation. 2016-01-23 21:26:13 -05:00
Maikel de Vries 6a3eaa2716 Aerobatics: new game mode and small improvements 2016-01-24 00:20:04 +01:00
Maikel de Vries 84218d1cbc merge UsageHelp into Description 
This is better for the new interaction menu, since only the description is shown for items, but it can be longer now.
 2016-01-23 16:28:02 +01:00
Maikel de Vries 7d46ab9f26 add new parkour aerobatics (sky race) (#1550) 2016-01-23 14:46:33 +01:00
Sven Eberhardt 234d4b365c Maze: Fix possible spray line to last position or (0,0) landscape corner #1624 2016-01-16 22:38:45 -05:00
Sven Eberhardt 5f713e7bb9 Maze: Fix error sound when trying to cheat 2016-01-16 22:03:35 -05:00
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