Commit Graph

3676 Commits (Controls)

Author SHA1 Message Date
David Dormagen c3c243d31e collection: utilize new key combination functionality; also put collection on shift
Shift instead of Ctrl is more consistent with dropping items, which is on Shift+Number. Incidentally you can now also decide to drop an item to make space for a new one DURING the collection process. Really rather rad.
2015-09-02 23:21:06 +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
David Dormagen cc876e01ce moved LaunchMeteor into more general Objects.ocd/System.ocg folder
This is to prevent errors on including objects that contain global functions. I believe this will be needed more in the future, thus there is now a new System.ocg folder.
2015-09-01 22:55:00 +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
Tobias Zwick f57bfa089c revert workaround made for #1368, doesn't work on (certain) Intel chipsets. Instead, limit the maximum bone count to 64 so to meet the limit of 1024 uniform components by certain graphics cards (#1285) 2015-08-31 19:28:00 +02:00
Peter Wortmann 30857e835e Shader gamma implementation
In comparison to the old system, this is a downgrade - instead of being
able to set a full color mapping by gamma ramp, we now get just a value
per colour channel.

Upside is that we do not need to play around with the global gamma ramps
any more, which was arguably the wrong way to do it.

This commit will likely break everything that has been using gamma so far.
2015-08-31 17:35:08 +01:00
Peter Wortmann 6a016f807d Alternate light drawing, v2
This is now a "mix" between the original and the alternate drawing
strategy, hopefully combining its strength. In detail:

1. Intensity of light sources aren't added together anymore. Instead,
   the brightest light source decides end brightness pre-smoothing.

2. For smoothing, we update normals more quickly than brightness. This is
   the main change relative to the first "alternate" version. Actually
   quite embarassing that I didn't think of this solution before %)

This is still a tad busier than what we have currently, simply due to
normals changing around more quickly. On the plus side, Clonk faces
shouldn't go dark anymore while walking, so that's something.
2015-08-31 17:35:08 +01:00
Maikel de Vries 37bd5abf87 fixed a wrong call to Contained() 2015-08-31 01:56:31 +02:00
David Dormagen e9a69c4252 collect objects solely via CTRL now
The player can also choose which object to collect by holding CTRL and navigating left/right.
2015-08-30 20:39:50 +02:00
Julius Michaelis 2a9b481087 Add a new variant of vehicle that can be passed from below but be walked on from above. 2015-08-30 22:19:36 +09:00
Sven Eberhardt 05a78138a3 Add sound and music ambience object.
Also tagged the existing music as "day". Only enabled in the first three missions for now.
2015-08-29 14:11:00 -04:00
Clonkonaut 6ad8471101 Nicer hit effect for zaphive. 2015-08-28 16:30:44 +02:00
Clonkonaut 247c2d3fb4 Added to organic hit sounds by ala. 2015-08-28 16:20:16 +02:00
Clonkonaut 86a68f8d9f Loom: renamed animation "my_animation" to "Working" 2015-08-28 16:17:56 +02:00
WinExploder 333bb1e771 Loom: Added Model with animations 2015-08-28 13:47:48 +02:00
David Dormagen a9cc9df8a0 chippies: minor fixes
- exchanged missing function for FindLocation
- creature owner only if NO_OWNER before
- added area-parameter to Chippie_Egg::Place)
- creature control: don't break when object is removed after creation
2015-08-28 13:27:08 +02:00
Sven Eberhardt 44a396497c Fix tree growth in skylands scenario (#750) and rework alt tree texture.
Tree growth now implemented using an overload of the grwoth function. Also made the alternate tree skin in skylands a bit more colorful
2015-08-27 23:29:06 -04:00
Sven Eberhardt 6ab6a1ac3c Add script interface for some EFX sound modifiers. 2015-08-27 21:44:23 -04:00
David Dormagen d4154ab1eb animals: added chippie 2015-08-27 22:27:36 +02:00
David Dormagen ce3d7e4227 added functionality for an AI player as the owner of animals
Animals should use SetCreatureControlled() and Find_OCF(OCF_Alvie) and Find_Hostile in their prey checks. Then, a scenario author could easily decide to make certain animals not attack the player. Or even animals attack each other. That's cool.
2015-08-27 22:26:37 +02:00
Armin 36c0d84c03 Add stalactite fragments
Conflicts:
	planet/Objects.ocd/Environment.ocd/Stalactite.ocd/Script.c
2015-08-27 21:42:59 +02:00
David Dormagen 06df6885ce stalactite: added sound for dropping water and sound/particles for hit 2015-08-27 21:12:27 +02:00
David Dormagen 250a20ccfc stalactite: updated stalactite model and improved placement & renamed "Stalactite1" to "Stalactite" 2015-08-27 19:25:22 +02:00
Armin 07cc668f46 stalactites: dynamic texture color & fix water sources being out of solid material 2015-08-27 19:24:40 +02:00
WinExploder b044315526 Added stalactite Object 2015-08-27 19:22:38 +02:00
Clonkonaut 2d223188cd Fix sawblade rotation. 2015-08-24 00:10:30 +02:00
Clonkonaut 6bcdfa3525 Added Zaps + hive.
Necessary changes to swarm library: SwarmCall
2015-08-24 00:10:30 +02:00
Clonkonaut bd5e127b22 Added GetTreetopPosition for placement in treetops.
TODO rework coconut to utilize this.
2015-08-24 00:10:29 +02:00
Clonkonaut c7df46762d Swarm library includes insect library. It's needed anyway. 2015-08-24 00:10:29 +02:00
Maikel de Vries ddd49f9b31 add lantern and smoke bomb as weapons to dark mine 2015-08-22 19:34:12 +02:00
Maikel de Vries d363fda9c1 add smoke bomb
Graphics by Win, sound by ala & from freesound.
2015-08-22 19:27:22 +02:00
Clonkonaut b2cc853887 New hit sound for the lantern. Also, general glass break sound. 2015-08-22 10:45:44 +02:00
David Dormagen 0d102d2184 explosion: fix nil-pointer when object removes itself on death
After doing damage to an object, you cannot be sure that the object persists. It might have been blown to smithereens. So, catch that case.
2015-08-20 13:47:27 +02:00
Maikel de Vries a63e8f4955 improve the AI testing scenario 2015-08-19 08:11:43 +02:00
Maikel de Vries 49effe4622 let AI handle the musket and fix tracking riding clonks 2015-08-19 08:11:43 +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
Maikel de Vries 2aa753c6a5 acid gold mine: map script and scenario parameters
The landscape and difficulty settings still require some fine tuning.
2015-08-18 18:41:26 +02:00
Maikel de Vries a61a91798b move DrawMaterial to map library functions 2015-08-18 12:36:59 +02:00
David Dormagen b3f81ef3ed increased lava damage
The lava now does not only do the damage via the fire system but also does some direct damage. Further increasing it might be good. Test it now.
2015-08-16 23:14:16 +02:00
David Dormagen d1ceafea16 interaction menu: added possibility to repair a damaged building 2015-08-16 17:40:28 +02:00
Sven Eberhardt 5e03c9a8db The Raid: Minor fixes, decoration, dialogue and map adjustments. 2015-08-09 23:26:56 -04:00
Sven Eberhardt 53d1ac8eac Fix angle adjustment for instant-flight command of airplane.
It was wrong for planes flying to the left, which caused planes to fly too low in the Raid.ocs intro.
2015-08-09 23:13:32 -04:00
Sven Eberhardt f873e81bf0 Fade airplane sound pitch when motor is turned on and off. 2015-08-09 19:28:07 -04:00
Sven Eberhardt 042d00c1d2 Fade airship sound pitch when motor is turned on and off. 2015-08-09 19:04:29 -04:00
David Dormagen d8b99b8a41 interaction menu: visually disable containers on one side if they are already open on the other 2015-08-07 16:48:28 +02:00
David Dormagen a27888a623 the Clonk now performs a roll when pressing [down] (even when walking)
People have complained that the implicit roll (if you don't know how it worked) could lead to death and severe injury. The roll is now explicit. Always and everywhere.
It doesn't have any other effect though; todo: reduce hit area and/or squash vertices of Clonk during roll
2015-08-07 16:12:41 +02:00
Armin Burgmeier edc611f3b1 Add double-sided lighting also for ambient lights 2015-08-03 22:44:04 -04:00
Maikel de Vries 5126e86315 fix wallkit in Krakatoa (#1363) 2015-08-03 20:18:54 +02:00
David Dormagen 36544bd56c Merge branch 'master' into Controls
Conflicts:
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c
	planet/Objects.ocd/Vegetation.ocd/Branch.ocd/Script.c
	planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c
	planet/System.ocg/FindLocation.c
2015-08-02 19:24:04 +02:00