Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix updating base classes #337

Merged
merged 4 commits into from
Sep 17, 2024
Merged
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -62,6 +62,7 @@
- Added InputList attribute control
- Moved mass attribute from transformation category to state category
- Moved limit speed attribute from special states category to state category
- Fixed updating base classes for RscDebugConsole, EditCodeMulti3, and Display3DEN

## REMOVED
- Customization via userconfig
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -28,3 +28,4 @@
| a1044438870 |
| Artenis |
| Pixelated Grunt | minor ESE improvement |
| Dart | Config |
4 changes: 2 additions & 2 deletions addons/main/GUI/RscDebugConsole.hpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
class RscControlsGroupNoScrollbars;
class RscButtonMenu;
class RscDebugConsole: RscControlsGroupNoScrollbars
{
class Controls
{
class ButtonSpectatorCamera;
class ButtonFunctions: ButtonSpectatorCamera
class ButtonFunctions: RscButtonMenu
{
idc = -1;
//Dynamically reposition it if Connor's functions viewer is available as well.
28 changes: 6 additions & 22 deletions addons/main/cfg3DEN.hpp
Original file line number Diff line number Diff line change
@@ -69,10 +69,13 @@ class Cfg3DEN
};
};
//Increase height of edit attribute controls
class Edit;
class Edit: Title
{
class Controls;
};
class EditMulti3: Edit
{
class Controls
class Controls: Controls
{
class Value;
class Background;
@@ -81,7 +84,7 @@ class Cfg3DEN
};
class EditCodeMulti3: EditMulti3
{
class Controls
class Controls: Controls
{
class Value;
class Background;
@@ -107,25 +110,6 @@ class Cfg3DEN
};
};
};
class EditCodeMulti5: EditCodeMulti3
{
h = QUOTE((5 + 20 * 3.5) * GRID_H);
class Controls: Controls
{
class Background: Background
{
h = QUOTE((20 * 3.5 + 0.6 * 5) * GRID_H);
};
class Value: Value
{
h = QUOTE(20 * 3.5 * GRID_H - 1 * GRID_H);
};
class Title: Title
{
h = QUOTE((20 * 3.5 + 1 * 5) * GRID_H);
};
};
};
#include "controls\SPR.hpp"
#include "controls\advancedDamage.hpp"
#include "controls\airdrop.hpp"
2 changes: 1 addition & 1 deletion addons/main/display3DEN/display3DEN.hpp
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ class Display3DEN
{
w = QUOTE(19 * GRID_W);
};
class Version: ctrlButton
class Version: ValueX
{
idc = -1;
text = "V";