Commit Graph

7173 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
Sven Eberhardt 43165e24cd Change C4AbstractApp:SetVideoMode spatial resolution parameters to signed int.
The magic value -1 is used to denote "current screen mode", but it has trouble fitting into the unsigned concept. An alternative would be to use 0 as the magic value, but that would include quite a few places (including existing configuration settings) to change.
2015-09-01 22:51:32 -04:00
Sven Eberhardt 7d9f7aee02 Fix some unused variables and integer type conversions. 2015-09-01 22:18:39 -04:00
Sven Eberhardt e5814f8841 Silence some spurious compiler warnings about partially initialized structures. 2015-09-01 21:37:16 -04:00
Sven Eberhardt 15a1a62521 Automatically deduce shift state in combo keys with Control/Shift combo. 2015-09-01 19:11:13 -04: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
Peter Wortmann 38806f4c0b Define left + right control for Mac
Higher wizardry.
2015-09-01 19:11:31 +01:00
Sven Eberhardt 0b37c96490 Fix Windows builds.
Removed some leftover gamma ramp functionality from Win32 AbstractApp.
2015-09-01 08:20:34 -04: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
Sven Eberhardt 95baaa7934 Enable usage of LeftControl, RightControl, LeftShift and RightShift as player control keys. 2015-08-31 20:50:54 -04:00
Tobias Zwick 9480ebc60c path to David's music pack 2015-08-31 23:30:28 +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 a45c865be1 Fixed preprocessor for AUDIO_TK != AUDIO_TK_OPENAL 2015-08-31 17:35:08 +01: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
Sven Eberhardt c588fe79c9 Unpack Music.ocg in Windows installer.
Currently, all music pieces are kept in memory to avoid random group access, which is a bit excessive for the larger music pack. This change will allow runtime music loads without too much delay.
2015-08-30 15:12:34 -04: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
Sven Eberhardt 49a3dd56cd Add optional music pack download to windows installer.
The download is expected to be at: http://download.openclonk.org/OpenClonkOST.ocg

And overwrites the previous Music.ocg.
2015-08-30 14:32:44 -04: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
Sven Eberhardt 3886f76bf3 Do not hang when a C4Value with prop list pointer is not cleared at game end.
Just cause an assertion in debug mode instead.
2015-08-29 13:22:55 -04:00
Sven Eberhardt 7813d87338 Fix prop list leak on game end when a sound with a modifier is currently playing. 2015-08-29 13:20:51 -04:00
Sven Eberhardt 535fc79c0f Silence a few compiler warnings. 2015-08-29 08:33:00 -04:00
Sven Eberhardt ca3ae81658 Play OpenAL sounds in front instead of rear for 5.1 surround setups [Win]. 2015-08-29 07:26:36 -04:00
Sven Eberhardt bc2259d197 MSVC/Apple CMake: Search for alext.h separately and make OpenAL extensions optional if only al.h is found. 2015-08-28 20:11:59 -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 41fd8c38b0 Ignore mission access in editor mode. 2015-08-27 22:19:09 -04:00
Sven Eberhardt da4a45c8a4 Fix mape build. 2015-08-27 21:57:08 -04:00
Sven Eberhardt b73689fc33 Make C4SoundModifier destructor virtual.
It shouldn't matter because the derived classes have no on fields or custom destruction, but silences a warning.
2015-08-27 21:51:10 -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