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

40 Commits (82e674ddb849789b7018d417e74ea50440d66525)

Author SHA1 Message Date
Sven Eberhardt bc4425462c Add localization support for string evaluators, gravestone and signpost inscriptions and custom game goal texts 2017-05-07 15:03:11 -04:00
Sven Eberhardt 8cd2432c58 Allow non-editor collection of objects by dialogue helper object 
Also revert Clonkonaut's crash landing into hotfix
 2017-01-01 17:00:57 -05:00
Sven Eberhardt 27291ec977 Automatically move dropped items from dialogue to dialogue target 
Because it happens easily when editing.
 2016-11-20 13:15:02 -05:00
Sven Eberhardt aed3f92982 Fix dialogue sequence assignment 
It used to be set by reference instead of copying, which means all dialogues created in a single session would reference the same sequence.
 2016-10-30 21:56:08 -04:00
Sven Eberhardt 6e6f642be6 Add tool tip to dialogue editor action 2016-10-10 16:45:24 -04:00
Sven Eberhardt 147e70ace9 Fix sequence and dialogue progress mode saving 2016-08-27 17:17:48 -04:00
Sven Eberhardt dd2e649825 Fix user action dialogue message options 2016-08-07 16:24:23 -04:00
Sven Eberhardt f6d1e6ed2b Fix dialogue creation through EditorAction 
Silence a warning and make sure the name is valid.
 2016-08-07 01:06:26 -04:00
Sven Eberhardt 8163ffac8a User action message: Fix display of empty messages 2016-07-31 10:36:56 -04:00
Sven Eberhardt 108f447b2b Dialogue user actions: Change text and options in message action to use evaluators 2016-07-30 23:00:18 -04:00
Sven Eberhardt aa68c7ee16 Add description and EditorHelp for dialogue properties and actions 2016-07-25 01:24:12 -04:00
Sven Eberhardt f47c31749a UserActions: Split triggering clonk and object 
Also fix goto.
 2016-07-24 10:50:39 -04:00
Sven Eberhardt 319392a779 UserAction: Rename OptionKey from Option to Function 2016-07-21 00:47:43 -04:00
Sven Eberhardt 5855140cd4 UserAction: Conditions and more triggering player/object options 2016-07-21 00:24:54 -04:00
Sven Eberhardt 1151016b56 Add dialogue target editor prop 2016-07-14 00:45:00 -04:00
Sven Eberhardt d605bab0be Qt Editor: Move EditorActions from EditorAction_* to a proplist EditorAction.* 2016-07-14 00:17:53 -04:00
Sven Eberhardt 28d2172b78 Qt Editor: Move editor props from EditorProp_* to an EditorProp proplist 2016-07-13 17:18:08 -04:00
Sven Eberhardt f780a55e0f Add dialogue UserActions to enable/disable dialogue and attention marker 2016-07-13 02:17:56 -04:00
Sven Eberhardt d2fd1d740e Add EditorProps to create NPC dialogues in the editor 2016-07-10 14:11:23 -04:00
Sven Eberhardt d3be591d8d Add "Message" UserAction 2016-07-06 01:03:46 -04:00
Maikel de Vries d607824df2 fix dialogue stopping and waiting time (#1597) 
First stop the dialogue properly and then wait for 30 frames to start a new one.
 2016-01-17 12:37:42 +01:00
Maikel de Vries 34fa60feeb dialogue: fix finding by name and public interface to get the target 2015-12-31 12:07:36 +01:00
Maikel de Vries b9699aff0f add function to dialogue to find by dialogue name 2015-10-11 09:18:45 +02:00
Maikel de Vries 96cf1b23f4 dialogue object: call on dialogue closed 2015-10-04 13:23:59 +02:00
Sven Eberhardt 41d394663b Auto-advance through dialogue options when they're reached multiple times. 
This is so you can just fast-forward through long dialogues (e.g. because you've reached them before) by hammering space without getting caught in loops.
 2015-10-03 23:16:33 -04:00
Sven Eberhardt 341712eba5 Remove dialogue when target NPC dies (#1295). 2015-05-07 19:54:14 +02:00
Maikel de Vries 96af2bb84c GetActiveSequence function for sequence object 
Can be used to test whether a sequence is already running, and did some clean ups as well.
 2015-03-01 14:02:16 +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
Sven Eberhardt 4d36f3a2d2 Some missions fixes/adjustments 
* Plane with same color in all missions
* Sequence multiplayer fix
* Heavy smoke is a particle parameter
* Goal graphics fix
* Fix rocky pick direction after dialogue initiation from left
* Dialogue supports sections
* Hat moved to decoration for other missions
 2014-09-21 16:36:05 +02:00
Sven Eberhardt addac19062 Crash landing intro/dialogues/outro improved for storyline integration. 2014-08-26 16:07:30 +02:00
Sven Eberhardt e6fc0b1a1d Minor dialogue improvements 
* Dialogue is blocked for a short time after it was stopped, so players don't restart it accidentally
* Broadcasting option to all players for important dialogues
* Speakers face each other
* add_attention parameter for SetDialogueProgress
 2014-08-20 18:06:19 +02:00
Sven Eberhardt 94e1316205 Extend Dialogue and Sequence object with some message and viewport functions for upcoming missions. 2014-08-14 17:18:28 +02:00
Sven Eberhardt 20558ef7e1 Display dialogue attention marker in front of associated clonk 2014-08-05 17:02:19 +02:00
Sven Eberhardt 474b6e1c31 Add Dlg_*_Init callback to dialogues. To be used e.g. for starting timers of NPC activities. 
Also fix scenario saving of attention state in dialogue object.
 2014-07-31 23:49:15 +02:00
Sven Eberhardt 620091f80c Fix switch of cinematics target in Dialogue. 2014-07-21 17:26:56 +02:00
Sven Eberhardt 7db507921a Added attention symbol to dialogues 2014-07-12 16:03:23 +02:00
Sven Eberhardt 5cd9b915b0 Added some dialogue functions and speaker portraits. UpdatedAddMenuItem and CustomMessage to allow more customization for picture graphics. 
I would prefer to render the models for speaker portraits directly. However, it seems like it's not currently possible to clip or render models to offscreen surfaces.
 2014-07-05 15:25:30 +02:00
Sven Eberhardt 13a60848c6 Fix save as scenario for Dialogue. 
Add GameCall as fallback mechanism for dialog implementation if no local function is defined.
 2014-02-08 22:49:08 +01:00
Maikel de Vries addf28a0ab Fix issues with Crash.ocs intro (#951) 2014-02-02 18:03:54 +01:00
Maikel de Vries 6ff632e2f2 Moved Dialogue to Helpers.ocd to avoid copies 2014-02-02 18:03:54 +01:00