Commit Graph

15 Commits (5ffc97f2f0e1208ab631e65e528a0dfe1b038b1f)

Author SHA1 Message Date
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
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
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 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
Armin Burgmeier 0cdafc278b Transform all mesh data to Clonk reference frame on load
Instead of doing the transformation when drawing a mesh. This allows making
the OpenGL normal matrix more consistent, since it does not include the
Ogre-To-Clonk transformation, and so that the transformation does not need
to be inverted in the shader.

As a side effect, all Attach transformations were updated, since before
they were specified in the OGRE reference frame, not the Clonk reference
frame.
2015-08-18 20:30:20 -04:00
David Dormagen 196f528201 Merge branch 'master' into Controls
Conflicts:
	planet/Objects.ocd/HUD.ocd/FancyGridMenu.ocd/DefCore.txt
	planet/Objects.ocd/HUD.ocd/GridMenu.ocd/DefCore.txt
	planet/Objects.ocd/Helpers.ocd/Dummy.ocd/Graphics.png
	planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c
	planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.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
	planet/Objects.ocd/Libraries.ocd/Flag.ocd/Marker.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
	src/game/C4Game.cpp
	src/gamescript/C4GameScript.cpp
	src/gui/C4GameMessage.cpp
	src/landscape/C4Landscape.cpp
2015-06-03 22:32:36 +02:00
Maikel de Vries 34133c7076 fix grenade launcher blocking hands after shooting 2015-05-17 18:42:51 +02:00
Maikel de Vries d583746cc5 correct kill tracing for ammo launched by grenade launcher 2015-05-16 22:56:15 +02:00
David Dormagen 77e8d77921 make sure all items use the RejectUse callback 2015-03-06 10:38:22 +01:00
Julius Michaelis 1b1fa1643b Fix grenade launcher ammo check 2014-05-03 21:03:19 +02:00
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +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 2139e950f1 adapted Flash particle and usages to new particle system 2013-11-26 21:24:57 +01:00
Clonkonaut 75cb0f2030 Added grenade launcher
!!!!!!!!!!
2013-05-24 21:21:07 +02:00