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

92 Commits (00b1b3778795cf5e69f59d27371d3029837274a3)

Author SHA1 Message Date
Sven Eberhardt dd690e62b9 Added anti-clogging mechanism to pump. 
Now pipes cycle through several offsets before giving up on the pumping.
 2015-09-05 13:10:55 -04: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 8a297766b3 fix pump power consumption (#1309) 2015-05-13 21:18:15 +02:00
Sven Eberhardt 21500a81a9 Fix pump to clear the last row of pixels (#1057) and allow pumping from pump without source pipe. 
ExtractMaterial has been changed to be able to slurp in from the most distant horizontal position rather than the closest to the extraction top center.

Also speed up ExtractMaterial for the common case of no required horizontal shifts.
 2015-05-01 18:13:41 +02: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 0ed8c2faa5 fix pumping downwards after source emptyness 2015-03-05 20:40:10 +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 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 a5155f6d88 fixed no power need rule 2015-02-04 12:40:29 +01:00
Maikel de Vries c0ff94eb75 normalize power values to multiples of ten 
This makes it easier for internal calculations and that value of 10 now represents a single light bulb. It is advisable to only use multiples of 10 for production and consumption values.
 2015-02-04 10:35:15 +01:00
Maikel de Vries 2d00588dff new power system (work in progress) 2015-02-04 10:35:14 +01:00
Maikel de Vries 2d1647ea77 improved prioritizing of power consumers 2014-12-19 21:47:08 +01:00
Maikel de Vries c6d87151d4 allow to cut the pump's source and drain (#1144) 2014-10-18 19:12:55 +02:00
Sven Eberhardt 5094cc5c1b Reworked "Save as scenario" option in editor to write a script file instead of Game.txt. 2013-12-27 17:10:09 +01:00
Clonkonaut 57eb53e298 Sound added to the pump. 2013-11-27 22:23:21 +01:00
Tobias Zwick ddd2db94e0 remove debug log and messages 2013-06-04 20:11:09 +02:00
Tobias Zwick e30d5b9ec5 final fixes and refactorings for the pump 2013-06-04 20:10:51 +02:00
Tobias Zwick 416d49db99 adapt pump to use CanInsertMaterial to determine pump height 2013-06-04 20:09:09 +02:00
David Dormagen 81629cd691 the pump now behaves correctly in regards to the power usage 2013-05-31 22:34:17 +02:00
Tobias Zwick 131ec86b98 refactor pump done. Remaining problem: power system (usage) 2013-05-30 22:11:39 +02:00
Tobias Zwick c4a957a6b1 Merge branch 'master' into pumpstuff 
Conflicts:
	planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
 2013-05-28 22:47:37 +02:00
Tobias Zwick 855ba27d6f tried to refactor pump 2013-05-27 21:51:26 +02:00
Matthias de75275f61 Changed pump to use mesh and script animations 2013-05-27 13:24:42 +02:00
Clonkonaut 0709351ffd Play & Stop icons (used by the pump). GRAPHICS MISSING 2013-05-23 17:50:15 +02:00
Sven Eberhardt c944935563 Pump: Fix update of vertical pump distance after each 200 material pixels pumped 2013-04-28 14:02:57 +02:00
Sven Eberhardt 53b38165ee Pump produces power when pumping downwards. 2013-04-28 13:57:53 +02:00
Sven Eberhardt 11438f7e02 Pump cannot destroy materials any more. 
Before this patch, you could destroy materials by pumping them into earth (like you could in CR). This made scenario with acid/lava obstacles rather easy.
 2013-03-02 22:33:56 +01:00
David Dormagen 7c1a1cef25 fixed the pump's irritating power consumption 2012-10-25 20:14:13 +02:00
Charles Spurrill bf8aa9241e Pump: Implemented Matthi's new graphics (pre-rendered) 2012-08-07 11:54:47 -07:00
Maikel de Vries 199272ef25 Pump is turned on by default as intended 2012-05-14 23:11:26 +02:00
Maikel de Vries eff20344d8 Moved construction direction to stucture library 2012-05-12 10:16:33 +02:00
Maikel de Vries 80e1abc808 Implemented a simple Damage>HitPoints -> Destruction mechanism for structures 2012-05-10 21:20:06 +02:00
Maikel de Vries 4a56f8d7c1 Replaced defcore values related to fire with properties 2012-04-28 16:17:38 +02:00
Felix Wagner 366d96680a Rotate your buildings in the construction preview using Space! 2012-04-16 16:31:38 +01:00
Tobias Zwick 038ef1b4b6 descriptions for structures 2012-04-15 13:13:14 +02:00
Maikel de Vries e129a438e3 Pump can be turned off and on 
Still needs icon graphics
 2012-03-10 20:45:18 +01:00
Sven Eberhardt 9cd563c52e Lots of improvements on Crash.ocs 
Pump: Make it possible to limit pumpable materials
 2012-03-10 18:23:48 +01:00
David Dormagen 5cbaa697f0 changed power system to transfer power freely in a base and get rid of power lines 
power now is either available or not - there is no "produce X power and save it somewhere" anymore
 2012-02-18 22:50:18 +01:00
Daniel 79d44490b6 Liquid Pipe System Update 2011-10-12 00:32:46 +02:00
Armin Burgmeier 675c077ed2 Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00