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

Tidy up repositories - this will be the main one from now on. #3

Merged
merged 24 commits into from
Jul 14, 2024
Merged

Tidy up repositories - this will be the main one from now on. #3

merged 24 commits into from
Jul 14, 2024

Conversation

AMacro
Copy link
Owner

@AMacro AMacro commented Jul 14, 2024

No description provided.

morm075 and others added 24 commits June 16, 2024 21:48
@morm075
Merge pull request #1 from AMacro/updated-server-browser
bcf5735 
Minor fixes and improvements
@morm075
Minor adjustments and commenting
81aa6ba
@AMacro
added button icons
6e721e5
@morm075
minor correction
c66ee37
@AMacro
PHP and Rust servers implemented
d236a90
@AMacro
Merge branch 'updated-server-browser' of https://github.com/morm075/d…
0e373f4 
…v-multiplayer into updated-server-browser
@morm075
another correction
c190545
@AMacro
Fixed SSL compilation issues
4b2c6bb
@morm075
Merge branch 'updated-server-browser' of https://github.com/morm075/d…
76f5aee 
…v-multiplayer into feature/server-browser-update
@AMacro
Update Read Me.md
492938e
@AMacro
Improved servers and server browser code
94f344f 
Updated API spec to include private_key requirements

Modularised the Rust server and compliance to new spec
Updated the PHP server to comply with new spec, additional config to allow flatfile and MySQL databases. Added ReadMe.

ServerBrowser major refactor. Now loads data from the lobby server
@morm075
Updates to locale.csv
8329b63 
Added translations to locale.csv, Translations to be verified.
@AMacro
Server browser and lobby server working
a7ae049 
Server browser now works, as well as the host game panel.
When a multiplayer game starts, the game registers itself with the lobby server and continues to provide updates while the session is active. When the session deactivates the lobby server is notified to remove the game server.

More work required on GUI
@AMacro
Merge branch 'updated-server-browser' of https://github.com/morm075/d…
499dacf 
…v-multiplayer into updated-server-browser
@AMacro
Minor UI fixes and version update
0fa44a6
@AMacro
Updated default server to https
e5051da
@AMacro
Refactored server browser for consistency
eb3b948 
ServerBrowserPane is now responsible for cleanup tasks and building the UI, rather than the RightPaneControllerPatch
@AMacro
Added auto refresh
6e8df46 
Once the first refresh has been done, auto refresh will occur every 30 seconds.
Refresh can no longer be spammed and will be locked out for 10 seconds following the last refresh (auto or manual)
@AMacro
Server details displayed in pane
a99179a 
When selecting a server, its details are now shown in the adjacent pane
@AMacro
Updated translations for server browser details pane
86f8245 
Added some CSV parsing logic to detect missing quotes in CSVs (flag too many columns), preventing crashes.
@AMacro
Fixed translation issue
30c5988
@AMacro
Updated default server browser text.
252745d 
Server browser is now fully implemented, noting that a future feature may be to display the required mods, rather than just show they are/aren't required
@AMacro
General tidy up and QoL for server browser
9925783
@AMacro
Bug fixes for lobby server redirects
00359ad
@AMacro AMacro merged commit 2458ed2 into AMacro:updated-server-browser Jul 14, 2024
AMacro added a commit to N95JPL/dv-multiplayer that referenced this pull request Jul 14, 2024
@AMacro
Squashed commit of the following:
36db54a 
commit 9d3fb99
Author: AMacro <[email protected]>
Date:   Sun Jul 14 12:41:53 2024 +1000

    Squashed commit of the following:

    commit 633bdc0
    Author: AMacro <[email protected]>
    Date:   Sun Jul 14 12:40:25 2024 +1000

        Cleaved up excessive logging

    commit c30a2e4
    Author: AMacro <[email protected]>
    Date:   Sun Jul 14 12:14:41 2024 +1000

        Back-merged beta to feature/sync-jobs

    commit 5db5133
    Merge: c0d547e fa0fbfb
    Author: AMacro <[email protected]>
    Date:   Sun Jul 14 11:39:10 2024 +1000

        Merge branch 'beta' into feature/sync-jobs

    commit c0d547e
    Author: AMacro <[email protected]>
    Date:   Sun Jul 14 11:26:17 2024 +1000

        Preparing to merge to beta

    commit 263cc55
    Author: AMacro <[email protected]>
    Date:   Sat May 18 15:29:02 2024 +1000

        Fix car plate sync and added better job sync pt2

        Added car plate syncing
        Changed time format into UTC for logging
        Jobs now sync in a batch when a player connects and then progressively sync as new items are added

    commit eff0205
    Author: AMacro <[email protected]>
    Date:   Sat May 18 15:27:24 2024 +1000

        Fix car plate sync and added better job sync

        Added car plate syncing
        Changed time format into UTC for logging
        Jobs now sync in a batch when a player connects and then progressively sync as new items are added

    commit 8adb497
    Author: AMacro <[email protected]>
    Date:   Sat May 18 11:09:05 2024 +1000

        Fixed infinite blank spawning (CargoType data Type)

        CaregoType is now held as a CargoType, rather than byte in TaskDataData
        CargoType is now serialised as int (byte is not wide enough to store all values of CargoType)

    commit 440b917
    Author: AMacro <[email protected]>
    Date:   Sat May 18 10:56:38 2024 +1000

        Fixed PlayerSqrDistanceFrom*() calculation

        Calcs now use player WorldPosition instead of RawPosition. This is inline with the game's internal calcs and gives the correct result.

    commit 220a04a
    Merge: c42f868 e1a3e97
    Author: AMacro <[email protected]>
    Date:   Sat May 18 09:58:58 2024 +1000

        Merge branch 'Join-Menu-Improvements' into feature/sync-jobs

    commit c42f868
    Author: AMacro <[email protected]>
    Date:   Sat May 18 09:41:26 2024 +1000

        Revert "Merge branch 'Join-Menu-Improvements' into feature/sync-jobs"

        This reverts commit c376c80, reversing
        changes made to 8df7a75.

    commit e1a3e97
    Author: AMacro <[email protected]>
    Date:   Sun May 12 18:46:23 2024 +1000

        Reworked the saving of last direct connection details

        Separated server and client settings

    commit c376c80
    Merge: 8df7a75 6daa671
    Author: AMacro <[email protected]>
    Date:   Sun May 12 11:32:55 2024 +1000

        Merge branch 'Join-Menu-Improvements' into feature/sync-jobs

    commit 8df7a75
    Merge: e37dd3e 764bfc7
    Author: AMacro <[email protected]>
    Date:   Sun May 12 11:32:45 2024 +1000

        Merge branch 'Localisation-Parsing-Fix' into feature/sync-jobs

    commit 6daa671
    Author: AMacro <[email protected]>
    Date:   Sun May 12 10:45:10 2024 +1000

        Enhanced "join" interface

        Default remote IP can now be set through the settings

        Popup/prompt for IP, port and password now auto-fill from the defaults

    commit e37dd3e
    Author: ChaoticWagon <[email protected]>
    Date:   Mon Sep 18 18:00:07 2023 -0400

        Job syncing almost works

commit 1827ded
Author: AMacro <[email protected]>
Date:   Sun Jul 14 12:16:28 2024 +1000

    Minor update to CSV parsing

commit fa0fbfb
Merge: c6f795f 0871556
Author: Macka <[email protected]>
Date:   Sun Jul 14 11:04:31 2024 +1000

    Merge pull request AMacro#8 from AMacro/Localisation-Parsing-Fix

    Merge Localisation-Parsing-Fix into beta branch

commit 0871556
Merge: db77e3d c6f795f
Author: Macka <[email protected]>
Date:   Sun Jul 14 11:03:58 2024 +1000

    Merge branch 'beta' into Localisation-Parsing-Fix

commit db77e3d
Merge: 764bfc7 c43328b
Author: Macka <[email protected]>
Date:   Sun Jul 14 10:54:17 2024 +1000

    Merge pull request AMacro#1 from N95JPL/CSV-Key-Fix

    Fix CSV.cs

commit c6f795f
Merge: 2b666d4 18333e4
Author: Macka <[email protected]>
Date:   Sun Jul 14 10:25:12 2024 +1000

    Merge pull request AMacro#7 from AMacro/feature/in-game-chat

    Merge feature/in-game-chat into beta branch

commit 2b666d4
Merge: 3edb410 2458ed2
Author: Macka <[email protected]>
Date:   Sun Jul 14 10:22:44 2024 +1000

    Merge pull request AMacro#6 from AMacro/feature/updated-server-browser

    Merge feature/updated-server-browser into beta branch

commit 18333e4
Merge: 2458ed2 13184b8
Author: Macka <[email protected]>
Date:   Sun Jul 14 10:10:38 2024 +1000

    Merge pull request AMacro#4 from morm075/in-game-chat

    Tidy up repositories - this will be the main one from now on.

commit 2458ed2
Merge: 0455990 00359ad
Author: Macka <[email protected]>
Date:   Sun Jul 14 10:06:59 2024 +1000

    Merge pull request AMacro#3 from morm075/updated-server-browser

    Tidy up repositories - this will be the main one from now on.

commit 00359ad
Author: AMacro <[email protected]>
Date:   Sun Jul 14 09:42:07 2024 +1000

    Bug fixes for lobby server redirects

commit 9925783
Author: AMacro <[email protected]>
Date:   Sun Jul 14 00:01:33 2024 +1000

    General tidy up and QoL for server browser

commit 13184b8
Author: AMacro <[email protected]>
Date:   Sat Jul 13 21:46:34 2024 +1000

    Added auto complete for whisper usernames, enforced some username control

    Usernames must now be unique and cannot contain spaces (automatically replaced with underscores) - this is enforced by adding a number to the end if there is a conflict

commit 9ee085c
Author: AMacro <[email protected]>
Date:   Sat Jul 13 17:52:24 2024 +1000

    Added sent message history

commit 14e5aae
Author: AMacro <[email protected]>
Date:   Sat Jul 13 16:40:48 2024 +1000

    Added chat commands

    Added server messages
    Added whispers
    Added help (displays commands)

commit 2d3d2df
Author: AMacro <[email protected]>
Date:   Fri Jul 12 22:18:55 2024 +1000

    Bug fixes

commit ea633a3
Author: AMacro <[email protected]>
Date:   Sun Jul 7 22:35:05 2024 +1000

    Added hotbar blocking and aligned chat window with lower left corner

commit 830cd1c
Author: AMacro <[email protected]>
Date:   Sun Jul 7 21:24:27 2024 +1000

    Initial commit

    Create chat panel blocked input from player when shown.
    Still need to block number keys for toolbelt and implement network logic

commit ab36de5
Author: AMacro <[email protected]>
Date:   Sun Jul 7 09:40:32 2024 +1000

    Reorganised UI components

commit 252745d
Author: AMacro <[email protected]>
Date:   Sun Jul 7 09:37:26 2024 +1000

    Updated default server browser text.

    Server browser is now fully implemented, noting that a future feature may be to display the required mods, rather than just show they are/aren't required

commit 30c5988
Author: AMacro <[email protected]>
Date:   Sun Jul 7 09:31:45 2024 +1000

    Fixed translation issue

commit 86f8245
Author: AMacro <[email protected]>
Date:   Sun Jul 7 09:26:18 2024 +1000

    Updated translations for server browser details pane

    Added some CSV parsing logic to detect missing quotes in CSVs (flag too many columns), preventing crashes.

commit a99179a
Author: AMacro <[email protected]>
Date:   Sun Jul 7 01:20:13 2024 +1000

    Server details displayed in pane

    When selecting a server, its details are now shown in the adjacent pane

commit 6e8df46
Author: AMacro <[email protected]>
Date:   Sat Jul 6 14:28:13 2024 +1000

    Added auto refresh

    Once the first refresh has been done, auto refresh will occur every 30 seconds.
    Refresh can no longer be spammed and will be locked out for 10 seconds following the last refresh (auto or manual)

commit eb3b948
Author: AMacro <[email protected]>
Date:   Mon Jul 1 20:15:34 2024 +1000

    Refactored server browser for consistency

    ServerBrowserPane is now responsible for cleanup tasks and building the UI, rather than the RightPaneControllerPatch

commit e5051da
Author: AMacro <[email protected]>
Date:   Mon Jul 1 19:05:32 2024 +1000

    Updated default server to https

commit 0fa44a6
Author: AMacro <[email protected]>
Date:   Sun Jun 30 21:45:06 2024 +1000

    Minor UI fixes and version update

commit 499dacf
Merge: a7ae049 8329b63
Author: AMacro <[email protected]>
Date:   Sun Jun 30 21:00:26 2024 +1000

    Merge branch 'updated-server-browser' of https://github.com/morm075/dv-multiplayer into updated-server-browser

commit a7ae049
Author: AMacro <[email protected]>
Date:   Sun Jun 30 20:51:08 2024 +1000

    Server browser and lobby server working

    Server browser now works, as well as the host game panel.
    When a multiplayer game starts, the game registers itself with the lobby server and continues to provide updates while the session is active. When the session deactivates the lobby server is notified to remove the game server.

    More work required on GUI

commit 8329b63
Author: morm075 <[email protected]>
Date:   Sun Jun 30 20:15:56 2024 +0930

    Updates to locale.csv

    Added translations to locale.csv, Translations to be verified.

commit 94f344f
Author: AMacro <[email protected]>
Date:   Thu Jun 27 22:29:00 2024 +1000

    Improved servers and server browser code

    Updated API spec to include private_key requirements

    Modularised the Rust server and compliance to new spec
    Updated the PHP server to comply with new spec, additional config to allow flatfile and MySQL databases. Added ReadMe.

    ServerBrowser major refactor. Now loads data from the lobby server

commit 492938e
Author: AMacro <[email protected]>
Date:   Sun Jun 23 11:53:14 2024 +1000

    Update Read Me.md

commit 76f5aee
Merge: c190545 4b2c6bb
Author: morm075 <[email protected]>
Date:   Sun Jun 23 10:15:46 2024 +0930

    Merge branch 'updated-server-browser' of https://github.com/morm075/dv-multiplayer into feature/server-browser-update

commit 4b2c6bb
Author: AMacro <[email protected]>
Date:   Sun Jun 23 10:44:32 2024 +1000

    Fixed SSL compilation issues

commit c190545
Author: morm075 <[email protected]>
Date:   Sat Jun 22 20:16:38 2024 +0930

    another correction

commit 0e373f4
Merge: d236a90 c66ee37
Author: AMacro <[email protected]>
Date:   Sat Jun 22 18:01:50 2024 +1000

    Merge branch 'updated-server-browser' of https://github.com/morm075/dv-multiplayer into updated-server-browser

commit d236a90
Author: AMacro <[email protected]>
Date:   Sat Jun 22 18:01:46 2024 +1000

    PHP and Rust servers implemented

commit c66ee37
Author: morm075 <[email protected]>
Date:   Sat Jun 22 10:26:05 2024 +0930

    minor correction

commit 6e721e5
Author: AMacro <[email protected]>
Date:   Thu Jun 20 21:16:32 2024 +1000

    added button icons

commit 81aa6ba
Author: morm075 <[email protected]>
Date:   Tue Jun 18 19:54:47 2024 +0930

    Minor adjustments and commenting

commit bcf5735
Merge: a4c8453 0455990
Author: morm075 <[email protected]>
Date:   Sun Jun 16 21:48:14 2024 +0930

    Merge pull request AMacro#1 from AMacro/updated-server-browser

    Minor fixes and improvements

commit 0455990
Merge: af9cd6d a4c8453
Author: AMacro <[email protected]>
Date:   Sun Jun 16 22:17:45 2024 +1000

    Merge branch 'updated-server-browser' into updated-server-browser

commit af9cd6d
Author: AMacro <[email protected]>
Date:   Sun Jun 16 22:04:12 2024 +1000

    Minor fixes and improvements

    Fixed main menu highlight bug
    added random server generation for testing
    fixed gridview element layout
    implemented a server data object

commit a4c8453
Author: morm075 <[email protected]>
Date:   Sun Jun 16 13:30:56 2024 +0930

    Continuing to update server browser

commit c43328b
Merge: 44471ca 764bfc7
Author: N95JPL <[email protected]>
Date:   Sun May 26 21:05:35 2024 +0100

    Merge branch 'Localisation-Parsing-Fix' into CSV-Key-Fix

commit 44471ca
Author: N95JPL <[email protected]>
Date:   Sun May 26 21:03:46 2024 +0100

    Fix CSV.cs

    Now ignores blank/whitespace keys

commit a6ab704
Merge: 3edb410 c691e32
Author: morm075 <[email protected]>
Date:   Sun May 26 12:04:08 2024 +0930

    Merge branch 'feature/server-browser' into feature/server-browser-update

commit c691e32
Author: morm075 <[email protected]>
Date:   Sat May 25 21:02:41 2024 +0930

    refactoring und updating

    update to network game

commit 764bfc7
Author: AMacro <[email protected]>
Date:   Sun May 12 09:48:19 2024 +1000

    Fixed minor issue with CSV parsing so that unix/windows line breaks don't matter.

commit e23d522
Author: Pierce Thompson <[email protected]>
Date:   Tue Aug 8 00:26:19 2023 -0400

    Begin creating the server browser menu

    This is still very incomplete, and is just laying the groundwork for future progress.
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.
2 participants
@AMacro @morm075