A different branch with the bat implementation #97
Conversation
…y there are so many changed files)
|
Qodo Merge was enabled for this repository. To continue using it, please link your Git account with your Qodo account here. PR Reviewer Guide 🔍Here are some key observations to aid the review process:
|
PR Code Suggestions ✨Latest suggestions up to 68529af
Previous suggestions✅ Suggestions up to commit 8eab71d
|
||||||||||||||||||||||
| <<<<<<< HEAD:scenes/fuel_slider.tscn | ||
| [ext_resource type="Script" uid="uid://nr0q7iu61suy" path="res://scenes/fuel_bar.gd" id="2_q6t1k"] | ||
| ======= | ||
| >>>>>>> origin/main:scenes/ui/fuel_slider.tscn |
There was a problem hiding this comment.
We should remove these Git merge conflict markers:
| <<<<<<< HEAD:scenes/fuel_slider.tscn | |
| [ext_resource type="Script" uid="uid://nr0q7iu61suy" path="res://scenes/fuel_bar.gd" id="2_q6t1k"] | |
| ======= | |
| >>>>>>> origin/main:scenes/ui/fuel_slider.tscn | |
| [ext_resource type="Script" uid="uid://nr0q7iu61suy" path="res://scenes/fuel_bar.gd" id="2_q6t1k"] |
| <<<<<<< HEAD:refueling_pad.tscn | ||
| [ext_resource type="Script" uid="uid://dcsta8rmoe340" path="res://refueling_pad.gd" id="1_6wxl3"] | ||
| ======= | ||
| [ext_resource type="Script" uid="uid://df7nhc0md14xw" path="res://scenes/refueling_pad.gd" id="1_6wxl3"] | ||
| >>>>>>> origin/main:scenes/refueling_pad.tscn |
There was a problem hiding this comment.
This contains merge conflict makers:
| <<<<<<< HEAD:refueling_pad.tscn | |
| [ext_resource type="Script" uid="uid://dcsta8rmoe340" path="res://refueling_pad.gd" id="1_6wxl3"] | |
| ======= | |
| [ext_resource type="Script" uid="uid://df7nhc0md14xw" path="res://scenes/refueling_pad.gd" id="1_6wxl3"] | |
| >>>>>>> origin/main:scenes/refueling_pad.tscn | |
| [ext_resource type="Script" uid="uid://df7nhc0md14xw" path="res://scenes/refueling_pad.gd" id="1_6wxl3"] |
brylie
left a comment
brylie
left a comment
There was a problem hiding this comment.
We can't merge this with the merge conflict markers still in the code, since Godot won't know how to parse those files.
![qodo-code-review[bot]](https://avatars.githubusercontent.com/in/484649?s=60&v=4){kind=small}
| <<<<<<< HEAD:refueling_pad.tscn | ||
| [ext_resource type="Script" uid="uid://dcsta8rmoe340" path="res://refueling_pad.gd" id="1_6wxl3"] | ||
| ======= | ||
| [ext_resource type="Script" uid="uid://df7nhc0md14xw" path="res://scenes/refueling_pad.gd" id="1_6wxl3"] | ||
| >>>>>>> origin/main:scenes/refueling_pad.tscn |
There was a problem hiding this comment.
Suggestion: Resolve merge conflict
| <<<<<<< HEAD:refueling_pad.tscn | |
| [ext_resource type="Script" uid="uid://dcsta8rmoe340" path="res://refueling_pad.gd" id="1_6wxl3"] | |
| ======= | |
| [ext_resource type="Script" uid="uid://df7nhc0md14xw" path="res://scenes/refueling_pad.gd" id="1_6wxl3"] | |
| >>>>>>> origin/main:scenes/refueling_pad.tscn | |
| [ext_resource type="Script" uid="uid://df7nhc0md14xw" path="res://scenes/refueling_pad.gd" id="1_6wxl3"] |
2 participants
User description
I don't understand why there are so many changed files, imports or something
PR Type
Enhancement
Description
Added unique Godot UID files for scripts and scenes
Updated scene files to reference new UID-based resources
Improved fuel slider integration in player scene
Updated project settings and environment references
Changes walkthrough 📝
28 files
Add UID file for playlist.gd scriptAdd UID file for track.gd scriptUpdate script references to use UID-based resourcesAdd UID file for background_music_player.gd scriptUpdate scene UID for better bat sceneAdd UID file for landing_pad.gd scriptUpdate script reference to UID-based landing_pad.gdUpdate script reference to UID-based landing_pad.gdUpdate script and refueling_pad references to UID-based resourcesUpdate script reference to UID-based landing_pad.gdUpdate script reference to UID-based landing_pad.gdUpdate script reference to UID-based landing_pad.gdUpdate script reference to UID-based landing_pad.gdUpdate script and cave_2 scene references to UID-based resourcesUpdate script and cave_2 scene references to UID-based resourcesAdd UID file for refueling_pad.gd scriptUpdate scene UID and script reference to UID-based resourceAdd UID file for camera_mount.gd scriptUpdate scene UID and script reference to UID-based resourceUpdate script reference to UID-based main_menu.gdAdd UID file for moving_hazard.gd scriptUpdate script reference to UID-based moving_hazard.gdAdd UID file for landing_controller.gd scriptIntegrate new fuel slider and update resource references to UIDsAdd UID file for stability_controller.gd scriptAdd UID file for sliding_door.gd scriptUpdate script reference to UID-based sliding_door.gdAdd UID file for trigger_pad.gd script1 files
Update project config features version