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

41 Commits (1bb728b04728746d0ea99181bf0e2bc639bfe5bc)

Author SHA1 Message Date
Nicolas Hake 1bb728b047 Fix variable_out_of_scope warnings in Objects 2018-07-23 12:12:23 +02:00
Maikel de Vries 0bac4579ef fix other script usages of SimFlight 2018-01-19 14:37:21 +01:00
Julius Michaelis 2931886438 Limit the number of times Cloud->Place retries. 
Initialization did not terminate in planet/System.ocg/Template.ocg/DefaultWorld.ocs/.
 2018-01-08 23:12:52 +01:00
David Dormagen f10b0854e8 fixed slow-mo rain (#1958) 
Yes, someone just had the "slow-mo" switch on. I also replaced the usage of the "RaindropSmall" particle (which was a stretched dot) with an actual stretched dot.
 2017-12-27 14:41:38 +01:00
Lukas Werling 6fc5c76a2c Rewrite Cloud positioning 
The old code did some obviously wrong things like calling functions
expecting relative coordinates with GetX()/GetY(). It also sometimes ran
into an infinite loop in Cloud->Place(). I fixed those issues and
cleaned up the rest to be nicer, hopefully without changing
functionality.
 2017-12-26 14:14:17 +01:00
Sven Eberhardt 5330c53e38 Fix cloud scenario saving 2017-03-05 12:30:25 -05:00
Nicolas Hake 7284d65685 Remove unintentional semicolon after if() 
Also changed some other instances of the if(); pattern to use an empty
block in order to suppress the new warning.
 2017-02-05 14:22:09 +01:00
Mark 44b2fda439 Cloud: Insert snow only if allowed to 2016-10-14 18:43:35 +02:00
Mark 0996c6e31e Cloud: Play sound at rain impact location 
The cloud does this with a helper object.
 2016-10-11 21:51:32 +02:00
Mark 7df951fb65 Cloud: Mode without material insertion 
Added a mode where the cloud does not extract or insert any materials, so that the rain is just a decorative element of the game.
 2016-10-11 21:19:21 +02:00
Maikel de Vries 202f2c49df fix snowing for cloud 2016-04-03 19:11:00 +02:00
Lukas Werling 43177e8951 Fix rain failing to insert material 2016-03-23 16:02:36 +01:00
Lukas Werling 634ec69052 Fix invisible water splash particles 2016-03-23 13:32:44 +01:00
Lukas Werling c9c64a942e Improve rain drop performance 2016-03-23 13:32:43 +01:00
Lukas Werling a309f91af0 Cloud: Improve smoking condition (e.g. lava hits water) 2016-03-23 13:32:43 +01:00
Lukas Werling cb64c83bd5 Add Cloud::SetVisualRainStrength for adjusting particle rain strength 2016-03-23 13:32:43 +01:00
Lukas Werling c0275011b3 Add sound (by ala) for water and acid rain 2016-03-23 13:32:36 +01:00
Lukas Werling f5ce3dc12b Cloud: Performance optimizations around particles 2016-03-23 13:30:13 +01:00
Lukas Werling f88d0659da Add real snow to snowing cloud 2016-03-23 13:24:18 +01:00
Lukas Werling 7661b13ba6 Move particle proplist definitions to global Particles.c 2016-03-23 13:24:18 +01:00
Lukas Werling 292418a964 Add Randrian's rain hit effects 2016-03-23 13:24:18 +01:00
Lukas Werling 021ecb0b2e Integrate Randrian's rain particles into Cloud.ocd 2016-03-23 13:24:18 +01:00
Mark 931705d339 Change cloud color 
Clouds can change their basic color with SetCloudRGB(r, g, b) now, for more ambient effects. This does not mess with the cloud shading, because the color is scaled appropriately.
 2016-01-27 05:47:57 +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
Sven Eberhardt 26085a1824 Fix rain change from water to snow (not ice) when it's cold. 
Also optimize the cloud a bit since it was the top element on the script profiler.
 2015-09-19 21:22:56 -04:00
Sven Eberhardt 369be20860 Fix cloud clipping (#1404). 2015-09-19 21:22:55 -04:00
David Dormagen bd04722553 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
	src/game/C4GraphicsSystem.cpp
	src/game/C4GraphicsSystem.h
	src/game/C4Viewport.cpp
	src/gui/C4GameMessage.cpp
 2015-01-15 19:57:01 +01:00
Mark 850bf1b9d4 CreateObject/CreateObjectAbove (#1214) 
Renamed CreateObject() to CreateObjectAbove() and replaced all occurrences in script files.
Added CreateObject(), the function may need a rewrite though, see comment in code.
Updated documentation
 2015-01-11 19:02:03 +01:00
David Dormagen f89b8c8319 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/DefCore.txt
	planet/Objects.ocd/Libraries.ocd/PowerConsumer.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/PowerProducer.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/System.ocg/ClonkControl.c
	src/gui/C4MouseControl.cpp
	src/landscape/C4PXS.cpp
 2014-12-25 15:24:19 +01:00
Maikel de Vries 85646c7a8e removed cloud vertices 2014-10-18 18:41:56 +02:00
Maikel de Vries 83930ee27f fixed cloud movement in ironpeak(#1149) 2014-10-18 12:52:06 +02:00
David Dormagen 06ac00ace8 Merge branch 'master' into Controls 
Conflicts:
	CMakeLists.txt
	Makefile.am
	planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
	planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	src/control/C4Control.cpp
	src/control/C4Control.h
	src/gamescript/C4GameScript.cpp
 2014-02-15 14:44:57 +01:00
David Dormagen 4c740e8894 the Cloud is not C4D_Vehicle anymore for obvious reasons 2014-02-15 14:40:08 +01:00
Sven Eberhardt 5094cc5c1b Reworked "Save as scenario" option in editor to write a script file instead of Game.txt. 2013-12-27 17:10:09 +01:00
Maikel de Vries d280bff611 Fixed cloud raining and lightning in tunnels 2013-10-04 17:16:44 +02:00
Maikel de Vries 1ca9de2f51 Fixed cloud issues: shading, alpha, movement, lightning 2013-10-04 12:48:01 +02:00
Tobias Zwick 117e9ec90f make day->night->day fading smoother, 
add sunset/dawn fade in between,
clouds don't turn invisible in the night
 2012-10-28 18:48:02 +01:00
Maikel de Vries cdee3ea748 Reduce rain in Goldrush 
Oh and yes Ringwall don't mess up the clean scripts I wrote and read the code style guidelines
 2012-10-20 13:54:00 +02:00
Sven Eberhardt 65b09ca9e2 Skylands: Some minor tweaks 2012-10-14 01:07:32 +02:00
Charles Spurrill e1c511311e Clouds darken at night; variable 'blueness' of night relative to moon phase 2012-05-22 13:16:48 -07:00
Maikel de Vries 32baccea4f Clouds are created via definition calls in scenarios 
This to get rid off NoRain.c appendtos, see scenarios for examples. Maybe we should also use this interface for other environment objects.
 2012-04-03 19:13:07 +02:00