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

4260 Commits (88148ac966b3a98d493449f43c5cea92ebca77d0)

Author SHA1 Message Date
Maikel de Vries 88148ac966 give wipf in tutorials a name 
This makes the story a bit more personal for the player, hopefully.
 2015-12-21 20:23:32 +01:00
David Dormagen 9da914dd22 musket: added dry fire ("click") sounds (by ala, originally "NoAmmunition*") 2015-12-21 12:33:34 +01:00
Sven Eberhardt 915c3b13af Thunderous Skies: Play "Pop" sound when target balloon is hit. 2015-12-20 19:02:11 -05:00
Maikel de Vries 1772378fb6 fix self-launching catapult to shoot immediately (#1490) 2015-12-20 22:54:21 +01:00
David Dormagen 26250d1a30 club: introduced some sensible limits to the speed calculation 
This means that ice, melted down to 10%, does not become a 9mm bullet anymore. It also means that all objects are at least visibly moved - e.g. when deflecting arrows.
 2015-12-20 19:17:35 +01:00
David Dormagen df5a9ebb26 axe: increase damage (against livings) 
The axe could always be used as a weapon. It dealt such a low amount of damage that it was basically useless, though. Hits required to kill a Clonk are now 9 (down from 17). The axe is still a lot weaker and slower than the sword.
It's just not ridiculously stupid anymore to try to use the axe as a weapon now.

We are now not trying to deceive the players anymore (who might have actually THOUGHT that the axe was usable as a weapon, because it is used just like the sword).
The alternative would be to disable the weapon-use completely.
 2015-12-20 19:17:35 +01:00
David Dormagen abf578ec71 axe: fixed striking time and added "swing" sound 
The usage of the wrong constant for the striking time was fixed in https://git.openclonk.org/openclonk.git/commit/65b5c4bef683f6cb1ff4b5732946a803a7c69d94 .
This broke striking with the axe completely, though, because it was just soo annoyingly slow - slow-mo. axe, anyone? And it doesn't even deal damage, wow.
 2015-12-20 19:17:35 +01:00
David Dormagen d038452ff6 deep sea mining: capitalized some "i" and replaced missing sounds in the intro 2015-12-20 19:17:34 +01:00
David Dormagen d7b2ef9f75 prevent clonk idle animation when in dialogs and reduced frequency of idle sound (#1506) 
This doesn't work for intros, though, because they use simple messages. We should unify the systems to only have one dialogue system that uses new-style-menus and implement required features in those menus..
 2015-12-20 19:17:34 +01:00
David Dormagen ce0f1498a8 Clonk vocals: use GetSoundSkinName instead of skin_name when checking for available sounds 
Previously, PlaySoundShock was defective with the "Adventurer" skin.
 2015-12-20 19:17:33 +01:00
Maikel de Vries aee8a5f20f tutorial 8: explains pump, wallkit, liquids 2015-12-20 16:41:50 +01:00
Maikel de Vries 414d1c4e3a elevator add function to get case 2015-12-20 16:40:47 +01:00
Maikel de Vries fb18e17eec tutorials: transfer items on death and make structures invincible 2015-12-20 11:31:01 +01:00
Maikel de Vries 9a9b7fe8be butterflies are not attracted to underwater plants 2015-12-20 10:35:26 +01:00
Maikel de Vries 76427c0b82 fix tutorial guide message callbacks when guide is hidden 2015-12-20 09:14:13 +01:00
Armin Burgmeier a9967e7b16 Avoid built-in GL matrices for sprite rendering 
Instead, compute the projection, modelview and normal matrices explictly
and upload them as shader uniforms. This is one step towards using the
OpenGL 3 core profile.
 2015-12-19 22:37:36 -08:00
Maikel de Vries d5c390406a change license of loader from CC-BY 2.0 to 3.0 
The creator (Nachtfalter) has agreed to this.
 2015-12-19 18:41:14 +01:00
Martin Strohmeier d113a6a38f add new song to soundtrack 2015-12-19 16:02:18 +01:00
Maikel de Vries 350a7b94d4 implement loader from Nachtfalter (see Trello) 
It is currenly licensed under CC-BY 2.0 and must be upgraded asap. But it was needed to run the game.
 2015-12-19 14:30:44 +01:00
Maikel de Vries 6559ee1ade tutorial 7: fine-tune NPC teleglove control and add fireflies 2015-12-19 11:56:40 +01:00
Maikel de Vries 8247839455 remove obsolete function GetDefGrab 2015-12-19 10:42:30 +01:00
Maikel de Vries 01dd5fcc27 fix explosion shockwave for vehicles which can be grabbed and pushed 
This broke when DefCore Grab was replaced with property Touchable.
 2015-12-19 10:42:30 +01:00
David Dormagen 11927659a0 added new sound when pickaxe hits hard material (by K-Pone, originally "SwordHit1") 2015-12-19 10:17:55 +01:00
Nicolas Hake d0d83f8e5c Deleted unlicensed images 2015-12-18 21:18:48 +01:00
David Dormagen d5221656c3 added spark sounds for slow flints hitting (by ala) 2015-12-18 08:18:14 +01:00
Clonkonaut a8dd4cac89 Make AI clonks select their shield when defending. 2015-12-17 19:44:00 +01:00
Clonkonaut 65b5c4bef6 Fixed axe striking length using the correct const (now Axe_Standard_StrikingLength, was Sword_Standard_StrikingLength). 2015-12-17 19:43:14 +01:00
Maikel de Vries dea3b7f1c3 fix invertion of clonk on top ladder elements (#775) 2015-12-17 19:40:15 +01:00
Nicolas Hake b45ae48775 Add test case for #1502 2015-12-17 18:53:31 +01:00
Maikel de Vries d16676a798 add button (G) to the tutorials to hide/show guide messages 2015-12-17 16:47:20 +01:00
Maikel de Vries d47db7289d pilot in tutorial 7 helps collecting mined gems 2015-12-17 15:57:11 +01:00
Maikel de Vries 7e193e1345 make teleglove reach overloadable 2015-12-17 15:55:21 +01:00
David Dormagen 87a03b75e2 added swing (and hit) sounds for sickle and club 2015-12-17 10:58:54 +01:00
David Dormagen 132d929675 boomshire: improved aesthetics of lever sparkles 2015-12-16 23:27:51 +01:00
Clonkonaut 0108c6667c Made invincible beings (MakeInvincible) immune from shockwaves, windbags and throwing stuff at them. 2015-12-16 23:15:22 +01:00
Clonkonaut 0e19014740 Renamed the please-don't-windbag-me callback from NoWindbagForce to RejectWindbagForce. 2015-12-16 23:13:08 +01:00
Maikel de Vries a631bc83e8 add licensing information for bat sounds 2015-12-16 23:11:26 +01:00
David Dormagen 7f4f5fee58 added new vocals for three skins (by ala) 
They are played e.g. when being hit by stuff, catching fire, killing teammates, idling, trying to put a shovel into the pump, and much more!
 2015-12-16 23:01:29 +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 01de7048c3 tutorial 07: explains airships, gems and ropeladders 
This tutorial is not yet connected to the main storyline of the tutorials, but will be later.
 2015-12-16 21:52:34 +01:00
Maikel de Vries 1a15b83b4c added bat 
Basic functionality is done, but can be improved, especially flight animations and AI.
 2015-12-16 21:49:18 +01:00
Maikel de Vries 5c262a7f38 fix tutorial goal checks when crew member dies 2015-12-16 21:42:29 +01:00
Maikel de Vries b98ab3e699 lantern and torch have call back to indicate them as light sources 2015-12-16 21:06:33 +01:00
Maikel de Vries 79e84e9515 make the wipf a prey 2015-12-16 21:05:33 +01:00
Maikel de Vries f6aee9927c add function to init the time object with a definition call 2015-12-16 20:19:09 +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
Maikel de Vries ba39500803 removed PlaneCrash.ogg from TreasureHunt scenario 
Duplicate of the same sound in Sound.ocg
 2015-12-16 17:45:26 +01:00
Maikel de Vries 281733a689 remove Snore.wav from SkeletonAppend test 
Not used, no license and it is a test for something unrelated...
 2015-12-16 17:41:34 +01:00
Clonkonaut 3f4a770f93 Fight for GIDL: Moved buy menu entries into scenario script. 2015-12-16 16:43:34 +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