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

185 Commits (c00a8cf3c3a33a88c5a8aba152d06d9f483921a5)

Author SHA1 Message Date
Maikel de Vries 3cc644f6fc reduced fire and explosive arrow strength 2015-01-09 23:37:04 +01:00
Maikel de Vries 32754c8a4e add bomb arrow 2015-01-04 09:18:40 +01:00
Maikel de Vries 8e54a567c4 add fire arrow 2015-01-04 09:17:59 +01:00
Maikel de Vries 629b4ee3d2 clean up arrow script and reduce its mass 2015-01-04 09:16:43 +01:00
David Dormagen f89b8c8319 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/DefCore.txt
	planet/Objects.ocd/Libraries.ocd/PowerConsumer.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/PowerProducer.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/System.ocg/ClonkControl.c
	src/gui/C4MouseControl.cpp
	src/landscape/C4PXS.cpp
 2014-12-25 15:24:19 +01:00
Maikel de Vries c6802b8776 increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
David Dormagen 5722339e83 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Structure.ocd/Script.c
	src/gamescript/C4GameScript.cpp
	src/gui/C4GameMessage.cpp
	src/gui/C4Gui.h
	src/gui/C4GuiDialogs.cpp
	src/gui/C4GuiWindow.cpp
 2014-08-13 11:52:41 +02:00
Sven Eberhardt 13499be402 Fix Sound() from deleted context when sword is deleted in strike callback 2014-05-29 18:57:40 +02:00
Julius Michaelis 1b1fa1643b Fix grenade launcher ammo check 2014-05-03 21:03:19 +02:00
David Dormagen 06ac00ace8 Merge branch 'master' into Controls 
Conflicts:
	CMakeLists.txt
	Makefile.am
	planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
	planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	src/control/C4Control.cpp
	src/control/C4Control.h
	src/gamescript/C4GameScript.cpp
 2014-02-15 14:44:57 +01:00
David Dormagen f7f3420977 correct kill tracing when flinging enemies down cliffs with melee weapons and ApplyWeaponBash 2014-02-15 14:32:48 +01:00
David Dormagen 425a221aff adjusted some particles (f.e. smoke slightly brighter, foundry more subtle) 
see http://forum.openclonk.org/topic_show.pl?pid=25749#pid25749 for further information
 2014-01-25 15:51:05 +01:00
Tobias Zwick f6e98d61e2 replace sulphur material with firestone material 2014-01-11 22:29:19 +07:00
Sven Eberhardt 57463b61c4 Rework SolidMasks to be defined in a separate SolidMask.png graphics file instead of the main definition graphics. 2014-01-08 01:55:33 +01:00
Sven Eberhardt 5094cc5c1b Reworked "Save as scenario" option in editor to write a script file instead of Game.txt. 2013-12-27 17:10:09 +01:00
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
Sven Eberhardt 4af3203840 Fix runtime error if arrow is removed in ProjectileHit. 2013-12-14 22:02:53 +01:00
Tobias Zwick ceca8b8fc7 add SoundAt function in C4Script (part of #238), document 
also, extend the documentation for Sound with previously undocumented parameters; threw out undocumented and also unused "multiple" parameter.
 2013-11-29 18:20:36 +07: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 fc1448feaa adapted sword to use the new particle system 2013-11-26 21:25:06 +01:00
David Dormagen 0aeb38f137 adapted MuzzleFlash particle and usages to new particle system 2013-11-26 21:25:04 +01:00
David Dormagen 875823644d adapted remaining usages of ExploSmoke* to new particle system 2013-11-26 21:25:04 +01:00
David Dormagen c17ec80039 removed particle "EngineSmoke" (use "Smoke" now) 2013-11-26 21:24:58 +01:00
David Dormagen 2139e950f1 adapted Flash particle and usages to new particle system 2013-11-26 21:24:57 +01:00
David Dormagen a5c8489059 adapted EngineSmoke particle and usages to the new particle system 2013-11-26 21:24:57 +01:00
Martin Plicht dd44c32e14 Remove some duplicate functions from scripts 2013-10-14 07:21:12 +02:00
David Dormagen 7eaef70af1 Merge branch 'master' into Controls 
Conflicts:
	planet/System.ocg/PlayerControls.txt
 2013-05-26 18:19:51 +02:00
Tobias Zwick 8f752d1d9e clean up files, make non-transparent textures high-quality JPEGs 2013-05-26 16:48:12 +02:00
David Dormagen cf4f85f9cf Merge branch 'master' into Controls 2013-05-24 21:31:29 +02:00
Clonkonaut 75cb0f2030 Added grenade launcher 
!!!!!!!!!!
 2013-05-24 21:21:07 +02:00
David Dormagen ae0a364587 Musket shots now exit at the correct position 
Launch() of the bullet now has offset parameters
LaunchProjectile() now only calculates own offset if none was passed to the function
 2013-05-24 20:45:32 +02:00
David Dormagen 086257b5f5 fixed callback name in musket 2013-05-24 20:09:42 +02:00
David Dormagen 34fc771911 merged master into Controls 
Conflicts:
	planet/Objects.ocd/Libraries.ocd/Structure.ocd/Script.c
 2013-01-30 21:37:31 +01:00
David Dormagen c8e6b84319 it is now easier to hit objects with the club (#905) 2013-01-28 21:10:18 +01:00
David Dormagen 299cc7e478 when not able to execute an Use-command (f.e. shield when not walking), the command is remembered and executed when possible 2012-12-29 18:42:19 +01:00
Charles Spurrill 5ce45b24d7 Fix sword rotation on clonk's back 2012-11-11 11:39:08 -08:00
Charles Spurrill 5cde2fa8de Fixed shield clipping through clonk's backpack 2012-11-11 11:15:01 -08:00
Charles Spurrill 277211cb3a Fixed rotation offset of secondary tool when using shield in primary hand 2012-11-11 10:56:37 -08:00
Charles Spurrill 956674aa5e Fixed shield acting as though it was always pointing up. 2012-11-10 15:56:37 -08:00
David Dormagen 544fd60838 fixed the shield always force-turning the Clonk 2012-11-05 21:30:34 +01:00
Russell 5782557a34 Clonk. Now with 65% better grammar. 2012-10-22 18:35:06 +01:00
Maikel de Vries c6dfd21172 Fixed a few C4Script runtime errors 2012-10-22 20:24:57 +02:00
David Dormagen 06ab4fc109 shield: possible to walk backwards now 2012-10-14 19:37:02 +02:00
David Dormagen 380c2de527 fix jump strike effect not fading out when dying mid-air 2012-10-14 14:47:14 +02:00
Maikel de Vries b4d02a44d0 Fixed bow bug: arrows stuck immediately after shooting 2012-10-14 14:10:09 +02:00
David Dormagen 7a3173da16 fixed sword jump-effect not disappearing when jumping into liquid 2012-10-14 14:06:23 +02:00
David Dormagen 430b03f8ae changed the sword jump effect, hopefully made clearer that it is intentional (#747) 2012-10-13 13:45:36 +02:00
Tobias Zwick e191cf0e71 my first commit on CCAN 2012-10-12 18:56:21 +02:00
Charles Spurrill 32cdba7415 Iron bomb is made from 1x Metal and 1x Sulphur 2012-08-09 17:40:25 -07:00
Charles Spurrill f4c9bdabf2 Remove needless HasFuse() funcs. Shrapnel now has hitcheck 2012-08-07 12:00:18 -07:00
Maikel de Vries 4a56f8d7c1 Replaced defcore values related to fire with properties 2012-04-28 16:17:38 +02:00
Tobias Zwick 1abe406ae2 descriptions and usagehelp for weapons 2012-03-28 21:14:58 +02:00
Martin Plicht a4194c22e9 Replace 0 with nil wherever string/object/array is expected 2012-04-12 11:48:23 +02:00
David Dormagen 99638db4c9 fixed shield exploit: limited the maximum damage of the sword on one target to 9 damage every 15 frames 2012-04-10 23:31:46 +02:00
Felix Wagner 2179adae7c (boni wtf?); fixed wrongful usage of GetItemPos() to determine carry_bone due to 
change of the functions return value
 2012-04-10 04:17:57 +01:00
Felix Wagner 9548c1979d Stupid me should have removed testing stuff... 2012-04-10 04:12:22 +01:00
Felix Wagner b0b561a25c Added cooldown for sword strike (#560); fixed clonk getting slowed if 
WeaponStrikeExpired isn't called
 2012-04-10 04:10:21 +01:00
Felix Wagner 38af458e05 Fixed/inserted various hit sounds. 2012-04-03 18:20:41 +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
Felix Wagner eb6b7be7ee Fixed various unused vars 2012-02-20 11:58:58 +00: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
Maikel de Vries 4f6ee17884 Objects: Weapons are armory products 
Also boolean functions should return booleans
 2011-10-14 00:03:55 +02: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 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
Felix Wagner 5258b47ce6 +StonyObjectHit, different sounds for soft/hard hit or just sliding 2011-10-08 17:12:19 +01: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
Maikel de Vries 59c1aefad9 Objects: All Versions to 5,2,0,1 2011-10-01 10:54:15 +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
Maikel de Vries 19a466bd93 Overcast: Some fixes and moving bricks clear materials 2011-09-05 19:35:50 +02:00
Tobias Zwick 330a80c1cb update authors and license information 2011-08-31 17:20:25 +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
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
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 d11e6afff4 The trail of the musket bullet is a little bit thinner 2011-05-20 15:41:12 +02:00
Armin Burgmeier 675c077ed2 Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00