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

4627 Commits (370b9cf898671a85771b31b49a2a806fcff43cd9)

Author SHA1 Message Date
Maikel de Vries c35df88ae9 add tutorial 5 explaining melee weapons 2016-01-10 22:53:04 +01:00
David Dormagen 9bca345342 tutorial 2: added German translation 2016-01-10 21:57:20 +01:00
Maikel de Vries d94b2356b1 add function to tutorial guide to get the amount of messages it has 2016-01-10 20:54:03 +01:00
Maikel de Vries f1a9db89bf increase gems in landscape to make sure goal can be completed 2016-01-10 20:54:03 +01:00
Sven Eberhardt 3735b135ac DarkCastle: Pre-damage last stone doors. 2016-01-10 14:20:46 -05:00
Sven Eberhardt f54a49d044 Resource goals: Reduce display of available resources by 10% to better match actually mined gems. 
Some material always gets lost on blasting/pickaxing.
 2016-01-10 13:41:04 -05:00
Sven Eberhardt 95ac155f6b GoldenMountain: Reduce required gem count. 2016-01-10 12:21:14 -05:00
Sven Eberhardt 05b6ee2407 Remove unused library dummy graphics. 2016-01-10 11:59:55 -05:00
Clonkonaut 962b178663 Merge remote-tracking branch 'remotes/origin/revert-opengl-2.1' 2016-01-10 17:27:56 +01:00
Sven Eberhardt 0f2057032f Retain inventory slot order on respawn #1543 2016-01-10 11:10:45 -05:00
Sven Eberhardt b8e24b8b62 Windmill: Fix gold bar collection 2016-01-10 10:49:51 -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
Sven Eberhardt b00daed283 GoldenMountain: Add wooden bridge plans #1570 2016-01-10 08:55:04 -05:00
Sven Eberhardt d56670c7ce Fix pickaxe killing scaling ability permanently if it is used before any local ActMap modifications #1563 2016-01-10 08:46:20 -05:00
Maikel de Vries 092f9846dc ensure showing construction materials for sites at the bottom of the map (#1365) 2016-01-10 14:18:58 +01:00
Clonkonaut 5fd8bfb140 Projectiles will fade out very fast (#1555). 2016-01-10 13:11:26 +01:00
Clonkonaut 0243a69913 Fix possible reference to deleted object in Boomattack. 2016-01-10 13:10:47 +01:00
Maikel de Vries 2b88578a7c disallow showing/hiding tutorial guide by player when in a sequence 2016-01-10 10:54:07 +01:00
Sven Eberhardt 2bb8be66ca Windmill: Downscale sky to match landscape size. 2016-01-09 17:53:44 -04:00
Sven Eberhardt dd25f85e6d Warn when assigning duplicate keys #1170 2016-01-09 17:00:21 -04:00
Sven Eberhardt dcefa516f6 GrappleBow: Pull back in if hook did not stick successfully #1546 2016-01-09 16:33:13 -04:00
Sven Eberhardt e64ec260bb Fix infinite air supply through breathing of own bubbles #1545 2016-01-09 16:15:20 -04:00
Sven Eberhardt fc659584e4 Fix catapult projectile priority when shooting clonk while items are placed in the catapult (typically by the scenario designer) #1547 2016-01-09 15:59:43 -04:00
Sven Eberhardt 1271fd9291 FightForGidl: Reduce screen shake. 2016-01-09 15:32:55 -04:00
Sven Eberhardt 310df9fe13 FightForGidl: Remove hammer for now (no towers yet) 2016-01-09 15:32:55 -04:00
Maikel de Vries cd30bf8079 fix eating/using the squid and the fish 2016-01-09 20:17:26 +01:00
Maikel de Vries 1ba1164d8e fix typo in dark mine string table request 2016-01-09 20:17:26 +01:00
Sven Eberhardt fd1c58db0d Hot Ice: Clonks have lower energy; iron bombs instead of swords in chests. 2016-01-09 15:09:12 -04:00
Sven Eberhardt 7f8551bb42 Add wealth display to Crash Landing #1548 2016-01-09 14:26:18 -04:00
Sven Eberhardt 3b74ac2929 DarkCastle: Fix nil access in intro. 2016-01-09 11:09:11 -04:00
Sven Eberhardt 11e73373a6 Use alt skins in storyline missions. 2016-01-09 11:09:11 -04:00
Sven Eberhardt 2e4da5077d Add dark skinned alt clonk skin [by Marky, CC-BY-3.0] 2016-01-09 11:09:10 -04:00
Sven Eberhardt dfe81b622a Alt clonk skins: Fix youngster portrait 2016-01-09 11:09:10 -04:00
Sven Eberhardt 3d98b8355c Alt clonk skins: hardcode clonk colors 2016-01-09 11:09:09 -04:00
David Dormagen 0ad1cdbf89 loam: made bridges smoother 
..by continuing the material drawing exactly where it was stopped the last frame. Previously, just some unconnected rectangles were drawn which were often times filled with gaps. Especially on angled bridges.
 2016-01-09 13:53:34 +01:00
Maikel de Vries 96344dfc00 disable climbing when swinging pickaxe 2016-01-08 22:43:46 +01:00
David Dormagen 05013563d3 tutorial1: added German translation 2016-01-08 21:25:20 +01:00
David Dormagen 0c73ae29e7 loam: fixed turning while digging and added some particles 
This were supposed to be two commits. Meh.
Also, I can't really test how the particles looks because everything is black for me - ck? :(
 2016-01-08 21:05:09 +01:00
Maikel de Vries 5da08f2720 prevent bat from getting stuck in material 2016-01-08 20:50:11 +01:00
Maikel de Vries 55b077898b finished outro sequence for tutorial 4 2016-01-08 19:46:28 +01:00
Maikel de Vries f99db85c97 add more bottom vertices to structures to prevent falling down 2016-01-08 19:46:28 +01:00
Sven Eberhardt 1b32663999 Fix movement on moving bricks #1530 2016-01-08 00:40:35 -04:00
Günther Brammer 7d0990baf9 editor: Don't try to insert manual newlines into error messages 2016-01-08 04:25:26 +01:00
Sven Eberhardt fbdfcafa43 Fix text error in tutorial 2 #1539 2016-01-07 22:06:35 -04:00
Sven Eberhardt 1933deec44 Fix GUI name and description of interact key #1540 2016-01-07 20:47:18 -04:00
Mark 8719ee8b58 Test scenario for SetGraphics() 
Scenario that tests SetGraphics() in various ways: Setting graphics of meshes/sprites to other objects, overlaying objects onto other objects.
The scenario is not in the Issues.ocf folder, because it addresses multiple issues #1458 and #1538 and the status of the issues has not been acknowledged yet.
 2016-01-07 19:09:18 +01:00
David Dormagen b6436783bb loam: disable free turning of Clonk 
From bug report out of http://forum.openclonk.org/topic_show.pl?tid=3233
 2016-01-07 10:09:39 +01:00
Tobias Zwick 0976c02d54 Update the Credits 
Space is getting scarce , I had to leave out the people who never contributed more than two commits. For 8.0 the credit screen should be reworked to either scroll down or be made for larger resolutions than 800x600.
 2016-01-06 19:39:03 +01:00
Maikel de Vries da6d4a8aa3 Skins for NPCs in the tutorials 2016-01-06 19:03:59 +01:00
Maikel de Vries 09b61246f0 add several clonk skins for NPCs by Marky 2016-01-06 19:03:59 +01:00
David Dormagen 941dc8a95b Wipf: added Snuff3 sound (by ala) 
Silence at the beginning and end was trimmed. Only true silence, though.
 2016-01-06 12:11:35 +01:00
Maikel de Vries e0ae612e10 killtracing: fix setting killer when airship is shot down 2016-01-05 18:20:33 +01:00
Maikel de Vries 7b4fe4452f killtracing: more tests and more precise test descriptions 2016-01-05 18:19:49 +01:00
Armin Burgmeier 4a02d3c77b Revert "Replace 3D texture in landscape shader by a 2D texture array" 
This reverts commit 790219ac7e.

This commit broke support for Mac OS X since Apple only supports OpenGL 3.0
with a core profile, not a compatibility profile. Revert this commit
temporarily for the 7.0 release, until we port all OpenGL usage to the core
profile with 8.0.

This fixes #1495.
 2016-01-04 18:27:44 -08:00
Maikel de Vries b5b6526c58 killtracing: airplane always gets destroyed when damage too much and with correct killer 2016-01-04 21:17:25 +01:00
Maikel de Vries ee9c44ac75 boompacks are not projectile targets of boompacks 
This would be very annoying if you fuse multiple of them at the same time
 2016-01-04 21:17:25 +01:00
David Dormagen 075fcca74f clonk: added "Diving Loop" sound (by ala) 
It's a bit quiet, but I guess that's not really a problem. It's also out of sync with the arm movement, but it's all I got (and it's so quiet you don't notice it anyway!).
 2016-01-04 20:52:11 +01:00
David Dormagen 78f74566af added alternative "Munch" sound (by ala) 2016-01-04 20:52:11 +01:00
Maikel de Vries f1c9b042ff killtracing: boompack gets correct controller when hit or incinerated 
also add a hitcheck when launched by a projectile hit
 2016-01-04 20:43:56 +01:00
Maikel de Vries af4819aa81 killtracing: add additional tests 2016-01-03 20:18:06 +01:00
Maikel de Vries 7aaa5a6e32 killtracing: pass controller of igniter when fusing dynamite 2016-01-03 20:18:06 +01:00
Maikel de Vries 659b1d24a7 killtracing: correct cause_plr for burning lorry fragments 2016-01-03 20:18:06 +01:00
Maikel de Vries 22d5036e9e killtracing: set killer of balloon rider if balloon is shot 2016-01-03 20:18:06 +01:00
David Dormagen 14c413028c interactions: always show action target & use AtRect instead of AtPoint 
The players have no notion about the midpoint of an object and are thus confused when clearly standing in front of something and not being able to interact with it.
(Yes that happened in a Let's Play and yes, that's why the interaction menu also uses Find_AtRect.)
 2016-01-03 17:39:26 +01:00
David Dormagen 22d9a21ff7 carry heavy: remove special treatment of CON_Interact 
Because it's an interaction. It should use the interaction interface and not some self-made hack. Previously, setting down a carry heavy object would always be executed even if aborted with Space+S.
 2016-01-03 17:38:05 +01:00
David Dormagen 4b398f95eb construction site: fix unstuck check for free objects 
We are looking for free objects. So for OCF_InFree and not for Not(OCF_InFree). Now Clonks are e.g. unstuck when the landscape adjusts to a construction site.
 2016-01-03 17:35:47 +01:00
Maikel de Vries 1eebe15fa1 dark mine: king of the hill as scenario option 2016-01-03 16:01:37 +01:00
Maikel de Vries 471470f1fb killtracing: more tests 2016-01-03 14:39:24 +01:00
Maikel de Vries 3392921bfe killtracing: windbag set controller for moved objects 2016-01-03 14:31:20 +01:00
Maikel de Vries 309edf4467 killtracing: fix contoller of dumped lorry contents 2016-01-03 13:54:26 +01:00
Maikel de Vries d6a16f7ff1 killtracing: more tests and overview table 2016-01-03 13:30:11 +01:00
Maikel de Vries 64af909a49 killtracing: set controller of keg when incinerated 2016-01-03 12:30:47 +01:00
Maikel de Vries 6530cba8eb killtracing: club set controller when hitting an object 2016-01-03 12:25:38 +01:00
Maikel de Vries 5ba7519b79 killtracing: add test scenario 2016-01-03 09:57:06 +01:00
Maikel de Vries 7f8b4c4bfc killtracing: cannon set controller of projectile to the shooter 2016-01-03 09:57:06 +01:00
Maikel de Vries f607112db4 flame: do not tumble clonks and correct killtracing 2016-01-03 09:57:06 +01:00
Maikel de Vries 21dead533c killtracing: pass owner and controller correctly in CastObjects 2016-01-03 09:57:06 +01:00
Maikel de Vries 869ea063f9 fix author mentioning of bat sounds 2016-01-03 09:57:06 +01:00
Armin Burgmeier 96c8b51eac Use generic vertex attributes for landscape rendering 2016-01-02 17:20:24 -08:00
Clonkonaut b2ecfcfc48 Slight improvements to Guardians. 
A single player now receives four times more wave bounty than before, scaling up to four players. It's still challenging but I believe now doable.
Enemies should no longer jump off airships when being shot at.
Fixed a typo in the airship appendto script.
Fixed a possible null pointer when changing weapons.
 2016-01-03 01:53:55 +01:00
Günther Brammer 9911a894df Fix FxRollingTimer parameter type for effect from int to effect 2016-01-03 00:22:36 +01:00
Armin Burgmeier 95774e0e8f Use generic vertex attributes for sprites, meshes, particles 2016-01-02 13:10:03 -08:00
Maikel de Vries a6344d0f1a dark mine: add deathmatch option plus some small improvements 2016-01-02 21:54:56 +01:00
Maikel de Vries 97cc3dd901 arena goals: pass whether it is a relaunch to OnPlayerRelaunch callback 2016-01-02 21:53:43 +01:00
Maikel de Vries 7ca791a5b0 fix random choice of object when dumping lorry contents 2016-01-02 21:52:52 +01:00
Maikel de Vries bbdb5d3229 add tutorial 4: explains loam production, lorry, pickaxe, elevator 
The outro sequence is not yet finished, and requires quite a lot of work still.
 2016-01-02 19:42:23 +01:00
Maikel de Vries 0b61ec4f93 add hanging action to the wipf 2016-01-02 19:42:23 +01:00
Maikel de Vries 06b6d6e85e fix musket bullet trail appearance at top map border 2016-01-02 19:42:23 +01:00
David Dormagen af576e7468 shovel: improved dust particles slightly 
A bit more but smaller particles. Now you can't make out a single sprite easily anymore.
The particles also do not spawn in solid material now.
 2016-01-02 17:27:49 +01:00
Clonkonaut 0348efa03e Fix propeller not moving in Deep Sea Mining Intro (#1531). 2016-01-02 13:44:23 +01:00
David Dormagen a3e4b620b9 reworked interactions (grabbing etc.) 
The player interface is now similar to how picking up works. This should increase acceptance. Also it was pretty fucked up before. The action bar is gone.
The script logic is now outsourced into a new library similar to the other stuff.
Objects can overload the selector for the new interaction (see "call elevator case").

Additional issues hit and resolved when working on this:
Shifting a cursor did not cancel certain actions (and there was no callback for that). This is now solved by adding two new callbacks.

Issues hit and not resolved:
Certain interactions (calling an elevator case, flipping a construction) are in some control library. They should be in the respective objects (and shown via callbacks etc.). Meh.
The internal interface (declaring interactions etc) has a few places where proplists are just translated because the properties are called differently. This is also a fuckup (i.e. a.interaction_object = b.Object) where the properties should just have been called the same in all places from the beginning.
The name "Action Bar" is pretty misleading now as it is no bar. But that's not something visible to the players. todo: cleanup.
 2016-01-02 13:02:45 +01:00
David Dormagen 683a6df0c4 Molten Monarch: some performance improvements 
Search less often. Search for less. And use the proper inventory interface.

Before (first number is relative to MovingBrick.FxMoveVerticalTimer, because that's relatively constant (I guess?)).
59x 00826ms	Global.FxBlessTheKingTimer
38x 00537ms	Global.FxDeathByFireTimer
 1x 00014ms	MovingBrick.FxMoveVerticalTimer
After
41x 00328ms	Global.FxBlessTheKingTimer
27x 00213ms	Global.FxDeathByFireTimer
 1x 00008ms	MovingBrick.FxMoveVerticalTimer
 2016-01-02 10:49:26 +01:00
Armin Burgmeier 0538d1e57f Fix the planet/Tests.ocf/ColorfulLights.ocs test scenario 
The TexMap.txt was outdated
 2016-01-01 22:28:22 -08:00
Armin Burgmeier 9b9d9e378f Fix PXSAndSmoke.ocs test scenario 
It contained an outdated TexMap.
 2016-01-01 22:28:21 -08:00
Clonkonaut e31b866e7f Fix animation error when scaling at unfavourably shaped walls (#1317). 
The error rarely happened when the clonk was attached to a wall solely with its head vertex. CheckScaleTop (Animations.ocd/Script.c) only checked the shoulders and hip vertices.
I also made sure that this.dist (FxIntScaleTimer, line 616) cannot exceed the animation length of "ScaleTop" although that shouldn't have posed a problem.
 2016-01-02 03:58:45 +01:00
Günther Brammer 00a4c6c428 Replace BorderBound DefCore value with BorderBound object property 2016-01-01 22:18:41 +01:00
Maikel de Vries 2269d55801 fix typos in tutorials 2016-01-01 22:18:41 +01:00
David Dormagen 104764b1e4 added ala's "BlastMetal" changes (#1492) 
I had to convert it to mono, though. Also it's a .wav now. But that's fine imo.
 2016-01-01 17:44:10 +01:00
Maikel de Vries 30d45fcdc3 streamline tutorial guide script interface 2016-01-01 13:45:50 +01:00
Maikel de Vries 80ad1a5650 improve lightning strikes 
- changes particle appearance
- add sounds
- change branching behavior
- add light source
 2016-01-01 10:51:54 +01:00
Maikel de Vries 53a1a76a90 add sounds for thunder strikes 2016-01-01 10:51:54 +01:00
Armin Burgmeier 8766f5123b Remove other usages of built-in GL matrices 
Primarily for the FoW rendering, which now also uses (simple) shaders
without ftransform() everywhere. This also removes all GLU calls.
 2015-12-31 17:30:21 -08:00
Maikel de Vries eaf66850b1 tutorial 3: fine-tuning and title image 2015-12-31 15:07:22 +01:00
Clonkonaut fa4512c5ea Guardians, slight improvements. 
Removed the windbag from the chest (might also remove it from the buy menu).
The chest below the base will now sometimes contain a gold bar, giving extra money to the player picking it up.
Made sure that no airship remains after fade out.
 2015-12-31 12:45:13 +01:00
Maikel de Vries 34fa60feeb dialogue: fix finding by name and public interface to get the target 2015-12-31 12:07:36 +01:00
Maikel de Vries 03ef09135e scenarios: some fine-tuning to clonkomotive 2015-12-31 10:33:27 +01:00
Maikel de Vries b5a00b69af fix whitespaces in tutorial scenario descriptions 2015-12-30 21:44:05 +01:00
Maikel de Vries 64af1e2a8a stars: fix placement and allow scenarios to change placement 2015-12-30 11:36:30 +01:00
Clonkonaut 4a26a7e8ad Increased bounty for several enemies. 2015-12-30 03:25:51 +01:00
Clonkonaut ef48a60b27 Fix possible null pointer. 2015-12-30 03:21:53 +01:00
Clonkonaut 1416887a22 Fix possible null pointer when shooting the balloon. 
I suspect that when the clonk gets send tumbling, OnUnmount might get called and nil rider.
 2015-12-30 03:21:35 +01:00
Maikel de Vries c8dff941dc worlds descriptions: fix whitespace and typos 2015-12-29 23:14:01 +01:00
Maikel de Vries 568c57900b add new world: Clonkomotive (thanks to Pyrit) 
Based on a round made by Pyrit, changed to fit into the worlds folder.
 2015-12-29 22:40:52 +01:00
Maikel de Vries ede6078c75 move out of solidmask as structure library function 2015-12-29 22:40:52 +01:00
Maikel de Vries 5a95f215a7 add wooden bridge 
Parts of the scripts by Pyrit and graphics by Randrian.
 2015-12-29 22:40:52 +01:00
Maikel de Vries 5b1d7d86a5 remove double initialization of wealth HUD in GoldRush 2015-12-29 22:40:52 +01:00
David Dormagen 7fce9071e3 lower interaction priority of dead Clonks 2015-12-29 18:28:23 +01:00
Nicolas Hake ae490dff11 Replace untranslated sentence in Tutorials/DE (#1522) 
Translation provided by K-Pone.
 2015-12-29 18:03:06 +01:00
Nicolas Hake 2723ef5516 Remove definition-local descriptions 
These descriptions wouldn't be displayed anywhere anyway, so we don't
need them.
 2015-12-29 17:58:44 +01: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
Clonkonaut b7b6fcfa3f Guardians of the Windmills: First draft. Unbalanced, untested, unplayable! (please test) 2015-12-28 14:43:21 +01:00
David Dormagen 58aec33841 prevent insects from being hit by projectiles (#1515) 
..which is now possible due to IsProjectileTarget being the only criterium (because OCF_Alive is not explicitely checked anymore).
 2015-12-28 11:20:58 +01:00
David Dormagen 9d947c7fb2 make IsProjectileTarget default to true for living beings 
..which eliminates the || GetOCF() & OCF_Alive everywhere. It also allows living things to explicitely disable being projectile targets.
This is a lot cleaner imo.
 2015-12-28 11:20:11 +01:00
Maikel de Vries 5a9a851ec9 remove BrickEdge object 
This was a huge pain since its existence and completely useless in its functionality...
 2015-12-28 10:21:50 +01:00
Maikel de Vries 5a02cd049f replace BrickEdge object with triangle drawing function 2015-12-28 10:21:50 +01:00
Maikel de Vries 3f7e05caa6 add a global function to draw material triangles 2015-12-28 10:21:49 +01:00
Maikel de Vries 69cf94127a removed unused Sulphur object 
Material is gone, object has no use, therefore removed. Can be added again if there is a need for it.
 2015-12-28 10:21:49 +01:00
Maikel de Vries 509bdac5bc remove unused Rebuy property from objects 2015-12-28 10:21:49 +01:00
David Dormagen 4a2643d432 elevator: make ropes match when flipped (#1517) 2015-12-28 10:21:19 +01:00
Maikel de Vries 8e8a66df76 category for non-structures to C4D_None 
These objects are not intended to be constructed as structures (the hammer menu) and should therefore not be structures.
 2015-12-28 00:31:15 +01:00
Maikel de Vries 2a4b92fbab igniter not producible in chemical lab 2015-12-27 23:24:27 +01:00
Maikel de Vries c4e9d84556 fix missing bat sound 2015-12-27 23:17:25 +01:00
Maikel de Vries 537f7c5f82 tutorial 3: fix wind and fine-tune intro 2015-12-27 17:05:36 +01:00
Clonkonaut 092b0ed540 Fixed speed upgrade for javelin. 2015-12-27 16:20:38 +01:00
Clonkonaut 2d96697a97 Fix animation error when switching to a new item. 2015-12-27 16:12:10 +01:00
Maikel de Vries b2f299cc9d tutorial 3: add description and another NPC 2015-12-27 15:13:16 +01:00
Maikel de Vries 21ffb18c4d show wealth in HUD for all worlds 2015-12-27 00:18:17 +01:00
Maikel de Vries d4a6c50d4d rope bridge can now be placed by a clonk 
There are still some things to fix/implement: breaking of bridge ropes when the posts move to far apart, animations for placement and retraction.
 2015-12-27 00:18:17 +01:00
David Dormagen 124337a5b5 boompack: fix PictureTransformation 
..too not leak out of bounding box.
 2015-12-26 18:21:51 +01:00
Maikel de Vries 42cf57afb6 improve drawing speed of ropebridge (and further clean up) 2015-12-26 15:57:30 +01:00
David Dormagen 802c85c8f8 grenade launcher, crate: fix PictureTransformation 
For the first, loading and shooting would reset it..
 2015-12-25 20:19:48 +01:00
Maikel de Vries 5ffc97f2f0 rope bridge clean up and cleaner way to create a bridge 
Now use Ropebridge->Create(x1, y1, x2, y2) to make a bridge, this allows for some more clean up in a commit to follow.
 2015-12-25 19:27:00 +01:00
Maikel de Vries c3fba77ecf remove playgrounds scenario (experimental) 
This has no use and is just a burden to keep.
 2015-12-25 19:27:00 +01:00
David Dormagen 9f2c60c94e adjusted some more PictureTransformation properties 
To either increase the size of the item, center it, or prevent it from going out of the bounding box.
 2015-12-25 19:14:52 +01:00
Maikel de Vries e4b1fe94ca clean up grapple bow scripts 2015-12-25 16:11:17 +01:00
Armin Burgmeier de3ed60aa8 Avoid built-in GL matrices for mesh rendering 
Instead, compute the projection, modelview and normal matrices explictly
and upload them as shader uniforms.
 2015-12-24 23:02:03 -08:00
Maikel de Vries 50930fec67 add usage to lorry to dump contents into landscape 2015-12-24 18:29:10 +01:00
Maikel de Vries 1bd37eb5c1 moved bat sounds to Sound.ocg folder 2015-12-24 18:01:34 +01:00
Maikel de Vries ab90c48171 title image for tutorial 8 2015-12-24 18:01:34 +01:00
David Dormagen fd53d017d9 smoke bomb: reduced amount of particles (but hopefully kept total cover by increasing size & alpha) 2015-12-24 15:14:34 +01:00
David Dormagen b278886921 catapult: fix PictureTransformation 
So that the mesh does not go outside the bounding box anymore.
 2015-12-24 15:06:23 +01:00
David Dormagen 9c3b437059 armory: add PictureTransformation 
..so that the mesh is not clipped in the production menu anymore.
 2015-12-24 14:58:31 +01:00
David Dormagen 25eb673b4c insect swarm library: slightly improved performance of MoveToTarget 
..by not using proplist access too much. I noticed the Playground would start lagging (debug build) and the profiler told me it was the mosquitos.

Before, 83% of the time in Mosquito::Activity was spent in MoveToTarget. After the change, only around 70% (multiple runs).
Is this a sensible way to measure the change?

Previous:
[14:30:22] 00186ms	Mosquito.Activity
[14:30:22] 00155ms	Mosquito.MoveToTarget

Afterwards:
[14:37:37] 00238ms	Mosquito.Activity
[14:37:37] 00172ms	Mosquito.MoveToTarget
 2015-12-24 14:44:57 +01:00
David Dormagen 8d410f1c18 burned airship: added name and description 
You can spawn the airship in the "Playground". Thus a player could notice that.
 2015-12-24 14:41:23 +01:00
Maikel de Vries 197a90a6e2 add new NPC to tutorial 3 2015-12-24 10:38:06 +01:00
Maikel de Vries 19b539a395 fix spawn menu in tutorial playground for small screen sizes 2015-12-24 10:38:06 +01:00
David Dormagen 3899add001 wind generator: changed word "efficacy" to "efficiency" 
See Maikel here http://forum.openclonk.org/topic_show.pl?pid=30564#pid30564 .
 2015-12-23 13:42:08 +01:00
Maikel de Vries 2f6dabb111 german translations for tutorial end of round dialogue 2015-12-23 10:05:24 +01:00
Sven Eberhardt 4d7033718b Fix nil pointer in hit check if shooter gets deleted during no-selfkill-check. 
Also rewrite the check using Find_InArray.
 2015-12-22 15:15:40 -05:00
Maikel de Vries 16683c0d1d add title image for tutorial 7 2015-12-22 20:26:23 +01:00
David Dormagen 2b92a4aeef wind generator: show current efficacy in interaction menu 
See http://forum.openclonk.org/topic_show.pl?tid=3222
 2015-12-22 13:59:59 +01:00
Clonkonaut 9f645e3a83 Removed the 2 diamond components for now (see discussion at #1505). 2015-12-22 13:48:35 +01:00
Clonkonaut 7f2f0f2749 Teleglove needs 2 diamonds for production (#1505). 2015-12-22 11:54:38 +01:00
Maikel de Vries 4c37584ea2 fix ladder grabbing when at the top of the ladder 2015-12-22 09:57:35 +01:00
Maikel de Vries 32bc68fdab fix letting go of wall when pulling in grappler rope (1219) 2015-12-21 22:21:32 +01:00
Clonkonaut 73c75ee627 Homebase: Upgrades for shooting strength added. 2015-12-21 21:10:24 +01:00
Clonkonaut 5d6773b656 Adjusted firing power for weapons. 
Bow, Grenade Launcher and Javelin use a local variable shooting_strength to determine range. No change here but I need this.
 2015-12-21 21:08:15 +01:00
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
Clonkonaut 0efe905c6a Removed obsolete Scenario.txt entries. 2015-12-16 01:35:41 +01:00
Clonkonaut f0a3213a82 Fix possible nullpointer in DetachObjects. 2015-12-16 01:27:33 +01:00
David Dormagen c767ad6931 added sounds for constructing and repairing (by ala) 2015-12-15 22:16:36 +01:00
David Dormagen ba880386b7 chippie added new egg crack sounds (provided by ala) 2015-12-15 20:40:27 +01:00
David Dormagen 0eb6ca9450 updated Sound credits as supplied by ala 
Some stuff was missing and some things were made specific (Monster/Growl* to Monster/Growl1-3) because there will be more sounds of that prefix.
 2015-12-15 20:39:53 +01:00
Sven Eberhardt e0bcaf8d7d Sound UI::Confirmed (instead of Objects::Connect) 2015-12-15 01:41:25 -05:00
Sven Eberhardt 1d7c5c00c8 Add some missing UI sounds. 
Still missing UI::Error.
 2015-12-15 00:25:44 -05:00
David Dormagen d81e82a7b4 large cave mushroom: fixed possible use-after-deletion 
The inherited Damage() can remove the object.
 2015-12-14 20:25:37 +01:00
David Dormagen 30524f3e98 large cave mushroom: fixed reproduction 2015-12-14 20:23:12 +01:00
Maikel de Vries f28029923c improve the moving out of basement of objects on construction 2015-12-14 18:13:18 +01:00
Maikel de Vries 1523c3f012 add growth to animal library 2015-12-14 18:13:18 +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
David Dormagen 278584578f scorched gardens: tune down meteor effects (and increase BAM) 
Because otherwise the map is completely smoked all the time.
 2015-12-13 20:48:02 +01:00
David Dormagen cfae622ba7 scorched gardens: eliminate obvious camping locations for players 2015-12-13 20:48:02 +01:00
David Dormagen 848471502f scorched gardens: disallow "Deathmatch" goal (in favour of Last Man Standing) 
Most kills do not count in this map or are suicides or environment-kills. The round is currently nearly unplayable as Deathmatch as it takes an eternity (also due to penalty points).
 2015-12-13 20:48:01 +01:00
Sven Eberhardt f12a07c447 Volcano Escape: Fix volcano bubbling sound. 2015-12-13 11:30:50 -05:00
Sven Eberhardt 1deb7e8176 Add range parameter to ShakeViewport. 
Controls the falloff distance, so you can create more localized (or more global) shakes.
 2015-12-13 11:11:01 -05:00
Sven Eberhardt 9727a5d25d Merge branch 'master' of ssh://git.openclonk.org/openclonk 2015-12-13 09:36:55 -05:00
Sven Eberhardt fbda2f1843 FightForGidl: Chippie bounty and developer msgboardcmds. 2015-12-13 09:36:11 -05:00
Sven Eberhardt b40fb83268 Move Breathing.wav and sound credits from Arena.ocf to main sounds file. 2015-12-13 09:31:31 -05:00
Clonkonaut 0b83fc2e26 Removed granite from starting cave in Deadly Grotto. 
Sometimes clonks got stuck in that right at the beginning.
 2015-12-13 13:38:42 +01:00
David Dormagen 2ca71d061b chippie: made some particle effects a bit nicer 
The death-particles match the color of the chippie better (by mixing in some less pre-modulated graphics). The egg particles are also a bit more intense (as the graphics file is already not full white).
 2015-12-13 08:20:38 +01:00
Sven Eberhardt 923abe9333 Add simple (~CR-like) corrode sound. 2015-12-13 01:37:26 -05:00
Sven Eberhardt 4de7a42ac1 DeadlyGrotto: Starting platform fix and Chest to knowledge. 2015-12-13 01:36:55 -05:00
Sven Eberhardt 40f46403ba Move sound author attribution from Objects.ocd into main Sound.ocg (where the sounds now reside). 2015-12-13 01:09:48 -05:00
Sven Eberhardt 9f6c45b832 Fix some simple missing sounds. 2015-12-13 00:47:00 -05:00
Sven Eberhardt 68c1ac8694 FightForGidl: Fix rewards, more gold, debug commands (#1494) 2015-12-12 15:09:14 -05:00
Clonkonaut 309aa5416b Melee weapons: reset clonk's running speed if thrown (#1487). 2015-12-12 20:37:42 +01:00
Sven Eberhardt 3247360bec FightForGidl: Fixes and life upgrade for clonk. 2015-12-12 13:31:38 -05:00
Maikel de Vries ef1b8b548e add frontend song (UrbanBolero) by K-Pone 2015-12-12 18:32:34 +01:00
Sven Eberhardt a65768e853 Provisional title for Defense.ocf 2015-12-12 12:22:31 -05:00
Maikel de Vries 2e297b6563 time isday and isnight return true and false if no time object is present 2015-12-12 18:15:55 +01: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