0ad/0ad
0ad/0ad
11
9
Fork 21
Code Issues 1.5k Pull Requests 36 Actions Projects Releases Wiki Activity

WIP: 🎨 Allow buildings to adapt to their map #7069

Draft
Stan wants to merge 1 commits from Stan/0ad:biome-replacer into main
pull from: Stan/0ad:biome-replacer
merge into: 0ad:main
Conversation 7 Commits 1 Files Changed 32 +456 -37
Stan commented 2024-09-22 18:39:33 +02:00
Owner
Copy Link

This patch allows buildings to adapt to their environment by changing variants depending on the biome they are in.
No context until the map is removed from the patch :)
TODO/Need Help: Figure out why skin is incorrect during construction, while preview and final work.
Continuation of https://code.wildfiregames.com/D4938

This patch allows buildings to adapt to their environment by changing variants depending on the biome they are in. No context until the map is removed from the patch :) TODO/Need Help: Figure out why skin is incorrect during construction, while preview and final work. Continuation of https://code.wildfiregames.com/D4938
received_636745918211921.jpeg
243 KiB
received_636745918211921.jpeg
Stan added 1 commit 2024-09-22 18:39:37 +02:00
🎨 Allow buildings to adapt to their map
Some checks failed
0ad-freebsd/pipeline/pr-main This commit looks good
Details
pre-commit / build (pull_request) Successful in 1m19s
Details
0ad-linux/pipeline/pr-main This commit looks good
Details
0ad-windows/pipeline/pr-main This commit looks good
Details
checkrefs / checkrefs (pull_request) Failing after 34s
Details
0ad-macos/pipeline/pr-main This commit looks good
Details
a44a35d201
sera commented 2024-09-23 07:41:20 +02:00
Member
Copy Link

I doubt that everywhere the git log is supposed to be rendered the font has a glyph for 🎨, while available here in terminal (black/white) I can't make out what that glyph is supposed to be, we probably should limit our self to ascii.

I doubt that everywhere the git log is supposed to be rendered the font has a glyph for 🎨, while available here in terminal (black/white) I can't make out what that glyph is supposed to be, we probably should limit our self to ascii.
Stan commented 2024-09-23 07:45:56 +02:00
Author
Owner
Copy Link

Yeah it's not meant to stay :)

Yeah it's not meant to stay :)
Stan force-pushed biome-replacer from a44a35d201 to 30d57d114c 2024-09-23 22:30:22 +02:00 Compare
Stan commented 2024-09-23 22:32:07 +02:00
Author
Owner
Copy Link

Force pushing does not work...

Force pushing does not work...
sera commented 2024-09-23 23:17:29 +02:00
Member
Copy Link

Can you try adding pull at the end of the lfs command in the workflow to make the remote explicit?

- run: git lfs pull -I binaries/data/mods/public/maps
+ run: git lfs pull -I binaries/data/mods/public/maps pull
Can you try adding pull at the end of the lfs command in the workflow to make the remote explicit? ``` - run: git lfs pull -I binaries/data/mods/public/maps + run: git lfs pull -I binaries/data/mods/public/maps pull ```
Stan added 1 commit 2024-09-24 07:48:53 +02:00
Try to fix the pipeline
Some checks failed
checkrefs / checkrefs (pull_request) Failing after 29s
Details
0ad-freebsd/pipeline/pr-main This commit looks good
Details
pre-commit / build (pull_request) Successful in 1m4s
Details
0ad-linux/pipeline/pr-main This commit looks good
Details
0ad-windows/pipeline/pr-main This commit looks good
Details
0ad-macos/pipeline/pr-main This commit looks good
Details
3a48b0daab
Stan force-pushed biome-replacer from 3a48b0daab to 111c29617f 2024-09-24 07:57:50 +02:00 Compare
Stan commented 2024-09-24 08:02:01 +02:00
Author
Owner
Copy Link

No more luck with that fix.

No more luck with that fix.
Stan force-pushed biome-replacer from 111c29617f to dcd2bcd3c4 2024-09-24 08:19:10 +02:00 Compare
Stan force-pushed biome-replacer from dcd2bcd3c4 to 88acc93221 2024-09-25 08:29:46 +02:00 Compare
Stan force-pushed biome-replacer from 88acc93221 to 1dd0f4340b 2024-09-25 08:31:24 +02:00 Compare
Stan force-pushed biome-replacer from 1dd0f4340b to 7ab421bc31 2024-09-25 08:35:29 +02:00 Compare
Stan commented 2024-09-25 10:13:28 +02:00
Author
Owner
Copy Link

Okay so

$ git lfs push upstream {branch_name}

did the trick
I didn't know map xmls were also in LFS.
Also gotta be careful not to push my lfs from my fork to the server. Else space is gonna be tight soon.

Okay so ```sh $ git lfs push upstream {branch_name} ``` did the trick I didn't know map xmls were also in LFS. Also gotta be careful not to push my lfs from my fork to the server. Else space is gonna be tight soon.
Stan commented 2024-09-25 10:17:35 +02:00
Author
Owner
Copy Link

I do hope they get cleaned when branches are deleted.

I do hope they get cleaned when branches are deleted.
Some checks reported warnings
0ad-freebsd/pipeline/pr-main This commit looks good
Required
Details
checkrefs / checkrefs (pull_request) Successful in 52s
Required
Details
pre-commit / build (pull_request) Successful in 1m5s
Required
Details
0ad-windows/pipeline/pr-main This commit looks good
Required
Details
0ad-linux/pipeline/pr-main This commit looks good
Required
Details
0ad-macos/pipeline/pr-main This commit is unstable
Required
Details
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u biome-replacer:Stan-biome-replacer
git checkout Stan-biome-replacer
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Closed
Duplicate

  
Closed
Fixed

  
Closed
Invalid

  
Closed
Needs info

  
Closed
Won't fix

  
Closed
Works for me

  
Difficulty
Hard

  
Difficulty
Medium

  
Difficulty
Simple

  
Needed for Beta

   
Needs Design Input

   
Needs Info

   
Pathfinding
  
Priority
1: Release Blocker

  
Priority
2: Must Have

  
Priority
3: Should Have

  
Priority
4: Nice To Have

  
Priority
5: If Time Permits

  
Regression
  
Theme
AI

  
Theme
Art & Animation

  
Theme
Atlas editor

  
Theme
Build & Packages

  
Theme
Core engine

  
Theme
Documentation

  
Theme
Internationalization & Localization

  
Theme
Maps

  
Theme
Multiplayer Lobby

  
Theme
Music & Sound FX

  
Theme
Network

  
Theme
Non-game systems

  
Theme
Simulation

  
Theme
UI & Simulation

  
Theme
UI – Game setup

  
Theme
UI – In-game

  
Theme
UI – Miscellaneous

  
Theme
Website & Forum

  
Type
Defect

  
Type
Enhancement

  
Type
Task

No Label
Closed
Duplicate
Closed
Fixed
Closed
Invalid
Closed
Needs info
Closed
Won't fix
Closed
Works for me
Difficulty
Hard
Difficulty
Medium
Difficulty
Simple
Needed for Beta
Needs Design Input
Needs Info
Pathfinding
Priority
1: Release Blocker
Priority
2: Must Have
Priority
3: Should Have
Priority
4: Nice To Have
Priority
5: If Time Permits
Regression
Theme
AI
Theme
Art & Animation
Theme
Atlas editor
Theme
Build & Packages
Theme
Core engine
Theme
Documentation
Theme
Internationalization & Localization
Theme
Maps
Theme
Multiplayer Lobby
Theme
Music & Sound FX
Theme
Network
Theme
Non-game systems
Theme
Simulation
Theme
UI & Simulation
Theme
UI – Game setup
Theme
UI – In-game
Theme
UI – Miscellaneous
Theme
Website & Forum
Type
Defect
Type
Enhancement
Type
Task
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: 0ad/0ad#7069
No description provided.
Delete Branch "Stan/0ad:biome-replacer"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?