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

41 Commits (92ed1537a0e79facded3c81f50f7767962d70d6f)

Author SHA1 Message Date
Maikel de Vries f99db85c97 add more bottom vertices to structures to prevent falling down 2016-01-08 19:46:28 +01:00
David Dormagen dcfb986e34 moved sounds into subfolders 
This completes http://forum.openclonk.org/topic_show.pl?tid=3215
 2015-12-13 22:14:55 +01:00
Armin Burgmeier b8ed577c0f Rotate the OGRE coordinate frame by 90 degrees in X 
Also rotate all meshes backwards so that everything keeps working. This should
make it more convenient for modellers to create new meshes.
See http://forum.openclonk.org/topic_show.pl?pid=29410#pid29410.
 2015-10-03 11:39:08 -04:00
Sven Eberhardt 69b3b21766 Remove erroneous IsInteractable from windmill. 
It doesn't seem to have an interaction. Pressing [Space] in front of the windmill would just cause a script error.
 2015-10-01 23:21:24 -04:00
David Dormagen 36544bd56c Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c
	planet/Objects.ocd/Vegetation.ocd/Branch.ocd/Script.c
	planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c
	planet/System.ocg/FindLocation.c
 2015-08-02 19:24:04 +02:00
Clonkonaut f653d4c70c Lantern may now be attached to buildings. Simply put it in the building's inventory. 2015-07-02 22:36:32 +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
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
Maikel de Vries 7c08270ff4 make power need call susceptible to proplist function change 2015-03-09 18:40:45 +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 2c317888ca wind mill is only power producer for itself 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 4ea0cb0ca6 make ContainBlast a property instead of DefCore entry 2015-01-15 17:46:53 +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
Maikel de Vries 2d1647ea77 improved prioritizing of power consumers 2014-12-19 21:47:08 +01:00
Maikel de Vries c6802b8776 increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
Maikel de Vries 6ba0164c5b removed unnecessary defcore Value entries 
Completely unneeded for structures and many other objects.
 2014-05-26 21:38:32 +02:00
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
David Dormagen 28f2aa85ff renamed Particle_WoodChip to Particles_WoodChip for consistency 2013-11-26 21:25:02 +01:00
David Dormagen 913f746ffe adjusted WoodChip particle and usages to new particle system and moved WoodChip particle to proper place (not only used by the axe..) 2013-11-26 21:25:00 +01:00
Sven Eberhardt e1b972f960 Added energy radius to power producing buildings. 
See forum discussion on flags / energy distribution.
 2013-09-16 22:39:56 +02:00
Tobias Zwick 8f752d1d9e clean up files, make non-transparent textures high-quality JPEGs 2013-05-26 16:48:12 +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 1e65c14ec2 Removed obsolete Collection zones 2012-05-12 13:17:22 +02:00
Maikel de Vries 6fcc0f6d2e Removed TimerCall in favour of AddTimer script implementation 2012-05-05 12:09:44 +02:00
Maikel de Vries 4a56f8d7c1 Replaced defcore values related to fire with properties 2012-04-28 16:17:38 +02:00
Armin Burgmeier 8c49c3a7f7 Use Anim_R to synchronize rotation and animation of the windgenerator 2012-04-22 00:55:44 +02:00
David Dormagen f1be189aa9 windmill now works without creator too 2012-04-22 00:07:02 +02:00
David Dormagen 2cecc74e48 wind generator checks more than one point for wind, added invisible helper object so that the wings can get obstructed 2012-04-21 21:09:16 +02:00
Bernhard Bonigl 4c38caaf27 Merged default into Controls 2012-04-17 17:37:52 +02:00
Felix Wagner 366d96680a Rotate your buildings in the construction preview using Space! 2012-04-16 16:31:38 +01:00
Bernhard Bonigl 0bec0179e1 Fixed ProductionTime-Callback for real. 2012-04-15 18:45:43 +02:00
Bernhard Bonigl 98b67b1cdc Fixed Warnings in Producers 2012-04-15 17:14:43 +02:00
Tobias Zwick 038ef1b4b6 descriptions for structures 2012-04-15 13:13:14 +02:00
David Dormagen 85b8e23a8b windmills produces power in steps, steam engine produces more power 2012-02-19 01:02:17 +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
Felix Wagner a059f0f64a DisregardsKnowledge -> IgnoreKnowledge, NeedsRawMaterial -> NeedRawMaterial 2012-01-19 22:31:05 +00:00
Felix Wagner 0937b60ad6 Set foundry, sawmill and windmill to disregard knowledge (every product available) 2012-01-16 23:32:46 +00:00
Charles Spurrill aa7216aa49 Windmill tweaks and fixes 2011-10-14 23:04:16 -07:00
Felix Wagner 6c75d3f625 Windmill added. Enjoy your meal! 2011-10-15 02:47:24 +01:00