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

25 Commits (92ed1537a0e79facded3c81f50f7767962d70d6f)

Author SHA1 Message Date
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
Maikel de Vries acf62234ce add icon for arrows 2015-09-03 17:44:45 +02:00
Maikel de Vries 3f55ea28bd add icons for hash and sum 2015-06-06 14:23:47 +02:00
Maikel de Vries a6a3272c8f rank icons for the new HUD 2015-06-06 14:18:41 +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 d8342b8410 add a world icon 2015-06-01 18:52:17 +02:00
David Dormagen 9829dabdb7 added Foaly's new number graphics 2015-04-12 20:26:27 +02:00
David Dormagen 9236ef265c interaction menu: added buttons for "transfer all items" 2015-04-12 20:24:45 +02: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 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
Tobias Zwick d5e349ab10 stop and play icons 2013-05-26 13:10:44 +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
Clonkonaut 0709351ffd Play & Stop icons (used by the pump). GRAPHICS MISSING 2013-05-23 17:50:15 +02:00
Sven Eberhardt 8fde966ee5 LibraryStackable supports infinite stack counts for tutorials, AI enemies, etc. 
Also renamed internal Update() function to avoid name collisions with other scripts/libraries.
 2013-02-09 13:35:17 +01:00
Tobias Zwick c6641c9850 nicer lightbulb graphics 2012-10-14 21:51:16 +02:00
David Dormagen ff464a1006 fixed Height entry in Coin symbol 2012-10-13 22:43:24 +02:00
David Dormagen b96cec3f26 power system uses small light bulbs as progress bar 2012-10-13 22:42:08 +02:00
David Dormagen 068f08f34f fixed the sell-message at the flag 2012-10-13 13:45:52 +02:00
Bernhard Bonigl 912f8bd313 Added new Ok and Cancel icons 2012-04-14 22:29:25 +02: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
Maikel de Vries 59c1aefad9 Objects: All Versions to 5,2,0,1 2011-10-01 10:54:15 +02:00
Armin Burgmeier 675c077ed2 Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00