Skip to content

Updated terrain, added new zones, and loading flow #47

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.

Sign up for GitHub

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

Jump to bottom
Merged
jonjondev merged 30 commits into from
Mar 6, 2025
Merged

Updated terrain, added new zones, and loading flow #47

jonjondev merged 30 commits into from
Mar 6, 2025

Conversation

@BenKellySoftware
Copy link
Member

@BenKellySoftware BenKellySoftware commented Mar 5, 2025 •
edited by jonjondev
Loading

Pull Request Description

This PR adds terrain to zone levels with updated controls, as well as a new loading menu flow and additional zones. It also updates direct input to restrict to nav-walking.

The PR has been...

  • provided a reasonable name that is not just the branch name (e.g "Implemented walls mechanic")
  • linked to its related issue (if any)
  • assigned a reviewer from the team

The code has been...

  • made mergable and free of conflicts in relation to the base branch (according to GitHub)
  • pulled to the reviewer's machine and reasonably tested
  • read through and approved by a reviewer
  • bumped in project version over the latest release (i.e. vX.Y.Z for major, minor or patch)

Note: for new features, use minor (Y), and for bug fixes or small changes, use patch (Z). Bumping the minor version should also reset the patch version to zero, so v1.2.4, would become v1.3.0. See semantic versioning for more info.

jonjondev and others added 28 commits November 16, 2024 11:55
@jonjondev
Moved lighting gradient to internal property
2f22d13
@jonjondev
Updated terrain plugin to set UVs based on full mesh size
d080b96
@jonjondev
Fixed levels menu DT reference for cheats
932f3a8
@jonjondev
Added terrain mesh generator to main zone
97797f4
@jonjondev
Removed unused UV assignment tools for terrain plugin
0216891
@BenKellySoftware
Fix terrain height controls
853f0a4
@BenKellySoftware
Update terrain heights
3fdaaf9
@jonjondev
Shuffled order for grid attributes to use mnemonic values
6f3c755
@jonjondev
Added road decal, used attribute alpha for emission mask
a29011b
@BenKellySoftware
Update map and alpha channel for road decal
7df8df6
@BenKellySoftware
Update main zone terrain to designs
3c0ec3a
@BenKellySoftware
Only display handles around selected plane
e8b5225
@BenKellySoftware
Add zone transitions and added peninsula zone
a26630b
@jonjondev
Implemented threaded level loading, added default transition scene
545f952
@jonjondev
Added 3D debug drawing utilities
9a7fd50
@jonjondev
Added navmesh bounds checking for movement input character control
2f3417d
@jonjondev
Exposed render layer configuration to terrain generation
7890672
@jonjondev
Moved surface collision checking to shared utility function
5b1786f
@jonjondev
Updated crops place with regard to terrain height
c1954fa
@BenKellySoftware
Set masks on terrains, replace selection cursor overlay with decal
8770053
@BenKellySoftware
map cleanup, added border to grid texture
6b92d14
@jonjondev
Added editor tool for grid cell enabling and disabling on click
d4d8376
@jonjondev
Added environment shaders
d1eed1e
@jonjondev
Added game startup flow with main menu and intro crawl, added base tr…
4999ea0 
…ansition screen
@jonjondev
Moved load flow to main menu, include zone transform in persistence
b32b204
@jonjondev
Fixed zone spawn location markup
3e4453e
@jonjondev
Fixed navigation checks occurring before map initialisation
963618c
@jonjondev
Reduced merge_rasterizer_cell_scale to silence navigation bake error
64a4f7b
@BenKellySoftware BenKellySoftware changed the title errain integration Terrain Integration Mar 5, 2025
@jonjondev jonjondev changed the title Terrain Integration Updated, integrated and authored terrain, added loading menu flow and new zones Mar 5, 2025
@jonjondev jonjondev linked an issue Mar 5, 2025 that may be closed by this pull request
Create layout for main zone #38
Closed
@jonjondev jonjondev self-requested a review March 5, 2025 22:54
jonjondev
jonjondev approved these changes Mar 5, 2025
View reviewed changes
Copy link
Member

@jonjondev jonjondev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Let's merge.

@jonjondev jonjondev force-pushed the feature/terrain-integration branch from cf1e4af to 5c3a7ab Compare March 6, 2025 02:07
@jonjondev jonjondev changed the title Updated, integrated and authored terrain, added loading menu flow and new zones Updated, integrated and authored terrain and added loading flow Mar 6, 2025
@jonjondev jonjondev changed the title Updated, integrated and authored terrain and added loading flow Updated terrain, added new zones, and loading flow Mar 6, 2025
@jonjondev jonjondev merged commit 33d7e3b into develop Mar 6, 2025
3 checks passed
@jonjondev jonjondev deleted the feature/terrain-integration branch March 6, 2025 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jonjondev jonjondev jonjondev approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Create layout for main zone

3 participants

@BenKellySoftware @jonjondev