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.

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

Issue67 godot4 upgrade #68

Merged
merged 20 commits into from
Jun 16, 2023
Merged

Issue67 godot4 upgrade #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
03580bf
issue67: First successful build and run after 3 to 4 migration updates.
RoddieKieley Mar 31, 2023
ad50417
issue67: Added the [input] section back to the project.godot file due…
RoddieKieley Mar 31, 2023
6da0cf7
issue67: Fixed ship and sector instantiation however sector label rem…
RoddieKieley Mar 31, 2023
a3a33bd
issue67: Fixed ship movement but shooting mapped to space not working…
RoddieKieley Apr 14, 2023
fb145b3
issue67: Fixed shooting and ship death by missile but missiles missin…
RoddieKieley Apr 14, 2023
8c7deba
issue67: Not setting initial sector label. Fixed sector label positio…
RoddieKieley Apr 21, 2023
66573dd
issue67: Cleaned up GD.Prints and 3to4 comments. Note DrawStarField n…
RoddieKieley Apr 21, 2023
924af50
issue67: Fixed StarFieldRing size scaling.
RoddieKieley Apr 21, 2023
bc4c2bd
issue67: Fixed two logging statements that were preventing clean shut…
RoddieKieley Apr 21, 2023
f4e0a4b
issue67: Updated csproj with Godot sdk 4.0.2 when opened. Prep for cl…
RoddieKieley May 4, 2023
2ca8889
issue67: Converted tabs to spaces.
RoddieKieley May 5, 2023
a3d06a5
Merge branch 'main' into issue67-godot4-upgrade-main
RoddieKieley May 5, 2023
47a4fd2
issue67: Reupdated Server for Godot 4.
RoddieKieley May 5, 2023
bab7bcb
issue67: Changed [Export]'d Dictionaries to Godot.Collection.Dictiona…
RoddieKieley May 5, 2023
c30254e
issue67: Fixed star field ring scaling issue.
RoddieKieley May 5, 2023
5637328
Fix space error in plugin
thoraxe May 9, 2023
ba92679
Fixes and cleanup on server code
thoraxe May 9, 2023
a659246
Tweaks to move and shoot
thoraxe May 9, 2023
78f7b98
Fixes an issue with clicking the ship in debug UI
thoraxe May 9, 2023
c4c5e44
Merge pull request #1 from thoraxe/RoddieKieley-issue67-godot4-upgrade
RoddieKieley May 18, 2023
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
2 changes: 1 addition & 1 deletion AMQPserver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using ProtoBuf;
using redhatgamedev.srt.v1;

public class AMQPserver : Node
public partial class AMQPserver : Node
{
public Serilog.Core.Logger _serilogger;

Expand Down
33 changes: 33 additions & 0 deletions Assets/Fonts/RedHatDisplay-Bold.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[remap]

importer="font_data_dynamic"
type="FontFile"
uid="uid://ddlj3n66imcl8"
path="res://.godot/imported/RedHatDisplay-Bold.ttf-e1dcbec6b90d2c43121204c0d1c08eca.fontdata"

[deps]

source_file="res://Assets/Fonts/RedHatDisplay-Bold.ttf"
dest_files=["res://.godot/imported/RedHatDisplay-Bold.ttf-e1dcbec6b90d2c43121204c0d1c08eca.fontdata"]

[params]

Rendering=null
antialiasing=1
generate_mipmaps=false
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
oversampling=0.0
Fallbacks=null
fallbacks=[]
Compress=null
compress=true
preload=[]
language_support={}
script_support={}
opentype_features={}
33 changes: 33 additions & 0 deletions Assets/Fonts/RedHatText-Italic.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[remap]

importer="font_data_dynamic"
type="FontFile"
uid="uid://bjs422uhj0nlv"
path="res://.godot/imported/RedHatText-Italic.ttf-5442a7b92e90f81dfa98b0f90cbbf3fd.fontdata"

[deps]

source_file="res://Assets/Fonts/RedHatText-Italic.ttf"
dest_files=["res://.godot/imported/RedHatText-Italic.ttf-5442a7b92e90f81dfa98b0f90cbbf3fd.fontdata"]

[params]

Rendering=null
antialiasing=1
generate_mipmaps=false
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
oversampling=0.0
Fallbacks=null
fallbacks=[]
Compress=null
compress=true
preload=[]
language_support={}
script_support={}
opentype_features={}
33 changes: 33 additions & 0 deletions Assets/Fonts/RedHatText-Regular.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[remap]

importer="font_data_dynamic"
type="FontFile"
uid="uid://c4x2m5t0ax0nk"
path="res://.godot/imported/RedHatText-Regular.ttf-26d51c6f384dae5a588f82cd577f5d85.fontdata"

[deps]

source_file="res://Assets/Fonts/RedHatText-Regular.ttf"
dest_files=["res://.godot/imported/RedHatText-Regular.ttf-26d51c6f384dae5a588f82cd577f5d85.fontdata"]

[params]

Rendering=null
antialiasing=1
generate_mipmaps=false
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
oversampling=0.0
Fallbacks=null
fallbacks=[]
Compress=null
compress=true
preload=[]
language_support={}
script_support={}
opentype_features={}
2 changes: 1 addition & 1 deletion CSLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Godot;
using System;

public class CSLogger : Node
public partial class CSLogger : Node
{
Node gdlogger;

Expand Down
98 changes: 37 additions & 61 deletions Player.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,95 +1,71 @@
[gd_scene load_steps=4 format=2]
[gd_scene load_steps=4 format=3 uid="uid://vmssqp0t7y7w"]

[ext_resource path="res://images/ship.png" type="Texture" id=1]
[ext_resource path="res://PlayerShip.cs" type="Script" id=2]
[ext_resource type="Texture2D" uid="uid://dttvdirodvjq7" path="res://images/ship.png" id="1"]
[ext_resource type="Script" path="res://PlayerShip.cs" id="2"]

[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 39.5, 41.5 )
[sub_resource type="RectangleShape2D" id="1"]
size = Vector2(39.5, 41.5)

[node name="ShipThings" type="Area2D"]

[node name="ClickBox" type="CollisionShape2D" parent="."]
position = Vector2( -0.5, 6.5 )
shape = SubResource( 1 )
position = Vector2(-0.5, 6.5)
shape = SubResource("1")

[node name="Stat" type="Node2D" parent="."]

[node name="IDLabel" type="Label" parent="Stat"]
margin_left = -35.0
margin_top = 28.0
margin_right = 35.0
margin_bottom = 42.0
offset_left = -35.0
offset_top = 28.0
offset_right = 35.0
offset_bottom = 42.0
grow_horizontal = 2
text = "UUIDUUID"
align = 1
__meta__ = {
"_edit_use_anchors_": false
}

[node name="LinearVelocity" type="Label" parent="Stat"]
margin_left = -33.0
margin_top = 41.0
margin_right = 33.0
margin_bottom = 55.0
offset_left = -33.0
offset_top = 41.0
offset_right = 33.0
offset_bottom = 55.0
text = "LinVel"
align = 1
__meta__ = {
"_edit_use_anchors_": false
}

[node name="AngularVelocity" type="Label" parent="Stat"]
margin_left = -33.0
margin_top = 53.0
margin_right = 33.0
margin_bottom = 67.0
offset_left = -33.0
offset_top = 53.0
offset_right = 33.0
offset_bottom = 67.0
text = "AngVel"
align = 1
__meta__ = {
"_edit_use_anchors_": false
}

[node name="HitPoints" type="Label" parent="Stat"]
margin_left = -33.0
margin_top = 68.0
margin_right = 33.0
margin_bottom = 82.0
offset_left = -33.0
offset_top = 68.0
offset_right = 33.0
offset_bottom = 82.0
text = "HP"
align = 1
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Position" type="Label" parent="Stat"]
margin_left = -33.0
margin_top = 81.0
margin_right = 33.0
margin_bottom = 95.0
offset_left = -33.0
offset_top = 81.0
offset_right = 33.0
offset_bottom = 95.0
text = "Position"
align = 1
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Hex" type="Label" parent="Stat"]
margin_left = -33.0
margin_top = 93.0
margin_right = 33.0
margin_bottom = 107.0
offset_left = -33.0
offset_top = 93.0
offset_right = 33.0
offset_bottom = 107.0
text = "MyHex"
align = 1
__meta__ = {
"_edit_use_anchors_": false
}

[node name="PlayerShip" type="KinematicBody2D" parent="."]
script = ExtResource( 2 )
[node name="PlayerShip" type="CharacterBody2D" parent="."]
script = ExtResource("2")

[node name="Sprite" type="Sprite" parent="PlayerShip"]
scale = Vector2( 0.25, 0.25 )
texture = ExtResource( 1 )
[node name="Sprite2D" type="Sprite2D" parent="PlayerShip"]
scale = Vector2(0.25, 0.25)
texture = ExtResource("1")

[node name="ShipHitBox" type="CollisionPolygon2D" parent="PlayerShip"]
polygon = PoolVector2Array( -5, -31, 5, -31, 11, -10, 16, 5, 26, 10, 29, 28, -17, 28, -28, 28, -28, 15, -25, 10, -16, 4 )
polygon = PackedVector2Array(-5, -31, 5, -31, 11, -10, 16, 5, 26, 10, 29, 28, -17, 28, -28, 28, -28, 15, -25, 10, -16, 4)

[node name="RemoteTransform2D" type="RemoteTransform2D" parent="PlayerShip"]
remote_path = NodePath("../../Stat")
Expand Down
Loading