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 c00a8cf3c3 fix a bunch of suspicious assignment warnings 2018-04-09 11:53:55 +02:00
Mark 21102bb4ef Melee Weapons: Code formatted for remaining melee weapons 
No actual changes, just added spaces and brackets for improved readability
 2018-03-20 21:13:45 +01:00
David Dormagen 29a1a21526 club respects Rule_NoFriendFire and IsProjectileTarget (#1993) 
Not recommended for 8.1, because there are semantic changes: The club can now also hit targets (IsProjectileTarget) while before it could only hit OCF_Alive and C4D_Object. It's similar to the sword now.
Oh, and before it could also not hit livings that were stuck.
 2018-03-11 15:04:59 +01:00
Maikel de Vries aa892171fb update version to 8.0 in DefCore.txt, Scenario.txt and Version.txt 2018-01-28 13:18:46 +01:00
Julius Michaelis f39ce4f25c Make arrows burn (#1983) 2018-01-28 12:51:14 +01:00
Maikel de Vries 65c279233e improve enemy finding for defense AI 
The path finder seems quite slow if a lot of AI enemies are around and can't find a path...
 2018-01-23 11:35:47 +01:00
Lukas Werling dd86c05b9f Fix some � U+FFFD REPLACEMENT CHARACTER instead of umlauts 2018-01-07 00:50:43 +01:00
Maikel de Vries ed41426ef8 fix line endings of some files in planet 2017-11-10 10:21:09 +01:00
Clonkonaut 6acea8930b Various objects: include library flammable 
Increased burn time (140 frames) for: axe, bucket, grapple bow, hammer, pickaxe, shovel, sickle. So useful items will burn a little bit longer.
Coal will burn for 245 frames and then just burst into ashes and not change into a Burned Object.
 2017-11-01 00:54:24 +01:00
Mark 09eec4b53c MoltenMonarch: Moved materials to weapons 
Weapon materials are now defined in the basic objects, so that other
scenarios can use the alternate skins, too.
 2017-08-11 14:22:45 +02:00
Maikel de Vries a53bc7eb61 fix script error when fire arrow's incineration destroys an object 2017-06-26 17:20:22 +02:00
Sven Eberhardt a2d6b65668 Add Title.txt for group folders in Objects.ocd and Decoration.ocd 2017-05-27 16:31:46 +09:00
Fulgen301 b7108ff836 Modify Blunderbuss in order to work with Rule_Relaunch 2017-03-30 20:55:05 +02:00
Fulgen301 b76cedbe7e Modify Bow in order to work with Rule_Relaunch 2017-03-30 20:55:05 +02:00
Fulgen301 51d61d1b26 Modify GrenadeLauncher in order to work with Rule_Relaunch 2017-03-30 20:55:04 +02:00
Sven Eberhardt 1c7ee21903 Add weapon speed setting to ranged weapons 2017-03-04 22:47:17 -05:00
Maikel de Vries 2807f36319 indicate which items are explosive 2017-02-02 21:47:57 +01:00
Mark 4b33beb9db MoltenMonarch: Clean code 
The king size weapons overloaded entire functions from their original objects. This was replaced by adding interfaces that allow for the manipulation of the desired values.
 2017-01-07 02:21:22 +01:00
Mark db9451dcce MoltenMonarch: Fix musket/blunderbuss 2017-01-07 02:10:00 +01:00
Maikel de Vries aeddfd1b03 prevent bullet pack from sliding due to zero friction 2016-12-26 17:55:45 +01:00
Lukas Werling 68ddeb3bed Convert all text files in planet to UTF-8 2016-12-11 21:19:13 +01:00
Sven Eberhardt 3330c592e3 Improve PlayerStart initial material setting to allow specification of weapon ammo, stackable stack count and liquid contents 2016-09-05 20:01:47 -04: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 095a589842 clean up bullet trail and fix offset to bullet 2016-08-22 16:32:47 +02:00
Maikel de Vries 1fc7fea628 remove unused local variable from grenade launcher 2016-08-22 16:32:47 +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 d93b4d7b3a Do not show helmet on back (can't make it work properly with other items). 
The helmet is just too big and bulky. Same with the diving helmet.
 2016-08-17 20:25:05 +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 1036bad7fb Added a helmet by pluto. Wear and get 20% off damage*! 
*: not all damage is reduced, does not help against explosions, fire, asphyxiation or corrosion. We assume no liability for any deaths or injuries occurred while wearing.
 2016-08-12 18:25:01 +02:00
Sven Eberhardt 5db45c0f47 Merge branch 'master' into qteditor 2016-08-06 21:45:19 -04:00
Clonkonaut cb8086cff7 Try to space out two items on the back better. 
Mainly concerns scaling / hangling and it isn't perfect but better than before.
 2016-08-07 03:04:04 +02:00
Clonkonaut 34af29fd7b Show quick slot item on clonk. 
All GetCarry* callbacks receive a parameter whether they are held in this slot and can then return a different display mode!

I also took the opportunity to restructure many scripts in a similar way.
 2016-08-05 01:14:13 +02:00
Sven Eberhardt 36685a3119 Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
Maikel de Vries 3620e22061 fix launching of javelins 
Bug was introduced when TakeObject changed.
 2016-06-12 11:39:11 +02:00
Maikel de Vries 2a731b2545 implement Components as a property lookup table 2016-05-21 13:34:34 +02:00
Maikel de Vries 1df322b7ff adapt objects and scenarios to new component implementation 2016-05-21 13:34:34 +02:00
Nicolas Hake 8e18a3fc96 Change (int)0 to nil where deprecated 2016-05-13 17:13:34 +02:00
Maikel de Vries 3907281933 fix script error when striking sword (#1731) 2016-05-01 16:54:05 +02:00
Maikel de Vries 3f085a0532 balance grenade launcher projectiles 
Decrease their mass to prevent too much damage when having a direct hit plus explosion. Also decrease the impact of the iron bomb explosion a bit to make it less overpowered.
 2016-04-25 21:27:22 +02:00
Maikel de Vries f5a9412a35 clean up iron bomb and shrapnel scripts 2016-04-25 21:27:22 +02:00
Maikel de Vries f46f38511a add function to determine if ironbomb and dynamite are fusing 2016-04-22 23:27:33 +02:00
Maikel de Vries 0d1b68dc39 balance item components and values 2016-04-08 19:17:53 +02:00
Maikel de Vries 13f0f584e8 fix not scaling with holding loaded musket (#1711) 2016-04-07 19:10:38 +02:00
Maikel de Vries 255429d3e0 make setting loaded public in musket and grenade launcher 2016-04-04 22:23:34 +02:00
Maikel de Vries ca265103bb do not stack loaded weapons with unloaded ones 2016-04-04 22:23:34 +02:00
Nicolas Hake fe91cec2b7 Merge remote-tracking branch 'github/pull/14' 2016-02-29 14:05:45 +01:00
Maikel de Vries 1b94d0fcc8 reduce javelin damage 
This way it really does what was promised in the last commit (ac8d5934), and not kill someone with 2 good throws.
 2016-02-14 18:31:39 +01:00
Lukas Werling 29491ec3b7 Replace lots of empty parameters with proplist for Sound() 2016-02-10 13:31:16 +01:00
Maikel de Vries 879048c366 show projectile trajectory preview for the grenade launcher 2016-02-03 19:49:23 +01:00
Maikel de Vries a390f8f248 fuse and activate iron bomb on cannon shot, fuse dynamite as well 2016-02-01 00:10:23 +01:00