marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,554 Commits
27 Branches
0 Tags
318 MiB
Commit Graph

2320 Commits (67589cf86a15b4e59b61f73ae891e35bbdf5b410)

Author SHA1 Message Date
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
Armin Burgmeier 6a2b058a6d MtBrame.ocs: Make sure there is a shovel for all players 2012-04-09 14:30:37 +02:00
Maikel de Vries 0a0e16a6af Fixed moving stuff in content menus and first item is in the middle 2012-04-09 15:18:00 +02:00
Felix Wagner 4bb8cebafc Fixed clonk getting stuck when falling off the bottom of (flying) liquid 2012-04-09 02:50:31 +01:00
Felix Wagner 91a1108873 Fixed underwater digging 2012-04-09 02:50:06 +01:00
Armin Burgmeier 9c9db94a96 MtBrame.ocs: Remove some loam so that it's not trivially solvable 2012-04-08 23:54:22 +02:00
Felix Wagner 5247e5e769 Merge with default 2012-04-08 22:49:06 +01:00
Julius Michaelis a07ef70acf Use array slice operator in Array.c 
There is no Easter egg hidden in this commit message :Þ
 2012-04-08 16:22:43 +02:00
Maikel de Vries 21ba812d06 Moved Vegetation from Environment to Objects 2012-04-08 20:55:03 +02:00
Armin Burgmeier a0b13ad238 Add MtBrame.ocs, a cooperative scenario for BeyondTheRocks 2012-04-08 19:56:14 +02:00
Bernhard Bonigl db4ad404b1 Removed wrong written Definition from Cannon 2012-04-08 01:43:29 +02:00
Bernhard Bonigl de3e9ed9aa Fixed Carryheavy-Animation bugs 
Re-enabled beeing able to grab stuff with carryheavy
 2012-04-08 01:43:15 +02:00
Bernhard Bonigl 061a96e514 Standardized variable-names in Clonk-Animations and put them into a "Namespace"-Proplist. 
More info in UpdateMenu-Implementation-Fail.
 2012-04-07 23:32:57 +02:00
Bernhard Bonigl 45cf4ff147 Reworked Carryheavy: 
* It doesn't need inventory-slots
* It has HUD-Support
* It has a drop-button in the interaction bar
 2012-04-07 23:31:59 +02:00
Felix Wagner cce5d109ef no_dig2objects parameter for DigFree / DigFreeRect 2012-04-05 16:49:47 +01:00
Felix Wagner de2dbceaf2 Added bucket to knowledge in GoldRush & IronPeak (Crash, Skylands?) 2012-04-05 03:05:48 +01:00
Felix Wagner 234ed3c6b1 + Bucket.ocd 
You can gather earth with the bucket to use it as a material for bridge or similar tasks. Press [Use] to collect or dump earth.
 2012-04-05 03:02:35 +01:00
Felix Wagner 8338a8674a Earth/Sand - no chunks dug out anymore 2012-04-05 03:01:50 +01:00
Maikel de Vries 35f8d6a454 Removed Goal.c and reimplemented effect in Goal library 2012-04-03 20:21:49 +02:00
Maikel de Vries 32baccea4f Clouds are created via definition calls in scenarios 
This to get rid off NoRain.c appendtos, see scenarios for examples. Maybe we should also use this interface for other environment objects.
 2012-04-03 19:13:07 +02:00
Bernhard Bonigl 6bece40590 Forgot to add necessary files for ConstructionSites. Fix when merging to default! 2012-04-02 23:57:27 +02:00
Bernhard Bonigl 6ecb036554 Changed Construction-Sites to be containers where material needs to be put into. 
They still construct themselves.
 2012-04-02 23:49:39 +02:00
Bernhard Bonigl 1f41511289 Merged default into Controls 2012-04-02 21:21:21 +02:00
Maikel de Vries 7b8800356a Removed Precipitation from engine 
Will be implemented through clouds and definition calls.
 2012-04-01 23:03:52 +02:00
Felix Wagner 38af458e05 Fixed/inserted various hit sounds. 2012-04-03 18:20:41 +01:00
Felix Wagner 4a40d7782c Converted WoodHit? to mono 2012-04-03 18:19:59 +01:00
Felix Wagner 4343f85eaf Authors for the added sounds 2012-04-03 18:19:37 +01:00
Felix Wagner 1fdb899897 + GlassHit? 2012-04-03 18:19:20 +01:00
Felix Wagner 84d3bf76ca + GeneralHit? 2012-04-03 18:19:08 +01:00
Felix Wagner 7f4360c88c + DullWoodHit? 2012-04-03 18:18:57 +01:00
Felix Wagner 6e3debbf16 + LightMetalHit? 2012-04-03 18:17:12 +01:00
Felix Wagner 2b8660cbdc + DullMetalHit? 2012-04-03 18:16:56 +01:00
Felix Wagner 527bac9d85 Fixed construction preview in front of tunnel material 2012-04-03 15:11:27 +01:00
Felix Wagner 237091cbaa Resolved unused var 2012-04-03 14:51:46 +01:00
Felix Wagner b8be22d9e3 Uncloseable menu for weapon chooser. 2012-04-03 14:51:38 +01:00
Felix Wagner caee67e9cd Function list for System.ocg 2012-04-03 03:00:18 +01:00
Felix Wagner bf795164f2 Resolved all warnings due to global function in included scripts. 2012-04-03 02:12:44 +01:00
Felix Wagner 6e303c4e2c Resorted the functions from C4.c, Commits.c amd Helpers.c 2012-04-03 01:55:55 +01:00
Benjamin Herr cdaee93c94 Rename all the drag/drop script callbacks to OnMouseDr* 
MouseDrag is already a property, and would overwrite the callback
functions. Renamed MouseDragDone and MouseDrop for consistency.
 2012-04-01 20:42:14 +02:00
Bernhard Bonigl cc4b1ce763 Cleaned up controls. Controls-Dialogue should be more usable now. 2012-04-01 19:27:42 +02:00
Maikel de Vries a0f8f6bc51 Fixed interchange of weapons in tutorial 3 and 4 on death (#665) 2012-04-01 16:49:03 +02:00
Bernhard Bonigl 0ea2f7e46d Lowered Rock needed for foundry to 4 from 6 2012-03-30 00:11:52 +02:00
Maikel de Vries 6a2d0aa901 Removed log from team account rule... 2012-03-31 18:34:00 +02:00
Maikel de Vries be02f5bdc1 Fixed multiple team account rules giving too much money 
Also removed three copies in Skylands.ocs
 2012-03-31 18:27:14 +02:00
Maikel de Vries 78fd5fd166 Implemented Callbacks to containers when content menus are opened and closed 
The chest now also plays its animation and sound again.
 2012-03-31 17:34:03 +02:00
Maikel de Vries 03109201cc Fixed some NoRain.c appendtos 2012-03-31 17:27:26 +02:00
Maikel de Vries 2da24e0ca3 MenuOK is now on Return 
This was already in the comments and it makes much more sense, cause it interferes with interact (Space)
 2012-03-31 14:19:39 +02:00
Maikel de Vries 84e5f04cd3 Fixed shooting items with cannon (#733) 
Also minor cleanup in code
 2012-03-31 12:46:24 +02:00
Bernhard Bonigl f5504f7497 Fixed Hand-Size. 
Turned Hand-Indicators into one layer
 2012-03-29 22:27:42 +02:00
Bernhard Bonigl 093c169a1e Constructions sites removed. You need all ressources on-site to create a construction. 
Locations taken into account: Clonk Inventory, stuff lying around, containers/lorries
 2012-03-29 22:08:54 +02:00
Tobias Zwick 1abe406ae2 descriptions and usagehelp for weapons 2012-03-28 21:14:58 +02:00
Tobias Zwick ad59d353af descriptions & usagehelp for materials and foodstuff 2012-03-28 20:16:12 +02:00
Bernhard Bonigl 71061c8d4b Allowed movement during construction-preview (for better positioning) 2012-03-28 19:39:00 +02:00
Felix Wagner 98f422a2ac Construction preview for the hammer. 2012-03-27 19:10:44 +01:00
David Dormagen 182889bfe4 lorry: fixed collection limit when collecting via collection zone 2012-03-24 16:33:15 +01:00
David Dormagen 3788bada43 plants will now stop growing for ten seconds after taking damage 2012-03-24 16:18:55 +01:00
David Dormagen cc715ae682 the sawmill now checks whether the tree will actually produce wood before sawing it 2012-03-24 16:09:11 +01:00
Maikel de Vries 3e705cf500 Toolsworkshop needs 100 power now 
This was a decision "we" testers made already weeks ago but forgot to implement.
 2012-03-23 22:50:40 +01:00
Bernhard Bonigl 25fec934d6 Removed all Hacks with Interaction. Enter/Exit also works now. 2012-03-22 20:26:06 +01:00
David Dormagen ae6381d467 halfed the point limit of the two KotH scenarios 2012-03-21 23:43:01 +01:00
Bernhard Bonigl b6731b1dc8 Inventory now updates when an object is removed (Loam, Constructing stuff,...) 2012-03-21 21:55:34 +01:00
Bernhard Bonigl 7842d8c8e5 Made inventory-slots bigger 2012-03-21 21:52:57 +01:00
Bernhard Bonigl 03729bdbf1 Experimental: Added Interaction-Hotkeys on <> to . (the row below the home row). 
Made the Keys <> on German Keyboards an \| and ;: on US Keyboards usable
 2012-03-21 21:52:32 +01:00
Bernhard Bonigl 3a7bc44da8 Experimental: Added Alt+# for rigth hand 2012-03-21 18:13:34 +01:00
David Dormagen d0aac358a4 plant library uses IsWalking callback now instead of checking procedure 2012-03-20 19:01:39 +01:00
Tobias Zwick 4a6c53a700 descriptions for produceables: tools 2012-03-19 01:03:05 +01:00
Tobias Zwick f5f733e131 just some comments 2012-03-15 13:44:25 +01:00
Martin Plicht e7878038c8 mac: Use standard localization facility for addon installation dialogs + put addons into preferred installation location (Library/Application Support) 2011-10-16 16:09:05 +02:00
Bernhard Bonigl b59dfc02be Removed Lock-Button. Inventory can't be hidden anymore. 2012-03-20 00:58:45 +01:00
Bernhard Bonigl 60bdf2a4f2 Inventory now anchors at top 2012-03-20 00:55:46 +01:00
Bernhard Bonigl 4c01b585d9 Removed dropping on Down+Mouse 2012-03-20 00:48:29 +01:00
Bernhard Bonigl 782615b444 Fixed Error with ExtraSlot when no content was present 2012-03-19 23:50:08 +01:00
Bernhard Bonigl ae46d1f178 Removed Health and Breath Tube 2012-03-19 23:44:17 +01:00
Bernhard Bonigl 77ab3af27b Inventory Slots show extra Slot in background 2012-03-19 23:32:36 +01:00
Bernhard Bonigl 0f0b213f42 Fixed next/previous ContentMenu cycling (broke when crewmember where introduced) 2012-03-18 23:19:08 +01:00
Bernhard Bonigl 46a1f003b6 Fixed Collecting putting an item onto the selected AND the last slot. 2012-03-18 22:50:03 +01:00
Sven Eberhardt f51dea167f Skylands.ocs: Goal 2012-03-18 22:11:30 +01:00
Bernhard Bonigl 01c004b65b Merged Controls into default 2012-03-18 22:07:58 +01:00
Bernhard Bonigl bd7dd4ec63 Fixed items beeing picked up into the wrong slot when hand was empty. 2012-03-18 21:46:08 +01:00
Bernhard Bonigl 54bc0e0c80 Backed out changeset: ad89e9a64847 
(Construction Menu doesn't use fancygrid anymore)
 2012-03-18 21:34:13 +01:00
Bernhard Bonigl 07e0c24378 Made ObjectSelector bigger (ActionBar) 2012-03-18 21:12:19 +01:00
Sven Eberhardt 57eac58aa3 Skylands: Fix lift tower 2012-03-18 18:26:30 +01:00
Sven Eberhardt 501797dd83 Skylands.ocs: Plane part respawn; plane part elevator transport fix 2012-03-18 17:25:11 +01:00
Charles Spurrill 3c2c6303b8 Low-res flag-banner to reduce moire effect 2012-03-18 06:25:22 -07:00
Charles Spurrill 6ec435bec5 Rewording of Crash.ocs English intro 2012-03-18 06:22:48 -07:00
Maikel de Vries 6e55dce1e5 Added Invincible and NonFlammable effects for NPCs, etc. 
Also applied that to Crash.ocs NPCs
 2012-03-18 13:16:25 +01:00
Sven Eberhardt ccb2c0dc98 Skylands: Trees, materials and some tweaks 2012-03-17 15:31:32 +01:00
Bernhard Bonigl e8cd3c2871 Fixed Catapult using only the first/second inventory slot instead of the selected ones. 2012-03-12 17:04:57 +01:00
Charles Spurrill c54226dcb1 Rewording of Crash.ocs' English intro 2012-03-11 20:14:50 -07:00
Sven Eberhardt 18fb523f58 Skylands.ocs: Sky islands scenario WIP 
fixed some typo in Crash.ocs
 2012-03-12 00:50:13 +01:00
Sven Eberhardt f6725b720f Flagpole buying: Update amounts when items are bought 2012-03-11 17:52:42 +01:00
Armin Burgmeier 4180382c77 Crash.ocs: Make emergency boompacks uncontrollable 2012-03-11 19:29:46 +01:00
Armin Burgmeier d7af22ba81 Merge default into Controls 2012-03-11 17:50:38 +01:00
Armin Burgmeier a942e33456 Don't restart intro if a player joins midgame 
Relies on #726 being fixed.
 2012-03-11 01:34:48 +01:00
Armin Burgmeier b777c0dd49 Start propellor sound with a small delay 
Sound does not work on Linux at all otherwise!?
 2012-03-11 01:32:15 +01:00
Armin Burgmeier da0f00f511 Add engine die sound to Crash.ocs 2012-03-11 01:25:22 +01:00
Maikel de Vries c55660126e Improved Crash intro sequence 2012-03-11 01:20:15 +01:00
Sven Eberhardt 151fed2348 New rule: Rule_BuyAtFlagpole 
Allows you to buy objects directly at flagpole
 2012-03-11 00:55:45 +01:00
Sven Eberhardt 346d3018da Crash.ocs: Goal graphics 2012-03-10 23:23:36 +01:00
Armin Burgmeier 97cfd81133 Support mesh graphics and ingame objects as menu item graphics 2012-03-11 00:06:44 +01:00
Maikel de Vries 263a359393 Crash: some minor improvements to the intro 2012-03-10 21:04:02 +01:00
Maikel de Vries e129a438e3 Pump can be turned off and on 
Still needs icon graphics
 2012-03-10 20:45:18 +01:00
Sven Eberhardt 633c3671bf Crash.ocs: Fix a shortcut in landscape 2012-03-10 20:03:46 +01:00
Bernhard Bonigl 80070b1b46 Merged default into Controls 2012-03-10 19:14:29 +01:00
Armin Burgmeier 8f239fb353 Add file forgotton in previous commit 2012-03-10 19:10:34 +01:00
Armin Burgmeier 87ff13981d Add intro to Crash scenario 2012-03-10 19:04:11 +01:00
Sven Eberhardt 7479ea523e Crash: Dialogue strings 2012-03-10 18:58:13 +01:00
Sven Eberhardt 6ba11122be Crash.ocs tweaks 2012-03-10 18:53:16 +01:00
Maikel de Vries 83ee9bcd7f Implemented goal for Crash.ocs 2012-03-10 18:46:51 +01:00
Sven Eberhardt 9cd563c52e Lots of improvements on Crash.ocs 
Pump: Make it possible to limit pumpable materials
 2012-03-10 18:23:48 +01:00
Maikel de Vries d6f2a8bd1b Fixed fuel consumption of producers 
The fuel amount of the fuels are reset to the original and correct values, adapted the steamengine a little for that.
 2012-03-10 17:33:57 +01:00
Maikel de Vries a82f87587e Added NPCs to Crash scenario 2012-03-10 17:02:45 +01:00
Sven Eberhardt a7289f5f1c +Crash.ocs - a new settlement adventure scenario WIP 2012-03-10 16:05:03 +01:00
Armin Burgmeier f1fa4810c3 Fix a C4Script warning by declaring a parameter in an #appendto script 2012-03-10 15:59:34 +01:00
Bernhard Bonigl 4c6b374dd7 Removed Interact = GrabNext. Use Actionbar-Hotkeys/Mouse for that. 
If something is grabbed, it'll always be ungrabbed by pressing Space now.
 2012-03-09 23:10:18 +01:00
Bernhard Bonigl de94d6b0a4 Made Inventory-Display a bit bigger 2012-03-09 23:06:44 +01:00
Bernhard Bonigl 0fcffec3bb Removed the huge GUI background and hand-display at the bottom 2012-03-09 23:00:05 +01:00
Bernhard Bonigl 7255a8abec ConstructionMenu uses adapted FancyGridMenu now 2012-03-09 21:50:37 +01:00
Bernhard Bonigl be0af9b77e First incarnation of the FancyGrid Menu 2012-03-09 21:50:24 +01:00
Bernhard Bonigl 7dc0601013 Fixed gridmenu having broken size if row item count was specified 2012-03-09 20:08:50 +01:00
Bernhard Bonigl 94dafb00b9 Fixed Construction-Menu creating deleted-object warnings due to Close + inherited 2012-03-04 23:45:14 +01:00
Bernhard Bonigl 124d600f60 Menus don't update if they're not beeing shown. 2012-03-04 23:16:21 +01:00
Bernhard Bonigl 26a85da227 Added a simple implementation of a grid-menu. Without border so far. 2012-03-04 23:04:15 +01:00
Maikel de Vries 51889abb04 Goldrush has more firestones in the earth 
This to make sure players can mine enough resources from the start, also symmetrize wind and introduced topsoil and midsoil earth.
 2012-03-04 21:45:55 +01:00
Maikel de Vries 9543c10cad Sawmill is not be accessible as a container. 
If one takes wood from the sawmill during production this triggers the infinite sawing loop.
 2012-03-04 17:12:39 +01:00
Maikel de Vries a977aebac5 Cloud: clean up and fixed lightning strikes 
This should in the end all depend on scenario settings, but it's okay for now I guess
 2012-03-04 10:44:53 +01:00
Bernhard Bonigl 72b34d7485 Created a general Menu Library_Menu. The menus themself only take care of display now. 
Moved MenuItem to Library_Menu
Moved the lift-off effect in the CircleMenu from the MenuItem to the CircleMenu
 2012-03-03 19:12:57 +01:00
Bernhard Bonigl 25675d1c52 Renamed Menu to CircleMenu 2012-03-03 18:57:38 +01:00
Bernhard Bonigl 8359ed8fcb ConstructionMenu: Added a bigger display for the selected item and displaying power production/consumption 2012-03-01 20:57:40 +01:00
Bernhard Bonigl bbe743b9ca Made Inventory-Display locked by default 2012-03-01 20:56:59 +01:00
Bernhard Bonigl 7d3d47e477 Implemented IsPowerConsumer/Producer callback in corresponding libraries 
Added a fancy green power-symbol to Library_PowerProducer
 2012-03-01 20:56:44 +01:00
Bernhard Bonigl aee33ae415 Added a temporary hack for grabbing stuff with space alone until Controls are fixed (for playtests) 2012-02-28 20:57:57 +01:00
Bernhard Bonigl 44ceefae9a Down+Space now Ungrabs if something is grabbed 2012-02-28 20:44:10 +01:00
Bernhard Bonigl 84e5483a54 Actionbar now always displays the same order of vehicles (pushed vehicle is not at the front) 2012-02-28 20:40:19 +01:00
Bernhard Bonigl 893746f641 Clicking or selecting a slot via hotkey that already is assigned to the other hand switches hands now. 2012-02-28 20:18:52 +01:00
Bernhard Bonigl 956a369ab7 Removed Zombie-GUI-Elements that have not been deleted on player removal 2012-02-28 20:07:45 +01:00
Bernhard Bonigl 0c5b5dd30c Made Inventory transition faster and MouseOver-Area for showing a bit bigger 2012-02-28 19:56:26 +01:00
Bernhard Bonigl e76ba4076c Removed Backpack-Control (Q-Key) 2012-02-28 19:53:47 +01:00
Bernhard Bonigl 8924d1ae10 Cleaned up ClonkControls and refactored collecting 2012-02-28 19:52:15 +01:00
Julius Michaelis cb6eb060cc Add a dialogue for windows which can be displayed when the graphics engine initialisation failed 
The dialogue has fields for resolution and a checkbox for fullscreen mode
 2012-02-28 18:28:16 +01:00
Bernhard Bonigl 7251865981 ContentsMenu now only shows fully built containers 2012-02-28 22:55:40 +01:00
Bernhard Bonigl 6dddb26b8e Fixed InteractionHotkey not beeing prioritized 2012-02-28 14:30:32 +01:00
Bernhard Bonigl cd30fbaeb2 Merge with default 2012-02-27 21:51:08 +01:00
Bernhard Bonigl a698b0e662 Fixed menus beeing built counter-clockwise instead of clockwise 
The middle now is the 8th menu entry instead of the 1st
 2012-02-27 21:34:59 +01:00
Bernhard Bonigl 9480a701c4 ContentsMenu takes order in clonk-inventory into account 2012-02-27 21:17:23 +01:00
Bernhard Bonigl 1be0395442 Fixed Menu-Movement when transferring stuff 2012-02-27 21:00:29 +01:00
Bernhard Bonigl 44336f23d7 The Content-Menu now displays nearby crewmembers to the left for trading. 2012-02-27 20:44:12 +01:00
Bernhard Bonigl b8b4ee03f8 Changed Shift+Hotkey to Space+Hotkey for Interaction 
Space now interacts on release instead of press
Shift now works as a drop/throw modifier
Shift+Hotkey now drops that inventory slot
Non-Forced Throws/Drops (without Shift) now automatically select the next non-selected non-free Slot
 2012-02-27 16:24:34 +01:00
Bernhard Bonigl ee3913714e Items now can't be held in both hand at the same time 2012-02-27 14:07:47 +01:00
Armin Burgmeier fea6209365 Fix drawing of non-default graphics in picture overlays 
This was broken by 427cf61d729a.
 2012-02-26 21:09:42 +01:00
Bernhard Bonigl 3fddad2aad Hovered Items in Menus are enlarged by 10% now 2012-02-26 21:12:07 +01:00
Bernhard Bonigl 458369efda Fixed Clonk having wrong items displayed in hand at selection 2012-02-26 20:02:44 +01:00
Bernhard Bonigl db53603396 Hotkeys select the item at release now 
Holding hotkey + left/right mouse button selects it into the corresponding hand
 2012-02-26 16:19:52 +01:00
David Dormagen 1963fa61ba fixed dropping of stuff 2012-02-26 15:54:09 +01:00
Bernhard Bonigl a0e9ef1406 Fixed Actionbar-Hotkeys not working (Shift+(1-0)) 2012-02-26 14:26:23 +01:00
Maikel de Vries 7e864912df Implemented MouseOver in favour of UpdateCursor to show menu infos 2012-02-26 14:15:42 +01:00
Bernhard Bonigl f8200180ab Clonk collects items automatically if HandSlot is empty now 2012-02-26 14:13:14 +01:00
Bernhard Bonigl 5587ed0618 Backback and Hands share one Inventory now 
New Inventory Display at the left side
Inventory fades out if not locked
Inventory fades in if something changes, or mouse hovers there
Left/Right Mouse Click on an Inventory-Slot selects it for the corresponding hand
Icons to show which Slot is selected by left/right hand
Inventory can be reordered via Drag&Drop
Dragging an Item from a Slot onto the Landscape drops it
Changed Shift+Number to Ctrl+Number for selecting crew
Changed Number to Shift+Number for using Action-Bar
Changed Number to select inventory-slots now
 2012-02-26 01:48:58 +01:00
Bernhard Bonigl 2a5c129c93 Implemented MouseHover-Callback. 
Calls OnMouseOver(player, draggedObject) in Objects beeing hovered over.
Calls OnMouseOut(player, draggedObject) in Objects that stop beeing hovered over.
 2012-02-26 01:36:38 +01:00
Bernhard Bonigl 3c785cbee3 Added MovePosition(x,y,precision), which moves an object by x/y. 2012-02-26 01:34:56 +01:00
David Dormagen e0fa05418c added more array helper functions 2012-02-25 21:58:05 +01:00
David Dormagen 4169a9232c swapped parameters of GetIndexOf 2012-02-25 21:57:39 +01:00
Armin Burgmeier 9d94b1da6e For scaled sprite graphics, don't interpret Picture coordinates as scaled 
Otherwise an object with a scale of 5 and a picture of 64x64 (such as the
Metal and the GoldBar objects) cannot properly set the picture rectangle.
 2012-02-25 17:35:24 +01:00
Armin Burgmeier cebbacd3f4 Remove "Picture" DefCore entry in objects having mesh graphics 2012-02-25 17:04:00 +01:00
Armin Burgmeier 8eb76cef8c Unify overlay drawing of pictures 
Instead of having custom code drawing the picture in C4DefGraphics.cpp,
re-use C4Def::Draw().

This changeset changes the coordinate system on which draw transformations
are applied to sprite picture overlays. The transformation is no longer
applied in the frame of the overlay picture but in the frame of the object on
which the overlay is drawn. This was already the case before for mesh
graphics, so this change unifies the interpretation of draw transformations
for sprite and mesh graphics.

The Tools Workshop has been changed accordingly so that object is production
are properly displayed on the sign. This also fixes the pictures of some
objects being off the sign.
 2012-02-25 16:54:51 +01:00