History

Merge pull request #33 from huffman/feat/entity-server-script-property

Fix compilation error and move MessageID to CilentServerUtils

Clément Brisset committed 9 years ago

Commit 6da188b2 parents 95f07f3 be9b19e9 files · +37 −13Browse files

Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 9 files). Show all

Unified · Split

assignment-client/src/scripts/EntityScriptServer.cpp+1−2
@@ -11,8 +11,6 @@ · 10 unmodified lines
11 11
12#include "EntityScriptServer.h"12#include "EntityScriptServer.h"
13 13
14#include "EntityScriptUtils.h"
15
16#include <AudioConstants.h>14#include <AudioConstants.h>
17#include <AudioInjectorManager.h>15#include <AudioInjectorManager.h>
18#include <EntityScriptingInterface.h>16#include <EntityScriptingInterface.h>
@@ -26,6 +24,7 @@ · 7 unmodified lines
26#include <UUID.h>24#include <UUID.h>
27#include <WebSocketServerClass.h>25#include <WebSocketServerClass.h>
28 26
27#include "ClientServerUtils.h"
29#include "../entities/AssignmentParentFinder.h"28#include "../entities/AssignmentParentFinder.h"
30 29
31int EntityScriptServer::_entitiesScriptEngineCount = 0;30int EntityScriptServer::_entitiesScriptEngineCount = 0;