Complete merge
This commit is contained in:
parent
ba6ecfde2f
commit
cbfa6afb49
@ -65,6 +65,7 @@
|
|||||||
#include "ClientPlayer.h"
|
#include "ClientPlayer.h"
|
||||||
#include "ClientUI.h"
|
#include "ClientUI.h"
|
||||||
#include "Fonts.h"
|
#include "Fonts.h"
|
||||||
|
#include <Core/Strings.h>
|
||||||
|
|
||||||
static float nextRandom() {
|
static float nextRandom() {
|
||||||
return (float)rand() / (float)RAND_MAX;
|
return (float)rand() / (float)RAND_MAX;
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
#include <Client/Client.h>
|
#include <Client/Client.h>
|
||||||
#include <Core/CpuID.h>
|
#include <Core/CpuID.h>
|
||||||
#include <Gui/StartupScreen.h>
|
#include <Gui/StartupScreen.h>
|
||||||
|
#include <Core/Strings.h>
|
||||||
|
|
||||||
#include <Core/VoxelModel.h>
|
#include <Core/VoxelModel.h>
|
||||||
#include <Draw/GLOptimizedVoxelModel.h>
|
#include <Draw/GLOptimizedVoxelModel.h>
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
#include <Client/Client.h>
|
#include <Client/Client.h>
|
||||||
#include <Core/Settings.h>
|
#include <Core/Settings.h>
|
||||||
#include <Client/Fonts.h>
|
#include <Client/Fonts.h>
|
||||||
|
#include <Core/Strings.h>
|
||||||
|
|
||||||
SPADES_SETTING(cg_lastQuickConnectHost, "127.0.0.1");
|
SPADES_SETTING(cg_lastQuickConnectHost, "127.0.0.1");
|
||||||
SPADES_SETTING(cg_protocolVersion, "");
|
SPADES_SETTING(cg_protocolVersion, "");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user