16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 05:29:17 +02:00

Merge branch 'tmj-dev'

This commit is contained in:
milek7
2018-02-16 15:25:53 +01:00
113 changed files with 4617 additions and 4057 deletions

View File

@@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/.
#include "gamepadinput.h"
#include "Logs.h"
#include "Timer.h"
#include "usefull.h"
#include "utilities.h"
glm::vec2 circle_to_square( glm::vec2 const &Point, int const Roundness = 0 ) {