mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
fb325db19f
commit 4b6351200b9f7e7bb75b780c46042afbed3359f3
Merge: a3946bb 47dc117
Author: Alex <18037145+salcodes1@users.noreply.github.com>
Date: Tue Dec 28 22:09:36 2021 +0200
Merge branch 'Mauler125:pylon' into pylon
commit a3946bb5ce4655665a763aeb3c2b016215bfa805
Author: Alex <18037145+salcodes1@users.noreply.github.com>
Date: Tue Dec 28 22:07:02 2021 +0200
Pylon C++ implementation actually working now
commit 00cd76f7b21476e054d3ead4a4c8d507f391c963
Author: Alex <18037145+salcodes1@users.noreply.github.com>
Date: Tue Dec 28 03:45:41 2021 +0200
Fixed post requests not using provided route
commit 2f2d01713fd38861f0e674641bf14b6afd25ecc6
Author: Alex <18037145+salcodes1@users.noreply.github.com>
Date: Tue Dec 28 03:44:20 2021 +0200
added get private game server info route
commit b53b89d31a7201ac594abf16dd7c00134bb5a132
Merge: 433f14c c8ec95b
Author: Alex <18037145+salcodes1@users.noreply.github.com>
Date: Tue Dec 28 03:32:14 2021 +0200
Merge branch 'pylon' into indev
commit 433f14c352a0ae366cff2cbe03753b2198a77848
Author: Alex <18037145+salcodes1@users.noreply.github.com>
Date: Tue Dec 28 03:31:33 2021 +0200
partial commit
commit c8ec95bd37ed0c3e16090ed0a15808bda6a2ee99
Author: Alex <18037145+salcodes1@users.noreply.github.com>
Date: Tue Dec 28 03:26:44 2021 +0200
Added backbone and some of the routes for r5net-ms (now Pylon) interactions
11 lines
792 B
Plaintext
11 lines
792 B
Plaintext
// Hint files help the Visual Studio IDE interpret Visual C++ identifiers
|
|
// such as names of functions and macros.
|
|
// For more information see https://go.microsoft.com/fwlink/?linkid=865984
|
|
#define CIMGUI_API
|
|
#define NULL
|
|
#define NULL ((void *)0)
|
|
#define IM_FMTARGS(FMT) __attribute__((format(printf, FMT, FMT+1)))
|
|
#define IM_FMTARGS(FMT) __attribute__((format(gnu_printf, FMT, FMT+1)))
|
|
#define IM_FMTARGS(FMT)
|
|
#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, __VA_ARGS__) friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
|