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

2528 Commits (0b45ac83cf6b5829d6158e51f37f0d6d4022bd69)

Author SHA1 Message Date
Nicolas Hake 016f626cbe planet: Normalize line endings 2013-01-13 19:00:12 +01:00
Tobias Zwick 28e2bdbb92 fix #724: revers the order in which GetCrew(plr,index) returns the crew 2013-01-13 15:45:51 +01:00
Tobias Zwick b85b08687f fix #907: name of the construction site is not localized 2013-01-13 14:16:43 +01:00
David Dormagen 7ba10ca3cf added IsPointInRectangle(point, rectangle) to System.ocg/Math.c 2013-01-12 18:15:51 +01:00
David Dormagen 00d5ffea03 added LargeCaveMushroom and Cave 
the Cave-dummy-object has a Place() method which places a cave
 2013-01-12 18:15:51 +01:00
David Dormagen 1cd7ffec6a added a FindLocation function in System.ocg/FindLocation.c 2013-01-12 18:15:50 +01:00
Sven Eberhardt 58ea47a4fd Added support for function pointers to ScheduleCall/AddTimer/ClearScheduleCall/RemoveTimer 2013-01-02 00:50:01 +01:00
David Dormagen 4dcc784d35 do not pass controls to disabled cursor anymore (i.e. via SetCrewEnabled) 2012-12-22 17:11:06 +01:00
Sven Eberhardt 829e83dcdb Production menu shows missing components/liquids/materials/fuel in red 2012-12-17 14:32:48 +01:00
Sven Eberhardt 159e2e49b6 Rebalance loam to require less water 2012-12-17 14:32:10 +01:00
Sven Eberhardt 430d59fc8c Merge branch 'master' of ssh://git.openclonk.org/openclonk 2012-12-17 13:53:59 +01:00
Sven Eberhardt 4cdbd8641c Rebalanced wood usage so you need fewer trees to get a settlement started. 
* Wind generator down to 3 wood, 1 metal
* Flagpole down to 3 wood, 1 metal
* Sawmill down to 1 wood, 4 rock
* Trees give 5 wood (that's still 2 wood with direct chopping) to make the sawmill even more efficient
* Reduce maximum number of trees by ~20%, because trees tend to cause so much lag
* Reduce amount of power needed by sawmill to make sure one wind generator is enough even with moderate wind conditions
 2012-12-17 13:52:53 +01:00
Nicolas Hake 2e71694710 Producers: consume required material (#885) 
Instead of just checking whether the material is available, also
consume it.

I'm not quite certain whether we should return the removed material
along with the amount removed (to match the return value of the barrel's
GetLiquid), but since the bucket is not currently accepting wildcards
I don't think it's necessary.
 2012-12-17 02:11:15 +01:00
Nicolas Hake db9ee644eb Fix walking animation with xdir=0 (#887) 
When trying to get the sign of the horizontal velocity, a calculation
erroneously assumed that it could never be 0. When it did, a #DE was
raised. This changeset replaces the calculation with the Sign() function
from Math.c, which handles a zero argument correctly.
 2012-12-17 02:11:03 +01:00
Sven Eberhardt 2e7d1e4ba7 Fix snow melting in lava/durolava 2012-12-16 18:51:44 +01:00
Sven Eberhardt 8c3e78cee4 Skylands: Map update with less rock, so building the double elevator is easier now 2012-12-07 23:21:34 +01:00
Sven Eberhardt 9cc2c0aca1 Skylands loam length tweak 2012-12-07 23:13:18 +01:00
Sven Eberhardt 7cbf11e39d Skylands 
* Removed lift tower
* Fix scaffolds walls to no longer move Clonks on creation
* Reduce scaffold hit points
* Add flints to home base material and more flints to landscape
* Remodeled landscape and chests a bit
* Made plane parts destructible on damage, so you can destroy them if they get stuck
* Tweaked storm push a bit
 2012-12-07 23:11:52 +01:00
Sven Eberhardt 7ab2fe0ec9 Change bridge length constant to a local for Loam. 
This silences a warning about overloaded constants. Unfortunately, you cannot change it at runtime (using Loam.BridgeLength=newlength).
 2012-12-07 22:18:11 +01:00
Sven Eberhardt c3ad022a25 Skylands made a bit easier 2012-12-02 21:33:17 +01:00
Sven Eberhardt fc10ae7b33 Skylands balancing... 2012-12-02 21:19:12 +01:00
Sven Eberhardt f7bde6706d Skylands now a bit more playable 2012-12-02 18:53:25 +01:00
Günther Brammer 0f48d92036 Move Minimal.ocs back to Tests.ocf 
Minimal.ocs is not at all experimental. It has two uses: Testing aspects of
the game that do not depend on the scenario in a clean environment, and
checking that the default scenario settings still work.
 2012-12-02 17:48:34 +01:00
Maikel de Vries 9489759d3a Renamed Tests.ocf to Experimental.ocf 
This scenario folder is now intended more towards scenario testing purposes rather than containing random development stuff.
Both Experimental.ocd and Experimental.ocf should never be included in releases.
 2012-12-02 16:55:53 +01:00
Maikel de Vries 365c6e94c6 Moved Experimental.ocd out of Tests.ocs to planet 
This is necessary such that these objects are not automatically loaded for scenarios inside Tests.ocs
 2012-12-02 16:42:37 +01:00
Maikel de Vries db9093c2d5 Renamed Lines.ocs to Playground.ocs 
This is supposed to be a scenario where the player has access to all objects and can try them to his liking.
 2012-12-02 16:39:17 +01:00
Maikel de Vries 016c616d1e Fixed a script error in Lines.ocs 2012-12-02 16:21:17 +01:00
Maikel de Vries 6a0e920879 Removed Settlement.ocs from Tests.ocf 
And again, this is nowhere near releasing.
 2012-12-02 16:20:52 +01:00
Maikel de Vries 529aef6941 Removed Materials.ocs from Tests.ocf 
What was this even used for? I think a single material can be tested locally.
 2012-12-02 16:13:19 +01:00
Maikel de Vries 50eabaf952 Removed MeleeMoutain.ocs from Tests.ocf 
This scenario is not release material currently and has not been maintained in a long time.
 2012-12-02 16:13:19 +01:00
Maikel de Vries 3224f4bf85 Removed MossTest.ocs from Tests.ocf and moved Moss.ocd to Experimental.ocd 2012-11-27 23:24:42 +01:00
Maikel de Vries ed30e35c30 Removed GrappleRace.ocs from Tests.ocf 
Not maintained, nor near releasable.
 2012-11-27 23:19:31 +01:00
Maikel de Vries 65acfd0867 Removed AirRace.ocs from Tests.ocf 
Not maintained anymore and not close to publishing.
 2012-11-27 20:24:26 +01:00
Maikel de Vries e14680de87 Removed PoT.ocs from Tests.ocf 
This scenario is not used any more and outdated.
 2012-11-27 20:21:38 +01:00
Maikel de Vries 6b53e21ea8 Removed Pyramid.ocs from Tests.ocf 
This scenario is not maintained and outdated.
 2012-11-27 20:20:15 +01:00
Sven Eberhardt 8fcd8e9fac Stormy Skylands: Added some missing files 2012-11-27 20:03:59 +01:00
Sven Eberhardt 555caffabd Stormy times in Skylands! 2012-11-26 23:15:26 +01:00
Maikel de Vries 1e76bbd969 Adapted stone door to open for all players if set team == 0 2012-11-23 23:07:40 +01:00
Günther Brammer cd14035a4e Prevent git from changing line endings in the game data 
These files need to be the same everywhere to allow the network code to
check that they are in fact the same.
 2012-11-21 20:34:53 +01:00
Tobias Zwick 348fb8c7a9 clean up mouse controls, reduced cursor graphics to the used ones 2012-11-16 17:29:42 +01:00
Maikel de Vries 13b9dd2e53 Added dummy object to fix script error 2012-11-15 22:07:21 +01:00
Matthias Rottländer 9ed8fcc2d4 Added model of the flightless bird 2012-11-15 15:56:40 +01:00
Felix Wagner 6f912365d2 Raiders of the Lost Castle WiP 2012-11-15 15:20:34 +01:00
Charles Spurrill 3bc2b3474a Added Hatch.ocd to Tests 2012-11-15 15:20:13 +01:00
Matthias Rottländer bf72b5aa3e New model for loom 2012-11-15 15:19:30 +01:00
Charles Spurrill 4be8e1f97b Shipyard texture 2012-11-13 20:18:46 -08:00
Charles Spurrill 1121425eca Airship: modules delete themselves when airship is removed 2012-11-12 18:09:58 -08:00
David Dormagen 4cdb4a6f3d fixed possible zero pointer error 2012-11-12 18:58:39 +01:00
Charles Spurrill bab481dbc9 Balloon: fixed "jump" when deploying 2012-11-11 18:49:06 -08:00
Charles Spurrill f70a66ceae Nicer smoke for chemlab 2012-11-11 16:51:22 -08:00