Server browser duplicates

[dGr8LookinSparky]

ui: Cleanup duplicate listings of multiprotocol servers.

build: Fixed the macos build by disabling the installation of free type for macos builds.

client: Fixed the demo playback

license: Update the copyright headers.

license: Upgrade the GPL license to GPLv3+.

server: Port various server network improvements from etlegacy.

[cengique]

@dGr8LookinSparky I still see 3 copies of servers, do I need to set something to see the changes?

[dGr8LookinSparky]

Hi @cengique :) , maybe you didn't build from the correct branch (it isn't merged into the master branch yet, it is in the server-browser-duplicates branch)? Also, after building from the server-browser-duplicates branch, be sure to test out the demos, that is try recording on different servers (different mods/fs-game/protocols), and then try playing each of them back from the main menu (the demo playback was pretty much completely broken before).

[cengique]

Hi @dGr8LookinSparky , I actually did build from that branch, and I can see the commit number in the console so I'm running the correct binary. Apparently I had forgotten to run the update.sh command to update the pk3 files. So now I can see the unique server names and the demos menu item. I recorded one demo in Zittrig, but it didn't show up in the demos window although there was a demo file under slacker/demos/demo0000.dm_71.

[cengique]

See comments.

[dGr8LookinSparky]

@cengique , that's odd, all of the demos should save in gpp/demos/, what happens if you move that demo file to the gpp demo folder (while the client is off), then see if it shows in the demo menu, and if so attempt to play that demo back?

[cengique]

@dGr8LookinSparky when I copy the file there, it does show up in the list, but I couldn't play it because of a "base server mismatch" error. I think it expects to have the slacker vm to play it.

[dGr8LookinSparky]

@cengique , it sounds like the behavior of the demo playback before the fix, did you delete the build/ folder before building? There can be issues with rebuilding with the current make file, and make clean may have issues with the current make file as well, so for this repo it is recommended to delete the build/ folder before rebuilding, which also means the asset pk3 files also need to be repackaged (which is a bit inconvenient and annoying).

[cengique]

@dGr8LookinSparky Ok, it looked like I was using old dev-scripts repo and it had a duplicate basepath in there. So pointing to the release folder fixed the problem. Now I also see the "Browse folders" menu options! Demo recording/playing worked and showed up without hassle.

[cengique]

@dGr8LookinSparky one more thing: the duplicate servers disappeared from the start screen, but there are duplicates in the "Server Browser" that you can bring up inside the game.

[dGr8LookinSparky]

@dGr8LookinSparky one more thing: the duplicate servers disappeared from the start screen, but there are duplicates in the "Server Browser" that you can bring up inside the game.

@cengique , sorry for the late reply. The fix for the duplicate listings is in the ui module, the GrangerLab and Unitremia servers distribute their own custom ui.qvm (from the separate 1.3 game logic repo), which I haven't updated with the fix yet and the reason that you still see duplicate listings in the in-game server browser on those servers. I'm planning on applying this fix in the game logic repo after the next client release.

[cengique]

@dGr8LookinSparky I pushed a new Docker image into the new grangerhub Docker account @redrumrobot created for us. Can someone else test the new build instructions I put in the README?

[dGr8LookinSparky]

@cengique , is the new docker update ready for testing with travis-ci (which would involve updating this file https://github.com/GrangerHub/tremulous/blob/server-browser-duplicates/.travis.yml ) ? I'm not familiar with docker yet, but do you know if your updated docker stuff works for the macos build too?

[cengique]

Travis CI script and Docker images confirmed working

[cengique]

@dGr8LookinSparky I made a squash merge. Do we now delete the branch?

[dGr8LookinSparky]

Looks good @cengique , I deleted that branch. I think I'll allow for one more week for us to test the latest master branch (especially to allow testing at the dev games next Saturday), and if all goes well, I'll then push a tag to have the next public client release available for download.