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

3797 Commits (6dddb26b8e1fd540ee4351d1d720438e2ed494bd)
 

Author SHA1 Message Date
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 893fb4bbed Make overlays on picture graphics work again 
This was partly broken by 427cf61d729a. However, already before that,
the size of the overlay was depending on the ingame size of the object
on whose picture the overlay was being drawn. This didn't make much sense
and now the size of the overlay is equal to the area on which the picture is
drawn in the first place.
 2012-02-26 21:44:00 +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 f3391ef939 New Branch for better Controls 2012-02-26 17:23:39 +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
Armin Burgmeier 7f5f916e76 Draw only partial set of faces for buildings in construction 2012-02-26 01:09:42 +01:00
Armin Burgmeier de67769065 Fix crash when C4Draw::Blit was called with NULL source surface (#721) 2012-02-26 01:01:55 +01:00
Armin Burgmeier 8f7f5cc1f1 Allow dragging of objects from FoW if they have C4D_IgnoreFoW set (#720) 2012-02-25 22:15:39 +01:00
Armin Burgmeier 09e0e48290 When starting to drag an object, use the object at mouse down time 
and not at the time the drag is started, which is a bit later, after the mouse
has been moved a few pixels in order. This makes it easier to start dragging
when hitting the drag object on an edge.
 2012-02-25 22:05:47 +01:00
Armin Burgmeier 7f5b7bcdd6 Make a MouseHover callback when the object being hovered by the mouse changes 2012-02-25 21:56:11 +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
Maikel de Vries c3b57957c4 Coniferous tree seeds faster, this is needed in for rounds like Goldmine 
Also some more trees and gold in goldmine.
 2012-02-25 16:15:17 +01:00
Julius Michaelis c96d5048f2 Fix a link in the german docs 2012-02-24 00:33:24 +01:00
Maikel de Vries dd2f93b3e4 Steamengine can now be accessed for contents 2012-02-23 22:35:30 +01:00
David Dormagen e3d84a550a added two particles 2012-02-23 21:45:58 +01:00
David Dormagen 7c883df228 added building: Power Compensator 2012-02-23 21:45:13 +01:00
David Dormagen 8f13c3c791 fixed Steam Engine to only burn fuel when needed, adjusted fuel values for coal and wood 2012-02-23 21:44:10 +01:00
David Dormagen d458eca6c4 ownable objects now have the right owner after construction 2012-02-23 21:42:15 +01:00
Charles Spurrill 3da02c2b2f (#694) Clonk can recollect boompacks in BoomRace 2012-02-22 22:33:24 -08:00
Maikel de Vries 6f2d4f629e Sawmill does not accepts trees before it is fully constructed (#715) 2012-02-21 18:51:29 +01:00
Sven Eberhardt bdd053e2dc Fix compilation with zlib 1.2.6 
Include zlib.h instead of just copying the definition for gzFile
 2012-02-21 17:12:00 +01:00
Maikel de Vries a9e43a1433 Fix sawmill woodchip and smoke production when off 2012-02-21 00:02:32 +01:00
Felix Wagner b61a44d7fa last fixes to make Eclipse happy 2012-02-20 12:27:14 +00:00
Felix Wagner 39e2fd8320 Unused var fix, I forgot to save 2012-02-20 12:06:38 +00:00
Felix Wagner 0051862213 For the sake of Eclipse: fixed various var declarations 2012-02-20 12:04:59 +00:00
Felix Wagner eb6b7be7ee Fixed various unused vars 2012-02-20 11:58:58 +00:00
Felix Wagner 67efb5c7e1 Fixed undefined field [Physicals] 2012-02-20 11:29:01 +00:00
Felix Wagner 1c4deede8c Fixed Code never reached warnings 2012-02-20 11:25:43 +00:00
Armin Burgmeier 94f552bbb8 Fix earth material initialization to work when texture is given 
This fixes misplaced InEarth objects when the Material= option in Scenario.txt
contains a material-texture combination instead of a material only.
 2012-02-19 19:33:35 +01:00
Armin Burgmeier e8e1c4b9d8 Check only 3 version numbers when checking whether an update exists 2012-02-19 18:31:09 +01:00