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

95 Commits (d3d41721f02d9c7c8a384a6c55ce2eef71df03e1)

Author SHA1 Message Date
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
Clonkonaut b30fea4f7d Tutorial 7: German translation. 2016-01-12 20:35:02 +01:00
Clonkonaut 4f7688810b Tutorial 3: Used the title from Title.txt. 2016-01-12 20:34:49 +01:00
Clonkonaut 07e912bac6 Tutorial 5: German translation. 2016-01-12 19:51:29 +01:00
Clonkonaut 8f71fa8a7a Tutorial 3: Translated new hint (#1594). 2016-01-12 19:50:59 +01:00
Maikel de Vries 7784a2617e fix showing rocks in tutorial 3 (#1594) 2016-01-12 09:48:46 +01:00
Clonkonaut e762e66a65 German translation for Tutorial 4. 2016-01-12 01:51:28 +01:00
Clonkonaut b11b8b0fb5 Finish German translation of Tutorial 3. 2016-01-12 01:51:08 +01:00
David Dormagen 717acafd34 tutorial 3: fixed typo in English translation 2016-01-11 22:48:57 +01:00
David Dormagen 18c58c783d tutorial 3: added German translation 2016-01-11 22:48:40 +01:00
Maikel de Vries 1600cccf3e tutorial 5: give second robber NPC a skin and fix outro walk speeds 2016-01-11 18:49:39 +01:00
Maikel de Vries be0d5161bb give fireman NPC in tutorial 3&4 a skin 2016-01-11 18:45:56 +01:00
Maikel de Vries e1e1380659 add title image to tutorial 5 2016-01-11 18:01:33 +01:00
Maikel de Vries fb3737d056 tutorial 5: fix outro, a typo and zoom ranges 2016-01-11 18:01:11 +01:00
Maikel de Vries c35df88ae9 add tutorial 5 explaining melee weapons 2016-01-10 22:53:04 +01:00
David Dormagen 9bca345342 tutorial 2: added German translation 2016-01-10 21:57:20 +01:00
Maikel de Vries d94b2356b1 add function to tutorial guide to get the amount of messages it has 2016-01-10 20:54:03 +01:00
Maikel de Vries 2b88578a7c disallow showing/hiding tutorial guide by player when in a sequence 2016-01-10 10:54:07 +01:00
David Dormagen 05013563d3 tutorial1: added German translation 2016-01-08 21:25:20 +01:00
Maikel de Vries 55b077898b finished outro sequence for tutorial 4 2016-01-08 19:46:28 +01:00
Sven Eberhardt fbdfcafa43 Fix text error in tutorial 2 #1539 2016-01-07 22:06:35 -04:00
Maikel de Vries da6d4a8aa3 Skins for NPCs in the tutorials 2016-01-06 19:03:59 +01:00
Maikel de Vries bbdb5d3229 add tutorial 4: explains loam production, lorry, pickaxe, elevator 
The outro sequence is not yet finished, and requires quite a lot of work still.
 2016-01-02 19:42:23 +01:00
Maikel de Vries 2269d55801 fix typos in tutorials 2016-01-01 22:18:41 +01:00
Maikel de Vries 30d45fcdc3 streamline tutorial guide script interface 2016-01-01 13:45:50 +01:00
Maikel de Vries eaf66850b1 tutorial 3: fine-tuning and title image 2015-12-31 15:07:22 +01:00
Maikel de Vries b5a00b69af fix whitespaces in tutorial scenario descriptions 2015-12-30 21:44:05 +01:00
Nicolas Hake ae490dff11 Replace untranslated sentence in Tutorials/DE (#1522) 
Translation provided by K-Pone.
 2015-12-29 18:03:06 +01: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 537f7c5f82 tutorial 3: fix wind and fine-tune intro 2015-12-27 17:05:36 +01:00