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

Merge branch 'experimental' into controllerfixup

Browse source
This commit is contained in:
fgenesis 2017-02-08 21:33:05 +01:00
commit daca65d20a
4 changed files with 938 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -43,6 +43,7 @@ notifications:
- "irc.esper.net#bitblot" - "irc.esper.net#bitblot"
skip_join: true skip_join: true
use_notice: true use_notice: true
on_success: change
template: template:
#- "[%{commit}: %{author}] %{message}" #- "[%{commit}: %{author}] %{message}"
#- "%{build_url}" #- "%{build_url}"

2
Aquaria/ScriptInterface.cpp
View file

@ -9611,7 +9611,7 @@ luaFunc(loadXMLTable)
tinyxml2::XMLDocument xml; tinyxml2::XMLDocument xml;
tinyxml2::XMLError err = readXML(fn, xml); tinyxml2::XMLError err = readXML(fn, xml);
if(err != tinyxml2::XML_NO_ERROR) if(err != tinyxml2::XML_SUCCESS)
{ {
lua_pushboolean(L, false); lua_pushboolean(L, false);
lua_pushinteger(L, err); lua_pushinteger(L, err);

984
ExternalLibs/tinyxml2.cpp
View file

File diff suppressed because it is too large Load diff

458
ExternalLibs/tinyxml2.h
View file

File diff suppressed because it is too large Load diff