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

5384 Commits (7789f9586a2739057a00b22c3db5053b61b55bfe)
 

Author SHA1 Message Date
Maikel de Vries 7789f9586a Replaced IronPeak Landscape.txt with Map.c 2013-10-13 11:34:45 +02:00
Maikel de Vries 12f677f96e Fixed MAPALGO_Lines, added MAPALGO_Rotate constant, fixed documentation 2013-10-13 10:28:13 +02:00
Maikel de Vries a92331951e Introduced Map Script for Gold Rush 
Also did a few minor changes to the scenario script
 2013-10-13 09:52:11 +02:00
Sven Eberhardt bd103481e8 Fix crash when ATTACHed object detaches in Enter/Exit call. 2013-10-12 23:36:42 +02:00
Sven Eberhardt 8cf8ad00e5 Added MAPALGO_Lines. 
This might make life easier for people who transition from Landscape.txt.

For new maps, lines should probably better be drawn using MAPALGO_Poly in a loop. This gives you more control over individual line widths, angles, etc.
 2013-10-12 19:28:22 +02:00
Martin Plicht b89d505457 dynamic particles: Fix last commit 
Remove explicit inherited destructor call
	Thread stopping in C4DynamicParticleSystem destructor seems more sensible
 2013-10-12 00:34:21 +02:00
Martin Plicht 3f356031b8 dynamic particles: CalculationThread destructor calls DynamicParticles.CalculateNextStep() to make the thread code waiting on the internal event object come to an end 2013-10-12 00:12:30 +02:00
David Dormagen 23a3abe01e CreateParticleEx: added "amount" parameter 
fixed some minor documentation errors (mainly links)
 2013-10-10 17:19:20 +02:00
David Dormagen 7ffa7e2ed9 dynamic particles: fixed incorrect copying of union 2013-10-09 01:49:10 +02:00
David Dormagen fc3aaab835 dynamic particles: more code cleanup and fixes 2013-10-09 01:29:12 +02:00
Nicolas Hake 8709b841bf cmake: Also look for static libraries 2013-10-08 22:02:39 +02:00
Nicolas Hake 94b726c9ad cmake: Get FindPNG to find the correct version of libpng 
FindPNG.cmake parses libpng's version from png.h. As such, there's no
reason not to use that information when looking for the library itself.
 2013-10-08 21:23:08 +02:00
Nicolas Hake 59ee0ed090 cmake: Get FindFreetype to look for versioned libraries 
Since FindFreetype.cmake already extracts the version of freetype
from its header files, I have no idea why they're not automatically
using that info to look for the proper library name in lieu of
hardcoding a single version.
 2013-10-08 21:23:07 +02:00
David Dormagen f5ad59382d dynamic particles: some code cleanups 2013-10-08 00:08:15 +02:00
David Dormagen dc574ff76b dynamic particles: use event based waiting in favor of Sleep() 2013-10-07 23:37:01 +02:00
David Dormagen 21c387fbd2 dynamic particles: PV_KeyFrames all other values for smoothing than "0" are currently not functional 2013-10-07 20:56:57 +02:00
David Dormagen 82f68db9a8 dynamic particles: removed the size-parameter of CreateParticleEx 2013-10-07 20:56:57 +02:00
David Dormagen 01bf846eb2 dynamic particles: changed nested value providers to use member pointers instead of direct pointers; not allow size of 0 2013-10-07 20:56:56 +02:00
David Dormagen beaa394b1d dynamic particles: value provider functions can now be nested 2013-10-07 20:56:56 +02:00
David Dormagen 9ea484f027 dynamic particles: fixed wrong particle color for constant colors 2013-10-07 20:56:55 +02:00
David Dormagen 4032a161ea CMakeList: added entries for dynamic particle source files 2013-10-07 20:56:55 +02:00
David Dormagen 564b722720 dynamic particles: fixed calculation of collision vertex and allow CollisionVertex=0 2013-10-07 20:56:54 +02:00
David Dormagen 381b744229 dynamic particles: added documentation 2013-10-07 20:56:54 +02:00
David Dormagen 0282ca0bd7 dynamic particles: fixed default value of Stretch 2013-10-07 20:56:53 +02:00
David Dormagen 1cb2296a37 dynamic particles: added on collision functions PC_Die and PC_Bounce 2013-10-07 20:56:53 +02:00
David Dormagen 85e0d9788a dynamic particles: added property CollisionVertex 2013-10-07 20:56:52 +02:00
David Dormagen 9753b48f7e dynamic particles: now respect particles' aspect ratio; added PV_Speed, added property Stretch 2013-10-07 20:56:51 +02:00
David Dormagen 2e2c40db07 dynamic particles: added phase property; added parameters to PV_Step; objects now draw their particles correctly; fixed PV_Random 2013-10-07 20:56:51 +02:00
David Dormagen ba41d77e0b dynamic particles: added BlitMode property (supports additive and 0) 2013-10-07 20:56:50 +02:00
David Dormagen e43b9d4fee dynamic particles: added rotation property 
added PV_Step and PV_Direction
 2013-10-07 20:56:50 +02:00
David Dormagen 8025e7c2b0 the dynamic particle system now runs the calculations in a different thread 
added PV_KeyFrames
 2013-10-07 20:56:49 +02:00
David Dormagen 40b66d1c76 added (early demo of) new particle system which should both be faster and more flexible than the old one 2013-10-07 20:56:49 +02:00
Maikel de Vries f209d1352c Clean up airship script and use float procedure to move the ship 
This removes some functionality which I will implement later, but provides a better basis to build upon.
 2013-10-07 19:32:41 +02:00
Maikel de Vries c05875da06 Make COMD_* work more intuitive for DFA_FLOAT 
Changing from COMD_UpRight to COMD_Up now makes you go upwards instead of continuing in the diagonal direction.
This does not seem to break anything, although the C4Command.cpp code is hard to verify due to lacking comments. If this is broken I will fix it. In any case no one is using it anyways.
 2013-10-07 19:15:46 +02:00
Maikel de Vries 1118a31752 Fixed a OCScript runtime error for the lightning strike 2013-10-07 19:10:25 +02:00
Maikel de Vries 9e8dd57dbb Disabled scaling and hangling under water, fixed vertices for swimming clonk 
Please note that the dive animation is putting the clonk to low compared to its center this should be fixed by one of the OC modelers.
 2013-10-06 14:55:48 +02:00
Sven Eberhardt fbdd4f7d6b Fix double-add of flags to linked flags list if flags make up a circle with an even number of elements >2. This would cause an error message somewhere in the power system. 
e.g.:
for (var a=0; a<360; a+=360/18) CreateObject(WindGenerator,Sin(a,450)+500,Cos(a,450)+500,player);

The algorithm is still weird. Why are three lists needed to traverse the graph of connected flags?
 2013-10-06 11:47:32 +02:00
Maikel de Vries 7f9f40a1f5 Renamed Settlement.ocf to Missions.ocf 2013-10-05 17:39:14 +02:00
Sven Eberhardt 2f37347b09 Auto-unstick produced vehicles from landscape by moving them upwards a bit. 
Thanks to Ann for reporting this!
 2013-10-05 16:11:03 +02:00
Martin Plicht 7ba5333f8b mac: C4ConsoleGUI: Implement SetInputFunctions 2013-10-05 13:19:59 +02:00
Martin Plicht 31119f1b88 cmake: Add Worlds.ocf to OC_C4GROUPS 2013-10-05 13:19:59 +02:00
Maikel de Vries f94a306f55 Move scenarios Gold Rush, Iron Peak, Krakatoa and AcidGoldMine to Worlds.ocf 2013-10-05 11:07:49 +02:00
Martin Plicht cc11006f22 mac: Fix build 2013-10-04 22:34:57 +02:00
Maikel de Vries b2ac11c326 Fixed Loc_Wall behavior in FindLocation.c 2013-10-04 20:58:47 +02:00
Maikel de Vries d280bff611 Fixed cloud raining and lightning in tunnels 2013-10-04 17:16:44 +02:00
Maikel de Vries c27d6c3b79 Fix home base material for Gem Grabbers 2013-10-04 16:52:20 +02:00
Maikel de Vries 7de2d7f617 Add new scenario Gem Grabbers to Worlds.ocf 2013-10-04 15:39:37 +02:00
Maikel de Vries ae6bafe292 Added scenario folder Worlds.ocf 
We are starting to have too many settlement scenarios for one folder. This folder will contain all settlement scenarios with simple goals like mining, production or expansion. And these scenarios should all have dynamic maps and should be playable even after goal completion.

I will add the scenarios Gold Rush, Iron Peak and Conquest of Krakatoa and maybe other later, once I am done adjusting them.
 2013-10-04 15:38:33 +02:00
Maikel de Vries 1ca9de2f51 Fixed cloud issues: shading, alpha, movement, lightning 2013-10-04 12:48:01 +02:00
Maikel de Vries 0c497d2b95 Airplane can be produced at the shipyard 2013-10-04 10:46:31 +02:00