diff --git a/Editor/main_window/dock/lvl_warp_props.ui b/Editor/main_window/dock/lvl_warp_props.ui index 66f00c9f6c..a9de14696d 100644 --- a/Editor/main_window/dock/lvl_warp_props.ui +++ b/Editor/main_window/dock/lvl_warp_props.ui @@ -6,8 +6,8 @@ 0 0 - 272 - 711 + 277 + 703 @@ -38,1498 +38,1517 @@ Warps and Doors - - - - 2 + + + QFrame::NoFrame + + + QAbstractScrollArea::AdjustToContents + + + true + + + + + 0 + 0 + 277 + 684 + - - 0 - - - 2 - - - 2 - - - 2 - - - 0 - - - - - - 0 - 32 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 0 - - - - 2 - - - 0 + + + 2 + + + 0 + + + 2 + + + 2 + + + 2 + + + 0 + + + + + + 0 + 32 + - - 0 + + QFrame::NoFrame - - 0 + + QFrame::Plain - + 0 - - - - - 16777215 - 22 - - - - Choise a warp entry to edit - - - 50 - - - QComboBox::AdjustToMinimumContentsLength - - - - - - - - 25 - 0 - - - - - 24 - 22 - - - - Create new warp entry. + + + 2 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 16777215 + 22 + + + + Choise a warp entry to edit + + + 50 + + + QComboBox::AdjustToMinimumContentsLength + + + + + + + + 25 + 0 + + + + + 24 + 22 + + + + Create new warp entry. Every warp points pair requires a warp entry - - - + - - - - - - - - 25 - 0 - - - - - 24 - 22 - - - - Remove current warp entry with all placed points. - - - - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 100 - - - - Pipe direction - - - - 4 - - - QLayout::SetMinimumSize - - - 0 - - - 2 + + + + + + + + + + + + 25 + 0 + + + + + 24 + 22 + + + + Remove current warp entry with all placed points. + + + - + + + + + + + + + + + 0 + 0 + - - 0 + + + 16777215 + 100 + - - 2 + + Pipe direction - - - - - 16777215 - 111 - - - - Entrance - - - Qt::AlignCenter - - - false - - - - QLayout::SetMinimumSize - - - 0 - - - 0 - - - 0 + + + 4 + + + QLayout::SetMinimumSize + + + 0 + + + 2 + + + 0 + + + 2 + + + + + + 16777215 + 111 + - - 0 + + Entrance - - 0 + + Qt::AlignCenter - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - Down - - - - :/arrows/arrows/black_down.png - :/arrows/arrows/red_down.png:/arrows/arrows/black_down.png - - - true - - - false - - - true - - - true - - - - - - - - 16 - 16 - - - - Left - - - - :/arrows/arrows/black_left.png - :/arrows/arrows/red_left.png:/arrows/arrows/black_left.png - - - true - - - false - - - true - - - true - - - - - - - - 16 - 16 - - - - Right - - - - :/arrows/arrows/black_right.png - :/arrows/arrows/red_right.png:/arrows/arrows/black_right.png - - - true - - - true - - - true - - - - - - - - 16 - 16 - - - - - - - - - - :/arrows/arrows/box.png - - - Qt::AlignCenter - - - - - - - - 16 - 16 - - - - Up - - - - :/arrows/arrows/black_up.png - :/arrows/arrows/red_up.png:/arrows/arrows/black_up.png - - - true - - - false - - - true - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 0 - 22 - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 0 - 22 - - - - - - - - - - - true - - - - 16777215 - 111 - - - - Exit - - - Qt::AlignCenter - - - - QLayout::SetMinimumSize - - - 0 + + false - - 0 + + + QLayout::SetMinimumSize + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 16 + 16 + + + + Down + + + + :/arrows/arrows/black_down.png + :/arrows/arrows/red_down.png:/arrows/arrows/black_down.png + + + true + + + false + + + true + + + true + + + + + + + + 16 + 16 + + + + Left + + + + :/arrows/arrows/black_left.png + :/arrows/arrows/red_left.png:/arrows/arrows/black_left.png + + + true + + + false + + + true + + + true + + + + + + + + 16 + 16 + + + + Right + + + + :/arrows/arrows/black_right.png + :/arrows/arrows/red_right.png:/arrows/arrows/black_right.png + + + true + + + true + + + true + + + + + + + + 16 + 16 + + + + + + + + + + :/arrows/arrows/box.png + + + Qt::AlignCenter + + + + + + + + 16 + 16 + + + + Up + + + + :/arrows/arrows/black_up.png + :/arrows/arrows/red_up.png:/arrows/arrows/black_up.png + + + true + + + false + + + true + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 0 + 22 + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 0 + 22 + + + + + + + + + + + true - - 0 + + + 16777215 + 111 + - - 0 + + Exit - - 0 + + Qt::AlignCenter - - - - - 16 - 16 - - - - Up - - - - :/arrows/arrows/black_up.png - :/arrows/arrows/green_up.png:/arrows/arrows/black_up.png - - - true - - - false - - - true - - - true - - - - - - - - 16 - 16 - - - - Left - - - - :/arrows/arrows/black_left.png - :/arrows/arrows/green_left.png:/arrows/arrows/black_left.png - - - true - - - false - - - true - - - true - - - - - - - - 16 - 16 - - - - - - - - - - :/arrows/arrows/box.png - - - Qt::AlignCenter - - - - - - - - 16 - 16 - - - - Right - - - - :/arrows/arrows/black_right.png - :/arrows/arrows/green_right.png:/arrows/arrows/black_right.png - - - true - - - true - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 0 - 22 - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 0 - 22 - - - - - - - - - 16 - 16 - - - - Down - - - - :/arrows/arrows/black_down.png - :/arrows/arrows/green_down.png:/arrows/arrows/black_down.png - - - true - - - true - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - 16777215 - 130 - - - - Level door - - - - 1 + + + QLayout::SetMinimumSize + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 16 + 16 + + + + Up + + + + :/arrows/arrows/black_up.png + :/arrows/arrows/green_up.png:/arrows/arrows/black_up.png + + + true + + + false + + + true + + + true + + + + + + + + 16 + 16 + + + + Left + + + + :/arrows/arrows/black_left.png + :/arrows/arrows/green_left.png:/arrows/arrows/black_left.png + + + true + + + false + + + true + + + true + + + + + + + + 16 + 16 + + + + + + + + + + :/arrows/arrows/box.png + + + Qt::AlignCenter + + + + + + + + 16 + 16 + + + + Right + + + + :/arrows/arrows/black_right.png + :/arrows/arrows/green_right.png:/arrows/arrows/black_right.png + + + true + + + true + + + true + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 0 + 22 + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 0 + 22 + + + + + + + + + 16 + 16 + + + + Down + + + + :/arrows/arrows/black_down.png + :/arrows/arrows/green_down.png:/arrows/arrows/black_down.png + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + Qt::Vertical - - QLayout::SetMinimumSize + + QSizePolicy::MinimumExpanding - - 1 + + + 0 + 0 + - - 1 + + + + + + + 0 + 0 + - - 1 + + + 16777215 + 130 + - - 1 + + Level door - - - - Entering into this warp causes exiting of the level. + + + 1 + + + QLayout::SetMinimumSize + + + 1 + + + 1 + + + 1 + + + 1 + + + + + Entering into this warp causes exiting of the level. If this flag enabled, possible to place entrance point only. - - - Exit only - - - - - - - Disables any possibility to enter into this warp. + + + Exit only + + + + + + + Disables any possibility to enter into this warp. Use this flag if you plan use it for level entrances only. If this flag is enabled, possible to place exit point only. - - - Enter only - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 40 - - - - - - - - - - - - 0 - 0 - - - - Warp to World map - - - - 1 - - - QLayout::SetMinimumSize - - - 2 - - - 2 - - - 2 + + + Enter only + + + + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 40 + + + + + + + + + + + + 0 + 0 + - - 2 + + Warp to World map - - - - X: - - - - - - - Target coordinates of player on the world map + + + 1 + + + QLayout::SetMinimumSize + + + 2 + + + 2 + + + 2 + + + 2 + + + + + X: + + + + + + + Target coordinates of player on the world map when you exited from a level through this warp - - - - - - - Y: - - - - - - - Target coordinates of player on the world map + + + + + + + Y: + + + + + + + Target coordinates of player on the world map when you exited from a level through this warp - - - - - - - Browse world map for setting a target exit point - - - Set - - - - - - - - - - - 0 - 0 - - - - Main - - - - QLayout::SetMinimumSize - - - 2 - - - 2 - - - 2 - - - 2 - - - 2 + + + + + + + Browse world map for setting a target exit point + + + Set + + + + + + + + + + + 0 + 0 + - - 1 + + Main - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 0 - 0 - - - - - - - - Qt::Vertical - - - QSizePolicy::Ignored - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - - - - - Place exit point or quickly jump to already placed - - - Set Exit - - - - - - - false - - - Point already placed - - - - - - - - - - QFrame::NoFrame - - - QFrame::Plain - - - 0 - - - - 0 + + + QLayout::SetMinimumSize + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + 1 + + + + + Qt::Vertical - - 0 + + QSizePolicy::MinimumExpanding - - 0 + + + 0 + 0 + - - 0 + + + + + + Qt::Vertical - - 0 + + QSizePolicy::Ignored - - - - Layer: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 25 - - - - - 16777215 - 25 - - - - 50 - - - - - - - - - - - 0 - 104 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 0 + + + 20 + 40 + - - 0 + + + + + + Qt::Horizontal - - 0 + + + + + + Place exit point or quickly jump to already placed - - 0 + + Set Exit + + + + + + + false - - 5 + + Point already placed - + + + + + + + + + QFrame::NoFrame + + + QFrame::Plain + + 0 - - - - - 0 - 25 - - - - - 16777215 - 25 - - - - Defines a type of warp: + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Layer: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 25 + + + + + 16777215 + 25 + + + + 50 + + + + + + + + + + + 0 + 104 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + 5 + + + 0 + + + + + + 0 + 25 + + + + + 16777215 + 25 + + + + Defines a type of warp: 0 - Instant, player will be teleported with zero of movement speed. 1 - Pipe, directional warp entrance and exit. 2 - Door, player can enter with up key. 3 - Portal, player will be teleported with keeping movelent speed as-is. - - - 20 - - - QComboBox::AdjustToMinimumContentsLength - - - 10 - - - false - - - - 0 - Instant - - - - 1 - Pipe + + 20 + + + QComboBox::AdjustToMinimumContentsLength + + + 10 + + + false + + + + 0 - Instant + + + + + 1 - Pipe + + + + + 2 - Door + + + + + 3 - Portal + + + + + + + + Message which will be shown +if required number of stars is not collected - - + + + + - 2 - Door + Need stars message - - + + + + - 3 - Portal - - - - - - - - Message which will be shown -if required number of stars is not collected - - - - - - - Need stars message - - - - - - - Need stars - - - - - - - - 16777215 - 25 - - - - Required number of a stars + Need stars + + + + + + + + 16777215 + 25 + + + + Required number of a stars to enter this warp - - - 10000 - - - - - - - Warp type - - - - - - - If this warp following to a level, number of existing + + + 10000 + + + + + + + Warp type + + + + + + + If this warp following to a level, number of existing and collected stars will not be shown. - - - Don't show stars number - - - - - - - Qt::Horizontal - - - - - - - - - - Place entrance point or quickly jump to already placed - - - Set Entrance - - - - - - - Qt::Horizontal - - - - - - - false - - - Point already placed - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Plain - - - - 0 + + + Don't show stars number + + + + + + + Qt::Horizontal + + + + + + + + + + Place entrance point or quickly jump to already placed - - 0 + + Set Entrance - - 0 + + + + + + Qt::Horizontal - - 0 + + + + + + false - - 0 + + Point already placed - - - - On-Enter event: - - - - - - - Trigger event when player will enter into this warp - - - - - - - - - - QFrame::NoFrame - - - QFrame::Plain - - - 0 - - - - 0 + + - - 2 + + + + + + QFrame::StyledPanel - - 2 + + QFrame::Plain + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + On-Enter event: + + + + + + + Trigger event when player will enter into this warp + + + + + + + + + + QFrame::NoFrame - - 2 + + QFrame::Plain - - 2 + + 0 - - - - Any mounted vehicles are will be removed + + + 0 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + Any mounted vehicles are will be removed when player will pass this warp. There are will be restored back when player finish level or lose it. - - - No Vehicles - - - - - - - Player can pass warp together with carried NPC. - - - Allow NPC - - - - - - - Entrance closed with a lock. Need a key to open it. - - - Locked - - - - - - - To be able enter into this warp, lock exlosion is needed. - - - Bomb needed - - - - - - - Player with special state only can enter into this warp. + + + No Vehicles + + + + + + + Player can pass warp together with carried NPC. + + + Allow NPC + + + + + + + Entrance closed with a lock. Need a key to open it. + + + Locked + + + + + + + To be able enter into this warp, lock exlosion is needed. + + + Bomb needed + + + + + + + Player with special state only can enter into this warp. Special state of playable character is defining by current configuration package settings. - - - Sp. State only - - - - - - - Qt::Vertical - - - QSizePolicy::Ignored - - - - 20 - 40 - - - - - - - - - - - Allow entering from both sides of this warp. - - - Two-way warp - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 130 - - - - Warp to other level - - - - QLayout::SetMinimumSize - - - 0 - - - 0 - - - 0 + + + Sp. State only + + + + + + + Qt::Vertical + + + QSizePolicy::Ignored + + + + 20 + 40 + + + + + + + + + + + Allow entering from both sides of this warp. + + + Two-way warp + + + + + + + + + + + 0 + 0 + - - 0 + + + 16777215 + 130 + - - 1 + + Warp to other level - - - - If this field is not empty, player will exit this level and will start this level. - - - - - - - Level file: - - - - - - - Declares Warp-ID of target level if value is not zero. + + + QLayout::SetMinimumSize + + + 0 + + + 0 + + + 0 + + + 0 + + + 1 + + + + + If this field is not empty, player will exit this level and will start this level. + + + + + + + Level file: + + + + + + + Declares Warp-ID of target level if value is not zero. Player will enter into target level through specific warp point. If value is zero, start level at pre-declared player start points. - - - 10000 - - - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - - - 27 - 16 - - - - - 16 - 16 - - - - Browse for another level file - - - ... - - - true - - - - - - - Show blank screen instead of loading screen. + + + 10000 + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + + 27 + 16 + + + + + 16 + 16 + + + + Browse for another level file + + + ... + + + true + + + + + + + Show blank screen instead of loading screen. In the SMBX Engine level loading screen showing a current playable character(s) and number of lives. - - - Hide level enter screen - - - - - - - Warp # - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Keep carried NPC when player entering + + + Hide level enter screen + + + + + + + Warp # + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Keep carried NPC when player entering to another level through this warp. - - - Allow inter-level NPC - - - - - - - - - - - 0 - 0 - - - - Cannon shoot exit - - - - QLayout::SetMinimumSize - - - 2 - - - 2 - - - 2 - - - 2 + + + Allow inter-level NPC + + + + + + + + + + + 0 + 0 + - - 0 + + Cannon shoot exit - - - - Projectile speed: - - - - - - - How fast will fly player when it will be shooted. + + + QLayout::SetMinimumSize + + + 2 + + + 2 + + + 2 + + + 2 + + + 0 + + + + + Projectile speed: + + + + + + + How fast will fly player when it will be shooted. Unit is a pixels per 1/65 seconds. - - - 10 - - - 99999.000000000000000 - - - 10.000000000000000 - - - - - - - When player will exit from this warp, it will be shooted by defined direction - - - Cannon exit - - - - - - - + + + 10 + + + 99999.000000000000000 + + + 10.000000000000000 + + + + + + + When player will exit from this warp, it will be shooted by defined direction + + + Cannon exit + + + + + + + + diff --git a/changelog.editor.txt b/changelog.editor.txt index f14810a380..185d4b83e8 100644 --- a/changelog.editor.txt +++ b/changelog.editor.txt @@ -17,6 +17,8 @@ Editor 0.3.1.12 - Fixed the focus stealing in the "don't show properties box" mode - Better nearest section detection calculation by position bookmarks - Fixed some missed "file modified" triggers +- Fixed confused events history tracking +- Added a scroll area into "Warps and Doors" toolbox Editor 0.3.1.11 - Added Polish translation of the editor @@ -157,7 +159,7 @@ Minor updates after release (updated version since 11 may 2015 build date): - Fixed music-box history - Fixed history of z-values - Copy-pasting bugs has been fixed -- Added support of custom music on world map (WLDX files only!) +- Added support of custom music on the world maps (WLDX files only!) Editor 0.2.2 - Added "Ask every startup" flag into config manager @@ -212,7 +214,7 @@ Editor 0.2.1 - Added SDL library to give better music and sound playback - Fixed grid alignment after duplicating/pasting - Added semi-transparent paths view for world map -- Added displaying of the items statistics to the debugger box +- Added displaying of the item's statistics to the debugger box - Fixed config directory path on Mac OS X - Fixed bug with item boxes updating when you switch between other applications - Added SMBX64 standard validator which prevents you from saving a file that would cause SMBX to crash, such as exceeding SMBX's maximum level size, etc. @@ -400,3 +402,4 @@ Editor 0.0.2 Editor 0.0.1 - First test version, can only check parsing of LVL files + diff --git a/changelog.engine.txt b/changelog.engine.txt index 42c2dd66e9..fd9b50d366 100644 --- a/changelog.engine.txt +++ b/changelog.engine.txt @@ -32,7 +32,7 @@ - Fixed custom folder confusion caused with dot-contained file names - Added more physical environment zones types include air chambers for underwater sections - Added separated support of portal and instant warps: instant warp will do same as in SMBX, portal warp will teleport character with keeping of kinetic energy -- Added support of entering event for warps +- Added support for entering event for warps - Added support of two-way directed warps - Added support of cannon exit warps - Better and stable inter-processing with editor based on stdin/stdout!1 @@ -99,7 +99,7 @@ - The player can climb on NPC-based climbable walls, not only on the BGO-based! - Fixed a lot of bugs - NPC's finally can be spawned from blocks where there are was included! -- Added support for the layers and basic events! [layers: show, hide, toggle; message box; play SFX; trigger another event; auto-scroll speed, changing of limit borders per section, toggling section background, toggling section music, other event actions are not implemented yet]. Working event triggers: block destroy, hit, empty-layer; NPC died, activated, empty layer [talk is not implemented yet!] +- Added support for the layers and basic events! [layers: show, hide, toggle; message box; play SFX; trigger another event; auto-scroll speed, changing of limit boundaries per section, toggling section background, toggling section music, other event actions are not implemented yet]. Working event triggers: block destroy, hit, empty-layer; NPC died, activated, empty layer [talk is not implemented yet!] - Fixed random crash caused by lua activation event when camera caught a corpse of NPC - Fixed slow performance caused by bad time delay function - Player finally can ride on NPC's heads [anyway, is not finished yet]