mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-07 14:50:21 +00:00
Code Issues Releases Wiki Activity

Merge branch 'experimental'

Browse source 
Conflicts:
	BBGE/Shader.cpp
This commit is contained in:
fgenesis 2013-06-24 02:48:17 +02:00
commit 93abd03c27
67 changed files with 2061 additions and 1000 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BBGE/Core.h
View file

@ -1175,8 +1175,6 @@ public:
void saveSizedScreenshotTGA(const std::string &filename, int sz, int crop34);
void saveCenteredScreenshotTGA(const std::string &filename, int sz);
virtual void msg(const std::string &message);
bool minimized;
std::string getEnqueuedJumpState();
int cullRadius;
@ -1310,6 +1308,7 @@ public:
int zgaSave(const char *filename, short int width, short int height, unsigned char pixelDepth, unsigned char *imageData);
volatile int dbg_numThreadDecoders;
static unsigned int dbg_numRenderCalls;
protected: