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

297 Commits (c00a8cf3c3a33a88c5a8aba152d06d9f483921a5)

Author SHA1 Message Date
Sven Eberhardt 692ff39c0e Add invisibility EditorProp to all object 
Also localize some property names.
 2016-09-03 22:07:10 -04:00
Sven Eberhardt bae26bb0d7 Add user action: Set clonk direction 2016-09-03 22:07:08 -04:00
Sven Eberhardt 31121d682c Rename option default value function property to DefaultValueFunction 
It was "Get" and later "Set", which was always a bit confusing.
 2016-09-01 18:32:24 -04:00
Sven Eberhardt 4c56b41de0 Fix color group in "any" value evaluator of user actions 2016-08-30 19:42:31 -04:00
Sven Eberhardt e7c11cf590 Add user action evaluators: Enter+Exit object 2016-08-30 01:40:18 -04:00
Sven Eberhardt 76227e4e6c Add user action color evaluators: Player color, random color, RGB 2016-08-30 00:30:22 -04:00
Sven Eberhardt 48d8ad8de9 Add UserAction evaluators: for integer/player/object in list 2016-08-29 15:18:21 -04:00
Sven Eberhardt c72135db1f Add user action comment 2016-08-29 00:41:48 -04:00
Sven Eberhardt cc2f626063 Add UserAction conditional value evaluator 
i.e. operator ? :
 2016-08-29 00:32:52 -04:00
Sven Eberhardt bda3cb5640 Add UserActions to deactivate/reactivate player control 2016-08-28 22:18:58 -04:00
Sven Eberhardt 5da1a0d5c1 Fix some sequence progress bugs 2016-08-28 00:16:58 -04:00
Sven Eberhardt 96842e2961 Sequence test uses first local player as triggering player 2016-08-27 22:20:03 -04:00
Sven Eberhardt b339db9ea7 UserAction particles: Add fire and ring particles 
Also sort particle type list by name.
 2016-08-27 17:45:01 -04:00
Sven Eberhardt 0e3b1865ea UserAction: Add more options for particle creation 
Also fix collision behaviour setting to work.
 2016-08-27 17:38:25 -04:00
Sven Eberhardt 147e70ace9 Fix sequence and dialogue progress mode saving 2016-08-27 17:17:48 -04:00
Sven Eberhardt 065d8536da UserAction evaluators: Sort constant value above other evaluators 2016-08-27 17:15:20 -04:00
Sven Eberhardt dfefa7df6f UserAction goto and log: Put parameters directly into enum 2016-08-27 17:14:51 -04:00
Sven Eberhardt 6b9df3118c Sort UserAction evaluators and groups by name 
Also merge effect group into ambience group.
 2016-08-27 16:46:59 -04:00
Sven Eberhardt e2e9248d89 UserAction: Clarify HideFullName property comment 2016-08-27 16:46:58 -04:00
Sven Eberhardt dba7e773ab UserAction variable evaluators: Default name to empty string constant 2016-08-27 10:01:33 -04:00
Sven Eberhardt 4a14ce735e Fix UserAction type "Any" evaluators 
Their callback function was not registered if they weren't duplicates from a non-any type
 2016-08-27 09:59:25 -04:00
Sven Eberhardt 820b2a39a0 Fix display of some user actions 2016-08-27 02:04:02 -04:00
Maikel de Vries 07008af820 fix missing string table entry in UserAction.ocd 2016-08-25 19:07:24 +02:00
Sven Eberhardt 44022f840f Add CustomInitializationScript to all objects 2016-08-25 00:18:11 -04:00
Sven Eberhardt e4fad91d36 Fix user action sound in local context 2016-08-23 02:07:53 -04: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 d2557960ae Add user action: Give player knowledge 2016-08-21 15:40:38 -04:00
Sven Eberhardt f6b3a6efb8 Add magic wand as an editor-assignable usage item 2016-08-21 15:17:51 -04:00
Sven Eberhardt f9349721e4 Add user action: Cast particles 2016-08-21 14:49:23 -04:00
Sven Eberhardt c7b114139a Add user action: Change wealth 2016-08-21 14:49:22 -04:00
Sven Eberhardt 967a5730ed UserAction evaluator display: Invert full name display default 
Showing the full name is far more common than hiding it.
 2016-08-21 14:49:21 -04:00
Sven Eberhardt 237956e7ba Add user action: Fling object 2016-08-21 14:49:20 -04:00
Sven Eberhardt b553d69d25 Add user action: Game over 2016-08-20 11:30:45 -04:00
Sven Eberhardt 56adee6bb9 Add script goal editor properties and user actions 2016-08-20 01:55:22 -04:00
Sven Eberhardt 4df8679be2 Simplify saving of scenario properties in saved scenarios. 
Just need to set "Save" to an identifier now.
 2016-08-20 01:55:21 -04:00
Sven Eberhardt 947ca6af7c Add user action: Activate/deactivate sequence 2016-08-20 01:55:20 -04:00
Sven Eberhardt 3a49a9c21d Add user action: Set object position 2016-08-15 01:19:14 -04:00
Sven Eberhardt 18437305ca Add AcidDrilling title image 2016-08-14 18:39:44 -04:00
Sven Eberhardt 6ee3849b18 Fix "number of objects in container" sequence trigger 2016-08-14 14:16:03 -04:00
Sven Eberhardt 4a94c3598b Sequence: Add "<" operator to contents count trigger 2016-08-13 23:25:01 -04:00
Sven Eberhardt 4fbeead744 Fix user action "Cast objects" speed property name 2016-08-09 00:12:45 -04:00
Sven Eberhardt ba9165d016 Fix "triggering clonk" user action evaluator in "a clonk dies" to point to the clonk. 2016-08-09 00:09:07 -04:00
Sven Eberhardt c5ecc3a2b1 Fix user action evaluator: Find contents with ID given 2016-08-09 00:03:51 -04:00
Sven Eberhardt d005c20f00 UserAction: Fix typo in US strings 2016-08-09 00:01:10 -04:00
Sven Eberhardt d5cc9c2a36 UserAction: Add missing SetCondition setter function 2016-08-08 16:24:06 -04:00
Sven Eberhardt be60b276d0 User action script: Fix script error if a context returns nil. 
If a context is defined but returns nil, the script now returns nil instead.
 2016-08-08 15:34:06 -04:00
Sven Eberhardt a713870f33 Reorder some user action parameters 2016-08-08 15:03:40 -04:00
Sven Eberhardt b2bed04a7e Fix sequence suspension 2016-08-08 00:49:17 -04:00
Sven Eberhardt 7e87b62e3e Add sequence triggers: Interval and object count in container 2016-08-07 23:42:40 -04:00
Sven Eberhardt 44999d550c Fix user action sequence check interval and make it configurable 2016-08-07 17:33:51 -04:00
Sven Eberhardt dd2e649825 Fix user action dialogue message options 2016-08-07 16:24:23 -04:00
Sven Eberhardt dd36e46f62 Fix sequence scenario saving 2016-08-07 16:09:40 -04:00
Sven Eberhardt 17409ab4c1 Add user action evaluator: If 2016-08-07 02:06:15 -04:00
Sven Eberhardt 5babeba4d8 Add user action evaluators: X/Y component of position 2016-08-07 01:50:29 -04:00
Sven Eberhardt b1460398fb UserActions: Prioritize some action main arguments 2016-08-07 01:16:27 -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 f59b6c837f UserAction: Fix some US string table entry names 2016-08-06 23:59:22 -04:00
Sven Eberhardt 714ff028c8 Update GetConditionalIDList to new array delegate syntax 2016-08-06 15:24:03 -04:00
Sven Eberhardt c12c51b44d Update sequence editor prop priorities and name 2016-08-02 01:12:09 -04:00
Sven Eberhardt 1d566ec6c5 Add VIS_Editor visibility flag 2016-08-02 01:12:08 -04:00
Sven Eberhardt 2d806772dd Add user action evaluators: Owner of object, controller of object 2016-07-31 22:57:34 -04:00
Sven Eberhardt 2f4ffa0a0c Add user action evaluators: Player wealth, clonk energy, object mass, object speed 2016-07-31 22:23:52 -04:00
Sven Eberhardt bf35f92228 Add arithmetic user action evaluators (+-*/%) 2016-07-31 21:31:53 -04:00
Sven Eberhardt d8b488aa98 Add user actions evaluators: Object/Player count 2016-07-31 17:31:18 -04:00
Sven Eberhardt ab954f65a8 Add user action evaluators to find single objects 2016-07-31 15:36:12 -04:00
Sven Eberhardt 27f9e15042 Add user action evaluators: Find objects in area or container 2016-07-31 15:09:05 -04:00
Sven Eberhardt 8163ffac8a User action message: Fix display of empty messages 2016-07-31 10:36:56 -04:00
Sven Eberhardt e57047f26a Add user action evaluators: Logic (not, and, or, ==, !=) 2016-07-31 10:36:22 -04:00
Sven Eberhardt 102032276b Fix grouping of typed user action evaluators 2016-07-31 09:04:25 -04:00
Sven Eberhardt 368aebb547 Simplify empty string handling in user actions 2016-07-31 09:02:19 -04:00
Sven Eberhardt 099c0e0bcf Add user action: Script 2016-07-31 08:56:38 -04:00
Sven Eberhardt 9b5c39a33f Add user action evaluator: Concatenate strings 2016-07-31 00:28:02 -04:00
Sven Eberhardt 404a578e5c Add user action: Log 2016-07-31 00:05:58 -04:00
Sven Eberhardt 04a7426e4f Add user action evaluator: Value to string 2016-07-30 23:59:09 -04:00
Sven Eberhardt de699080dc Add user action evaluator: Distance between positions 2016-07-30 23:49:45 -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 f12c6dc3e7 Add user action variables 2016-07-30 22:39:22 -04:00
Sven Eberhardt 490e92bc4e Add sequence trigger: Object enters region (rectangle or circle) 2016-07-30 19:42:55 -04:00
Sven Eberhardt 30f62f6a43 Add user action evaluator: Type of object 2016-07-30 18:00:04 -04:00
Sven Eberhardt 8bc310c52a Add user action evaluator: Object exists 2016-07-30 17:47:45 -04:00
Sven Eberhardt a01c6d4db9 Add user action comparison evaluators 2016-07-30 17:39:15 -04:00
Sven Eberhardt ea3603b991 Add user action: Cast objects 2016-07-30 16:51:57 -04:00
Sven Eberhardt 95c556bb9a Shorten some user action display names 2016-07-30 14:50:22 -04:00
Sven Eberhardt 6f204d89f5 User action sound: User "Global" as name for nil sound source 2016-07-30 14:14:09 -04:00
Sven Eberhardt 323691eeca Add user actions: Open and close doors 2016-07-30 13:21:38 -04:00
Sven Eberhardt 9522fb7e42 Add user action evaluators: Random positions and offsets in rectangle or circle 2016-07-30 12:29:35 -04:00
Sven Eberhardt b1096786d8 Add user action evaluator: Difference between two positions 2016-07-30 11:26:34 -04:00
Sven Eberhardt 95e27e6a22 Add user action evaluator: Position of object 2016-07-30 11:14:12 -04:00
Sven Eberhardt 7eee5c4832 Add user action evaluator: Random integer 2016-07-30 11:03:26 -04:00
Sven Eberhardt 898aff0cc8 Add user action evaluators: Offsets and coordinate positions 2016-07-30 02:06:54 -04:00
Sven Eberhardt 7c094c3bf1 Add user action evaluator: Position (absolute and relative) 2016-07-30 01:06:21 -04:00
Sven Eberhardt bdea3876d6 Add user action: Remove object 2016-07-29 02:06:20 -04:00
Sven Eberhardt e19e5ce7ea Add user action: Create object 2016-07-29 01:43:35 -04:00
Sven Eberhardt 77a4916383 UserAction: Add Sound 2016-07-28 23:44:10 -04:00
Sven Eberhardt c70ee82068 Define localized help text strings for UserActions 2016-07-25 22:44:09 -04:00
Sven Eberhardt 5f9259c27f UserAction EditorHelp props 2016-07-25 01:42:23 -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 91873ca0ac Add graphics for sequence 2016-07-23 01:44:32 -04:00
Sven Eberhardt 58faf41068 Sequence: Add more triggers. 
* Player enters circular region
* Game starts (after player joins)
* Player joins
* Player removed
* All goals fulfilled
* Clonk death
* Construction of structure
* Production of item
 2016-07-22 01:51:29 -04:00
Sven Eberhardt 319392a779 UserAction: Rename OptionKey from Option to Function 2016-07-21 00:47:43 -04:00
Sven Eberhardt 626719194a Add trigger+action to sequence object. 
Sequences can be used to create triggered cutscenes, intros, outros, etc. in the future.
 2016-07-21 00:24:55 -04:00
Sven Eberhardt 5855140cd4 UserAction: Conditions and more triggering player/object options 2016-07-21 00:24:54 -04:00
Sven Eberhardt b915ecc32a Clonk AI EditorProp using SetGlobal 2016-07-21 00:24:53 -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 656aa303f9 Ignore SetAI(..., true) if an AI already exists 
Can happen e.g. in multiplayer editing
 2016-07-13 22:15:55 -04:00
Sven Eberhardt 8d6a7058c6 Fix possible user action sequence id conflict when saving scenario after testing a sequence 2016-07-13 17:39:36 -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 7a6ced04c5 UserAction: Add const object and bool evaluators 2016-07-13 02:17:12 -04:00
Sven Eberhardt 36685a3119 Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
Sven Eberhardt d3ede324be EditorBase: Publish some properties 2016-07-10 16:09:37 -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
Sven Eberhardt 5c6da07c51 Add UserAction scripted editor property delegates 
UserActions will be used to click small dialogues and scripts directly in the editor.
 2016-07-06 01:03:02 -04:00
Sven Eberhardt af3e3bb6c8 Add EditorProps for EnemyAI effect 
Also remove old object-based editor controls.
 2016-06-18 10:45:06 -04:00
Sven Eberhardt 4e603e2ef8 Add "Name" EditorProp for all objects 2016-06-16 16:15:42 -04:00
Sven Eberhardt 923789ec49 Add PlayerStart object. 
This is an easy-to-use object for the editor which replaces Scenario.txt [PlayerX] settings.
 2016-06-08 22:15:56 -04:00
Sven Eberhardt 96068b9a17 Initialize EditorBase definition with higher priority. 
Many other definitions may depend on it being initialized and it would be verbose and error-prone to add a check to every single dependent definition.
 2016-06-07 18:23:53 -04:00
Sven Eberhardt 3797b07f29 Add IDList EditorProp. 2016-06-07 00:13:01 -04:00
Sven Eberhardt 4e7df72c4c Editor Props: Invincibility and player color. 2016-04-16 22:05:38 -04:00
Maikel de Vries 9220c285c6 gui clock: add optional in screen countdown 
And use it in Aerobatics.
 2016-01-27 20:19:19 +01: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
Clonkonaut a8dd4cac89 Make AI clonks select their shield when defending. 2015-12-17 19:44:00 +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
Sven Eberhardt 1dca9cf1b5 FightForGidl: No friendly fire and some AI fixes. 2015-12-12 00:02:31 -05:00
Sven Eberhardt 6b5bd38cc8 Fix aim cancellation by spear AI (#1474) 2015-12-05 21:13:37 -05:00
David Dormagen aec1988722 removed category "vehicle" of several helper objects 
Otherwise you can spawn them in the "Playground" scenario.
 2015-11-29 18:28:40 +01:00
Maikel de Vries 47ce50d364 status symbol category none instead of vehicle 2015-11-29 11:45:02 +01:00
Sven Eberhardt e7a3878406 Fix AI stuck in aiming animation when shooting was cancelled by another AI command. 2015-11-22 14:47:13 -05:00
Maikel de Vries c2271f743a AI do not use shield on explosives 2015-10-14 20:58:52 +02:00
Maikel de Vries 70875e3465 let the AI attack hostile clonks only 2015-10-14 20:44:38 +02:00
Maikel de Vries e2c5158275 rename S2AI to AI 
This in preparation for a more general AI (in the far future).
 2015-10-14 20:44:38 +02: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
Maikel de Vries 2bda4c56e8 make clock gui use script menus 2015-10-03 19:51:08 +02:00
Sven Eberhardt 7edf197246 Fix script error when EnemyAI on chippie tries to jump 2015-09-26 17:20:07 -04:00
Sven Eberhardt 1ba28cd3f6 Sequence stores and restores breath of all clonks of watching players. 2015-09-14 22:43:03 -04:00
Maikel de Vries 24e18bf7e2 fix clock countdown sound playing for all players 2015-09-09 23:09:26 +02:00
Maikel de Vries 1f87faded7 add clock as gui element which can be used as a countdown 
Thanks to Sven2 for graphics and parts of the script.
 2015-09-09 18:27:57 +02:00
Maikel de Vries 49effe4622 let AI handle the musket and fix tracking riding clonks 2015-08-19 08:11:43 +02:00
Sven Eberhardt 341712eba5 Remove dialogue when target NPC dies (#1295). 2015-05-07 19:54:14 +02:00
Maikel de Vries 6af6348a32 clean up dummy object 2015-03-01 14:02:16 +01: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
Maikel de Vries 346d5cd709 another batch of Graphics.png removals 2015-02-15 22:37:08 +01:00
Maikel de Vries 6cd3b9775c fixed power need symbol display for elevator 2015-02-15 09:34:45 +01:00