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

147 Commits (master)

Author SHA1 Message Date
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
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
Maikel de Vries b2f299cc9d tutorial 3: add description and another NPC 2015-12-27 15:13:16 +01:00
Maikel de Vries 5ffc97f2f0 rope bridge clean up and cleaner way to create a bridge 
Now use Ropebridge->Create(x1, y1, x2, y2) to make a bridge, this allows for some more clean up in a commit to follow.
 2015-12-25 19:27:00 +01:00
Maikel de Vries ab90c48171 title image for tutorial 8 2015-12-24 18:01:34 +01:00
Maikel de Vries 197a90a6e2 add new NPC to tutorial 3 2015-12-24 10:38:06 +01:00
Maikel de Vries 19b539a395 fix spawn menu in tutorial playground for small screen sizes 2015-12-24 10:38:06 +01:00
Maikel de Vries 2f6dabb111 german translations for tutorial end of round dialogue 2015-12-23 10:05:24 +01:00
Maikel de Vries 16683c0d1d add title image for tutorial 7 2015-12-22 20:26:23 +01:00
Maikel de Vries 88148ac966 give wipf in tutorials a name 
This makes the story a bit more personal for the player, hopefully.
 2015-12-21 20:23:32 +01:00
Maikel de Vries aee8a5f20f tutorial 8: explains pump, wallkit, liquids 2015-12-20 16:41:50 +01:00
Maikel de Vries fb18e17eec tutorials: transfer items on death and make structures invincible 2015-12-20 11:31:01 +01:00
Maikel de Vries 76427c0b82 fix tutorial guide message callbacks when guide is hidden 2015-12-20 09:14:13 +01:00
Maikel de Vries 6559ee1ade tutorial 7: fine-tune NPC teleglove control and add fireflies 2015-12-19 11:56:40 +01:00
Maikel de Vries d16676a798 add button (G) to the tutorials to hide/show guide messages 2015-12-17 16:47:20 +01:00
Maikel de Vries d47db7289d pilot in tutorial 7 helps collecting mined gems 2015-12-17 15:57:11 +01:00
Maikel de Vries 01de7048c3 tutorial 07: explains airships, gems and ropeladders 
This tutorial is not yet connected to the main storyline of the tutorials, but will be later.
 2015-12-16 21:52:34 +01:00
Maikel de Vries 5c262a7f38 fix tutorial goal checks when crew member dies 2015-12-16 21:42:29 +01:00
Sven Eberhardt bf63f2ef17 Gidl+Windmill moved to new "Defense.ocf" (title picture missing) 
They aren't quite fitting at the moment and Clonko wants to share the buy menu.
 2015-12-12 12:06:25 -05:00
David Dormagen f562a688c4 Playground: try to unstuck spawned vehicles or the Clonk very scrupulously (#1442) 2015-11-30 21:51:08 +01:00
David Dormagen eed8a11105 tutorials: fixed some German descriptions and scenario titles 2015-11-27 20:54:18 +01:00
David Dormagen a035239406 tutorial3: dynamically add name of interaction button into dialogues 
Also fixed one or two minor typos.
 2015-11-15 17:38:23 +01:00
Maikel de Vries 0094cbe819 remove empty tutorial spawn menu graphic 2015-10-15 19:24:59 +02:00
Maikel de Vries a4ed4a9373 add option to tutorial guide to close on last message 2015-10-15 19:24:59 +02:00
Maikel de Vries d3eb09eaa5 fix ropebridge caveat in tutorial 2 2015-10-11 12:35:05 +02:00
Maikel de Vries fd4e7c120e add tutorial 3 2015-10-11 12:11:10 +02:00
Maikel de Vries dd5f7d2ebe fix tutorial 2 easteregg 2015-10-11 09:19:36 +02:00
Maikel de Vries 626765dd45 fix tutorial guide after HUD changes 2015-10-11 09:14:55 +02:00
Maikel de Vries bccb87bfdc fix tutorial 1 map after texture changes 2015-10-11 09:14:09 +02: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
Maikel de Vries b52491f506 tutorials: alternative wipf skin for player's wipf 2015-09-24 17:31:11 +02:00
Maikel de Vries 2c8c49cbc8 tutorials: wipf not collectible during tutorials 2015-09-24 17:31:11 +02:00
Maikel de Vries c6d1a1c763 tutorial 2: failsafe path for wipf 2015-09-23 17:25:15 +02:00
Maikel de Vries 8b16ab0972 adapt tutorials to new wipf 2015-09-23 16:35:05 +02:00
Maikel de Vries b699b7df26 add wipf 
The wipf for now has the basic functionallity, where both the model, animations and AI behaviour can be improved.
 2015-09-23 16:31:53 +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
Sven Eberhardt 889a8dbdf9 Tutorial 00002: Respawn with contents. 
Otherwise it's very easy to lose your shovel in the acid lake and fail.

(You can still fail by throwing it in though)
 2015-09-13 12:53:06 -04:00
Sven Eberhardt eb9e640b67 Fix igniter picture in tutorial 0001. 2015-09-13 11:24:28 -04:00
Maikel de Vries 225f4b1559 add tutorial 2 2015-09-13 15:03:15 +02:00
Maikel de Vries 78f7b76b0e add playground scenario as reward for completing all tutorials 2015-09-13 13:38:56 +02:00
Maikel de Vries 80d5525ed9 add tutorial 1 2015-09-13 13:38:56 +02:00
Maikel de Vries ace8ad48d6 add wipf (placeholder) as clonk friend in tutorials 2015-09-13 13:38:55 +02:00
Maikel de Vries 395f0d3f15 add method to disable controls in tutorials 2015-09-13 13:38:55 +02:00
Maikel de Vries 7cdf3e6d1f add tutorial guide 2015-09-13 13:38:55 +02:00
Maikel de Vries d9cf76401a add tutorial goal 2015-09-13 13:38:55 +02:00
Maikel de Vries f4cd257df1 add tutorial arrow 2015-09-13 13:38:55 +02:00
Maikel de Vries 4c58ee2f5f add tutorial main folder 2015-09-13 13:38:55 +02:00