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

51 Commits (3b0891ba89f7a75f832032036a6aefa2573e325d)

Author SHA1 Message Date
Nicolas Hake 05ca450111 Fix suspicious_assignment warnings in Missions 2018-07-23 10:45:52 +02:00
Maikel de Vries aa892171fb update version to 8.0 in DefCore.txt, Scenario.txt and Version.txt 2018-01-28 13:18:46 +01:00
Lukas Werling 058e9addb4 Skylands: Don't use half solid mask on vertical scaffold wall 2018-01-05 22:11:16 +01:00
Lukas Werling da63092ee1 Skylands: Fix "free wood" appearing in front of Sawmill 2018-01-05 22:11:16 +01:00
Lukas Werling ea009cad76 Skylands: Enable half solid masks for scaffolds 
We found these scaffolds to be rather infuriating to use, maybe this
will make it a bit better.
 2017-12-27 13:17:24 +01:00
Lukas Werling 4b0ab0b8b1 Skylands: Fix script error 
OnPlaneFinished deletes the calling object.

ERROR: can't access local variables without this
 by: SetProgress(5) (Missions.ocf/Skylands.ocs/Plane.ocd/Script.c:37)
 by: AddPart() (Missions.ocf/Skylands.ocs/Plane.ocd/Script.c:57)
 by: Timer() (Missions.ocf/Skylands.ocs/Plane.ocd/Script.c:47)
 by: FxIntScheduleCallTimer(0,effect {Function = "Timer", Name = "IntScheduleCall", NoStop = true, Pars = [], Repeats = -10794}) (System.ocg/Schedule.c:95)
 2017-12-27 12:59:11 +01:00
Maikel de Vries 7b4ba0245b fix script error on basement attachment to scaffold (#1917) 2017-06-03 15:41:03 +02:00
Lukas Werling 68ddeb3bed Convert all text files in planet to UTF-8 2016-12-11 21:19:13 +01:00
Mark d356d9db3d Fix inherited() calls 
The ... operator should be added so that the parameters are passed down. In some cases even the named parameters were not passed down.
 2016-11-26 18:57:31 +01:00
Sven Eberhardt 0cdad64934 Fix goal and rule displays (#1811) 2016-09-14 21:46:16 -04:00
Clonkonaut 1b76c31452 5 title picture by ala and K-Pone. 
https://clonkspot.org/forum/topic_show.pl?pid=14524#pid14524
 2016-08-15 00:32:01 +02:00
Sven Eberhardt 5db45c0f47 Merge branch 'master' into qteditor 2016-08-06 21:45:19 -04:00
Sven Eberhardt 693c0124b9 Update more goal icons for better editor size 2016-08-04 21:15:25 -04:00
Clonkonaut 56f8372a68 Skylands: fix GetComponent when called in definition context on 'small 
trees' (#1781).

At some point someone might test if this breaks anything but I think it does not.
 2016-07-25 17:55:53 +02:00
Sven Eberhardt 36685a3119 Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
Clonkonaut b6ca10d11a Constructor library: Changed to search through all available knowledge and filter using an overloadable function. 
The hammer will now only construct definitions that have the callback "IsHammerBuidable". This will exclude all C4D_Structure objects that are not buildings and can't be build in a meaningful way.
Also, with the carry heavy branch I want to test adhoc built lorries (lorries as construction sites). Sven suggested this.
 2016-06-18 19:45:45 +02:00
Maikel de Vries 2a731b2545 implement Components as a property lookup table 2016-05-21 13:34:34 +02:00
Maikel de Vries 1df322b7ff adapt objects and scenarios to new component implementation 2016-05-21 13:34:34 +02:00
Sven Eberhardt e8b0b9c16f WoodenBridge construction plan for some missions. 2016-01-10 21:39:56 -05:00
Nicolas Hake c0befc6ba0 Remove C4RTF 
The only use of C4RTF in its final moments was parsing out plain text
from RTF files anyway, so why even go to all the trouble instead of just
storing plain text in the beginning?
 2015-12-29 17:51:43 +01:00
Maikel de Vries 509bdac5bc remove unused Rebuy property from objects 2015-12-28 10:21:49 +01:00
Clonkonaut 0efe905c6a Removed obsolete Scenario.txt entries. 2015-12-16 01:35:41 +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
Maikel de Vries 338f3bca9d change airplane id (Plane -> Airplane) 
This is for a better distinguising between the Plane property and the airplane
 2015-11-21 20:53:19 +01:00
David Dormagen 73a817d1ae scaffold: use interaction menu instead of ControlLeft/Right/.. and allow extensions to both sides (#949) 2015-11-01 18:22:23 +01:00
Clonkonaut 86866d1d13 Skylands: Fixed various issues (#1267): 
- Chest added to knowledge
- GetWind returns -100
- Removed sky pixels from starting island
- Higher spawn position
- Real description
- Goal help will point out next missing part
 2015-10-13 16:04:54 +02:00
Clonkonaut f6d0ccff2e Skylands: Player starting material moved into chest to not overfill clonks. 2015-10-12 21:19:55 +02:00
Maikel de Vries 4c66cc4ad7 change time interface to remove connection between System.ocg and Objects.ocd 2015-09-22 23:31:17 +02:00
Julius Michaelis 0df19491e7 Get rid of incorrect sRGB headers in png files. 
libpng >1.6 keeps nagging because of that.

Quick bash script to do so:
find . -name *.png \
| while read f; do
	n=$(pngcrush -ow -rem allb-reduce "$f" 2>&1 | grep -c 'incorrect sRGB');
	if [[ $n -gt 0 ]]; then
		git add "$f"
	else
		git checkout "$f"
	fi
done
 2015-09-12 21:27:53 +09:00
Sven Eberhardt 44a396497c Fix tree growth in skylands scenario (#750) and rework alt tree texture. 
Tree growth now implemented using an overload of the grwoth function. Also made the alternate tree skin in skylands a bit more colorful
 2015-08-27 23:29:06 -04:00
Maikel de Vries 73ebce9f9a remove celestial environment object in favor of scenario callback 2015-04-08 20:18:24 +02:00
Maikel de Vries 70d75a7bca remove big conifers from skylands to prevent large forests 2015-04-02 21:39:19 +02:00
Sven Eberhardt 49c5b22591 Remove some empty graphics files. 2015-01-17 18:22:06 +01:00
Maikel de Vries 4ea0cb0ca6 make ContainBlast a property instead of DefCore entry 2015-01-15 17:46:53 +01:00
Mark d7a88eea62 Use CreateObject() in scripts (#1214) 
Objects with id Rule_*, Goal_*, and Environment_* are created with CreateObject() now.
 2015-01-11 19:04:42 +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 c6802b8776 increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
Sven Eberhardt 7513045d6c Move "Done" achievement from individual missions to parent folder. 2014-10-03 12:17:58 +02:00
Sven Eberhardt cde41733f8 Add "Done"-achievement to all missions. 2014-09-25 15:25:33 +02:00
Maikel de Vries a4a57a3dd6 added pump knowledge to golden mountain 2014-07-14 18:51:16 +02: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
Apfelclonk 4ecca08a20 Fix scaffold's solid mask 2014-04-26 19:22:02 +02:00
Maikel de Vries 9b96ab2305 Cleaned up base material in library and engine 
* rename to cleaner *Base* instead of *HomeBase*
* fixed library implementation
* engine code is now obsolete
 2014-04-16 14:07:01 +02:00
Maikel de Vries c075103bb9 Added GetDescription to all goals 
This will be used by the new HUD on the controls branch.
 2014-02-17 20:41:02 +01: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
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
Tobias Zwick 44f1887003 split up Plants library into crop (harvestable), tree (choppable) and plant (plant reproduction) 
This should make the plants not overloaded with functionality so that odd stuff like #904 can happen. I think the plants need more cleanup still.
 2013-12-05 11:23:22 +07:00
David Dormagen 30619ae7fd removed unused particle definitions & cleaned up Particle.txt of LightningBolt particle 2013-11-28 23:44:24 +01:00
David Dormagen b7cb5dc74a adapted remaining usages of old particle system in Missions.ocf to the new one 2013-11-26 22:43:28 +01:00
David Dormagen 6dc707b203 moved ObjectRestorer from Storm/Tutorials into Helpers.ocd 
It was used by more than one scenario already and the two versions already diverged. We should not do that in our own repository.
 2013-11-26 22:42:52 +01:00