maelstrom/openblocks
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases 3 Packages Wiki Activity Actions

Compare commits

base: maelstrom:df795482b50b8e12e394faed1db75e898a293b9c
Branches Tags
maelstrom:master
maelstrom:feature/jolt
maelstrom:feature/cmake-refactor
maelstrom:patch/0.3.2
maelstrom:feature/part-types
maelstrom:feature/players
maelstrom:windows-port
maelstrom:alpha-3
maelstrom:pre-alpha-2
maelstrom:pre-alpha-1
..
compare: maelstrom:64bc82007b52f162d8b26fd80c796b90868bc96c
Branches Tags
maelstrom:master
maelstrom:feature/jolt
maelstrom:feature/cmake-refactor
maelstrom:patch/0.3.2
maelstrom:feature/part-types
maelstrom:feature/players
maelstrom:windows-port
maelstrom:alpha-3
maelstrom:pre-alpha-2
maelstrom:pre-alpha-1

No commits in common. "df795482b50b8e12e394faed1db75e898a293b9c" and "64bc82007b52f162d8b26fd80c796b90868bc96c" have entirely different histories.
df795482b5 ... 64bc82007b

2 changed files with 2 additions and 3 deletions
Show stats Expand all files Collapse all files

4
core/src/rendering/debug/debugrenderer.cpp
View file

@ -1,5 +1,5 @@
#include "rendering/shader.h" #include "rendering/shader.h"
#include "rendering/texture.h" #include "rendering/texture3d.h"
#include "timeutil.h" #include "timeutil.h"
#include <GL/glew.h> #include <GL/glew.h>
#include <GL/gl.h> #include <GL/gl.h>
@ -7,7 +7,7 @@
#include <string> #include <string>
extern int viewportWidth, viewportHeight; extern int viewportWidth, viewportHeight;
extern Texture* fontTexture; extern Texture3D* fontTexture;
extern Shader* fontShader; extern Shader* fontShader;
extern Shader* identityShader; extern Shader* identityShader;

1
editor/aboutdialog.cpp
View file

@ -3,7 +3,6 @@
#include <qdialogbuttonbox.h> #include <qdialogbuttonbox.h>
#include <qnamespace.h> #include <qnamespace.h>
#include <qplaintextedit.h> #include <qplaintextedit.h>
#include <qfile.h>
class LicenseDialog : public QDialog { class LicenseDialog : public QDialog {
public: public: