[pull] master from TaterClient:master#16
Open
pull[bot] wants to merge 405 commits intoLuoChu-DDNetDev:masterfrom
Open
[pull] master from TaterClient:master#16pull[bot] wants to merge 405 commits intoLuoChu-DDNetDev:masterfrom
pull[bot] wants to merge 405 commits intoLuoChu-DDNetDev:masterfrom
Conversation
SollyBunny
force-pushed
the
master
branch
2 times, most recently
from
4b42f24 to
59dd250
Compare
Handle Emscripten client being quit or aborted in the HTML wrapper by hiding the canvas, instead of doing this in the client only on successful exit. Also reset the canvas' cursor to ensure it becomes visible again. On client quit, print a log output indicating that the client can be restarted by reloading the page. Add button for convenience to reload page. Handle WebGL context lost event by quitting the client and logging an error message. The client cannot currently recover from GL context loss, because it would require reloading all textures, framebuffers etc. Handle WebGL context creation error event by logging a more detailed error message. The client already handles the failed context creation.
Add version to android
As soon as ddnet edits this I will get a inline git conflict from ddnet-insta@dcb7505 which is fiddely. Its nicer to look at conflicts if array elements have their own lines.
Ensure the map size packed in `NETMSG_MAP_DETAILS` matches the map size packed in `NETMSG_MAP_CHANGE`, instead of ignoring the value in `NETMSG_MAP_DETAILS`.
The `IEngineMap`/`IMap`/`CMap` map wrapper for datafiles should not be a kernel interface, as this complicates using the interface especially when there are multiple instances of a map (e.g. current ingame map, entities background map, menu background map, and -in the future- during editor map loading), as each separate map has to be registered with the kernel with a different class name. Now, the *game* client/server instead of the *engine* client/server owns the main map of the client/server. The map is not registered as a kernel interface anymore. Instead, game client/server expose the map to the engine client/server with a getter function. The handling of the entities background map and menu background map is simplified, as these are simply created as separate objects instead of requiring separate subclasses.
Add `IMap::FullName` and `CDataFileReader::FullName` functions which return the full name of the currently loaded map/datafile, e.g. `subfolder1/subfolder2/my_map`. Add `IMap::BaseName` and `CDataFileReader::BaseName` functions which return the base name of the currently loaded map/datafile, e.g. `my_map`. Add `IMap::Path` and `CDataFileReader::Path` functions which return the path of the currently loaded map/datafile within the storage system, e.g. `maps/subfolder1/subfolder2/my_map.map`. Server-side usage changes: - Replace `IServer::GetMapName` (`CServer::m_pCurrentMapName`) with `IMap::BaseName`. - Replace `CServer::m_aCurrentMap` with `IMap::FullName`. Client-side usage changes: - Replace `IClient::GetCurrentMap` (`CClient::m_aCurrentMap`) with `IMap::BaseName`. - Replace `IClient::GetCurrentMapPath` (`CClient::m_aCurrentMapPath`) with `IMap::Path`.
It is one word
… map size of `NETMSG_MAP_DETAILS` and `NETMSG_MAP_CHANGE` (ddnet#11747)
…p` functions to access map name, path and hashes (ddnet#11658)
Avoid duplicate validation (currently only of the map version item) and duplicate unpacking of tiles layers with tileskip property by loading the editor map via `IMap` instead of `CDataFileReader`. The check of the `CMapItemVersion` map item is now already implemented in the `IMap::Load` function. Unpacking the tile skip value in the `CLayerTiles::ExtractTiles` function is not necessary anymore, as this is already done when the map is loaded with the `IMap::Load` function. This also simplifies the `CMapBasedEnvelopePointAccess` usage, as this class does not need to be used with a `CDataFileReader` anymore, which means the `CMap::GetReader` function can be removed as well.
Also update the ddnet-libs to use ssh instead of https since I can't push to https See ddnet/ddnet-libs#48
Set the map name, size and CRC of the current server's server info based on the currently loaded map to ensure that it matches the actual map. Use the map name of the server info for the Discord activity, instead of passing it separately. Do not unpack the map name from 0.7 server info because it is already determined based on the loaded map.
This reverts commit 216f6bc.
This reverts commit e45d765.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )