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

716 Commits (c00a8cf3c3a33a88c5a8aba152d06d9f483921a5)

Author SHA1 Message Date
Felix Wagner cce5d109ef no_dig2objects parameter for DigFree / DigFreeRect 2012-04-05 16:49:47 +01:00
Felix Wagner 234ed3c6b1 + Bucket.ocd 
You can gather earth with the bucket to use it as a material for bridge or similar tasks. Press [Use] to collect or dump earth.
 2012-04-05 03:02:35 +01:00
Felix Wagner 38af458e05 Fixed/inserted various hit sounds. 2012-04-03 18:20:41 +01:00
Armin Burgmeier 4180382c77 Crash.ocs: Make emergency boompacks uncontrollable 2012-03-11 19:29:46 +01:00
Armin Burgmeier 87ff13981d Add intro to Crash scenario 2012-03-10 19:04:11 +01:00
Sven Eberhardt 9cd563c52e Lots of improvements on Crash.ocs 
Pump: Make it possible to limit pumpable materials
 2012-03-10 18:23:48 +01:00
Maikel de Vries d6f2a8bd1b Fixed fuel consumption of producers 
The fuel amount of the fuels are reset to the original and correct values, adapted the steamengine a little for that.
 2012-03-10 17:33:57 +01:00
Armin Burgmeier 9d94b1da6e For scaled sprite graphics, don't interpret Picture coordinates as scaled 
Otherwise an object with a scale of 5 and a picture of 64x64 (such as the
Metal and the GoldBar objects) cannot properly set the picture rectangle.
 2012-02-25 17:35:24 +01:00
Armin Burgmeier cebbacd3f4 Remove "Picture" DefCore entry in objects having mesh graphics 2012-02-25 17:04:00 +01:00
David Dormagen 8f13c3c791 fixed Steam Engine to only burn fuel when needed, adjusted fuel values for coal and wood 2012-02-23 21:44:10 +01:00
Felix Wagner 39e2fd8320 Unused var fix, I forgot to save 2012-02-20 12:06:38 +00:00
Felix Wagner 0051862213 For the sake of Eclipse: fixed various var declarations 2012-02-20 12:04:59 +00:00
Felix Wagner eb6b7be7ee Fixed various unused vars 2012-02-20 11:58:58 +00:00
Felix Wagner 1c4deede8c Fixed Code never reached warnings 2012-02-20 11:25:43 +00:00
Maikel de Vries 4d1b10a23a Removed Cable reel and power line 2012-02-19 00:45:10 +01:00
David Dormagen e5746dd407 Sprout Berries should look less like plastic 2012-02-04 15:03:39 +01:00
David Dormagen d6b90bdaa7 Sprout Berry Bush added 2012-01-22 00:20:16 +01:00
Felix Wagner 54b97e8b0a Weird code tweak. How could this not provoke an error? 2012-01-17 22:40:26 +00:00
Maikel de Vries a675400f8a Loam can be produced at the foundry with water 
still need to display water needs
 2012-01-12 19:23:35 +01:00
Armin Burgmeier 340bbb5f79 Set a picture rect for the metal bar 2012-01-09 22:19:05 +01:00
Maikel de Vries 7bcb72ab7b Hammer construction menu replaced by drag&drop menu 
This to get rid completely of the old menus, there is still work to do on the drag&drop menu though
 2012-01-02 03:14:57 +01:00
Armin Burgmeier 609e42a296 Add definition picture graphics for dynamite box and igniter 2011-12-31 13:01:39 +01:00
Maikel de Vries e1da36219f New implementation for the production menu, similar to contents menu 2011-12-29 16:59:07 +01:00
Armin Burgmeier d0e8e8c2f5 Add components for dynamite 2011-12-29 20:26:55 +01:00
David Dormagen 5adc9d9537 GoldBars can be sold too 2011-12-29 20:21:19 +01:00
David Dormagen 2c2cc44b15 GoldSeller library added (used by flag to autosell gold/valuables) 
Cash sound added
 2011-12-29 16:06:12 +01:00
Maikel de Vries 0d1260331b Explosives can be produced in the workshop until an alternative is available 2011-12-28 19:48:33 +01:00
Maikel de Vries 93481ed972 Remove Library_ItemContainer in favour of content menu (open with E) 
It should work sufficiently well to use this from now on, for the next release it still needs some work though.
 2011-12-28 19:25:00 +01:00
Felix Wagner 3da392888c Moss & Lichen added, Lichen graphic needed 2011-11-05 01:49:15 +00:00
Charles Spurrill d9a02eaf14 Carry-Heavy system added 2011-10-26 14:03:12 -07:00
Felix Wagner f812208711 Axe: interrupt chopping if clonk does something else than IsWalking 2011-10-21 21:17:03 +01:00
Charles Spurrill 66e261572b Boompack doesn't weigh so much 2011-10-20 01:53:27 -07:00
Felix Wagner 096c07a251 Sawmill added. Just push chopped trees in front of it. 2011-10-20 00:42:32 +01:00
Charles Spurrill 23d2508602 fixed shovel topology 2011-10-18 17:07:43 -07:00
Charles Spurrill ec1e9fba5c Fix orangey-ness of hammer and boompack 2011-10-18 15:40:44 -07:00
Charles Spurrill 8925f85af1 Sword is finally shaded like it is supposed to be :) 2011-10-17 03:59:42 -07:00
Charles Spurrill a611d019ba HaseFuse() for objects that are lit to detonate. Only used by cannon for now. 2011-10-17 03:29:15 -07:00
Charles Spurrill e4c08a7288 Nugget and Ore are IsFoundryIngredient() 2011-10-16 09:48:13 -07:00
Charles Spurrill 3fab3265f9 Fixed bug where clonk could hold other items when chopping trees 2011-10-15 11:58:47 -07:00
Charles Spurrill dab09d89d6 Dynamite and dynamite box are IsAlchemyProduct() (and the igniter is not!) 2011-10-15 02:25:44 -07:00
Charles Spurrill aa7216aa49 Windmill tweaks and fixes 2011-10-14 23:04:16 -07:00
Felix Wagner 6c75d3f625 Windmill added. Enjoy your meal! 2011-10-15 02:47:24 +01:00
Charles Spurrill 5e3a9f9450 Gold bar is smaller 2011-10-14 14:38:53 -07:00
Daniel 79d44490b6 Liquid Pipe System Update 2011-10-12 00:32:46 +02:00
Charles Spurrill 5516dea6fe Larger bread (graphic in landscape) 2011-10-14 01:24:04 -07:00
Charles Spurrill e568750d35 Added Gold Bar (3 nuggets to smelt) 2011-10-14 01:03:56 -07:00
Charles Spurrill 074f473d05 Metal-barrel has proper strings 2011-10-14 00:58:16 -07:00
Felix Wagner 865b91849b The axe can now chop trees and split them into wood (lossy) 2011-10-14 01:04:33 +01:00
Maikel de Vries 4f6ee17884 Objects: Weapons are armory products 
Also boolean functions should return booleans
 2011-10-14 00:03:55 +02:00
Charles Spurrill b079ead630 New seed graphic 2011-10-12 19:51:34 -07:00
Charles Spurrill c73316ead6 Axe works (visually)! Ready for clonkonaut to make it affect trees 2011-10-12 16:50:31 -07:00
Julius Michaelis 0f12b3485e Find sounds with all extensions instead of only wav, so Sound() does no longer require .ogg extensions 
Do not replace * with ? in sound name wildcards anymore, adjust scripts
 2011-10-12 23:09:22 +02:00
Charles Spurrill 05c02c7dda Proper attribution of the pickaxe 2011-10-12 14:32:15 -07:00
Charles Spurrill 046d6d558f Club doesn't switch hands when used from right slot 2011-10-12 14:19:10 -07:00
Charles Spurrill e32825d203 Musket steel is brighter 2011-10-12 10:47:30 -07:00
Charles Spurrill 305081b6d3 Iron bomb doesn't weigh so much 2011-10-10 15:18:29 -07:00
Charles Spurrill 0e5d4ece61 New Flour graphic 2011-10-09 17:41:35 -07:00
Richard Gerum c0a1e343c6 clonk can turn while on grappler rope 2011-10-09 15:26:52 +02:00
Maikel de Vries e89caa464a Objects: Moved actual production into producer library 
Energy handling is still to be done + some other stuff as well
 2011-10-09 14:13:55 +02:00
Felix Wagner 0efc3fc5dc Balloon needs Cloth to produce 2011-10-09 01:27:33 +01:00
Felix Wagner ac416cfb6e Foodstuff: bread, cooked mushroom, flour (needs graphic) 2011-10-09 01:19:58 +01:00
Felix Wagner 6e9c8583a4 Gold more golden. 2011-10-09 00:32:47 +01:00
Felix Wagner 5258b47ce6 +StonyObjectHit, different sounds for soft/hard hit or just sliding 2011-10-08 17:12:19 +01:00
Felix Wagner 99efb8e2ba Wheat and seeds (dummy graphics for seeds) 2011-10-08 05:42:49 +01:00
Charles Spurrill 0a23c3eed6 Replaced Electrical.ogg with a sound with a legitimate license 2011-10-07 17:19:25 -07:00
Maikel de Vries 4adf230b94 Objects: Made production library work again 2011-10-07 17:38:34 +02:00
Charles Spurrill 7b496b293b Iron Bomb tweaks and fixes 2011-10-06 06:34:32 -07:00
Charles Spurrill 238cb6a0c2 Added Iron Bomb (grenade). Modified Explode.c to allow custom exlosion sounds 2011-10-06 06:02:36 -07:00
Felix Wagner b595e32262 gold chunk -> nugget 2011-10-01 06:32:42 +01:00
Maikel de Vries 59c1aefad9 Objects: All Versions to 5,2,0,1 2011-10-01 10:54:15 +02:00
Maikel de Vries a7763beb25 Objects: Interactables return true on Interact() 2011-09-29 23:23:06 +02:00
Tobias Zwick 55fa80fac1 Grappler: fixed division by zero (#613) 2011-09-19 14:03:43 +02:00
Tobias Zwick bcbb2ae132 Fix grappler also shots on cancel 2011-09-19 12:51:53 +02:00
Charles Spurrill a45777935e Deflate balloon if it is stuck in material 2011-09-15 02:37:32 -07:00
Charles Spurrill c3353e670c 3D graphics added to Axe.ocd 2011-09-14 18:23:17 -07:00
Charles Spurrill 79dc85caa1 Some balloon collision fixes 2011-09-14 00:59:02 -07:00
Tobias Zwick dcbb648fa9 CC-BY sounds for the axe 2011-09-13 23:41:02 +02:00
Charles Spurrill ae30d55fe5 Shield uses SetColor instead of SetOwner for colour display 2011-09-13 09:47:18 -07:00
Charles Spurrill 32a9645728 #652: Shield: Black face 2011-09-13 07:17:15 -07:00
Charles Spurrill b0112f0473 Minor fixes to the balloon 2011-09-13 00:51:03 -07:00
Tobias Zwick b81d40ddcb a few license updates 2011-09-10 15:36:36 +02:00
Charles Spurrill 63ffa871a9 Animation fix for clonk while using balloon 2011-09-09 16:21:26 -07:00
Charles Spurrill a8ef50bc0e added balloon graphics and sound (finally!) 2011-09-08 22:22:17 -07:00
Tobias Zwick 23a3dafd3a license updates for sound effects 
(now with all sources linked and a few changed to CC-BY 3.0)
 2011-09-08 23:08:16 +02:00
Maikel de Vries 19a466bd93 Overcast: Some fixes and moving bricks clear materials 2011-09-05 19:35:50 +02:00
Tobias Zwick f51df71078 clear up some info about licenses of sound files 2011-09-01 15:04:52 +02:00
Tobias Zwick 330a80c1cb update authors and license information 2011-08-31 17:20:25 +02:00
Peter Wortmann d444b16290 Earth chunks actually look like earth 2011-08-20 15:40:07 +01:00
Tobias Zwick ecd6de1d65 refactor: schedulecalls without object can now be made from object context 
(parameter obj is not automatically filled with this if nil)
 2011-07-31 19:27:26 +02:00
Tobias Zwick 480ff384f8 refactored most effects to use meaningful names for their variables 2011-07-31 17:59:51 +02:00
Maikel de Vries a55e10a48b Objects: Fixed musket 2011-07-31 14:50:23 +02:00
Richard Gerum 4d5c821222 fixed positioning of the clonk on the grappler 2011-07-12 14:17:12 +02:00
Maikel de Vries e2db1bc85a Actions default to COMD_Stop, Decel for float and swim procedures 
With this change everything should behave as normal, still not a fan of these numerous float hacks.
 2011-07-06 19:11:12 +02:00
Maikel de Vries d550f7c7da Differentiate between COMD_None and COMD_Stop 
Was necessary after 267ebb600481 and current abuse of FLOAT procedure. None keeps the current motion, Stop halts the current motion of a procedure.
 2011-07-06 18:13:39 +02:00
Maikel de Vries 493bde32ad Fixed boomshire and jar of wind 2011-06-18 12:30:17 +02:00
Richard Gerum a114d2f3ce removed waring from the ropebridge 2011-06-13 15:41:32 +02:00
Richard Gerum 2f68cc6e64 ropebridge planks can fall out on explosion (or it the bridge is set to fragile) 2011-06-13 15:33:32 +02:00
Richard Gerum 501ab13b11 the front line of the ropebridge is now foreground 2011-06-13 11:00:32 +02:00
Richard Gerum 4aeed96f89 added ropebridge 2011-06-12 13:29:15 +02:00
Charles Spurrill 74aebbbf72 Fixed friction values for the Rock 2011-06-08 02:45:18 -07:00
Charles Spurrill bceba4ccee Sword plays jump/slash animations again, sword also faces down on clonk's back 2011-06-08 01:49:11 -07:00
Charles Spurrill 2db0970156 tweaked shield graphics 2011-06-08 01:06:25 -07:00
David Dormagen 9100a44d88 fixed the visuals of the sword's downwards-stab a bit 2011-06-05 01:08:54 +02:00
Charles Spurrill 747cf2be39 Clonk doesn't contort or moonwalk when using shield with right hand 2011-05-31 07:22:47 -07:00
Tobias Zwick 8c490dca05 Implemented free shapes (=polygons) to be added or cleared from the landscape: 
+ Refactored the ShakeFree, BlastFree, DigFree, DrawQuad etc. functions and
  removed unused functions ClearRectDensity, DigFreeMaterial,...
+ Moved the polygon fill algorithm from StdSurface8.cpp to C4Landscape.cpp
+ Clearance functions which used to subtract a circle now subtract something
  that looks more like a chunk
+ Pickaxe works with BlastFree now
+ Removed Dig2ObjectRequest
 2011-05-31 00:33:35 +02:00
Charles Spurrill abd1b13a5b Barrels shows what liquid they carry; metal barrel doesn't look awful :D 2011-05-24 21:00:16 -07:00
Charles Spurrill d6134a0bf2 Newer graphics for powder-keg 2011-05-24 20:58:52 -07:00
Charles Spurrill 4c6886c329 Removed Gunpowder object, substitute with local var in PowderKeg 2011-05-24 18:22:18 -07:00
Tobias Zwick d11e6afff4 The trail of the musket bullet is a little bit thinner 2011-05-20 15:41:12 +02:00
Tobias Zwick cb1571ccf6 The pickaxe ist swung a bit faster 2011-05-20 15:40:48 +02:00
Tobias Zwick 85c02a2a5a GrappleBow: correct the display of the rope and grapple hook 2011-05-20 15:40:30 +02:00
Tobias Zwick cd523d631b Water splash sound for the barrel 2011-05-20 15:39:57 +02:00
Tobias Zwick cefe8b2eac fix up the balloon a bit (remove debug message, correct translation, that kind of stuff) 2011-05-20 15:39:41 +02:00
Maikel de Vries ca2ea1be98 Objects: Tool products return true instead of 1 
This is just plain ugly, |a> Are you a tool? |b> 1. DynamiteBox is also a tool for now, mainly for testing.
 2011-04-17 14:00:59 +02:00
Maikel de Vries f5efd2067b Objects: Fixed pickaxe hovering 
A clonk could hover with the pickaxe by repeatedly using it in mid-air.
 2011-03-25 16:34:15 +01:00
Armin Burgmeier 675c077ed2 Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00