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

4308 Commits (c0befc6ba08776e2cd9ee173ea236942d003a219)

Author SHA1 Message Date
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