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

9712 Commits (qteditor)
 

Author SHA1 Message Date
Sven Eberhardt a14f8597d2 Qt editor: Fix AsyncGet on bool delegate 2016-08-05 01:00:33 -04:00
Sven Eberhardt 9bcef15b99 Add AddScenarioSaveDependency for scenario saving: Adds a dependency without forcing a name 2016-08-05 00:30:43 -04:00
Sven Eberhardt a06363b70b Fix restart rule graphics 2016-08-05 00:29:52 -04:00
Sven Eberhardt 6bd6c07195 Qt editor: Remove some debug logging 2016-08-04 22:22:14 -04:00
Sven Eberhardt 395cca18e1 Add script to sync System.ocg/Language*.txt files 2016-08-04 22:19:39 -04:00
Sven Eberhardt 1fd12024c7 Add some MSVC and QT files to .gitignore 2016-08-04 22:16:00 -04:00
Sven Eberhardt bce09d272d Add EditorInitialize callback 2016-08-04 22:12:10 -04:00
Sven Eberhardt 693c0124b9 Update more goal icons for better editor size 2016-08-04 21:15:25 -04:00
Sven Eberhardt c14721523c Make standard goals and rules visible as icons in editor 2016-08-04 19:32:57 -04:00
Sven Eberhardt 3eb106dd85 Add SetMaxEnergy function to clonk 2016-08-04 19:14:39 -04:00
Clonkonaut 34af29fd7b Show quick slot item on clonk. 
All GetCarry* callbacks receive a parameter whether they are held in this slot and can then return a different display mode!

I also took the opportunity to restructure many scripts in a similar way.
 2016-08-05 01:14:13 +02:00
Clonkonaut 70b124c9d4 Added carry mode CARRY_Sword. Similar to CARRY_Belt but attached to a bone which doesn't move while running. 2016-08-05 01:08:03 +02:00
Sven Eberhardt 68700408ad Add max energy and max contents count settings to PlayerStart object 
Values are used for all starting clonks and all clonks created later in the game for this player (e.g. respawns) after spawning from the spawn point with these settings.
 2016-08-04 10:48:40 -04:00
Clonkonaut 4bd48242cf Fixed CarrySpear animation. 
I deserialised the skeleton file and removed some bone positions that I guess were wrongfully included because they concerned the left (non-carrying) arm. I think I didn't break anything but if so, this patch is to be reverted.
 2016-08-04 16:18:26 +02:00
Clonkonaut 74636c11a6 Added CARRY_Belt as a new carrying method for items. 2016-08-04 15:56:44 +02:00
Sven Eberhardt 729489e40d Add user action: Set clonk inventory size 2016-08-03 23:50:35 -04:00
Sven Eberhardt 71b337fd59 Add SetMaxContentsCount function to inventory library 
Makes sure the inventory buttons and hands are updated.
 2016-08-03 23:50:34 -04:00
Lukas Werling b7359e0c27 Remove the GTK platform (USE_GTK) 
The GTK code does not work with the Qt editor. The simpler SDL2 platform
does, so we have little reason to keep the GTK code.

Note that GTK is still a dependency for mape.

Discussion: http://forum.openclonk.org/topic_show.pl?tid=3328
 2016-08-03 16:25:46 +02:00
Clonkonaut d1382f7244 Fixed inventory slot selection. 2016-08-02 23:59:15 +02:00
Clonkonaut 36e2e1ab3e Switch inventory slots by pressing number key (hold) + number key. 
This can be used to sort the inventory according to personal liking!
 2016-08-02 18:39:13 +02:00
Clonkonaut 89be1da072 Changed quick switch slot selection to Number + Q. 
As suggested by Zapper in this posting: http://forum.openclonk.org/topic_show.pl?pid=31073#pid31073.
This way is probably the only way item usage will ever work on Q. For now, this reverses the previous changes. Q will again react on key down.
 2016-08-02 17:49:34 +02:00
Sven Eberhardt c12c51b44d Update sequence editor prop priorities and name 2016-08-02 01:12:09 -04:00
Sven Eberhardt 24a5dc33db Qt editor: Sort properties in property list by localized name and priority 2016-08-02 01:12:08 -04:00
Sven Eberhardt 1d566ec6c5 Add VIS_Editor visibility flag 2016-08-02 01:12:08 -04:00
Clonkonaut faf3add7e7 Quick Switch slot is now selectable using Q + number key. 
This makes a very fundamental change with quick switch: The switching action is now performed on the key release instead of the key press. Let's see if this performs badly for players.
 2016-08-02 00:37:40 +02:00
Clonkonaut 2713462cd2 Show quick switch key above quick switch item slot in HUD. 
This will prepare the quick switch system according to Maikel's suggestion (http://forum.openclonk.org/topic_show.pl?pid=31070). The highlighting method is open to discussion. Currently, font colour and style are similar to the interaction key above the action bar icon. But it is very well possible that this will look bad when the key name is very long.
 2016-08-01 17:14:34 +02:00
Lukas Werling 582c82c159 Qt editor/Linux: Fix crash on player removal 
See 69fff71abf
 2016-08-01 13:54:35 +02:00
Sven Eberhardt e5f2e4e58a Fix StdBuf::Compare with iAt>0 
This caused the clonk to sometimes walk in the air when jumping.
 2016-08-01 00:37:19 -04:00
Sven Eberhardt 69fff71abf Qt editor: Fix crash on player removal 2016-07-31 23:22:09 -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
Clonkonaut 8966df8310 Grapple bow: Show hook in extra slot (#1768). 
This will give you visible feedback if the hook is fired or not. Perfect for dual hook handling situations. Library_HasExtraSlot is used to show this but IsContainer returns false. This will prevent hook extraction using the interaction menu. Removing the hook from the grapple bow will cause errors (this should probably be taken care of sometime).
 2016-08-01 00:03:14 +02: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 d1e8bc39c5 Qt Editor: Fix enum property delegate option value lookup for undefined options 2016-07-31 10:35:15 -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 b1a1df8dee Add eval parameter to not pass errors 2016-07-31 08:15:54 -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 18444c7e0d Add StringToIdentifier script function 
Required to sanitize variables in the editor. Works by stripping all non-identifier characters and preprending a _ if necessery.
 2016-07-30 21:43:01 -04:00