16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 18:39:18 +02:00

Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2018-07-17 16:20:11 +02:00
77 changed files with 2959 additions and 2171 deletions

View File

@@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/.
#include "ResourceManager.h"
#include "uitranscripts.h"
class opengl_renderer;
class sound_source;
using uint32_sequence = std::vector<std::uint32_t>;
@@ -100,7 +101,7 @@ private:
class openal_renderer {
friend class opengl_renderer;
friend opengl_renderer;
public:
// constructors