aa892171fb
update version to 8.0 in DefCore.txt, Scenario.txt and Version.txt
2018-01-28 13:18:46 +01:00
c0047bdc53
Fix a desync during runtime join (GH-58)
...
This is a workaround for a more complex engine-side issue. See #1953
2017-11-05 13:56:21 +01:00
d356d9db3d
Fix inherited() calls
...
The ... operator should be added so that the parameters are passed down. In some cases even the named parameters were not passed down.
2016-11-26 18:57:31 +01:00
94ec4e336b
Fix inherited(...) calls
...
The named parameters have to be handed down, because the ... operator only passes all the unnamed parameters.
2016-11-26 17:56:41 +01:00
202e1ed682
HUD modularity: Callback for controller ID
...
I think that the call GUI_Controller->GetControllerID() has more appeal, but it makes the code confusing maybe.
2016-11-26 11:10:35 +01:00
36685a3119
Add HideInCreator=true to internal/helper/library definitions
2016-07-10 22:06:48 -04:00
bfd0bd035d
Added magic energy support for 3rd party devs.
2015-09-30 10:20:20 +02:00
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
a0deca27b6
Make HUD controller reinitialization after section change more failsafe.
2015-09-10 18:35:03 -04:00
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
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
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
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
49c5b22591
Remove some empty graphics files.
2015-01-17 18:22:06 +01:00
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
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
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
c6802b8776
increase game content version entries to 6.0
2014-12-12 22:58:16 +01:00
952f06b173
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
2014-09-29 11:47:09 +02:00
31febf7a40
Fix HUD Adapter recreation on section change
2014-09-12 01:02:13 +02:00
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
a7fe61bb36
Fix CrewSelector HUD for non-Clonk crew memebers
2014-01-04 14:21:44 +01:00
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
5b4e8c887c
when loading (f.e. bow and musket) the inventory slot displays a small loading bar
2012-07-05 20:09:32 +02:00
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
12ffe6ab9c
Removed overlooked Tube-Updates
2012-04-22 18:48:38 +02:00
71dd5fc64d
Fixed display-problems with CarryHeavy
2012-04-13 19:14:55 +02:00
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
b6731b1dc8
Inventory now updates when an object is removed (Loam, Constructing stuff,...)
2012-03-21 21:55:34 +01:00
0fcffec3bb
Removed the huge GUI background and hand-display at the bottom
2012-03-09 23:00:05 +01:00
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
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
59c1aefad9
Objects: All Versions to 5,2,0,1
2011-10-01 10:54:15 +02:00
8f4d300a3f
HUD: Some clean up in scripts and files
...
Moved all HUD elements to Elements.ocd, this should have been quite obvious in the first place.
Cleaned up health and breath tube, scripts were unreadable.
Breath tube doesn't stay when swimming, swimming and breath are unrelated quantities and should be treated accordingly, but more important the bar in the crew selector and the HUD now behave the same.
2011-09-28 19:55:01 +02:00
8774235f82
breath tube shows again
2011-09-24 12:56:40 +02:00
6a03498136
HUD: More safety checks for non-crewmembers
2011-09-22 17:18:37 +02:00
99494e504a
Objects: Prevent HUDadapter from throwing runtime errors for non-crewmember clonks
2011-09-18 22:03:08 +02:00
e3a1cdcc3f
the HUD optimizations now mostly use the old callbacks
2011-09-18 19:15:31 +02:00
675c077ed2
Change .c4d extension to .ocd
2011-03-13 16:55:00 +01:00
Maikel de Vries