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

425 Commits (45444c0d6abce74f47272c3217d3d1bd2c2363f6)

Author SHA1 Message Date
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
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 a93d96a3ca fix use of hammer in front of damaged structures (#1331) 2015-05-25 11:31:23 +02:00
David Dormagen 9829dabdb7 added Foaly's new number graphics 2015-04-12 20:26:27 +02:00
Maikel de Vries f3de7d4b06 construction site: sign in front and transparency for non-mesh structures 2015-04-07 23:21:57 +02:00
Maikel de Vries 71df13b803 fix attachment of basement to tall structures 2015-04-07 19:04:21 +02:00
Maikel de Vries 58c1220a19 fix scenario saving of basements 2015-04-07 18:54:29 +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 6d197b80d3 disable loading bar on reloading for now 
But keep as a separate commit to make it easier to re-enable it in the future.
 2015-04-04 11:25:17 +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
Maikel de Vries 9e2ccdb8b6 prohibit creation of more plants than seed amount in seed area 2015-04-02 19:46:33 +02:00
David Dormagen d077d3343e reworked bucket & producer library to work with stackable earth objects instead of magic material amounts 2015-03-26 12:27:10 +01:00
David Dormagen 916e587b68 improved UI support of stackable library & extra slot 2015-03-26 12:24:48 +01:00
David Dormagen 7d1d70f017 removed NoCollectDelay from engine; it's now handled by script 
Which allows a lot more fine-grained controls as all the control and UI stuff is now also in script anyway.
 2015-03-26 12:23:20 +01:00
Maikel de Vries a24dd229c4 producer does not depend on partial fuel amounts 2015-03-24 22:39:18 +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 5b12d6c240 deactivate power producers correctly on over production 2015-03-09 21:50:19 +01:00
Maikel de Vries 7c08270ff4 make power need call susceptible to proplist function change 2015-03-09 18:40:45 +01:00
David Dormagen 379d189787 now always use on leftclick and throw on rightclick (drop if you click your Clonk or below); also removed some old references to the right mouse button (UseAlt) 2015-03-09 13:33:31 +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
Maikel de Vries 5e456cda8a flag marker category none 
This ensures no interactions with other objects, also note a Plane needs to be set for a C4D_None object.
 2015-03-02 20:46:48 +01:00
David Dormagen 635dd6c285 flag marker: the little helper objects are no longer vehicles 2015-03-01 11:32:29 +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
Maikel de Vries 94019dd335 callback for projuct ejection in producer library 2015-02-22 19:03:30 +01:00
Maikel de Vries 40e0ea7bfc fix door control for wooden cabin 2015-02-18 18:25:49 +01:00
Maikel de Vries d2988163f5 fix flag marker redrawing on owner change 2015-02-16 17:17:18 +01:00
Maikel de Vries 49997045f6 fixed burned wind generator radiusin Mine Rescue 2015-02-16 14:17:05 +01:00
Maikel de Vries 6cd3b9775c fixed power need symbol display for elevator 2015-02-15 09:34:45 +01:00
Maikel de Vries a5b6066f25 fix removal of ownership on flag movement 2015-02-14 00:16:32 +01:00
Maikel de Vries de8ee9d840 fix flag removal effect on power network 2015-02-11 22:42:35 +01:00
Maikel de Vries cba73bafca implement flag ownership and network change on team switch and hostility change 2015-02-11 00:02:45 +01:00
Maikel de Vries 45a8c02cd0 clean up the animal library 2015-02-11 00:02:45 +01:00
Maikel de Vries 7f79caade5 flag library: fix on owner change and clean up 2015-02-09 19:32:15 +01:00
Maikel de Vries b7b6b187f7 clean up gold seller library 2015-02-09 19:32:15 +01:00
Maikel de Vries e47a08aaf7 clean up more flag related libraries 2015-02-08 15:28:13 +01:00
Maikel de Vries 37eb7a0095 make flag marker id consistent with other libraries 2015-02-08 13:35:26 +01:00
Maikel de Vries f2794d335f move ownable library into flag group 2015-02-08 13:35:26 +01:00
Sven Eberhardt bcd821a786 Fix construction menu opened at wrong position. (#982). 
It was always opened at the last mouse position of the owner of the hammer. Fixed it to use the controlling player instead.
 2015-02-08 13:31:51 +01:00
Maikel de Vries ce37dc181e clean up of the flag library 
This might have fixed the appearance of flag markers at the flag's center.
 2015-02-08 13:07:56 +01:00
Maikel de Vries df58032aa8 deactivate producers of higher priority on overproduction 2015-02-06 21:16:48 +01:00
Maikel de Vries 1336bb36ee libraries clean-up: remove graphics and clean defcores 2015-02-06 19:44:22 +01:00
Maikel de Vries 5c29121600 correct inherited call in structure library 2015-02-05 17:56:14 +01:00
Maikel de Vries 4d773f4ee9 fixed mine rescue goal 2015-02-05 17:40:13 +01:00
Maikel de Vries b59141f905 remove debug logging from power library 2015-02-04 15:56:02 +01:00
Maikel de Vries a5155f6d88 fixed no power need rule 2015-02-04 12:40:29 +01:00
Maikel de Vries a0dd53227e fixed storage not being consumer and producer at the same time 2015-02-04 10:35:16 +01:00
Maikel de Vries 97900a1278 libraries: remove power system before ownership 2015-02-04 10:35:16 +01:00