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

124 Commits (bc5df7f35bf2f9e160a4739fbd96da584893cb55)

Author SHA1 Message Date
Martin Strohmeier e62938b3e4 Add Sandbox to Tutorials.ocf 2017-03-28 16:09:35 +02:00
David Dormagen 599509295d fixed some typos in German string tables 2017-03-12 11:18:35 +01:00
Fulgen301 c856df57ca AirborneMining: Remove remaining english text from StringTblDE.txt 2017-02-18 18:57:47 +01:00
Fulgen301 00340cc7f3 AirborneMining: Add missing german translation 2017-02-18 15:25:27 +01:00
Fulgen301 95d2e4bec1 Tutorial06: Translate string table which was forgotten 2017-02-18 15:24:17 +01:00
Maikel de Vries 0dbfa2dd91 ai: airship gets new pilot if old one is lost 2017-02-02 21:47:57 +01:00
Maikel de Vries d1c0750095 show wealth in tutorial 1 2017-01-15 15:38:33 +01:00
Clonkonaut 71d5e611a4 Airplane: carry up to 20 items and 3 clonks (#1663). Also refactoring of the script. 2016-12-30 03:54:01 +01:00
Maikel de Vries 3aaf216582 tutorials: don't show tutorial helper objects in editor 2016-12-21 14:12:01 +01:00
Maikel de Vries 478265fe96 explain clicking on goal icon in tutorials (#1683) 2016-12-21 14:12:01 +01:00
Maikel de Vries 309b24c6fe fix deprecated implicit declaration in for loop for tutorial arrow 2016-12-16 21:39:37 +01:00
Lukas Werling 68ddeb3bed Convert all text files in planet to UTF-8 2016-12-11 21:19:13 +01:00
Mark 94ec4e336b Fix inherited(...) calls 
The named parameters have to be handed down, because the ... operator only passes all the unnamed parameters.
 2016-11-26 17:56:41 +01:00
Maikel de Vries bfc830a103 fix wrongly turned catapult (#1838) 2016-11-11 20:10:12 +01:00
Fulgen301 db61e047ee Tutorial 06: German translation added. 2016-11-11 18:43:35 +01:00
Maikel de Vries fa977149e9 make firefly use insect swarm library 2016-09-30 18:58:42 +02:00
Maikel de Vries 18424aaaa7 add rule to control pump speed 2016-09-23 09:26:06 +02:00
Sven Eberhardt 0cdad64934 Fix goal and rule displays (#1811) 2016-09-14 21:46:16 -04:00
Maikel de Vries 4410e95cc2 tutorial 6: do not allow turning catapult while aiming (#1744) 2016-08-25 19:07:24 +02:00
Maikel de Vries 97c093ea0d tutorial 03: add welcome message to guide post 2016-08-25 19:07:24 +02:00
Maikel de Vries e18cee3a46 turn musket into blunderbuss 
The musket was not a very popular and useful weapon, being inferior to the bow. It now shoots 5 weaker bullets in one shot with less damage per bullet, this might require some further testing and fine-tuning. Also the weaker bullets mean that they can be used in a gatling-gun (WIP) and in the airplane as well.
 2016-08-22 16:32:48 +02:00
Maikel de Vries 45bb9ab550 rename lead shot to lead bullet and clean up script 2016-08-22 16:32:47 +02:00
Sven Eberhardt bce903ee04 Merge branch 'master' into qteditor 
Conflicts:
	planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Animal.ocd/CreatureControl.ocd/DefCore.txt
 2016-08-13 23:42:59 -04:00
Lukas Werling f3b2ff1295 Merge branch 'gamepad-controls' 2016-08-07 18:10:24 +02:00
Sven Eberhardt 693c0124b9 Update more goal icons for better editor size 2016-08-04 21:15:25 -04:00
Sven Eberhardt 36685a3119 Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
Mark 98dc6fa252 Fix Bug #1742 
Fixed and tested other problems in tutorial 3 and 4, too
 2016-06-01 20:40:26 +02:00
Lukas Werling 0afa589286 Replace all usage of "bool released" with "int status" 2016-03-21 18:45:42 +01:00
Mark 9d17cff91e Refactoring: Removed old barrel functions 
Replaced old barrel functions with the liquid container library calls
 2016-02-16 21:01:59 +01:00
Maikel de Vries 3e5bec1ffd tutorial 7: add interaction to call the airship (#1595) 2016-02-08 17:32:30 +01:00
Maikel de Vries c4c8362ef8 tutorial 3: ensure progress if sawmill is completed in a diffent way (#1674) 
for example if the pieces of rock are put into the site one by one.
 2016-02-08 15:27:58 +01:00
Maikel de Vries a88a890960 tutorial 7: explain cycling through multiple interactions (#1599) 2016-02-08 15:27:58 +01:00
Maikel de Vries 0d358ce45b tutorial 4: make sure player hacks out ore at the right location (#1675) 2016-02-08 15:27:58 +01:00
Maikel de Vries 933314165b tutorial 2: fix confusing formulation for dropping items (#1633) 2016-02-08 15:27:58 +01:00
Maikel de Vries 8128b8db33 tutorial 2: improve message to make loam bridge (#1634) 2016-02-08 15:27:58 +01:00
Maikel de Vries 1ebdc31182 add tutorial 6 
Still intro, outro and some NPCs missing.
 2016-02-07 21:29:27 +01:00
Maikel de Vries 2a4fa85583 tutorials: fix some descriptions and control strings 2016-02-07 21:29:27 +01:00
Maikel de Vries 0a928d4a11 tutorials: various small fixes 2016-02-07 10:19:11 +01:00
Maikel de Vries d7d2f8f39f fix showing description in the playground item spawn menu 2016-01-23 16:42:37 +01:00
Maikel de Vries 84218d1cbc merge UsageHelp into Description 
This is better for the new interaction menu, since only the description is shown for items, but it can be longer now.
 2016-01-23 16:28:02 +01:00
David Dormagen a7b674f662 tutorial guide: use full width for text when not showing buttons (related to #1612) 
A little rant about why I 'hardcoded' the value 2.9em:
If you are using constants to specify some positions, please give the meaningful names so that other people can work with them. E.g. calling something "menu_height" and then using it to adjust the X position AND the Y position of a BUTTON probably means it's not the "menu_height"...
I believe that the current "dynamic layout" will terribly break if someone would e.g. decide that the menu should be one line higher (because hey, then everything else would also move).

The real solution is to rewrite the layout of the menu to be dynamic and use constants (because currently it isn't and doesn't, it just tries to.).
 2016-01-19 20:39:39 +01:00
David Dormagen cd57e47493 script GUIs: fixed text clipping and scrolling (#1605, related to #1612) 
Previously, text windows would just change their own size and leave cropping and scrolling to their parent. This made the code easier, but was apparently unintuitive for scripters.
Now text windows do not change their size but show a scrollbar themselves (unless GUI_FitChildren or GUI_NoCrop of course).

This implied some other changes, because now parents without a scroll bar need to clip, too. (Or the clipping needs to be moved to the child window. But then it would have to be made sure that menu decoration can still go out of the bounds.)
And this also needed some script fixes where scripters assumed the text windows would not scroll (and thus made them smaller than 1em).

related to https://git.openclonk.org/openclonk.git/commit/46ad28ea652fad34814a866f3b9c305aa7cc6faa
 2016-01-18 21:39:54 +01:00
Maikel de Vries 5881018cb4 tutorials: hide guide message while in a dialogue (#1593) 2016-01-17 12:39:24 +01:00
Maikel de Vries 1ab3fdc104 tutorial 3: lumberjack directs to other villagers when needed (#1596) 2016-01-17 09:32:36 +01:00
Maikel de Vries cbc37ebb79 make sawmill site uncancellable in tutorial 3 (#1617) 2016-01-17 09:11:01 +01:00
Tobias Zwick 2cd5236339 fix problems with scenarios after having added the shape textures 2016-01-16 16:57:15 +01:00
Maikel de Vries 2ce04aa485 tell player to park airship a bit higher in tutorial 7 (#1598) 2016-01-12 23:25:30 +01:00
David Dormagen 46ad28ea65 tutorial guide: don't scroll portrait with text 
..by putting the text into another subwindow. Might be good to "fix" (it's intended but possibly not wise) that in the engine, but not right now before the release, because it could introduce new bugs.
 2016-01-12 23:17:49 +01:00
Maikel de Vries a7da208d85 fix next mission for tutorials 5 and 8 2016-01-12 23:07:36 +01:00
Clonkonaut 05b714a758 Tutorial 8: German translation. 2016-01-12 20:35:12 +01:00