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

Jump to bottom

Initial port to Godot 4 #103

Merged
merged 58 commits into from
Jun 1, 2022
Merged

Initial port to Godot 4 #103

merged 58 commits into from
Jun 1, 2022

Conversation

dsnopek
Copy link
Contributor

@dsnopek dsnopek commented Apr 12, 2022 •
edited
Loading

This builds on #95, to get it actually working.

The test suite and a number of manual tests are working with the latest 'master' branch of Godot.

Godot 4 bugs that we're working around

Fixes #52

@elgansayer
Update reference name -> RefCounted
c1b1339
@elgansayer
* Update Reference name -> RefCounted
0c97747 
* Update getsets to properties
* Update yields -> await
* update super
@elgansayer
Swap setget _> property
b236a69
@elgansayer
Upgrade setgets to properties
cdb9140
@elgansayer
Update TYPE_REAL -> Type_FLOAT
03705d9
@elgansayer
Update Pool arrays to packed
ecf7a2a
@elgansayer
Update tool -> @tool for gdscript2
1b1fe02
@elgansayer
user super where possible
59d6c72
@elgansayer
Repalce . with super
8ffe9be
@elgansayer
Replace . with super
e7ee928
@elgansayer
Replafce. with super1
5fb1e57
@elgansayer
Update setgets to properties
c177a73
@elgansayer
Update connect calls
f76a4c5
@elgansayer
* Fix const causing broken compilation
2fb380c 
* Fix some properties
@elgansayer
Fix coroutine calls
ccdcde0
@elgansayer
Fix PoolByteArray to PackedByteArray
0343c14
@elgansayer
Update coroutie calls
47061c2
@elgansayer
Call escape_http with str
5640dbb
@elgansayer
There is no bool constructor. So just use str
de7c8ef
@elgansayer
Update _refresh_session coroutines. Call the coroutine _refresh_sessi…
589fff4 
…on.call
@elgansayer
Switch to var _SCHEMA as dbstrict 2 is not accepting const
21f4444
@elgansayer
Replace validate json with new json class
c3c812c
@elgansayer
* Update properties
53130d9 
* Update yields
@elgansayer
Replace yields with await
efe8ffb
@elgansayer
* Replace reference with RefCounted
0cc64e4 
* Update coroutines with a call
@elgansayer
Change const with var, gdscript2 is failing to assign a const
da9ff53
@elgansayer
Swap to using JSON.new
14ad2aa
@elgansayer
Fix json result no longer existing
d669908
@elgansayer
Update properties. Fix wrong param name
038cced 
Update coroutine calls
@elgansayer
SwitchTYPE_INT to packed
93ed2a2
@dsnopek dsnopek mentioned this pull request Apr 29, 2022
Closed
dsnopek added 14 commits May 2, 2022 14:51
@dsnopek
Fix up all properties to use get/set correctly, and got exceptions cr…
5ec9e4f 
…eated with the correct info
@dsnopek
Got socket _almost_ working
f33a518
@dsnopek
Renamed AsyncRequest.resumed signal to completed, and got closer to p…
91673ed 
…arsing socket messages
@dsnopek
Woohoo! It's actually parsing messages from NakamaSocket!!
1475d7c
@dsnopek
Merge branch 'master' into godot4-from-pr95
d5ef5eb
@dsnopek
Remove quite a bit of the work arounds for Godot issues #53115 and #5…
b9f73ac 
…6217
@dsnopek
Re-enable the @tool annotation
5ce88b8
@dsnopek
Look through diff, and try to make main.go closer to the original
bb347d2
@dsnopek
Make _SCHEMA const again in NakamaRTMessage
0819768
@dsnopek
Fix whitespace issues from reviewing the diff
9134c71
@dsnopek
Change unnecessary await on 'completed' signal to just await
f163cee
@dsnopek
Remove unnecessary .call()'s that got added (a couple are still neces…
ff5f119 
…sary)
@dsnopek
First pass at porting the test_suite (not currently passing)
72b4a28
@dsnopek
Got the test_suite closer to passing
007a669
@elgansayer
Copy link
Contributor

looking fantastic. gdscript4 is making more sense but it still has some bugs to iron out. This is looking great. Amazing work! Thank you.

@dsnopek dsnopek mentioned this pull request May 23, 2022
Merged
@dsnopek
Copy link
Contributor Author

dsnopek commented May 23, 2022

With the changes in this PR, on Godot 4 (on commit godotengine/godot@7ea8cde), the test suite is passing, and a bunch of manual tests (trying both HTTPS and WebSocket requests) are working as well!

There are issues with the latest alpha (Godot 4.0-alpha8) which is why I had to use a later commit, but there is a new alpha release every two weeks, so I'm hoping everything will work with 4.0-alpha9 which should be coming in a few days!

There's still some ugly workarounds for GDScript bugs, including having to remove type hinting in a bunch of places. I'll make sure that all of these are represented in issues on the Godot project, and get them linked here.

But I think we may be at the point where it makes sense to make an unstable branch for Godot 4 in the upstream repo?

@elgansayer
Copy link
Contributor

elgansayer commented May 27, 2022 •
edited
Loading

Thats fantastic. Amazing work!!
I think an unstable might be better after the Godot commit 7ea8cde9834b0fda4a928217b7880da3dd330214 is released in an alpha build.

@dsnopek dsnopek changed the base branch from master to godot-4 June 1, 2022 15:14
@dsnopek dsnopek marked this pull request as ready for review June 1, 2022 15:14
@dsnopek dsnopek changed the title [WIP] Godot 4 port Initial port to Godot 4 Jun 1, 2022
@dsnopek dsnopek merged commit b2b78d3 into heroiclabs:godot-4 Jun 1, 2022
@dsnopek
Copy link
Contributor Author

dsnopek commented Jun 1, 2022

I just merged this into the 'godot-4' branch! We can continue development with future PRs against that branch :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Prepare for new GDScript syntax (GDScript 2.0)
2 participants
@dsnopek @elgansayer