e18cee3a46
turn musket into blunderbuss
...
The musket was not a very popular and useful weapon, being inferior to the bow. It now shoots 5 weaker bullets in one shot with less damage per bullet, this might require some further testing and fine-tuning. Also the weaker bullets mean that they can be used in a gatling-gun (WIP) and in the airplane as well.
2016-08-22 16:32:48 +02:00
f3b2ff1295
Merge branch 'gamepad-controls'
2016-08-07 18:10:24 +02:00
cb8086cff7
Try to space out two items on the back better.
...
Mainly concerns scaling / hangling and it isn't perfect but better than before.
2016-08-07 03:04:04 +02:00
34af29fd7b
Show quick slot item on clonk.
...
All GetCarry* callbacks receive a parameter whether they are held in this slot and can then return a different display mode!
I also took the opportunity to restructure many scripts in a similar way.
2016-08-05 01:14:13 +02:00
2a731b2545
implement Components as a property lookup table
2016-05-21 13:34:34 +02:00
1df322b7ff
adapt objects and scenarios to new component implementation
2016-05-21 13:34:34 +02:00
21b7d86535
allow windbag usage while hanging on balloon
2016-04-17 14:51:30 +02:00
acc04b2398
Improve default Use/Throw angles when not aiming
2016-03-22 18:56:31 +01:00
29491ec3b7
Replace lots of empty parameters with proplist for Sound()
2016-02-10 13:31:16 +01:00
84218d1cbc
merge UsageHelp into Description
...
This is better for the new interaction menu, since only the description is shown for items, but it can be longer now.
2016-01-23 16:28:02 +01:00
3392921bfe
killtracing: windbag set controller for moved objects
2016-01-03 14:31:20 +01:00
509bdac5bc
remove unused Rebuy property from objects
2015-12-28 10:21:49 +01:00
0e19014740
Renamed the please-don't-windbag-me callback from NoWindbagForce to RejectWindbagForce.
2015-12-16 23:13:08 +01:00
dcfb986e34
moved sounds into subfolders
...
This completes http://forum.openclonk.org/topic_show.pl?tid=3215
2015-12-13 22:14:55 +01:00
40f46403ba
Move sound author attribution from Objects.ocd into main Sound.ocg (where the sounds now reside).
2015-12-13 01:09:48 -05:00
7f6c13084a
Register definition-local sounds into definition namespace (id::Soundname) #1185 .
...
Also move all object sounds to global Sound.ocg so they are still played.
This is to prevent naming collisions. All sounds are moved because otherwise all scripts would have to be adjusted. Also, the distinction between sounds in definitions and sounds in Sound.ocg was rather arbitrary.
It will also ensure most sounds are reloaded when sound is turned off temporarily, although that should better be fixed properly.
2015-12-07 00:08:24 -05:00
b8ed577c0f
Rotate the OGRE coordinate frame by 90 degrees in X
...
Also rotate all meshes backwards so that everything keeps working. This should
make it more convenient for modellers to create new meshes.
See http://forum.openclonk.org/topic_show.pl?pid=29410#pid29410 .
2015-10-03 11:39:08 -04:00
733a864b63
adjust value of some tools and weapons
2015-09-07 22:34:53 +02:00
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
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
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
9394909cfb
fine-tune windbag force on clonk and objects
2015-04-04 17:15:57 +02:00
3c17ebdc02
make windbag burst more gradual and slightly depend on mass ( #1297 )
2015-04-03 12:21:28 +02:00
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
a10c9316ef
renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle
2013-12-17 22:32:01 +01:00
81924b1503
adapted Air particle and usages to new particle system
2013-11-26 21:25:02 +01:00
9b9050ebf4
moved Air particle from WindBag to Effects
2013-11-26 21:25:01 +01:00
7eaef70af1
Merge branch 'master' into Controls
...
Conflicts:
planet/System.ocg/PlayerControls.txt
2013-05-26 18:19:51 +02:00
064166d09e
make most sound effects mono
2013-05-26 17:42:37 +02:00
8f752d1d9e
clean up files, make non-transparent textures high-quality JPEGs
2013-05-26 16:48:12 +02:00
2425bb2793
fix wind bag rotation and vertices
2013-05-25 14:36:22 +02:00
ba426651ad
fix wind bag rename
2013-05-25 14:36:04 +02:00
52a1d5c18e
rename jar of winds to windbag
2013-05-25 00:08:54 +02:00
Maikel de Vries