Commit Graph

7839 Commits (1ac897127f05e35c58838a93af612845449461fd)
 

Author SHA1 Message Date
Sven Eberhardt 1ac897127f Add farming objects and knowledge to Gem Grabbers to be able to build airship. 2015-12-06 15:44:49 -05:00
Sven Eberhardt 54da061196 Airship needs cloth instead of rope. 2015-12-06 15:44:49 -05:00
David Dormagen 7a0b170075 interaction menu: made menu-rejection errors a callback
Objects that prevent interaction just in some situations (hostility, dead Clonks, ..) should always be shown in the interaction menu (because otherwise players might suspect bugs) and TELL the player WHY they want no interaction.
For that, they might need to specify own error messages.

Known issues:
* The "OnOpen" callback is done even if interaction is disallowed, however just simply removing the callback might not be sufficient, because we might get a callback disbalance if objects change their attitude while the menu is opened and the menu is closed again.
* Some objects (which should) do not include the Library_Ownable. However, we have no base melees atm and since this might introduce new errors, postpone it to 8.0.
2015-12-06 21:28:03 +01:00
j 8e7326e0f9 Title images for two parkours. 2015-12-06 19:56:17 +01:00
Armin 7ea79e539f Add Sayneds support of cyrillic letters. The default Clonk font can now display russian words. 2015-12-06 19:56:02 +01:00
David Dormagen c02cce2c0c interaction menu: allow transfer of items only into IsContainer (#1484) 2015-12-06 16:55:48 +01:00
Sven Eberhardt 6bcb6bb53e Prevent interaction menu on dead clonks (#1483). 2015-12-06 01:50:38 -05:00
Sven Eberhardt 132da18dc6 GoldenMountain: Add cotton plants and loom and cloth plans to allow building of wind bag.
Wind bag was in the construction plans but you could not build it because there was no way to get cloth.
2015-12-06 01:19:06 -05:00
Sven Eberhardt 7cf09196c6 Volcano Escape: Draw underground lava.
It was initially set to sky to make lava glow. But now lava glows by itself.
2015-12-05 21:21:30 -05:00
Sven Eberhardt b4e0b7d7d1 FightForGidl: Eliminate enemy player after round end.
For the evaluation dialogue.
2015-12-05 21:14:09 -05:00
Sven Eberhardt 6b5bd38cc8 Fix aim cancellation by spear AI (#1474) 2015-12-05 21:13:37 -05:00
Sven Eberhardt d48f590dfb Fix conversion buffer access for DrawMaterialQuad with DMQ_Bridge (#1478). 2015-12-05 14:41:56 -05:00
Sven Eberhardt 85bbd55eeb Move Guardians of Windmills mission out of storyline section 2015-12-05 14:41:55 -05:00
Clonkonaut 6cd2faf582 Disabled wealth display by default (#1425).
Can be shown by using GUI_Controller->ShowWealth(). Did that for GoldRush but see bug #1477.
2015-12-05 12:42:52 +01:00
Maikel de Vries 042ba9a164 speed up finding flagpole for position 2015-12-05 11:45:43 +01:00
Sven Eberhardt 2ad8c75d37 docs: Remove .mid from allowed music extension (#1476) 2015-12-04 19:08:16 -05:00
David Dormagen 4f4120b22b pickaxe: made blue sparks when hitting hard material stronger
To satisfy Matthi.
2015-12-05 00:23:54 +01:00
Sven Eberhardt d758c85028 Add max memory time to music resume feature (#1461) 2015-12-03 19:17:41 -05:00
David Dormagen 973ceed23f fix volcanoes leaving behind sky (#1465)
DrawMaterialQuad was probably changed at some point and forgotten here. grep tells me we don't have any other DrawMaterialQuad-calls remaining where a boolean value is passed as the old "fSub" parameter.
2015-12-03 22:13:29 +01:00
Sven Eberhardt cbb7b0ba2c Log music system info if Config.Sound.Verbose is enabled. 2015-12-02 23:08:50 -05:00
Sven Eberhardt cc12230d56 Add "immediate" parameter to SetPlrView and ResetCursorView script functions to force viewport scroll position to the target. 2015-12-02 22:11:28 -05:00
Sven Eberhardt 3fdf7142b5 Fix custom viewport zoom initialization done in InitilizePlayer in fullscreen mode. 2015-12-02 21:24:57 -05:00
Sven Eberhardt 46a7d653d8 Fix two typos in comments. 2015-12-02 20:27:39 -05:00
Sven Eberhardt 8c3e61c3da Fix NO_OWNER global sound modifier on savegame resume (#1462) 2015-12-02 20:27:38 -05:00
David Dormagen 2bc40963c0 Hideout: added spawning effect
The Clonks' positions are now a bit random, too. I doubt that will have a noticable tactical influence on the game.
Buut it probably looks cooler when the effects are not all in one place.
2015-12-02 22:43:56 +01:00
David Dormagen 34291a0d98 respawn points are called "Respawn" instead of "Flagpole" now
This should give players a hint about what they are used for without actually having to die first.
2015-12-02 22:11:23 +01:00
Nicolas Hake 812e40f0d0 Denumerate sound modifier values after player reload (#1462)
Deserializing players neglected to turn an enumerated proplist back into
a live one. This would explode later during player initialization when
someone didn't check that the deserialized value was a real, live
proplist.
2015-12-02 16:55:04 +01:00
David Dormagen fb3a1468a0 added texture for gold idol
The idol was once just a temporary placeholder that was to be replaced immediately. But apparently, we won't replace it anytime soon.
So we should at least give it a basic texture for the next release...
2015-12-02 13:55:39 +01:00
David Dormagen 43d10642f1 fix HP bar offset
The HP bar was only centered over the object IFF the object's first vertex was in its center. This was not necessarily true for buildings (e.g. targets in GIDL).
Now the vertex position is taken into account when positioning the bar.
2015-12-02 13:05:19 +01:00
David Dormagen fdeccdf83d make GIDL targets damagable by AI (#1464)
The no-friendly-fire effect also protected the targets from being damaged by AI.
2015-12-02 13:03:51 +01:00
David Dormagen 178a91f338 moved some functions that depend on Object.ocd from the global System.ocg to Objects.ocd/System.ocg (#1473)
The global System.ocg should not cause any errors even if Objects.ocd is not loaded. This means that any functions that depend on certain definitions (e.g. FindLocation) will just not be available.
2015-12-02 12:46:02 +01:00
Nicolas Hake 871811eac8 Move some private shape calculating functions out of C4Landscape
None of these functions require access to any state of C4Landscape, and
they've only been used from within C4Landscape.cpp, so don't need to be
part of the header.
2015-12-02 01:48:13 +01:00
Nicolas Hake e8a90e7d23 Temporarily remove solid masks before clearing landscape (#1472)
When clearing parts of the landscape, solid masks must be disabled
beforehand because we don't want to remove the actual solid mask itself.
Theoretically we should also temp remove solid masks before DigFree,
ShakeFree, and all of the other landscape modifiers, just in case
someone overrides the Vehicle material with stupid values.
2015-12-02 01:41:47 +01:00
Nicolas Hake 6738ef1f4c Clear object pointers in inactive objects (#1238, #1452)
Instead of iterating through the main object list twice to check for
pointers, iterate through both the main list and the inactive list.
2015-12-01 23:46:46 +01:00
David Dormagen f627bc13d3 treasure hunt: fixed some dialogues 2015-12-01 20:57:08 +01:00
Clonkonaut f8ddc7b313 Documentation for the second parameter of EliminatePlayer (#1261). 2015-11-30 23:49:15 +01:00
David Dormagen f562a688c4 Playground: try to unstuck spawned vehicles or the Clonk very scrupulously (#1442) 2015-11-30 21:51:08 +01:00
Nicolas Hake eb22e357b1 Win32: Prevent Alt key presses from opening the system menu (#1468)
Pressing the Alt key enters the menu modal loop, which takes control of
the thread that everything happens on. As a quick fix, we'll suppress
this loop for simple Alt key presses, but this will still happen when
the system menu gets opened by Alt+Space or clicking the icon in the
window's title bar.

A more permanent solution would be to detach the message loop from
everything else, by having rendering etc. run in a separate background
thread.
2015-11-30 21:33:36 +01:00
Clonkonaut df45b58bbd Mushrooms burn (#1362).
Will no longer 'grow' in lava like the bug report stated.
2015-11-30 18:41:19 +01:00
David Dormagen 2e7f44f141 made cotton seed's mesh use transparency (#1456) 2015-11-30 10:18:20 +01:00
David Dormagen 7f5e85a82a interaction menu: do OnClose-callbacks if the Clonk/object moves out of range (#1466) 2015-11-30 10:17:31 +01:00
Maikel de Vries 2280710d39 trajectory takes controller of ranged weapon 2015-11-29 23:35:49 +01:00
David Dormagen 6a6e812a45 smoke bomb: changed smoke effect
It looks more like a smoke screen now and less like little circle-shaped sprites.
2015-11-29 22:30:13 +01:00
David Dormagen af9fe24dac AimManager: catch a nil-pointer
..which could happen if you RemoveObject()'ed an item from the Clonks hands.
2015-11-29 22:25:38 +01:00
David Dormagen 987d13bcae hideout: moved flag bases 4px higher
They were in the ground. Now the aren't.
2015-11-29 19:40:30 +01:00
David Dormagen ccb9783e43 made capture-the-flag flags brighter
They are the most important item of their respective rounds. They need to stand out from the background as well as possible.
2015-11-29 19:39:57 +01:00
David Dormagen 714ad4bc7b elevator case: do not throw error on ControlUp/Down without elevator
Which can hopefully only happen when you spawn the case in the "Playground" scenario. Or maybe as a decoration object.
2015-11-29 18:30:45 +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
Maikel de Vries 47ce50d364 status symbol category none instead of vehicle 2015-11-29 11:45:02 +01:00
Matthias Rottländer 5503bc6268 * New everrock texture 2015-11-28 19:12:58 +01:00