David Dormagen
4964fb11ce
shift+click support: used undocumented GetPlayerControlState instead of own memory for key state
...
One of Sven's private functions. I also renamed the control to CON_ModifierMenu1 (from CON_ModifierInventory1), because it's actually supposed to be the menu modifier in general - even if it's mapped on the inventory key.
2015-10-10 00:52:43 +02:00
David Dormagen
b9420ce68c
added shift+click support for menus
...
Or more generally: added support for any modifier key for any other command without the requirement to define a new command based on the old one plus the key. This can be helpful in situations where the player commands are decoupled from the script engine control handling (e.g. with menus).
Currently Shift+Click is only used by the inventory menu to transfer all items of a certain kind.
2015-10-09 13:14:27 +02:00
Clonkonaut
9f7b2fc007
ActionBar: Show description for ACTIONTYPE_EXTRA.
2015-10-06 15:08:50 +02:00
Clonkonaut
9aee7ca973
GUI_Controll_CrewBar: Do not access crew_warnings as array if objects is deleted.
2015-10-05 13:33:36 +02:00
Sven Eberhardt
c0222974dc
Fix transfer from surroundings to container using interaction menu.
2015-10-03 22:26:10 -04:00
Sven Eberhardt
acc14ec7c9
Don't show HUD in NO_OWNER viewports ( #1414 ).
2015-10-03 20:49:17 -04:00
Clonkonaut
bfd0bd035d
Added magic energy support for 3rd party devs.
2015-09-30 10:20:20 +02:00
Clonkonaut
178e904fdd
HUD redesign. Beware!
...
Added interaction icon to help knowing when interaction is possible.
Limited crew portraits and information to two clonks.
Added additional warnings texts for further clonks (crew count > 2).
Moved inventory from bottom to top.
2015-09-30 10:11:43 +02:00
David Dormagen
439cfac129
custom GUIs: do not break text when style flag NoCrop is set and set NoCrop for HP display
2015-09-25 15:01:24 +02:00
David Dormagen
42a5b8e0fe
interaction menu: reworked "surrounding" internals ( #1396 )
...
The surrounding tab now uses the standard, mainstream contents display. That means that e.g. no ugly hacks are necessary to enable the "transfer all" buttons.
Previously, the surrounding menu was completely separate and always collected into the Clonk. Now you can also just put stuff directly from your surrounding into your lorry (i.e. just take everything around you into the lorry).
2015-09-24 21:27:52 +02:00
David Dormagen
f4f9afa477
custom guis: for the Player property, distinguish between NO_OWNER and nil
...
NO_OWNER means the message will be visible for noone (can f.e. be used to hide a ui window). nil means the message won't have visibility restrictions. This is probably what the scripter expects.
Previously, a value of "nil" would have been read as 0. So not setting the Player property and setting it to nil would mean two different things.
2015-09-23 22:03:29 +02:00
Sven Eberhardt
5b981be93c
HUD: Fix extra slot display in multiplayer.
2015-09-20 20:43:12 -04:00
David Dormagen
7a6e8cdf90
interaction menu: simplified object-finding-logic greatly
...
This is mainly to get rid of IsContainerEx, because wtf.
The only reason why the categories were restricted was to prevent HasExtraSlot-objets from being found. Some C4D_Objects (or with wrong category in general) wanted to be found however. They are now found just like that.. like it was supposed to be.
2015-09-20 17:36:45 +02:00
Sven Eberhardt
bf1596a229
Adjust interaction menu object ordering.
...
The clonk opening the menu should always have higher priority so the clonk is predictably selected on the left side even if standing behind e.g. a crate.
Other clonks should be behind because interaction with them is rare but having your fellow players stand in front of a building is very common. Allies also tend to run in front just when you opened that menu.
2015-09-15 21:13:53 -04:00
Sven Eberhardt
9ec3ca0304
Fix production menu entries in unowned producer buildings.
2015-09-15 20:50:50 -04:00
David Dormagen
35903e64d9
fixed possible nil-pointer access in interaction menu
...
I am still not 100% sure in which situation this occurs (see also old comment in line 168). I suspect it happens when an object is removed from the menu and the object check timer ticks just before the inventory timer.
It is possible that this should rather be resolved by removing the inventory check effects when the right conditions are met (aka the menu is removed). IF that is even the cause. Right now I don't think the current situation is too bad, because the check is very lightweight and superflous content check effects will be removed when a new menu is opened on either side anyway.
2015-09-15 21:27:26 +02:00
David Dormagen
673243c9dd
properly handle QueryRejectDeparture everywhere ( #1382 )
2015-09-11 21:08:38 +02:00
Sven Eberhardt
5b6ba5d980
Fix nil pointer in inventory HUD when inventory slot count of active target is reduced.
2015-09-10 18:52:49 -04:00
Sven Eberhardt
fe0b85870c
Fix division by zero in HUD on undefined health and breath values.
2015-09-10 18:35:04 -04:00
Sven Eberhardt
261bef7120
Ignore invisible objects for interaction menu.
...
They were creating invisible tabs, which was a bit weird.
2015-09-09 19:46:55 -04:00
Sven Eberhardt
c536afefd3
Fix HUD after section change in Deep Sea Mining.
...
Also fixed a typo, which is a related bugfix and therefore in the same commit.
2015-09-08 23:18:53 -04:00
David Dormagen
bfbca4065d
inventory: fixed stacking containers displaying no stack count
2015-09-08 19:41:51 +02:00
David Dormagen
cc3452bd0d
custom guis: properly scale with font size now
...
Previously, the em <-> pixels conversion was a hardcoded value. Now the GUI scales with the font size that can be selected in the options.
Sadly, all scales were off since the hardcoded value was too low.
2015-09-06 19:02:31 +02:00
David Dormagen
f856aa4968
interaction menu: added minimize button
2015-09-06 16:35:35 +02:00
Maikel de Vries
33be9d719f
fix wealth display in HUD
2015-09-06 09:23:06 +02:00
Sven Eberhardt
1a9b7fa98f
Fix HUD deletion of all players when one player is removed.
2015-09-05 20:37:13 -04:00
David Dormagen
87a824b49d
inventory & interaction: added Find_Layer where appropriate
2015-09-05 11:22:23 +02:00
David Dormagen
32923188b9
interaction menu: added name of object at the top of the menu
...
..and also increased speed of GUI_ObjectInteractionMenu::FxIntCheckObjectsTimer by around 10%.
2015-09-04 16:53:32 +02:00
David Dormagen
d8b99b8a41
interaction menu: visually disable containers on one side if they are already open on the other
2015-08-07 16:48:28 +02:00
Maikel de Vries
4e3c211fcc
remove outdated object selector
2015-06-29 21:38:07 +02:00
Maikel de Vries
83124d86f4
remove obsolete back pack slot hud element
2015-06-27 15:56:19 +02:00
Maikel de Vries
ec6d7c173e
implement transfer all objects to surroundings
2015-06-07 19:04:43 +02:00
Maikel de Vries
1db961a92c
make construction site a container for interaction menu
2015-06-07 12:53:59 +02:00
Maikel de Vries
2e0bde2a1c
fixed interaction for construction site and chest
2015-06-07 12:28:22 +02:00
Maikel de Vries
1054bd55de
crew HUD now shows selected crew member
2015-06-07 10:16:56 +02:00
Maikel de Vries
3ba41e36d9
update goal in info menu
2015-06-07 09:30:25 +02:00
Maikel de Vries
4a0bf73474
show player the goal HUD is clickable
2015-06-07 09:03:34 +02:00
Maikel de Vries
46475f8aab
remove unusud GUI_Marker object
2015-06-07 08:21:57 +02:00
Maikel de Vries
9f1b9cc243
script GUI implementation for crew HUD
...
There are still a few features lacking, namely showing the selected clonk and the old bars for health and breath.
2015-06-06 15:40:17 +02:00
Maikel de Vries
c19304fd1b
hud controller: remove empty graphics and clean up defcores
2015-06-04 17:12:11 +02:00
Maikel de Vries
3a6bcaafb6
use new script gui for goal and wealth HUD
2015-06-03 22:36:36 +02:00
David Dormagen
196f528201
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/HUD.ocd/FancyGridMenu.ocd/DefCore.txt
planet/Objects.ocd/HUD.ocd/GridMenu.ocd/DefCore.txt
planet/Objects.ocd/Helpers.ocd/Dummy.ocd/Graphics.png
planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c
planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Flag.ocd/Marker.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
src/game/C4Game.cpp
src/gamescript/C4GameScript.cpp
src/gui/C4GameMessage.cpp
src/landscape/C4Landscape.cpp
2015-06-03 22:32:36 +02:00
Maikel de Vries
aa84f78c03
fixed description of the chest interaction
2015-05-21 22:32:23 +02:00
David Dormagen
47d73f01ee
progress bars: allow progress bars from non-object contexts (fixes potential issue with HUDProgressBar)
2015-04-26 19:41:48 +02:00
David Dormagen
9236ef265c
interaction menu: added buttons for "transfer all items"
2015-04-12 20:24:45 +02:00
David Dormagen
4baf849c44
stackable: always take full stack from container, fix flickering in menu while standing on uncollectable stack
2015-04-04 20:37:06 +02:00
David Dormagen
0ef6bb306b
added new progress bar style to replace old pie-chart in inventory slot (when f.e. reloading)
2015-04-04 11:23:25 +02:00
David Dormagen
916e587b68
improved UI support of stackable library & extra slot
2015-03-26 12:24:48 +01:00
David Dormagen
ca682b7fc3
removed several old menu objects and added a replacement menu with the new GUI system
2015-03-20 18:07:37 +01:00
David Dormagen
ebcc397221
add proper support (inventory & interaction-menu contents) for extra slot library
...
Also fix bug with GuiScriptWindow where scrollbars would not be hidden in some cases (f.e. no-crop parent and negative-top child).
2015-03-19 16:22:06 +01:00
Maikel de Vries
4841fb944b
make hud bars staticbacks
2015-03-06 22:39:52 +01:00
David Dormagen
d740a79ba5
polished the updating behaviour of the interaction menu; added "Your Environment" tab into interaction menu
2015-03-05 18:53:52 +01:00
David Dormagen
700f332cc0
production menu: sort items by value; fix minor bug
2015-03-01 11:30:46 +01:00
David Dormagen
6466c6d45b
adapted flagpole to the interaction menu; moved some frequent checks (completion/hostility) to the interaction menu; the flag is no longer static back
2015-03-01 11:20:33 +01:00
David Dormagen
f169640713
interaction menu: improved support/updating of custom entries; adapted pump & producer to interaction menu
...
Also fooled around with the layout of the interaction menu. Far from final though.
2015-03-01 10:27:29 +01:00
David Dormagen
047bafaa6a
improved support for custom interaction menus; made pump control use the new interaction menu
2015-02-27 11:23:20 +01:00
Maikel de Vries
15f75f072b
show exit interaction when inside object ( #1169 )
2015-02-16 20:31:29 +01:00
Maikel de Vries
346d5cd709
another batch of Graphics.png removals
2015-02-15 22:37:08 +01:00
Sven Eberhardt
49c5b22591
Remove some empty graphics files.
2015-01-17 18:22:06 +01:00
David Dormagen
bd04722553
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
src/game/C4GraphicsSystem.cpp
src/game/C4GraphicsSystem.h
src/game/C4Viewport.cpp
src/gui/C4GameMessage.cpp
2015-01-15 19:57:01 +01:00
Mark
850bf1b9d4
CreateObject/CreateObjectAbove ( #1214 )
...
Renamed CreateObject() to CreateObjectAbove() and replaced all occurrences in script files.
Added CreateObject(), the function may need a rewrite though, see comment in code.
Updated documentation
2015-01-11 19:02:03 +01:00
David Dormagen
55bfecae4c
interaction menu: ignore containers(/objects) that are contained themselves
2015-01-04 12:26:37 +01:00
David Dormagen
bc9697ab3a
worked on making the order of items in the interaction menu and action bar more consistent; changed some minor things
2015-01-03 15:32:06 +01:00
David Dormagen
44989941cd
inventory menu: also show name of object in description box
2014-12-25 18:14:30 +01:00
David Dormagen
f89b8c8319
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/DefCore.txt
planet/Objects.ocd/Libraries.ocd/PowerConsumer.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/PowerProducer.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
planet/System.ocg/ClonkControl.c
src/gui/C4MouseControl.cpp
src/landscape/C4PXS.cpp
2014-12-25 15:24:19 +01:00
Maikel de Vries
c6802b8776
increase game content version entries to 6.0
2014-12-12 22:58:16 +01:00
David Dormagen
48bc48159e
Script GUIs: fixed last remaining old method names
2014-10-23 23:28:06 +02:00
Maikel de Vries
46c4b8df5c
added object name to menu item tooltips ( #1146 )
2014-10-18 09:57:49 +02:00
David Dormagen
c09e9880e2
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
2014-10-13 18:54:05 +02:00
David Dormagen
6a875a1b29
CustomGuis: renamed several script functions to be more consistent; removed Gui_AddMargin as it is obsolete
...
All calls that reference an existing Gui window now start with "GuiUpdate" (exception: GuiClose). All other functions are always to be called DURING menu creation and layouting.
The "Margin" property replaces Gui_AddMargin.
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/CustomGuiOpen/GuiOpen/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/CustomGuiClose/GuiClose/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/CustomGuiSetTag/GuiUpdateTag/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/CustomGuiUpdate/GuiUpdate/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/Gui_AddCloseButton/GuiAddCloseButton/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/Gui_UpdateText/GuiUpdateText/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/Gui_AddSubwindow/GuiAddSubwindow/g'
2014-10-11 11:51:26 +02:00
David Dormagen
049088be78
CustomGUIs: major rework of layouting & controls; better integration of C4GUI
2014-10-11 11:29:02 +02:00
Sven Eberhardt
fe59448c5d
Reset cursor view on UnGrab control.
...
This is to reset the view e.g. after controlling a switch.
2014-10-03 22:34:35 +02:00
David Dormagen
952f06b173
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
2014-09-29 11:47:09 +02:00
Sven Eberhardt
764f0aedd0
Fix goal graphics in HUD if goal is using multiple graphics and SetGraphics.
...
We don't have a GetGraphics() function at the moment, so use a small workaround.
2014-08-20 18:06:18 +02:00
David Dormagen
5722339e83
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Structure.ocd/Script.c
src/gamescript/C4GameScript.cpp
src/gui/C4GameMessage.cpp
src/gui/C4Gui.h
src/gui/C4GuiDialogs.cpp
src/gui/C4GuiWindow.cpp
2014-08-13 11:52:41 +02:00
Sven Eberhardt
28ba0ca4c5
DeepSeaMining scenario and game goal reworked.
...
* Goal is now construction of a communication structure
* Map size halved
* Do not respawn fish in player view range
Constructor: Added some callbacks for custom construction sites
Rubies: Store used graphics in local variable
ContentsMenuController: Added safety checks when host object is deleted in callback
2014-07-03 21:22:37 +02:00
Maikel de Vries
582cabf072
only show enter action button if in front of entrance
...
And not if in front of structure.
2014-06-08 18:39:35 +02:00
David Dormagen
269e09fca1
object interaction menu: increase size of side-bar items
2014-03-31 20:14:08 +02:00
David Dormagen
df658118cb
interaction menu: fixed a zero-pointer bug in FxIntRefreshContentsMenuTimer
...
When the array is not copied, it can under some circumstances be manipulated in DoMenuRefresh when it is called the next time from another location than the contents-update-effect. The effect does not want the array to change, though.
2014-03-27 19:44:34 +01:00
Maikel de Vries
99742ed166
Fixed displaying of Goals
...
This was due to not escaping the % character in Format
2014-03-27 19:13:32 +01:00
David Dormagen
8b0e6e5292
interaction menu: further fixes and cleanups; external menus can now be integrated smoothly into the framework; the production menu is now shown in the interaction menu
2014-03-26 23:55:32 +01:00
David Dormagen
537846d76d
menus: fixed two possible null-reference errors
2014-02-28 22:39:14 +01:00
David Dormagen
afbaf8c6aa
contents menu: fix not being able to put stuff into f.e. construction sites by ignoring the OCF check when collecting; allow Clonks to take stuff out of containers even if hand is full
2014-02-28 22:19:30 +01:00
David Dormagen
75e776cb04
custom GUIs: added "Margin" property
...
The property can be used to give GUI windows a margin. Either the same margin in all directions (Margin = "1em") or different margins (Margin = ["1em", "2em", "10$", "0.5em"] - [left, top, right, bottom]).
2014-02-26 22:37:12 +01:00
Maikel de Vries
647003cf3c
Added a nice GUI menu for displaying multiple goals
2014-02-17 20:39:47 +01:00
David Dormagen
4346da8e4e
custom GUIs: replace position properties X/Y/Wdt/Hgt with Left/Right/Top/Bottom that take strings instead of arrays, also change absolute unit from pixels to em
...
Before you'd define the X coordinate of the top-left corner of a window with X = [500, -40], now you do Left = "50%-4em". The em values currently do not scale with font-size yet, but it is important to do the formal change as early as possible to not have to do all work twice. Scaling of font and thus menus can be implemented later.
2014-02-17 15:46:36 +01:00
David Dormagen
fa4638d6c0
custom GUIs: change order of arguments of GuiAction_SetTag from (target, id, tag) to (tag, id, target)
2014-02-16 17:18:34 +01:00
David Dormagen
a0a76c051d
custom GUI: removed "CreateCustomMenu" which was only a wrapper for "CreateObject" - use "CreateObject" now
...
This should reduce the confusion about why the function behaves so differently from Gui_Open: the style objects only provide an interface for those easy GUIs, they are not really part of the GUI system.
2014-02-15 18:59:33 +01:00
David Dormagen
fb5e330f81
added dummy implementation of OnCarryHeavyChange callback to inventory bar
2014-02-15 17:38:42 +01:00
David Dormagen
06ac00ace8
Merge branch 'master' into Controls
...
Conflicts:
CMakeLists.txt
Makefile.am
planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
src/control/C4Control.cpp
src/control/C4Control.h
src/gamescript/C4GameScript.cpp
2014-02-15 14:44:57 +01:00
David Dormagen
acb35071ad
Merge branch 'Controls-fix' into Controls
...
Conflicts:
planet/Objects.ocd/HUD.ocd/ObjectInteractionMenu.ocd/Script.c
2014-02-15 14:42:35 +01:00
David Dormagen
50a6ca214c
started work on a new interaction menu - currently only the inventory part works
...
TODO: add production/buying/etc. - should be easily pluggable into the framework menu
2014-02-15 14:40:53 +01:00
David Dormagen
410a0ff5cb
made the user-data parameter of a GUI_Call-action-callback the first (before player number, menuID etc.) to be more intuitive
2014-02-15 14:39:56 +01:00
David Dormagen
fe68f80171
clear displayed inventory slot when object leaves inventory ( #966 )
2014-02-15 14:32:45 +01:00
David Dormagen
6a04337f7c
intermediate changes [TO AMMEND]
2014-02-15 14:32:42 +01:00
David Dormagen
216a33b493
made the user-data parameter of a GUI_Call-action-callback the first (before player number, menuID etc.) to be more intuitive
2014-02-15 14:32:27 +01:00
Sven Eberhardt
9a5a5432db
fix some safety checks
2014-01-08 01:54:13 +01:00
Sven Eberhardt
a7fe61bb36
Fix CrewSelector HUD for non-Clonk crew memebers
2014-01-04 14:21:44 +01:00
Sven Eberhardt
5865042849
Scoreboard library: Add functions to remove rows and columns.
2014-01-03 12:44:36 +01:00
Sven Eberhardt
56f985a017
Fix some failsafeties in HUD when controlling non-Clonk crew objects
2013-12-30 02:11:48 +01:00
Tobias Zwick
325053410f
rename script callback UpdateTransferZone to OnSynchronized ( #220 )
2013-12-17 23:16:11 +07:00
Martin Plicht
dd44c32e14
Remove some duplicate functions from scripts
2013-10-14 07:21:12 +02:00
Nicolas Hake
bfc54cf549
Avoid #DE in GUI_CrewSelector::FxGUIHealthMonitorDamage
...
GetMaxEnergy() is squashing very low values into 0. Objects could thus
still be alive while GetMaxEnergy returns 0, producing a div by zero.
Avoid this error by defaulting the divisor to 1.
2013-10-03 13:10:27 +02:00
David Dormagen
7eaef70af1
Merge branch 'master' into Controls
...
Conflicts:
planet/System.ocg/PlayerControls.txt
2013-05-26 18:19:51 +02:00
David Dormagen
0c23d1b9a6
reimplemented the action bar to use the custom GUIs
...
action bar now only shows shortly after hitting Interact
2013-05-26 14:59:19 +02:00
Martin Plicht
a915cdb15f
Make Eclipse happy by changing some zeros to nils and stuff
2013-05-26 00:01:08 +02:00
David Dormagen
6fe8b1719e
changed the inventory bar to use the new custom gui system
...
inventory bar is now at bottom of screen
2013-05-25 21:28:33 +02:00
David Dormagen
d18d8c65c9
Merge branch 'Menus' into Controls
2013-05-24 01:24:57 +02:00
David Dormagen
6c861f9165
removed the hold-number-and-click-mouse controls
2013-05-24 00:00:18 +02:00
David Dormagen
20bfab48b6
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Script.c
2013-05-23 17:53:41 +02:00
David Dormagen
337126fcb9
renamed MenuWindow to GuiWindow
...
added HP-Bar-test to MenuTest.ocs
bugfix
2013-05-09 13:28:45 +02:00
David Dormagen
9ad9a67939
Merge branch 'master' into Menus
...
Conflicts:
src/script/C4StringTable.cpp
src/script/C4StringTable.h
2013-04-07 23:02:36 +02:00
David Dormagen
1c05f22d41
added OnClose callback
...
more tests
minor fixes
2013-04-07 22:52:45 +02:00
David Dormagen
c2ba7e65d7
improved menu functionality; added test scenario and helper objects
2013-04-04 18:36:27 +02:00
Sven Eberhardt
aeeedcd770
Fix script errors in scenarios that don't load Objects.ocd
2013-03-19 19:27:19 +01:00
David Dormagen
6f9a11b817
further improved the right-click info message for structures
2013-02-02 21:41:20 +01:00
David Dormagen
34fc771911
merged master into Controls
...
Conflicts:
planet/Objects.ocd/Libraries.ocd/Structure.ocd/Script.c
2013-01-30 21:37:31 +01:00
David Dormagen
e6487533c2
added first version of object information dialogue on right-click
2013-01-30 21:27:09 +01:00
David Dormagen
ddeb338dc9
added progress bar style: GUI_ShadedSimpleProgressBar which looks like the currently used HP bar
2013-01-22 18:44:28 +01:00
Tobias Zwick
28e2bdbb92
fix #724 : revers the order in which GetCrew(plr,index) returns the crew
2013-01-13 15:45:51 +01:00
David Dormagen
d7eb93be1b
split ClonkControl.ocd into five libraries
...
Library_Inventory: handles slots and an arbitrary amount of hands, generic and not only Clonk-related
Library_InventoryControl: interactions between the user and the inventory
Library_CarryHeavyControl: interaction with carry-heavy-objects
Library_ClonkGamepadControl: gamepad-related stuff
Library_ClonkControl: general Clonk control library
2012-12-25 12:19:23 +01:00
Günther Brammer
98f4a5cc78
Only set the position of GUI_Goal on creation
...
I needed this to reduce the occurence of SetPosition while debugging
something that might have been caused by a SetPosition call.
2012-10-21 15:54:13 +02:00
David Dormagen
9753652821
power system's light bulbs are now in front of game-objects (f.e. trees)
2012-10-24 22:21:24 +02:00
Tobias Zwick
c6641c9850
nicer lightbulb graphics
2012-10-14 21:51:16 +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
David Dormagen
b96cec3f26
power system uses small light bulbs as progress bar
2012-10-13 22:42:08 +02:00
Bernhard Bonigl
233816bad9
Restrict Actionbar-Slots to 10 max.
2012-10-10 16:43:08 +02:00
David Dormagen
0940116620
added progress bar GUI_CustomImageProgressBar
2012-07-09 11:18:44 +02: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
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
Bernhard Bonigl
59a39d3ed4
Added SetBackgroundColor for GridMenus
2012-06-21 14:06:25 +02:00
David Dormagen
743ddc0f34
grid menu: fix possible zero-division with empty menu
2012-06-17 21:36:13 +02: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
Bernhard Bonigl
3ae8067703
Savegames: Simple fix for GUI, reset whole gui on load. #737
2012-05-13 19:31:28 +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
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
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
Bernhard Bonigl
f295d10b6d
ContentMenu now correctly removes containers when they're out of range.
2012-05-06 18:12:18 +02:00
Bernhard Bonigl
cd31b0e6e4
Forgot Debuglog. :(
2012-04-24 22:31:01 +02:00