Skip to content

Commit

Permalink
ed tabs todo
Browse files Browse the repository at this point in the history
  • Loading branch information
@cryham
cryham committed Dec 1, 2024
1 parent 139bcf0 commit a9c2c1b
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 22 deletions.
70 changes: 59 additions & 11 deletions data/gui/Editor_Objects.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Property key="Colour" value="1 0.6 0.2"/>
</Widget>

<!-- ============================================================================================================================================= -->
<!-- ............................................................................................................................................. -->
<!-- 📦🏢 Objects -->
<Widget type="TabItem" skin="" position="2 24 794 562">
<Property key="Caption" value="#D0D0D0#{Objects}"/>
Expand Down Expand Up @@ -60,34 +60,82 @@

</Widget>

<!-- ============================================================================================================================================= -->
<!-- ............................................................................................................................................. -->
<!-- 💧 Fluids -->
<Widget type="TabItem" skin="" position="2 24 794 562">
<Property key="Caption" value="#80C0FF#{Fluids}"/>
<!-- <Widget type="TextBox" skin="TextBox" position="14 16 128 24">
<Property key="Caption" value="#{ObjDynamic}"/>
<Property key="TextColour" value="0.6 0.82 1.0"/>
</Widget> -->

<Widget type="ListBox" skin="ListBox" position="12 40 166 500" name="FluidsList">
<Property key="Colour" value="0.6 0.8 1"/>
</Widget>

</Widget>

<!-- ============================================================================================================================================= -->
<!-- ............................................................................................................................................. -->
<!-- ✨ Particles -->
<Widget type="TabItem" skin="" position="2 24 794 562">
<Property key="Caption" value="#C0C080#{Particles}"/>
<!-- <Widget type="TextBox" skin="TextBox" position="14 16 128 24">
<Property key="Caption" value="#{ObjDynamic}"/>
<Property key="TextColour" value="0.6 0.82 1.0"/>
</Widget> -->

<Widget type="ListBox" skin="ListBox" position="12 40 166 500" name="ParticlesList">
<Property key="Colour" value="0.8 0.8 0.8"/>
</Widget>

</Widget>


<!-- NEW -->
<!-- ............................................................................................................................................. -->
<!-- 🎆 Fields -->
<Widget type="TabItem" skin="" position="2 24 794 562">
<Property key="Caption" value="#C080FF#{Fields}"/>

<!-- todo -->
<Widget type="TextBox" skin="TextBox" position="260 16 190 24">
<Property key="Caption" value="#{NotDone}"/>
<Property key="TextColour" value="0.95 0.7 0.7"/>
</Widget>
</Widget>

<!-- ............................................................................................................................................. -->
<!-- 💡 Lights -->
<Widget type="TabItem" skin="" position="2 24 794 562">
<Property key="Caption" value="#FFF870#{Lights}"/>

<!-- todo -->
<Widget type="TextBox" skin="TextBox" position="260 16 190 24">
<Property key="Caption" value="#{NotDone}"/>
<Property key="TextColour" value="0.95 0.7 0.7"/>
</Widget>
</Widget>

<!-- ............................................................................................................................................. -->
<!-- 🔉 Sounds -->
<Widget type="TabItem" skin="" position="2 24 794 562">
<Property key="Caption" value="#80C0FF#{Sounds}"/>

<!-- todo -->
<Widget type="TextBox" skin="TextBox" position="260 16 190 24">
<Property key="Caption" value="#{NotDone}"/>
<Property key="TextColour" value="0.95 0.7 0.7"/>
</Widget>
</Widget>

<!-- ............................................................................................................................................. -->
<!-- 🎇 Entities -->
<Widget type="TabItem" skin="" position="2 24 794 562">
<Property key="Caption" value="#E0C0E0#{Entities}"/>

<Widget type="ListBox" skin="ListBox" position="12 40 166 500" name="EntitiesList">
<Property key="Colour" value="0.9 0.8 0.9"/>
</Widget>

<!-- todo -->
<Widget type="TextBox" skin="TextBox" position="260 16 190 24">
<Property key="Caption" value="#{NotDone}"/>
<Property key="TextColour" value="0.95 0.7 0.7"/>
</Widget>
</Widget>

</Widget>
</Widget>

Expand Down
5 changes: 4 additions & 1 deletion data/gui/core_language_en_tag.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1279,7 +1279,7 @@
<Tag name="Tile">Tile</Tag>


<!-- Editor tools -->
<!-- Editor Objects verious -->
<Tag name="CarStart">Car Start</Tag>
<Tag name="Fluids">Fluids</Tag>

Expand All @@ -1294,6 +1294,9 @@
<Tag name="Fields">Fields</Tag>
<Tag name="InputFieldsTelepEnd">Enter - toggle teleport end edit</Tag>

<Tag name="Sounds">Sounds</Tag>
<Tag name="Entities">Entities</Tag>


<!-- Tools -->
<Tag name="Tools">Tools</Tag>
Expand Down
5 changes: 5 additions & 0 deletions docs/Changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,16 @@ WIP means work in progress, unfinished, still being developed.
Global Illumination ([GI methods](https://ogrecave.github.io/ogre-next/api/latest/_gi_methods.html): IFD+VCT),
on new Gui tab Advanced after Effects, has also debug visuals.
- Game
- WIP ambient track sound (rain, etc)
- WIP dynamic object hit sounds
- Setup - Paints tab new *filter* slider, to show paints only from filter rating and above.
But editing paints list must be done w/o filter, on highest value.
Pressing Random (or Space) sets random from visible list.
- *Statistics* window with list of completed game tutorials, championships, challenges, collections
- restored tire trails, but still 1 color, meh
- Editor
- Split Edit window to own with: Objects, Fluids, Particles, etc
- 3D model preview on top of Gui
- Gui comboboxes open on click (whole, not just on down arrow)

### Version 3.2 - 23.09.2024
Expand Down
20 changes: 10 additions & 10 deletions src/emojis.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ You can search in code by emoji for all that is related to it.
_______ _________ ____________ ___________ _______ ______ _________
Scene Scene-2 Atmosphere HUD, Game HUD-2 Road Vehicle

🏝️ scenery 💧🌊 Fluids 🌞 Sun ⏱️ HUD timer 🌍 Minimap 🛣️ Road 🚗 Vehicle car 🚀 Spaceship
🏞️ Track Scene water mud ⛅ Sky clouds ⏲️ Gauges ⚫💭 Tire wheel 🔘 Sphere
trk scn ✨🔥 Particles 🥛 Next chk beam 📏 Wall bridge 🪜 suspension 🏍️ Motorbike
⛰️ Terrain ter Emitters emt 🌫️ Fog 🔝 Arrow 🚦 Pacenotes 🏛️ Column col 🚌 Bus
🏔️ Blendmap 🌦️🌧️ Weather 🎗️ Trail 📈 engine 🚤 Hover
Trees 🛢️📦 Objects obj rain snow 🔨 Damage hit ❌ wrong chk ⭕ Pipe 🔴 brake
🌳🪨 Veget-ation 🏢 caves buildings 🌪️🍃 wind 💨 Boost ➰➿ Loop
🪴 Bush 🍄shroom 🎆 Fields fld ⏪ Rewind 🎨 paint
🌿 Grass grs accelerate lift 🪐🌌 Space
⛈️🌋 Extreme
🏝️ scenery 💧🌊 Fluids 🌞 Sun ⏱️ HUD timer 🌍 Minimap 🛣️ Road 🚗 Vehicle car 🚀 Spaceship
🏞️ Track Scene water mud ⛅ Sky clouds ⏲️ Gauges ⚫💭 Tire wheel 🔘 Sphere
trk scn ✨🔥 Particles 🥛 Next chk beam 📏 Wall bridge 🪜 suspension 🏍️ Motorbike
⛰️ Terrain ter Emitters emt 🌫️ Fog 🔝 Arrow 🚦 Pacenotes 🏛️ Column col 🚌 Bus
🏔️ Blendmap 🛢️📦 Objects obj 🌦️🌧️ Weather 🎗️ Trail 📈 engine 🚤 Hover
Trees 🏢 caves buildings rain snow 🔨 Damage hit ❌ wrong chk ⭕ Pipe 🔴 brake
🌳🪨 Veget-ation 🌪️🍃 wind 💨 Boost ➰➿ Loop
🪴 Bush 🍄shroom 🎆 Fields fld ⏪ Rewind 🎨 paint
🌿 Grass grs accelerate lift 🪐🌌 Space
🎇 entities ent ⛈️🌋 Extreme
🫧 Anomaly
____________ ______ _____ _______ ______ ________ _______ ________
Components Game GUI GUI-2 Code Code-2 Tools Render
Expand Down

0 comments on commit a9c2c1b

Please sign in to comment.