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

Implement Tesseract Gameplay Logic and Lumina Collection Logic #93

Merged
merged 28 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3a8d0e5
Add Tesseract configuration and visual metadata files
Sheerwin02 Dec 19, 2024
0a4f8eb
[Add] Add Lumina functionality and configuration related files
Sheerwin02 Dec 19, 2024
869b76d
[Test] Test spawn lumina
Sheerwin02 Dec 19, 2024
4f6ef5b
[Update] Use trigger method to trigger effector
Sheerwin02 Dec 19, 2024
f405019
[Update] Change CollecetdLuminas to Component
Sheerwin02 Dec 29, 2024
95cf5e7
[Add] Introduce LuminaType and TesseractType blueprints, and update T…
Sheerwin02 Jan 5, 2025
9ce5492
Merge branch 'main' into feature/tesseract
nixon-voxell Jan 16, 2025
8f9272f
Use trigger observers to spawn lumina
nixon-voxell Jan 16, 2025
a50f37b
Add deposit lumina protocol
nixon-voxell Jan 16, 2025
d22a473
Move screens related code into its own folder
nixon-voxell Jan 17, 2025
9f6e3ea
Rename lumina module to objective & WIP move tesseract logic to Sandbox
nixon-voxell Jan 17, 2025
52667d0
Add hash_coords_2d to math_utils
nixon-voxell Jan 18, 2025
07d421b
Add blueprint spawner
nixon-voxell Jan 18, 2025
b816087
Add MineSpot
nixon-voxell Jan 18, 2025
e9a4e4a
Add MineSpot into Sandbox
nixon-voxell Jan 18, 2025
9b2988c
Add Ore types, Large, Medium, Small into sandbox
nixon-voxell Jan 19, 2025
1df5f95
Only initialize Primitive/Mesh Rigidbody that is not a confirmed entity
nixon-voxell Jan 20, 2025
24f408b
Add ObjectiveAreaManager
nixon-voxell Jan 20, 2025
082f13d
Reset objective area in 5 secs after it depletes in sandboxes
nixon-voxell Jan 20, 2025
9d89df4
Fix test
nixon-voxell Jan 20, 2025
05a2cf0
Spawn lumina on ore destroyed
nixon-voxell Jan 20, 2025
e2017d9
Add OreDestroyed marker component to prevent ore from being destroyed…
nixon-voxell Jan 20, 2025
962f150
Add OreDestroyed on spawn as it's initialized as nothing
nixon-voxell Jan 20, 2025
c76596b
Remove Wall layer, setup lumina layer, add SourceEntity to LuminaType…
nixon-voxell Jan 21, 2025
7b83aa4
Remove sensor from LuminaConfig, add spaceship collision layer to spa…
nixon-voxell Jan 21, 2025
e4fe6f7
Delay Health comp init until PostUpdate for a chance to init it elsew…
nixon-voxell Jan 22, 2025
94c87c0
Fix material disappearance issue
nixon-voxell Jan 23, 2025
4b3e68d
Listen for DepositLumina message over the web.
nixon-voxell Jan 23, 2025
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 Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions assets/blueprints/Tesseract.meta.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(
assets:
[
]
)
6 changes: 3 additions & 3 deletions assets/enoki/booster_flakes.ron
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
linear_damp: Some((10.0, 0.0)),
angular_damp: Some((1.0, 0.0)),
scale_curve: Some((points: [
(3.0, 0.0, None),
(5.0, 1.0, Some(CubicInOut))
(5.0, 0.0, None),
(7.0, 1.0, Some(CubicInOut))
])),
color_curve: Some((points: [
((red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0), 0.0, None),
((red: 1.3, green: 0.8, blue: 2.0, alpha: 1.0), 0.0, None),
((red: 0.0, green: 1.7, blue: 2.0, alpha: 1.0), 0.2, None),
((red: 0.0, green: 1.4, blue: 2.0, alpha: 1.0), 0.5, None),
((red: 0.0, green: 0.5, blue: 1.0, alpha: 0.0), 1.0, None)
Expand Down
8 changes: 4 additions & 4 deletions assets/enoki/gun_sparks.ron
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
(6.0, 1.0, Some(CubicInOut))
])),
color_curve: Some((points: [
((red: 10.0, green: 10.0, blue: 10.0, alpha: 1.0), 0.0, None),
((red: 10.0, green: 8.0, blue: 0.0, alpha: 1.0), 0.2, None),
((red: 10.0, green: 6.0, blue: 0.0, alpha: 1.0), 0.5, None),
((red: 1.0, green: 0.5, blue: 0.0, alpha: 0.0), 1.0, None)
((red: 3.0, green: 3.0, blue: 2.0, alpha: 1.0), 0.0, None),
((red: 3.0, green: 2.7, blue: 0.0, alpha: 1.0), 0.2, None),
((red: 3.0, green: 2.4, blue: 0.0, alpha: 1.0), 0.5, None),
((red: 2.0, green: 1.5, blue: 0.0, alpha: 0.0), 1.0, None)
]))
)
Binary file modified assets/levels/lobbies/Local.glb
Binary file not shown.
4 changes: 0 additions & 4 deletions assets/levels/lobbies/Local.meta.ron
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,5 @@
assets:
[
("SpawnPointA", File ( path: "blueprints/SpawnPointA.glb" )),
("SpotLight", File ( path: "blueprints/SpotLight.glb" )),
("SpotlightGlow", File ( path: "materials/SpotlightGlow.glb" )),
("Bsse0", File ( path: "materials/Bsse0.glb" )),
("Base2", File ( path: "materials/Base2.glb" )),
]
)
Binary file modified assets/levels/lobbies/Sandbox.glb
Binary file not shown.
Binary file added assets/levels/luminas/NormalConfig.glb
Binary file not shown.
5 changes: 5 additions & 0 deletions assets/levels/luminas/NormalConfig.meta.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(
assets:
[
]
)
Binary file added assets/levels/luminas/NormalVisual.glb
Binary file not shown.
5 changes: 5 additions & 0 deletions assets/levels/luminas/NormalVisual.meta.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(
assets:
[
]
)
Binary file added assets/levels/ores/LargeConfig.glb
Binary file not shown.
5 changes: 5 additions & 0 deletions assets/levels/ores/LargeConfig.meta.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(
assets:
[
]
)
Binary file added assets/levels/ores/LargeVisual.glb
Binary file not shown.
5 changes: 5 additions & 0 deletions assets/levels/ores/LargeVisual.meta.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(
assets:
[
]
)
Binary file added assets/levels/ores/MediumConfig.glb
Binary file not shown.
5 changes: 5 additions & 0 deletions assets/levels/ores/MediumConfig.meta.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(
assets:
[
]
)
Binary file added assets/levels/ores/MediumVisual.glb
Binary file not shown.
5 changes: 5 additions & 0 deletions assets/levels/ores/MediumVisual.meta.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(
assets:
[
]
)
Binary file added assets/levels/ores/SmallConfig.glb
Binary file not shown.
5 changes: 5 additions & 0 deletions assets/levels/ores/SmallConfig.meta.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(
assets:
[
]
)
Binary file added assets/levels/ores/SmallVisual.glb
Binary file not shown.
5 changes: 5 additions & 0 deletions assets/levels/ores/SmallVisual.meta.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(
assets:
[
]
)
Binary file added assets/levels/tesseracts/Tesseract.glb
Binary file not shown.
5 changes: 5 additions & 0 deletions assets/levels/tesseracts/Tesseract.meta.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(
assets:
[
]
)
Binary file added assets/materials/Base3.5.glb
Binary file not shown.
Binary file removed assets/materials/Base5.001.glb
Binary file not shown.
Binary file removed assets/materials/Bsse1.001.glb
Binary file not shown.
Binary file added assets/materials/DockingBorder.glb
Binary file not shown.
Binary file modified assets/materials/Dots Stroke.glb
Binary file not shown.
Binary file added assets/materials/GlowGreen.glb
Binary file not shown.
Binary file modified assets/materials/GlowOrange.glb
Binary file not shown.
Binary file added assets/materials/GlowWhite.glb
Binary file not shown.
Binary file added assets/materials/GlowYellow.glb
Binary file not shown.
Binary file added assets/materials/Indigo.glb
Binary file not shown.
Binary file added assets/materials/LargeOre.glb
Binary file not shown.
Binary file removed assets/materials/Material.001.glb
Binary file not shown.
Binary file removed assets/materials/Material.002.glb
Binary file not shown.
Binary file removed assets/materials/Material.003.glb
Binary file not shown.
Binary file removed assets/materials/Material.004.glb
Binary file not shown.
Binary file added assets/materials/MediumOre.glb
Binary file not shown.
Binary file modified assets/materials/PurpleGlow.glb
Binary file not shown.
Binary file added assets/materials/SmallOre.glb
Binary file not shown.
Loading
Loading