Commit Graph

2684 Commits (6681a2cd7daf5c65effdc64985651dddfea47538)

Author SHA1 Message Date
Sven Eberhardt b01ee77095 Fix Clonk skin selection for skin==0 2012-10-15 10:55:40 +02:00
Tobias Zwick 59f112a0f4 fix: pickaxe always blasts free material, also if the center point of the blast is free 2012-10-15 10:40:02 +02:00
Felix Wagner 45a4651b67 Reenabled default damage reaction to coniferous (#820) 2012-10-15 01:58:00 +02:00
Felix Wagner a31f4733af Tutorial 3: Weapons come back when destructed (#553) 2012-10-15 01:14:58 +02:00
Tobias Zwick c6641c9850 nicer lightbulb graphics 2012-10-14 21:51:16 +02:00
David Dormagen 2631e05daa added burned graphics for the Coniferous 2012-10-14 21:51:21 +02:00
David Dormagen 7ac3c30124 ignore successive calls to Library_PowerConsumer which do not change states 2012-10-14 20:30:15 +02:00
Tobias Zwick d7da19b031 fix needed material in construction sites only displayed for first player 2012-10-14 20:00:43 +02:00
Maikel de Vries 40bdd0e995 Fixed MtBrame catapult creation 2012-10-14 19:49:02 +02:00
David Dormagen 94c85d8609 hopefully fixed a script error related to animation replacements
the shield replaced the animation "Walk" with an array of two animations. Then when GetWalkAnimationPosition was queried from FxIntWalkTimer:476 it threw an error at GetAnimationLength
2012-10-14 19:39:40 +02:00
David Dormagen 06ab4fc109 shield: possible to walk backwards now 2012-10-14 19:37:02 +02:00
Julius Michaelis 8d2c6ca599 Fix language strings for IDS_MSG_FULLSCREEN_DESC 2012-10-14 19:13:02 +02:00
David Dormagen 4b3b56ff22 added new model for armory with texture 2012-10-14 16:56:49 +02:00
Maikel de Vries 7a280e85fc Added ropeladder to toolsworkshop products 2012-10-14 15:50:07 +02:00
Felix Wagner 88bdfcd584 Removed unsupported entries from the sickle' material 2012-10-14 15:49:26 +02:00
Felix Wagner b71efe70b3 Moved FindHeight to System.ocg/Math.c 2012-10-14 15:45:20 +02:00
Felix Wagner 4235b9f42e Added sickle for harvesting
New callback in the plants library: SickleHarvesting
Set to false to allow harvesting via interact (e.g. Mushroom, Lichen)
2012-10-14 15:43:00 +02:00
Maikel de Vries c29ada46bb Make chests in arenas indestructible 2012-10-14 15:04:23 +02:00
David Dormagen 380c2de527 fix jump strike effect not fading out when dying mid-air 2012-10-14 14:47:14 +02:00
Felix Wagner ce7574c24c Tutorial 2: added catapult, equipment is restored properly
Removed cannon, added catapult
Added EquipmentRestore effect to grappler and ropeladder
2012-10-14 14:43:38 +02:00
David Dormagen efa9aea411 power system indicators fade out a lot slower and display quick changes more consistently 2012-10-14 14:32:52 +02:00
Tobias Zwick a123285269 back to the rocks -> beyond the rocks 2012-10-14 14:18:41 +02:00
David Dormagen 8c20d46818 fixed duplicate line in description of Overcast
hah, commit 5000!
2012-10-14 14:17:12 +02:00
Maikel de Vries b4d02a44d0 Fixed bow bug: arrows stuck immediately after shooting 2012-10-14 14:10:09 +02:00
David Dormagen 163ccd8e75 fixed Scoreboard_Relaunch's use of the conditional function of Scoreboard_Death.
This might fix the relaunch elimination bug.
2012-10-14 14:07:46 +02:00
David Dormagen 7a3173da16 fixed sword jump-effect not disappearing when jumping into liquid 2012-10-14 14:06:23 +02:00
Tobias Zwick 9df0792180 fix some strings in tutorial 5 2012-10-14 13:26:40 +02:00
Tobias Zwick 63fcec3e8c fix controls: interact + down = ungrab doesn't work as intended:
confusing situations can arise, e.g. while shoving a tree, one can use the foundry
2012-10-14 13:26:30 +02:00
David Dormagen 47e699d4ea fixed KotH stars' color 2012-10-14 13:47:03 +02:00
Sven Eberhardt 8b6e697339 PowerConsumer: NoPowerNeed-effect can be used to exclude some buildings from energy need 2012-10-14 13:32:25 +02:00
Maikel de Vries adfb38475c Fixed Arena scenario descriptions 2012-10-14 13:26:48 +02:00
David Dormagen 1d4c38a09d fixed possible null-pointer in ScorchedGardens' meteor 2012-10-14 13:20:56 +02:00
David Dormagen ee1a8e8ce9 fixed deathmatch description in case that only one player is remaining 2012-10-14 13:20:37 +02:00
David Dormagen bfe14b492e fixed KotH goal on-click message 2012-10-14 12:56:08 +02:00
Tobias Zwick f22fe90484 Nachtfalter's new moon 2012-10-14 01:38:09 +02:00
Tobias Zwick 2a228b11ed remove non-existing control def 2012-10-14 01:20:52 +02:00
Tobias Zwick c51ffb5a26 fix descriptions in control dialog 2012-10-14 01:04:49 +02:00
Sven Eberhardt 65b09ca9e2 Skylands: Some minor tweaks 2012-10-14 01:07:32 +02:00
Sven Eberhardt 3ee51eaf8e Skylands: Fixed LiftTower (for now....) 2012-10-14 00:00:09 +02:00
David Dormagen ff464a1006 fixed Height entry in Coin symbol 2012-10-13 22:43:24 +02:00
David Dormagen 63669e6f77 Telekinetic Gyroglove renamed to Tele Glove 2012-10-13 22:43:04 +02:00
David Dormagen e0d9a682e6 flag is now static-back on construction; no falling down anymore 2012-10-13 22:42:41 +02:00
David Dormagen b96cec3f26 power system uses small light bulbs as progress bar 2012-10-13 22:42:08 +02:00
Felix Wagner e2ee7a59bd Descriptions corrected and synchronised 2012-10-13 22:25:25 +02:00
Maikel de Vries b7b6dd2111 Move expansion goal from krakatoa to goals 2012-10-13 19:05:57 +02:00
Maikel de Vries 3be05409de Change the forest creation in GoldRush a bit 2012-10-13 18:57:02 +02:00
Tobias Zwick 374e86d632 fixed tutorial 01 for current controls 2012-10-13 18:58:41 +02:00
Tobias Zwick 48a7fc7968 make highres landscape default 2012-10-13 18:41:25 +02:00
Sven Eberhardt 8bd2beb164 Increase Clonk collection radius downwards (#810) 2012-10-13 18:47:31 +02:00
Maikel de Vries 89b0d5472c Sawmill only takes on tree at a time
The sawmill is not a storage for trees
2012-10-13 17:41:13 +02:00
Maikel de Vries df0096cd57 Order scenarios inside their folders
There is no logic behind this ordering
2012-10-13 16:45:13 +02:00
Tobias Zwick 42011a9442 fix #757 - waves are blue again now 2012-10-13 16:27:15 +02:00
Armin Burgmeier cf159068b3 Fix warning about undefined backspace key on Linux 2012-10-13 16:15:01 +02:00
Maikel de Vries 70acea19fb Crash: added missing knowledge 2012-10-13 15:52:49 +02:00
David Dormagen 068f08f34f fixed the sell-message at the flag 2012-10-13 13:45:52 +02:00
David Dormagen 430b03f8ae changed the sword jump effect, hopefully made clearer that it is intentional (#747) 2012-10-13 13:45:36 +02:00
Maikel de Vries 6bbabdfc41 Fixed stone doors in tutorial 4
again, the landscape was the problem
2012-10-13 13:23:29 +02:00
Felix Wagner 7130394cfb Scenario folder descriptions added and synchronised 2012-10-13 13:17:59 +02:00
Felix Wagner c76a93965b Loom script, Cloth and Cotton items added 2012-10-13 12:31:38 +02:00
Felix Wagner a4820a4f28 Removed Components=Rock from Seeds 2012-10-13 12:30:17 +02:00
Maikel de Vries 192bc4a03d Fixed endless sawmill, is not meant for interacting with (#806) 2012-10-12 18:21:32 +02:00
Tobias Zwick e191cf0e71 my first commit on CCAN 2012-10-12 18:56:21 +02:00
Charles Spurrill 2725031b30 Goldrush: Placeholder English description in DescDE.rtf 2012-10-12 02:59:31 -07:00
Charles Spurrill 2d9d287b92 Gold Rush title and description, different icon for Mt Brame 2012-10-11 20:30:08 -07:00
Charles Spurrill a66f39f729 Title.pngs for Arena, Parkour, and Settlement scenario folders 2012-10-11 19:39:48 -07:00
Charles Spurrill 33e6f93653 elevator: cable texture is separate, to allow scroll animation (not implemented) 2012-10-11 18:36:51 -07:00
Charles Spurrill ad86c278c9 Elevator has winch turn animation 2012-10-11 04:42:16 -07:00
Charles Spurrill 140e5b9b76 New title images for tutorials 2012-10-11 04:11:40 -07:00
Tobias Zwick 8c5005bef9 I hate Mercurial 2012-10-10 23:47:30 +02:00
Tobias Zwick d46840c90f player controls cleaned up + localization 2012-10-10 23:33:51 +02:00
Bernhard Bonigl 51e61a485d Move free Objects at the bottom of a construction side up to the surface. 2012-10-10 19:33:51 +02:00
Bernhard Bonigl 233816bad9 Restrict Actionbar-Slots to 10 max. 2012-10-10 16:43:08 +02:00
Bernhard Bonigl 9a91a4dfca Reduce Collect-Priority by 1. This fixes collecting when jumping. 2012-10-10 16:38:33 +02:00
Bernhard Bonigl bf23ad757c WoodChip-Particles fade out slower and move with the wind a bit. 2012-10-10 16:34:25 +02:00
Maikel de Vries 67589cf86a Refactor scenarios: Others
blabla hg
2012-10-09 21:05:50 +02:00
Maikel de Vries 7523bf3ab5 Refactor scenarios: Arenas 2012-10-09 20:42:32 +02:00
Maikel de Vries 5ada7012ad Fixed stone door in tutorial 4 2012-10-08 22:59:46 +02:00
Sven Eberhardt 08b495e43d PlayerControls: When the user changes a key assignment in his local config, all derived key assignments (Key=CON_*) change as well (#807).
The "CON_" prefix is now mandatory when referencing other key assignments. Updated PlayerControls.txt to reflect that.
2012-10-08 20:45:04 +02:00
Tobias Zwick ba1a2cbdad add missing strings for localisation of controls definition dialogue 2012-10-07 18:45:50 +02:00
Tobias Zwick f296f31c62 add script that automatically removes unused strings from LanguageXX.txt in the System.ocg and executed it once 2012-10-07 15:27:30 +02:00
Maikel de Vries 4181b645c6 New scenario: Krakatoa.ocs
Originally made for the Let's Rock settlement scenario design contest.
2012-08-12 16:35:47 +02:00
Maikel de Vries 9a18538ac1 Coconut tree: fixed some more issues 2012-08-11 18:56:35 +02:00
Charles Spurrill 7d45946c4f Some more original graphics to replace CR placeholders in Graphics.ocg 2012-08-09 17:42:38 -07:00
Charles Spurrill 0afe958618 Fixed coconut tree to procreate properly 2012-08-09 17:41:46 -07:00
Charles Spurrill 32cdba7415 Iron bomb is made from 1x Metal and 1x Sulphur 2012-08-09 17:40:25 -07:00
Charles Spurrill e019cd5655 Added missing 'MoveTowards' function in Math.c and upgraded LaunchProjectile func 2012-08-09 17:37:53 -07:00
Charles Spurrill 869e2acac0 Cannon: Remove accidentally committed SelfPropellent script for projectiles 2012-08-07 12:32:36 -07:00
Charles Spurrill 1e85978c40 Fixed carry-heavy library from inserting items into ground on drop 2012-08-07 12:30:35 -07:00
Charles Spurrill a8ea9a0d38 Some fixes to AlignVehicleRotation script 2012-08-07 12:17:52 -07:00
Charles Spurrill ee8d0de693 Boompack: Remove accidentally committed SelfPropellent script for cannon launching 2012-08-07 12:07:13 -07:00
Charles Spurrill ece7b463a4 Balloon: Undeployed Balloon item is treated as object, not vehicle 2012-08-07 12:03:02 -07:00
Charles Spurrill 2b256c09b8 Boompack launches when incinerated (can also be detonated on damage like the powderkeg, too) 2012-08-07 12:02:34 -07:00
Charles Spurrill f4c9bdabf2 Remove needless HasFuse() funcs. Shrapnel now has hitcheck 2012-08-07 12:00:18 -07:00
Charles Spurrill 0142c65ed4 Change trajectorye effect script to compensate with GetGravity() change 2012-08-07 11:57:55 -07:00
Charles Spurrill 905847a4ab Shipyard: Added animated 3D model. All done except for texture (blank wires uv-map included) 2012-08-07 11:57:01 -07:00
Charles Spurrill bf8aa9241e Pump: Implemented Matthi's new graphics (pre-rendered) 2012-08-07 11:54:47 -07:00
Charles Spurrill 5be266549e Airplane: Damage doesn't need to equal < 0 before destructing. Rather, <= 0. 2012-08-07 11:53:39 -07:00
Charles Spurrill 6d9a238e75 Airship fixed so explosives hitting the gondola also do damage 2012-08-07 11:51:48 -07:00
Charles Spurrill b8afe21a89 Much of Cannon script redone in a saner manner. More precision (1000x), no animation jumping while turning. 2012-08-07 11:51:04 -07:00
Charles Spurrill ae3f8156ea thicker airship bottom to avoid lorry clipping through 2012-08-03 14:38:02 -07:00
Charles Spurrill e54673962a Added library allowing solidmasked vehicles to 'rotate' parented objects along the z-axis with their rotation. See airship 2012-08-03 14:22:06 -07:00
Charles Spurrill 6f74d0430f #796: Added missing gravestone rule 2012-08-02 12:00:11 -07:00
Günther Brammer 35a0d7b6cd Script: Get/SetGravity use 1/100 px/tick^2 instead of 1/500
The old factor was chosen because the default gravity * 500 was exactly
100. But a lot of other engine interfaces use 1/100 px/tick or px/tick^2,
and that is a common scale for scripts to work in, too.
2012-07-15 22:42:17 +02:00
Charles Spurrill c28ef14f00 #752: Gravestones Rule Added. On clonk death, a gravestone is created (collecting the clonk's corpse to hide it) 2012-07-26 15:01:23 -07:00
Charles Spurrill ea445138b1 Fancy icons for Rules.ocd 2012-07-26 11:38:50 -07:00
Charles Spurrill c33bf65be8 Kitchen 3D graphic added 2012-07-26 11:20:45 -07:00
Charles Spurrill 5ddf912294 Added coconut/palm tree 2012-07-23 12:44:07 -07:00
Charles Spurrill d4dbf167e7 #756: Fixed Picture transform for boompack during flight 2012-07-22 18:55:01 -07:00
Charles Spurrill e1b4c4c7dd Prettier clonk-skin icons in Crew Selection menu 2012-07-22 17:36:47 -07:00
Charles Spurrill 41f5f59ebf #765: Clonk stops moving when setting down heavy-objects 2012-07-22 17:35:27 -07:00
Koronis c57f05a44f improved tree falling animation and sound 2012-07-22 21:15:49 +02:00
Charles Spurrill 6a13a63ef0 #791: Chopped trees are displayed behind buildings 2012-07-21 09:15:47 -07:00
Felix Wagner 63ad16a1e9 Chemical lab: Changed knowledge of the scenarios to include chemlab 2012-07-16 14:38:58 +01:00
Felix Wagner c713f9a91a Inventor's lab: Added inventor's lab
Changed the following items to IsInventorProduct:
Grapple bow, Jar of winds, Teleglove
2012-07-16 14:35:29 +01:00
Felix Wagner 53298dc089 Shipyard: Added shipyard
Changed the airship to IsShipyardProduct
2012-07-16 14:29:49 +01:00
Felix Wagner 28c77c8074 Armory: Added armory
Changed the following items to IsArmoryProduct:
Cannon, Catapult
2012-07-16 14:23:10 +01:00
Felix Wagner e53d8e492c Kitchen: Added kitchen
Changed the following items to IsKitchenProduct:
Bread, CookedMushroom
2012-07-16 14:14:00 +01:00
Felix Wagner 7dd8519e86 Chemical Lab: Split firestone has now IsChemicalProduct 2012-07-16 14:08:25 +01:00
Felix Wagner 732bee449c Chemical Lab: Added Chemical Lab
Changed the following items to IsChemicalProduct:
Boompack, Dynamite, DynamiteBox, PowderKeg
2012-07-16 13:57:42 +01:00
Günther Brammer f41590d71f Merge branch 'movement' 2012-07-13 23:27:14 +02:00
Sven Eberhardt fec75aa79d Fix subsisting com dir if hangle animation is aborted (#418) 2012-07-13 22:55:44 +02:00
David Dormagen 8fb926bc0a flag can reset marker's color correctly 2012-07-13 22:32:09 +02:00
David Dormagen 0940116620 added progress bar GUI_CustomImageProgressBar 2012-07-09 11:18:44 +02:00
Felix Wagner 5a1d9ef9c3 Corrected function call to case. 2012-07-07 20:46:16 +01:00
David Dormagen 10ff0979bb added GUI_PieProgressBar and changed inventory slot to use it when displaying progress bars 2012-07-06 20:57:32 +02:00
David Dormagen 5b4e8c887c when loading (f.e. bow and musket) the inventory slot displays a small loading bar 2012-07-05 20:09:32 +02:00
David Dormagen 65fc668fef added the progress bar GUI_CustomRingProgressBar that is able to show any image as the ring segments 2012-07-05 20:08:54 +02:00
David Dormagen fdd4aa5553 power system: changed the floating messages on power change into progress bars (also only on power change) 2012-07-03 10:34:33 +02:00
David Dormagen 70f7bf2b48 renamed VisualEnvironment.ocd to Ambience.ocd 2012-07-02 21:34:12 +02:00
David Dormagen 416a65acde added ProgressBar interface and two progress bars: ring and simple
for more explanation, see forum post
2012-06-30 22:52:04 +02:00
David Dormagen 22c9f2fcac scoreboard: don't change headline for "title" column, since that sets title of whole scoreboard 2012-06-29 18:59:18 +02:00
David Dormagen eeada2e59e scoreboard: fixed sorting of columns 2012-06-28 17:31:44 +02:00
David Dormagen da976b4770 added new scoreboard abstraction layer on top of the engine functions - it scales!
for a complete description see the forum post
2012-06-28 00:17:15 +02:00
David Dormagen 1a9c503d07 fixed effect added to the scenario in ThunderousSkies 2012-06-28 00:16:09 +02:00
David Dormagen fb7151db7d added RemoveTimer() function as counterpart to AddTimer() 2012-06-24 20:37:28 +02:00
grgecko 1217f77238 Tutorials "new controls" adaptation 2012-06-23 20:02:19 +02:00
Günther Brammer 24bfd6345d Use Action.Attach even when Action.Procedure is not nil
But default to the previously used value when Attach is not set. Use 0 to
override the default.
2012-06-16 03:01:47 +02:00
Günther Brammer 944ca60910 Tweak the "corner scale" behaviour
Instead of teleporting from sticking with the left/rightmost vertex to the
want to standing on the lowest one at the same position, the Clonk can now
climb using the lowest vertex alone. That means the teleport only needs to
cover only one pixel each in x and y direction to go from sticking to the
side of the landscape pixel to sticking on top of the same pixel.

Also remove some unnecessary x/ydir resets and make comdir in the direction
of the wall the Clonk is scaling keep the up/down direction instead of only
going up.
2012-06-08 16:17:42 +02:00
Felix Wagner e461e50f75 added foreground param to Tree_Coniferous' Place() 2012-06-07 18:29:07 +01:00
Felix Wagner d4fa3e10f3 Added settings parameter to plants' default Place() 2012-06-07 18:29:00 +01:00
Felix Wagner 74071251ed Scenarios using def->Place() for plants 2012-06-07 01:46:02 +01:00
Felix Wagner 0e5f0b28f2 + PlaceForest() 2012-06-07 01:45:49 +01:00
Felix Wagner a10ba81b3e Added Place() to plants library 2012-06-07 01:45:38 +01:00
David Dormagen 80d94966bc added better documentation to some System.ocg functions 2012-06-05 22:51:09 +02:00
David Dormagen 15e29fcfd8 added very simple framework for the creation of purely visual environment objects + not-implemented-zicadas 2012-06-05 22:31:58 +02:00
David Dormagen 45eb8e16e5 added some zero-pointer safeties after calls to OnSlotFull 2012-06-21 23:40:27 +02:00
Bernhard Bonigl 59a39d3ed4 Added SetBackgroundColor for GridMenus 2012-06-21 14:06:25 +02:00
David Dormagen a697016c58 reset some more internal variables to nil when cancelling aiming
they could get in the way when re-aiming quickly after a shot
2012-06-19 21:30:14 +02:00
David Dormagen a28cf7008b allow successive calls of CancelAiming (which do not do anything) 2012-06-19 19:55:51 +02:00
Bernhard Bonigl b46e40d78e Experimental: Create Construction-Menu at cursor-position 2012-06-18 19:03:50 +02:00
David Dormagen 8877dda619 kill logs: allow global callback for appending to log too ("%s is now king") 2012-06-17 21:38:10 +02:00
David Dormagen 79928b4692 flag library: SetFlagRadius now behaves correctly in regards to area markers 2012-06-17 21:37:41 +02:00
David Dormagen a7a16e1f5b clonk control: zero pointer safety, check whether menu exist after trying to create it 2012-06-17 21:37:13 +02:00
David Dormagen 088c9ad265 pickaxe: allow hitting objects with certain callback 2012-06-17 21:36:48 +02:00
David Dormagen 743ddc0f34 grid menu: fix possible zero-division with empty menu 2012-06-17 21:36:13 +02:00
Günther Brammer 8d5023637f Windmill: Fix Use-after-Explode error 2012-05-31 22:52:53 +02:00
Günther Brammer 20577f8575 GL: Identifiers starting with GL_ are reserved for the implementation
Some compilers are less strict about this than others, unfortunately.
The Gallium one complains with

preprocessor error: Macro names starting with "GL_" are reserved.
2012-05-30 23:34:08 +02:00
Nicolas Hake e0bde2256a GL: Make max uniform count available to shader and work around low limits (#786)
beliar reports that his driver doesn't support the number of fragment shader
uniforms that we're using in the landscape scaler. By making the reported limit
available to the GLSL code, it can use a workaround using a 1D texture to
transfer data.
2012-05-28 16:05:30 +02:00
Julius Michaelis 9166c770ef <Ringwaul> Soooo I was thinking [\n] The Savegames folder should have the floppy disk icon instead of the standard book 2012-05-22 23:20:01 +02:00
Charles Spurrill 10739a4d78 re-added airplane to StartupScenSelIcons.png 2012-05-22 13:54:15 -07:00
Charles Spurrill fe866111ef added floppy-disk icon to StartupScenSelIcons.png 2012-05-22 13:28:17 -07:00
Charles Spurrill e1c511311e Clouds darken at night; variable 'blueness' of night relative to moon phase 2012-05-22 13:16:48 -07:00
Charles Spurrill 67b59b8a2f Added 'Picture' graphic for the elevator case (seen in action-bar) 2012-05-22 12:04:50 -07:00
Maikel de Vries 821155b11c Fixed numbering of ringmenu, applied to buying at flag and weapon selector 2012-05-22 20:34:10 +02:00
Maikel de Vries edfda6aecb Fixed HUD display of wealth 2012-05-21 21:41:41 +02:00
Maikel de Vries 199272ef25 Pump is turned on by default as intended 2012-05-14 23:11:26 +02:00
Felix Wagner 29aa801eeb Supposedly fixed endless javelin restoration in Tutorial 3. (#553) 2012-05-13 23:12:14 +01:00
Felix Wagner 4ce82c364c Fixed removed object usage error. 2012-05-13 23:11:29 +01:00
Felix Wagner 061bcf836f Added split firestone option to ToolsWorkshop. 2012-05-13 22:20:02 +01:00
Felix Wagner 5bfb0433b2 Removed IsToolProduct from firestone. 2012-05-13 22:19:36 +01:00
Felix Wagner 86acb50ece Corrected position of elevator case. 2012-05-13 22:19:04 +01:00
Felix Wagner f77b4134b4 Removed GetConstructionDirection() 2012-05-13 20:54:24 +01:00
Bernhard Bonigl 0729c4577f Fixed Non-Inventory-Contents(CarryHeavy) using up Space in the ContentsMenu (#778) 2012-05-13 20:37:44 +02:00
Charles Spurrill f327ee7c12 changed Pipe graphics to AlteredARMOR's pipe render 2012-05-13 11:13:55 -07:00
Maikel de Vries 2472e270c7 Fixed balloon hanging on the bottom of a map (#780) 2012-05-13 20:00:51 +02:00
Charles Spurrill d87c911596 GoldRush.ocs: Players can build Chests and Pumps 2012-05-13 10:54:43 -07:00
Bernhard Bonigl 3ae8067703 Savegames: Simple fix for GUI, reset whole gui on load. #737 2012-05-13 19:31:28 +02:00
Maikel de Vries 2710585eed String table for the producer library 2012-05-13 15:18:21 +02:00
Maikel de Vries 5aa45484ce Fixed horizontal movement of stone door (#781) 2012-05-13 02:29:28 +02:00
Maikel de Vries 60c3b5bf44 Fixed teleportation scroll for attach procedure(#779) 2012-05-13 02:21:42 +02:00
Felix Wagner 3be0bf374a Added elevator case model. 2012-05-12 22:34:50 +01:00
Felix Wagner 36e55443e1 GetPlrClonkSkin returns nil on NO_OWNER, fixed clonk's gender setting. 2012-05-12 15:56:41 +01:00
Maikel de Vries c4bb9e6999 Stop fire sound if object stopped burning (real fix) 2012-05-12 14:42:20 +02:00
Maikel de Vries 797837712b Stop fire sound if object stopped burning 2012-05-12 14:07:55 +02:00
Maikel de Vries eff20344d8 Moved construction direction to stucture library 2012-05-12 10:16:33 +02:00
Maikel de Vries 80e1abc808 Implemented a simple Damage>HitPoints -> Destruction mechanism for structures 2012-05-10 21:20:06 +02:00
Maikel de Vries 1e65c14ec2 Removed obsolete Collection zones 2012-05-12 13:17:22 +02:00
Felix Wagner bae56ecb81 Female hurt sounds. 2012-05-12 01:45:36 +01:00
Felix Wagner 8af9bee707 Female death sound. 2012-05-12 01:38:42 +01:00
Felix Wagner 63be80a1f8 + Fire sound 2012-05-11 18:32:21 +01:00
Felix Wagner 8e745134f2 New furnace sounds. 2012-05-11 18:14:43 +01:00
Felix Wagner 8828754fcc Removed furnace sounds (Sampling+) 2012-05-11 17:58:54 +01:00
Felix Wagner 3ddc793eaa Removed FireLoop (Sampling+) 2012-05-11 17:55:12 +01:00
Felix Wagner 2d346333b1 + Inflame sound 2012-05-11 17:54:56 +01:00
Felix Wagner f07359e4b1 Fixed ClearScheduleCall (causing #770) 2012-05-11 16:31:47 +01:00
Felix Wagner 9faa53e5b0 UsageHelp for the bucket 2012-05-11 15:19:12 +01:00
Felix Wagner 2b83fc9ec9 Produce loam by using the bucket. Use 25 pixels of earth. 2012-05-11 15:07:03 +01:00
Tobias Zwick 61c348a3e2 update credits 2012-05-10 21:40:17 +02:00
Bernhard Bonigl 8bd16da9c4 Added Stringtables to constructing and removed old unused stuff 2012-05-08 20:43:30 +02:00
Bernhard Bonigl a5adc8c2ad Added missing CON_PushENter to IsInteractionControl 2012-05-08 20:42:08 +02:00
Bernhard Bonigl c601231960 Added Interaction for flipping construction sites during placement 2012-05-08 20:27:24 +02:00
Bernhard Bonigl 43deb1fc37 Extra-Interactions can now be placed at every position in the actionbar 2012-05-08 20:26:50 +02:00
Bernhard Bonigl 67d0b60cd6 Prevented heal-notification in CrewSelector on clonk creation. 2012-05-07 23:12:28 +02:00
Bernhard Bonigl 41f12a770e Removed Inventory in Boomrace, also made Boompack undroppable. 2012-05-07 23:11:46 +02:00
Bernhard Bonigl c5f4952f76 Carryheavy objects entered via script aren't dropped when lifting is cancelled anymore. 2012-05-07 23:06:19 +02:00
Bernhard Bonigl 7ac11a9711 Fixed error when a Boompack hit solid material 2012-05-07 22:58:22 +02:00
Bernhard Bonigl 90fdc232fa InteractionBar now can display additional interactions from the Clonk via GetExtraInteractions callback.
Also moved carryheavy-dropping from hardcoded to that callback.
2012-05-07 22:57:52 +02:00
Bernhard Bonigl 3893fea82f Added Helper-Functions that categorize Controls 2012-05-07 20:34:28 +02:00
Maikel de Vries 0d77daba4f Fixed opening and closing the chest 2012-05-07 20:27:46 +02:00
Bernhard Bonigl 645f03e37e Changed CircleMenu to display first item in the middle 2012-05-06 19:47:01 +02:00
Bernhard Bonigl eec4865993 Crewselector now correctly uses tooltips 2012-05-06 19:23:43 +02:00
Bernhard Bonigl fe31d2d4eb Interactionbar now correctly uses tooltips 2012-05-06 19:21:00 +02:00
Bernhard Bonigl 65c5dfd632 Moved setting of the Tooltip into the GUI-Elements instead the controllers. 2012-05-06 19:20:40 +02:00
Günther Brammer 099cd15e56 Script: Remove unused OnBlastIncinerationDamage callback
Scenarios that want to override the default behaviour of BlastObject should
overload the BlastObject function itself. Objects can simply use the Damage
callback and/or set BlastIncinerate to nil.
2012-05-06 15:37:43 +02:00
Günther Brammer 2510734ad3 Script: Damage callback changed to Damage(Change, Cause, CausedByPlr) 2012-05-06 14:45:35 +02:00
Bernhard Bonigl 6a885d33aa Fixed incorrect Selection call to selected item when switching left and right hand.
Sometimes also caused errors.
2012-05-06 18:24:56 +02:00
Bernhard Bonigl f295d10b6d ContentMenu now correctly removes containers when they're out of range. 2012-05-06 18:12:18 +02:00
Bernhard Bonigl c87d5d4435 Fixed incorrect GetPosition parameters 2012-05-06 18:10:36 +02:00
Bernhard Bonigl dce8e579d3 Added InFrontOf(object). Returns if the midpoint of the calling object is in front of the other object. 2012-05-06 18:10:16 +02:00
Maikel de Vries 22f734ee65 Rank casts a wood on destruction
added some placement values for vegetation
2012-05-06 14:40:24 +02:00
Maikel de Vries 5c351a0eae Made plant reproduction is more realistic
Plants don't grow as n! and prefer not to grow at the same location.
2012-05-06 13:33:39 +02:00
Armin Burgmeier 2684c2707d Fix erroneous timers in Game.txt
These were accidentally introduced in fc90557056ff due to a bug in the
conversion script.
2012-05-05 23:40:38 +02:00
Maikel de Vries c567e6c9a4 Fixed some errors in Tests.ocf
CableLorries.ocs remains for the diehard.
2012-05-05 19:50:51 +02:00
Armin Burgmeier d53a0798dd Remove superfluous Timer= entries in Game.txt 2012-05-05 15:53:42 +02:00
Maikel de Vries 6fcc0f6d2e Removed TimerCall in favour of AddTimer script implementation 2012-05-05 12:09:44 +02:00
Maikel de Vries 339990f3fa Fixed loam runtime errors
first copypaste fail, second a remove object one.
2012-05-01 22:23:16 +02:00
Maikel de Vries 90ee070f33 Cleaned up Fire.c a bit 2012-05-01 20:50:21 +02:00
Charles Spurrill bf8ae0f0e9 Steampunk's eyelids work now 2012-04-30 06:36:43 -07:00
Bernhard Bonigl a3c0c85b1a Don't divejump during aiming 2012-04-29 18:12:04 +02:00
Bernhard Bonigl c576a7bd3f Allow turning while jumping during aiming 2012-04-29 18:09:37 +02:00
Maikel de Vries 5da0847a9a Materials inside the construction site don't burn due to incendiary materials 2012-04-29 16:57:38 +02:00
Maikel de Vries da4c683a03 Don't perform scripts after removing an object 2012-04-29 16:56:40 +02:00
David Dormagen cd8f978b28 fixed KingOfTheHill-goal InitializePlayer() 2012-04-29 16:27:26 +02:00
Bernhard Bonigl 5ae4496d7f Clonk now aborts usage if a related inventory-slot is changed. (e.g. when aiming the bow) 2012-04-29 16:26:32 +02:00
Bernhard Bonigl 8c9536c197 Chests are interactable now 2012-04-29 15:29:10 +02:00
Bernhard Bonigl 38235f762a CarryHeavy doesn't play animation if clonk is inside 2012-04-29 15:05:41 +02:00
Bernhard Bonigl 56809d9e43 Fixed a carryheavy-bug with Collect(x,x, pos) 2012-04-29 15:05:29 +02:00
Bernhard Bonigl 54ec5629cd LastManStanding RelaunchContainer can only contain 1 clonk now 2012-04-29 15:04:37 +02:00
Maikel de Vries f6534bdfdb Prevent selecting more than one item in weapon menu 2012-04-29 14:03:20 +02:00
Maikel de Vries f647f211af Fixed flag meshes in Frozen Fortress and Hideout (#758) 2012-04-29 13:50:30 +02:00
Maikel de Vries 37b5bb9c6d Clonk closes eyes on death (#752) 2012-04-29 13:27:50 +02:00
Maikel de Vries 70c6e8bf5e Don't pass this as a command target to global effects in mountain melee 2012-04-29 13:21:07 +02:00
Maikel de Vries 06af685e01 Fixed runtime error for boomattack in guardian of windmills
Check stuff when you change the engine behaviour of RemoveObject!
2012-04-29 12:09:12 +02:00
Maikel de Vries 443069ac75 Don't pass this as a command target to global effects in scenarios
Just don't!
2012-04-29 11:50:23 +02:00
Julius Michaelis 8dfeb8dfc2 Settlement Tutorial: Add lost binary files + minor fixes 2012-04-29 00:30:29 +02:00
Julius Michaelis 95ef462a10 Once upon a time... Settlement Tutorial! 2012-04-28 23:52:50 +02:00
Felix Wagner e1ad8bf24f Fixed $UsageHelp$ in Seeds.ocd 2012-04-28 19:31:25 +01:00
Maikel de Vries 4a56f8d7c1 Replaced defcore values related to fire with properties 2012-04-28 16:17:38 +02:00
Maikel de Vries e0eca72b50 Implemented volcano
Still needs some work though on different areas (sounds)
2012-04-28 13:18:27 +02:00
Maikel de Vries e01b6e3954 Loam can now be used only in multiples of 30 degrees
This needs some testing and feedback, angle less than 30 do not make sense imo but 45 degrees maybe preferred.
2012-04-28 09:33:40 +02:00
Maikel de Vries 8188793d67 Implemented Sign function (Math.c) 2012-04-28 09:32:42 +02:00
Bernhard Bonigl cd31b0e6e4 Forgot Debuglog. :( 2012-04-24 22:31:01 +02:00
Bernhard Bonigl 1f02f8490c Health-Change-Effect on the CrewSelector
Crewselector shows liquid-color as background if underwater (instead of blue)
2012-04-24 22:22:06 +02:00
Bernhard Bonigl cf796d0912 Crewselector has blue background if Clonk underwater 2012-04-23 23:33:19 +02:00
Bernhard Bonigl 981ce396ec Made ConstructionSite less filled. 2012-04-23 23:19:52 +02:00
Bernhard Bonigl 3989baedbd Added border for CrewSelectors + Selection highlighting 2012-04-23 21:57:08 +02:00
Bernhard Bonigl 83ad05b3c0 GUI now takes inventory-size directly from the clonk.
Renamed backpack-stuff to inventory in Controller.
2012-04-23 21:07:11 +02:00
Bernhard Bonigl 105e4bcee7 Removed function calls that were missed at cleanup. 2012-04-23 20:33:13 +02:00
Maikel de Vries b36e10b8dc Barrel spray extinguishes burning objects 2012-04-23 22:48:41 +02:00
Bernhard Bonigl ed8d46e047 Removed unused GUI-Elements 2012-04-22 18:54:16 +02:00
Bernhard Bonigl 12ffe6ab9c Removed overlooked Tube-Updates 2012-04-22 18:48:38 +02:00
Bernhard Bonigl b52dafc7b2 Cleaned up ClonkControls a bit and added more Comments.
Removed unused function HUDShowItems
2012-04-22 18:44:28 +02:00
Bernhard Bonigl 27dbd170dc Cleaned up HUD-Controller code. 2012-04-22 18:11:52 +02:00
Felix Wagner 4546c4a9f9 Fixed hit sound for metal. 2012-04-22 14:21:22 +01:00
Maikel de Vries 45905c013d Prevent dead corpses from burning
Eternal fires appear for C4D_Living && !GetAlive() && NoBurnDecay.
2012-04-22 15:15:04 +02:00
Maikel de Vries 3768206cc6 Contact incineration in Fire effect takes into account containers and layers
This was already in the engine before(at least the containers), and makes much more sense.
However, it's useful to think about how ClosedContainers and Extinguish should work.
2012-04-22 13:08:54 +02:00
Armin Burgmeier ccbc7aebc8 Fix missing object bug in Crash.ocs, create windmill in DoInit() 2012-04-22 01:06:25 +02:00
Felix Wagner e9010b81e9 Construction preview: combining, Elevator: combine two for SUPER elevator 2012-04-22 00:00:41 +01:00
Armin Burgmeier 8c49c3a7f7 Use Anim_R to synchronize rotation and animation of the windgenerator 2012-04-22 00:55:44 +02:00
Armin Burgmeier 90dc9abbcd Add Anim_R as a AVP for mesh animations 2012-04-22 00:22:05 +02:00
David Dormagen f1be189aa9 windmill now works without creator too 2012-04-22 00:07:02 +02:00
David Dormagen 1150d2afa3 windmill in crash landing fixed 2012-04-22 00:06:33 +02:00
David Dormagen 7179d2635b removed unused callbacks in the wind generator 2012-04-21 21:22:32 +02:00
David Dormagen 2cecc74e48 wind generator checks more than one point for wind, added invisible helper object so that the wings can get obstructed 2012-04-21 21:09:16 +02:00
Bernhard Bonigl 705b19fefd Merged Controls into default 2012-04-21 17:18:37 +02:00
Bernhard Bonigl c836de2092 Reverted Trees offset to normal.
Backed out changeset: 3e1d78fa02b9
2012-04-21 17:11:49 +02:00
Maikel de Vries f767091f7b Typo in string table of Seeds.ocd 2012-04-18 23:34:14 +02:00
Bernhard Bonigl de19c7432e Made ConstructionSites display material below
Added Stringtables for ConstructionSite
2012-04-17 18:18:28 +02:00
Bernhard Bonigl fa46079626 Added wireframe preview for Construction Site 2012-04-17 18:08:39 +02:00
Bernhard Bonigl e8ef7a9537 Made ConstructionSite compatible with dir-flipping-preview
Fixed ConstructionSite not removing on build fail
2012-04-17 18:08:23 +02:00
Bernhard Bonigl 4c38caaf27 Merged default into Controls 2012-04-17 17:37:52 +02:00
Bernhard Bonigl bb4f4dedf6 Fixed potential error in ContentsMenu 2012-04-17 15:39:44 +02:00
Bernhard Bonigl 30ea077941 Chopping trees now takes mouse-position into account
Fixed Axe-Slashing display
2012-04-17 14:43:49 +02:00
Bernhard Bonigl 1d57376875 Set Trees offset to the bottom. They actually grow UP now, instead from the center outwards. 2012-04-17 14:28:55 +02:00
Bernhard Bonigl c6fe70d251 Fixed plants continuing growing after beeing chopped down 2012-04-17 14:28:37 +02:00
Bernhard Bonigl 657782cfb6 Fixed Conifers changing rotation on 100 Con instead on construction
StartGrowth now applies a random time-offset so trees don't grow simultanously.
2012-04-17 14:06:40 +02:00
Felix Wagner 5ba322b417 Fixed mixed up language 2012-04-16 21:36:52 +01:00
Maikel de Vries 16fa9cf341 Placement is now a property instead of DefCore value 2012-04-16 22:17:05 +02:00
Felix Wagner 366d96680a Rotate your buildings in the construction preview using Space! 2012-04-16 16:31:38 +01:00
Felix Wagner d973636cf8 + GetCalcDir() - returns -1 for DIR_Left, 1 for DIR_Right 2012-04-16 16:30:20 +01:00
Felix Wagner 6b2f3c6d40 + Ashes.ocm 2012-04-17 19:07:18 +01:00
Bernhard Bonigl 0bec0179e1 Fixed ProductionTime-Callback for real. 2012-04-15 18:45:43 +02:00
Bernhard Bonigl b7fba5ee29 Introduce RefuseTransfer(object) callback. Allows to refuse transfer out of a Container via ContentsMenu. 2012-04-15 18:32:38 +02:00
Bernhard Bonigl c2c9dfbeaa Removed now unused function and adapted Drag'n'Drop 2012-04-15 18:28:32 +02:00
Bernhard Bonigl 41188c7588 Fixed infinite content menu updates 2012-04-15 18:22:46 +02:00
Bernhard Bonigl a4c8b2c941 Fixed Contents-Menu Updating 2012-04-15 17:25:38 +02:00
Bernhard Bonigl c80970e37f Fixed bug in RemoveMenuItem 2012-04-15 17:14:54 +02:00
Bernhard Bonigl 98b67b1cdc Fixed Warnings in Producers 2012-04-15 17:14:43 +02:00
Maikel de Vries 106e05d7e2 Fixed updating the textures of barrels 2012-04-15 17:15:59 +02:00
David Dormagen 6517b230e6 added NoPowerNeed rule, made requesting 0 power possible 2012-04-15 17:02:47 +02:00
Bernhard Bonigl a1670205d3 Fixed RemoveItem and added Clear to Menus 2012-04-15 16:15:06 +02:00
Bernhard Bonigl 1dfc41042a Added helper function GetPosition 2012-04-15 16:14:29 +02:00
Bernhard Bonigl 9236cde273 Fixed faulty productio-time in Producer-Library 2012-04-15 15:11:18 +02:00
Bernhard Bonigl 27f3ea8173 Fixed single-interaction 2012-04-15 14:44:33 +02:00
Maikel de Vries 8c6530c0d7 Fixed wealth goal short description 2012-04-15 13:37:18 +02:00
Bernhard Bonigl 1c91495eb5 Merged default into Controls 2012-04-15 13:22:38 +02:00
Tobias Zwick cdaabca574 deleted descriptions for libraries 2012-04-15 13:13:41 +02:00
Tobias Zwick 038ef1b4b6 descriptions for structures 2012-04-15 13:13:14 +02:00
Tobias Zwick b85c4d6001 show tooltips from Description property for content menu items 2012-04-15 12:18:40 +02:00
Tobias Zwick 3333160efa show tooltips from UsageHelp property for backpack items 2012-04-15 12:17:50 +02:00
Bernhard Bonigl b5f099be79 Hardcoded Construction-Site Intersections. 2012-04-15 00:29:38 +02:00
Bernhard Bonigl a687b0f85c Added simple construction-site-blocking check 2012-04-14 23:37:12 +02:00
Bernhard Bonigl 219bceefcd Added Helper-Functions returning the left/right/top/bottom Edge of an object 2012-04-14 23:36:54 +02:00
Bernhard Bonigl a56c684a19 Fixed Construction sites moving containers into them, instead of their contents. 2012-04-14 23:16:17 +02:00
Bernhard Bonigl 75ec1ed63c Changed ConstructionSite Icon 2012-04-14 22:54:18 +02:00
Bernhard Bonigl 9da6d67c80 Space now also closes menus 2012-04-14 22:53:36 +02:00
Bernhard Bonigl c4e782e713 Moved Close() into Menu.ocd 2012-04-14 22:53:17 +02:00
Bernhard Bonigl 83a972cced Introduced GetInteractionCount(object) to prevent infinite loops 2012-04-14 22:53:02 +02:00
Bernhard Bonigl c366f33fad Fixed Carryheavy having wrong constant in ObjectSelector 2012-04-14 22:30:19 +02:00
Bernhard Bonigl fefb8b4de8 Added Multi-Interaction-Support for Script (Objects can have multiple interactions) 2012-04-14 22:30:02 +02:00
Bernhard Bonigl 912f8bd313 Added new Ok and Cancel icons 2012-04-14 22:29:25 +02:00
Bernhard Bonigl e025aed501 Merged default into Controls 2012-04-14 21:55:16 +02:00
Bernhard Bonigl b4fb51249e Controls now tries to handle first actionbar-item before using hardcoded behaviour on pressing Space 2012-04-14 18:41:56 +02:00
Bernhard Bonigl deec6a902a Fixed Bug with CarryHeavy-Display and reaction 2012-04-14 16:51:30 +02:00
Bernhard Bonigl c75f70e387 Fixed error message with boompack 2012-04-14 16:51:11 +02:00
Bernhard Bonigl 367af8ba9f Fixed error when updating attach before attaching 2012-04-14 16:51:01 +02:00
Bernhard Bonigl 1d51575b67 Fixed Dialogue not continuing 2012-04-14 16:02:10 +02:00
Bernhard Bonigl 0d53a16a21 Backed out changeset: b48412700d66 2012-04-14 15:38:18 +02:00
Armin Burgmeier eca25614fe Increase max. player size in settlement scenarios 2012-04-14 16:39:45 +02:00
Bernhard Bonigl 0bac82bcc3 Fixd UI-Updates with CarryHeavy on Clonk-Selection
Added CarryHeavy to the Contentsmenu
2012-04-13 20:24:41 +02:00
Bernhard Bonigl 0dda1f59f5 Fixed ContentsMenu Transfer from leftmost clonk to selected clonk if no containers were present. 2012-04-13 19:27:58 +02:00
Bernhard Bonigl f5d88c0da5 Backed out changeset: 9ed36a2c6ab2
Making stuff unintuitive is not a "fix".
2012-04-13 19:18:39 +02:00
Bernhard Bonigl 71dd5fc64d Fixed display-problems with CarryHeavy 2012-04-13 19:14:55 +02:00
Bernhard Bonigl 9a4295f745 Fixed beeing able to drop carryheavy in non-walk 2012-04-13 17:49:09 +02:00
Felix Wagner 57c0dec3f5 Earthquake sound 2012-04-12 21:49:41 +01:00
Maikel de Vries e7f770923b Fixed setting frequency of disasters 2012-04-12 22:15:54 +02:00
Martin Plicht 7ffa6e58bc Base.ocd: Call Sell with correct? parameters 2012-04-12 20:12:36 +02:00
Martin Plicht 67f697c94b Don't pass 0 for the effect when calling RemoveEffect with effect name 2012-04-12 20:02:53 +02:00
Martin Plicht a4194c22e9 Replace 0 with nil wherever string/object/array is expected 2012-04-12 11:48:23 +02:00
Maikel de Vries d0e2b08041 Added Meteor
Can be used in the same way as earthquakes via definition calls.
2012-04-11 22:41:08 +02:00
Maikel de Vries 3b84fdb582 Earthquake uses definition call in scenarios
Somehow I like this method, and I will use it for all disasters and maybe other environment objects as well.
Launching earthquakes is still possible via a global function though. Still needs sound...
2012-04-11 22:32:01 +02:00
Armin Burgmeier ad3a19008d MtBrame.ocs: Some minor map adjustments 2012-04-11 22:20:53 +02:00
David Dormagen 99638db4c9 fixed shield exploit: limited the maximum damage of the sword on one target to 9 damage every 15 frames 2012-04-10 23:31:46 +02:00
David Dormagen a78d8a1858 IsJumping now returns true only for actions that contain "Jump" (used to return true for Tumble) 2012-04-10 23:29:31 +02:00
David Dormagen fc0a9f1630 fire damage to living objects doubled
incendiary material (lava) burns you twice as fast
2012-04-10 23:28:41 +02:00
Felix Wagner 2179adae7c (boni wtf?); fixed wrongful usage of GetItemPos() to determine carry_bone due to
change of the functions return value
2012-04-10 04:17:57 +01:00
Felix Wagner 9548c1979d Stupid me should have removed testing stuff... 2012-04-10 04:12:22 +01:00
Felix Wagner b0b561a25c Added cooldown for sword strike (#560); fixed clonk getting slowed if
WeaponStrikeExpired isn't called
2012-04-10 04:10:21 +01:00
Felix Wagner 7fbefbeb67 Fixed grappler rope acceleration (#476) 2012-04-10 03:14:26 +01:00
Armin Burgmeier e325aa6835 MtBrame.ocs: Rework map a bit to prevent reaching the goal via dyna jump 2012-04-09 15:41:40 +02:00