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

72 Commits (92ed1537a0e79facded3c81f50f7767962d70d6f)

Author SHA1 Message Date
Sven Eberhardt e64ec260bb Fix infinite air supply through breathing of own bubbles #1545 2016-01-09 16:15:20 -04:00
Maikel de Vries f607112db4 flame: do not tumble clonks and correct killtracing 2016-01-03 09:57:06 +01:00
Maikel de Vries 2280710d39 trajectory takes controller of ranged weapon 2015-11-29 23:35:49 +01:00
David Dormagen aec1988722 removed category "vehicle" of several helper objects 
Otherwise you can spawn them in the "Playground" scenario.
 2015-11-29 18:28:40 +01:00
Sven Eberhardt d136dc22c0 Implement landscape inflammation. 
It used to create the non-existent FLAM objects from the engine. Use a script callback to a global function that creates Flame objects instead.
 2015-10-09 16:24:16 -04:00
David Dormagen 38397aacaa bubble: fix category 
The bubble is definitely not a vehicle.
 2015-10-02 17:59:45 +02:00
Clonkonaut 6a9ef8b961 New: Cotton, Cotton Seed, Cloth, Seed Library 2015-09-18 19:44:49 +02:00
Maikel de Vries 89838bf63f add uniform sphere particle 2015-09-13 13:38:47 +02:00
Julius Michaelis 0df19491e7 Get rid of incorrect sRGB headers in png files. 
libpng >1.6 keeps nagging because of that.

Quick bash script to do so:
find . -name *.png \
| while read f; do
	n=$(pngcrush -ow -rem allb-reduce "$f" 2>&1 | grep -c 'incorrect sRGB');
	if [[ $n -gt 0 ]]; then
		git add "$f"
	else
		git checkout "$f"
	fi
done
 2015-09-12 21:27:53 +09:00
WinExploder 775820fd92 new alien meteor effect and adjusted meteor light 
squashed:
alien meteor: removed commented out stuff in script
Added new particle effect for AlienMeteor
Added missing particle for Alien Meteor :x
Changed meteor light
 2015-09-11 20:00:23 +02:00
Clonkonaut d98134332c Carry heavy objs draw special pickup symbol when holding Shift. 2015-09-11 01:08:54 +02:00
Maikel de Vries f5b7fe7498 fixed gravity calculation for trajectories 2015-09-06 13:46:45 +02:00
David Dormagen ac738735b2 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
	src/game/C4Game.cpp
	src/game/C4GraphicsSystem.cpp
	src/gamescript/C4GameScript.cpp
 2015-09-02 08:19:34 +02:00
WinExploder 6257d9d6be added item spawning functionality and better effect for meteor; added alien meteor skin 
squashed:
-Made meteor particle effect awesome
--Slight changes to rotation of Alien meteor and particles
-cleaned up alien meteor and merged item spawning functionality into normal meteor
-Fixed AlienMeteor spawn chance
-Changed AlienMeteor visuals slightly
-Made AlienMeteor Particles even better C:
-WIP: Alien meteor + particles
 2015-09-01 22:42:14 +02:00
David Dormagen 18808da543 object pickup: reworked selector effect 
The reworked effect makes it clearer that this is a meta-action and is not part of the ingame world.
 2015-09-01 13:37:44 +02:00
Maikel de Vries 572c582265 remove some more empty graphics 2015-07-20 18:11:16 +02:00
Sven Eberhardt 067c4d4e57 Light up target door on remote control by switch (#1296). 2015-05-07 20:26:16 +02:00
Maikel de Vries 61a5c88157 remove Flame graphics and clean up script 2015-03-24 21:37:51 +01:00
David Dormagen df56689946 added Armin's particle fire 
http://forum.openclonk.org/topic_show.pl?tid=3070
Only some optimizations have been added.
 2015-03-22 10:22:15 +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
Sven Eberhardt 59fe944e15 Make light effect static. 
Otherwise, it would fall down [Maikel].
 2015-01-03 13:03:52 +01:00
Tobias Zwick f5ecd4776d new function SetLightRange (replaces SetPlrViewRange) 2015-01-02 01:06:00 +01:00
Sven Eberhardt 2b997b994a Add light effect to explosions. 
Currently, all players see the light. In the future, we may want limit it to the controller of the explosion.
 2014-12-31 13:36:22 +01:00
Maikel de Vries c6802b8776 increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
Maikel de Vries 8c16a9b4d7 moved all particle definition into separate folder Particles.ocd 
This adds a bit more structure to Objects.ocd and particles could be further organized into different subfolders.
 2014-10-26 19:49:22 +01:00
Sven Eberhardt e8ee64fd1f Smoke graphics rework (#1088) 2014-07-22 22:42:33 +02:00
Maikel de Vries 6ba0164c5b removed unnecessary defcore Value entries 
Completely unneeded for structures and many other objects.
 2014-05-26 21:38:32 +02: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
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
Tobias Zwick 325053410f rename script callback UpdateTransferZone to OnSynchronized (#220) 2013-12-17 23:16:11 +07:00
David Dormagen 4126fa7021 moved Straw particle to Effects.ocd 2013-11-28 23:24:34 +01:00
David Dormagen 3b296506f5 renamed TeleGlove's "Spark1" and "Spark2" to "ElectroSpark" and adapted TeleGlove to use the new particle system 2013-11-26 21:25:06 +01:00
David Dormagen 0aeb38f137 adapted MuzzleFlash particle and usages to new particle system 2013-11-26 21:25:04 +01:00
David Dormagen 875823644d adapted remaining usages of ExploSmoke* to new particle system 2013-11-26 21:25:04 +01:00
David Dormagen 241ea62d0f added new explosion effect based on Matthi's explosion with the new particle system 2013-11-26 21:25:03 +01:00
David Dormagen 0d8603bbe5 renamed Thrust particle to FireDense to give a better impression of the actual GFX 2013-11-26 21:25:03 +01:00
David Dormagen 6c0fb4e4b8 moved Boompack/Thrust particle to Effects.ocd 2013-11-26 21:25:02 +01:00
David Dormagen 76fecd1fb4 changed ItemSpark to use the new particle system 2013-11-26 21:25:02 +01:00
David Dormagen 81924b1503 adapted Air particle and usages to new particle system 2013-11-26 21:25:02 +01:00
David Dormagen 55fc0f6dd7 removed legacy entries from SphereSpark/Particle.txt 2013-11-26 21:25:01 +01:00
David Dormagen 9b9050ebf4 moved Air particle from WindBag to Effects 2013-11-26 21:25:01 +01:00
David Dormagen 328bf6d330 updated ParkourCheckpoint to use the new particle system; renamed "PSpark" to "SphereSpark"; moved CheckPoint/PSpark to Effects/PSpark 2013-11-26 21:25:00 +01:00
David Dormagen 913f746ffe adjusted WoodChip particle and usages to new particle system and moved WoodChip particle to proper place (not only used by the axe..) 2013-11-26 21:25:00 +01:00
David Dormagen c3c48b1456 adapted Wave particle and usages to new particle system 2013-11-26 21:25:00 +01:00
David Dormagen 40b84704fe adapted Trajectory particle and occurences to new particle system 2013-11-26 21:24:59 +01:00
David Dormagen 3ffa87dd02 adapted StarSpark particle and occurences to new particle system 2013-11-26 21:24:59 +01:00
David Dormagen c17ec80039 removed particle "EngineSmoke" (use "Smoke" now) 2013-11-26 21:24:58 +01:00
David Dormagen ced4734035 removed the MaterialParticle and added missing Particles.c to System.ocg 2013-11-26 21:24:58 +01:00
David Dormagen b101a0d756 adapted all magic particles and usages to new particle system 2013-11-26 21:24:58 +01:00
David Dormagen 2139e950f1 adapted Flash particle and usages to new particle system 2013-11-26 21:24:57 +01:00