diff --git a/.gitmodules b/.gitmodules
index 89cfc2304..9f4650dae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -83,3 +83,6 @@
 [submodule "project/jni/application/fheroes2/fheroes2"]
 	path = project/jni/application/fheroes2/fheroes2
 	url = http://github.com/gerstrong/fheroes2plus.git
+[submodule "project/jni/application/ninslash/src"]
+	path = project/jni/application/ninslash/src
+	url = git@github.com:pelya/Ninslash.git
diff --git a/project/jni/application/ninslash/.gitignore b/project/jni/application/ninslash/.gitignore
new file mode 100644
index 000000000..b48f9b63a
--- /dev/null
+++ b/project/jni/application/ninslash/.gitignore
@@ -0,0 +1 @@
+/AndroidData
diff --git a/project/jni/application/ninslash/AndroidAppSettings.cfg b/project/jni/application/ninslash/AndroidAppSettings.cfg
new file mode 100644
index 000000000..aaf486b08
--- /dev/null
+++ b/project/jni/application/ninslash/AndroidAppSettings.cfg
@@ -0,0 +1,291 @@
+# The application settings for Android libSDL port
+
+# Specify application name (e.x. My Application)
+AppName="Ninslash"
+
+# Specify reversed site name of application (e.x. com.mysite.myapp)
+AppFullName=ninslash.com
+
+# Application version code (integer)
+AppVersionCode=01600
+
+# Application user-visible version name (string)
+AppVersionName="0.1.6.00"
+
+# Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
+# If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
+# If the URL in in the form ':dir/file.dat:http://URL/' it will be downloaded as binary BLOB to the application dir and not unzipped
+# If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir -
+# these files are put inside .apk package by build system
+# You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version, first associated with the file
+AppDataDownloadUrl="!!Game data|data.zip"
+
+# Reset SDL config when updating application to the new version (y) / (n)
+ResetSdlConfigForThisVersion=n
+
+# Delete application data files when upgrading (specify file/dir paths separated by spaces)
+DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag"
+
+# Here you may type readme text, which will be shown during startup. Format is:
+# Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/
+ReadmeText=''
+
+# libSDL version to use (1.2/1.3/2.0)
+LibSdlVersion=1.2
+
+# Specify screen orientation: (v)ertical/(p)ortrait or (h)orizontal/(l)andscape
+ScreenOrientation=h
+
+# Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only
+# with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32)
+VideoDepthBpp=24
+
+# Enable OpenGL depth buffer (needed only for 3-d applications, small speed decrease) (y) or (n)
+NeedDepthBuffer=n
+
+# Enable OpenGL stencil buffer (needed only for 3-d applications, small speed decrease) (y) or (n)
+NeedStencilBuffer=n
+
+# Try to use GLES 2.x context - will revert to GLES 1.X if unsupported by device
+# you need this option only if you're developing 3-d app (y) or (n)
+NeedGles2=y
+
+# Use glshim library for provide OpenGL 1.x functionality to OpenGL ES accelerated cards (y) or (n)
+UseGlshim=
+
+# Application uses software video buffer - you're calling SDL_SetVideoMode() without SDL_HWSURFACE and without SDL_OPENGL,
+# this will allow small speed optimization. Enable this even when you're using SDL_HWSURFACE. (y) or (n)
+SwVideoMode=n
+
+# Application video output will be resized to fit into native device screen (y)/(n)
+SdlVideoResize=n
+
+# Application resizing will keep 4:3 aspect ratio, with black bars at sides (y)/(n)
+SdlVideoResizeKeepAspect=n
+
+# Do not allow device to sleep when the application is in foreground, set this for video players or apps which use accelerometer
+InhibitSuspend=y
+
+# Create Android service, so the app is less likely to be killed while in background
+CreateService=
+
+# Application does not call SDL_Flip() or SDL_UpdateRects() appropriately, or draws from non-main thread -
+# enabling the compatibility mode will force screen update every 100 milliseconds, which is laggy and inefficient (y) or (n)
+CompatibilityHacksForceScreenUpdate=n
+
+# Application does not call SDL_Flip() or SDL_UpdateRects() after mouse click (ScummVM and all Amiga emulators do that) -
+# force screen update by moving mouse cursor a little after each click (y) or (n)
+CompatibilityHacksForceScreenUpdateMouseClick=n
+
+# Application initializes SDL audio/video inside static constructors (which is bad, you won't be able to run ndk-gdb) (y)/(n)
+CompatibilityHacksStaticInit=n
+
+# On-screen Android soft text input emulates hardware keyboard, this will only work with Hackers Keyboard app (y)/(n)
+CompatibilityHacksTextInputEmulatesHwKeyboard=n
+
+# Built-in text input keyboards with custom layouts for emulators, requires CompatibilityHacksTextInputEmulatesHwKeyboard=y
+# 0 or empty - standard Android keyboard
+# 1 - Simple QWERTY keyboard, no function keys, no arrow keys
+# 2 - Commodore 64 keyboard
+# 3 - Amiga keyboard
+# 4 - Atari800 keyboard
+TextInputKeyboard=
+
+# Hack for broken devices: prevent audio chopping, by sleeping a bit after pushing each audio chunk (y)/(n)
+CompatibilityHacksPreventAudioChopping=n
+
+# Hack for broken apps: application ignores audio buffer size returned by SDL (y)/(n)
+CompatibilityHacksAppIgnoresAudioBufferSize=n
+
+# Hack for VCMI: preload additional shared libraries before aplication start
+CompatibilityHacksAdditionalPreloadedSharedLibraries=""
+
+# Hack for Free Heroes 2, which redraws the screen inside SDL_PumpEvents(): slow and compatible SDL event queue -
+# do not use it with accelerometer/gyroscope, or your app may freeze at random (y)/(n)
+CompatibilityHacksSlowCompatibleEventQueue=n
+
+# Save and restore OpenGL state when drawing on-screen keyboard for apps that use SDL_OPENGL
+CompatibilityHacksTouchscreenKeyboardSaveRestoreOpenGLState=n
+
+# Application uses SDL_UpdateRects() properly, and does not draw in any region outside those rects.
+# This improves drawing speed, but I know only one application that does that, and it's written by me (y)/(n)
+CompatibilityHacksProperUsageOfSDL_UpdateRects=
+
+# Application uses mouse (y) or (n), this will show mouse emulation dialog to the user
+AppUsesMouse=y
+
+# Application needs two-button mouse, will also enable advanced point-and-click features (y) or (n)
+AppNeedsTwoButtonMouse=n
+
+# Right mouse button can do long-press/drag&drop action, necessary for some games (y) or (n)
+# If you disable it, swiping with two fingers will send mouse wheel events
+RightMouseButtonLongPress=n
+
+# Show SDL mouse cursor, for applications that do not draw cursor at all (y) or (n)
+ShowMouseCursor=n
+
+# Screen follows mouse cursor, when it's covered by soft keyboard, this works only in software video mode (y) or (n)
+ScreenFollowsMouse=n
+
+# Generate more touch events, by default SDL generates one event per one video frame, this is useful for drawing apps (y) or (n)
+GenerateSubframeTouchEvents=n
+
+# Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n)
+ForceRelativeMouseMode=n
+
+# Show on-screen dpad/joystick, that will act as arrow keys (y) or (n)
+AppNeedsArrowKeys=n
+
+# On-screen dpad/joystick will appear under finger when it touches the screen (y) or (n)
+# Joystick always follows finger, so moving mouse requires touching the screen with other finger
+FloatingScreenJoystick=n
+
+# Application needs text input (y) or (n), enables button for text input on screen
+AppNeedsTextInput=y
+
+# Application uses joystick (y) or (n), the on-screen DPAD will be used as joystick 0 axes 0-1
+# This will disable AppNeedsArrowKeys option
+AppUsesJoystick=y
+
+# Application uses second on-screen joystick, as SDL joystick 0 axes 2-3 (y)/(n)
+AppUsesSecondJoystick=y
+
+# Application uses third on-screen joystick, as SDL joystick 0 axes 20-21 (y)/(n)
+AppUsesThirdJoystick=n
+
+# Application uses accelerometer (y) or (n), the accelerometer will be used as joystick 1 axes 0-1 and 5-7
+AppUsesAccelerometer=n
+
+# Application uses gyroscope (y) or (n), the gyroscope will be used as joystick 1 axes 2-4
+AppUsesGyroscope=n
+
+# Application uses orientation sensor (y) or (n), reported as joystick 1 axes 8-10
+AppUsesOrientationSensor=n
+
+# Use gyroscope to move mouse cursor (y) or (n), it eats battery, and can be disabled in settings, do not use with AppUsesGyroscope setting
+MoveMouseWithGyroscope=n
+
+# Application uses multitouch (y) or (n), multitouch events are passed as SDL_JOYBALLMOTION events for the joystick 0
+AppUsesMultitouch=n
+
+# Application records audio (it will use any available source, such a s microphone)
+# API is defined in file SDL_android.h: int SDL_ANDROID_OpenAudioRecording(SDL_AudioSpec *spec); void SDL_ANDROID_CloseAudioRecording(void);
+# This option will add additional permission to Android manifest (y)/(n)
+AppRecordsAudio=n
+
+# Application needs to access SD card. Always disable it, unless you want to access user photos and downloads. (y) / (n)
+AccessSdCard=n
+
+# Application needs Internet access. If you disable it, you'll have to bundle all your data files inside .apk (y) / (n)
+AccessInternet=y
+
+# Immersive mode - Android will hide on-screen Home/Back keys. Looks bad if you invoke Android keyboard. (y) / (n)
+ImmersiveMode=y
+
+# Application implements Android-specific routines to put to background, and will not draw anything to screen
+# between SDL_ACTIVEEVENT lost / gained notifications - you should check for them
+# rigth after SDL_Flip(), if (n) then SDL_Flip() will block till app in background (y) or (n)
+# This option is reported to be buggy, sometimes failing to restore video state
+NonBlockingSwapBuffers=n
+
+# Redefine common hardware keys to SDL keysyms
+# BACK hardware key is available on all devices, MENU is available on pre-ICS devices, other keys may be absent
+# SEARCH and CALL by default return same keycode as DPAD_CENTER - one of those keys is available on most devices
+# Use word NO_REMAP if you want to preserve native functionality for certain key (volume keys are 3-rd and 4-th)
+# Keys: TOUCHSCREEN (works only when AppUsesMouse=n), DPAD_CENTER/SEARCH, VOLUMEUP, VOLUMEDOWN, MENU, BACK, CAMERA
+RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP"
+
+# Number of virtual keyboard keys (currently 6 is maximum)
+AppTouchscreenKeyboardKeysAmount=3
+
+# Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right)
+RedefinedKeysScreenKb="PAGEDOWN SPACE TAB"
+
+# Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu
+RedefinedKeysScreenKbNames="Next_weapon Jump Show_scores"
+
+# On-screen keys theme
+# 0 = Ultimate Droid by Sean Stieber (green, with cross joystick)
+# 1 = Simple Theme by Beholder (white, with cross joystick)
+# 2 = Sun by Sirea (yellow, with round joystick)
+# 3 = Keen by Gerstrong (multicolor, with round joystick)
+# 4 = Retro by Santiago Radeff (red/white, with cross joystick)
+# 5 = GameBoy from RetroArch
+# 6 = PlayStation from RetroArch
+# 7 = SuperNintendo from RetroArch
+# 8 = DualShock from RetroArch
+# 9 = Nintendo64 from RetroArch
+TouchscreenKeysTheme=2
+
+# Redefine gamepad keys to SDL keysyms, button order is:
+# A B X Y L1 R1 L2 R2 LThumb RThumb
+RedefinedKeysGamepad="RETURN PAGEDOWN TAB T SPACE RCTRL RETURN RCTRL SPACE PAGEDOWN"
+
+# How long to show startup menu button, in msec, 0 to disable startup menu
+StartupMenuButtonTimeout=3000
+
+# Menu items to hide from startup menu, available menu items:
+#  SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu  SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.CommandlineConfig SettingsMenuMisc.ResetToDefaultsConfig  SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu  SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout SettingsMenuKeyboard.ScreenKeyboardAdvanced 
+HiddenMenuOptions='SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMouse.DisplaySizeConfig'
+
+# Menu items to show at startup - this is Java code snippet, leave empty for default
+# new SettingsMenuMisc.ShowReadme(), (AppUsesMouse \&\& \! ForceRelativeMouseMode \? new SettingsMenuMouse.DisplaySizeConfig(true) : new SettingsMenu.DummyMenu()), new SettingsMenuMisc.OptionalDownloadConfig(true), new SettingsMenuMisc.GyroscopeCalibration()
+# Available menu items:
+#  SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu  SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.CommandlineConfig SettingsMenuMisc.ResetToDefaultsConfig  SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu  SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout SettingsMenuKeyboard.ScreenKeyboardAdvanced 
+FirstStartMenuOptions=''
+
+# Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
+AppMinimumRAM=0
+
+# GCC version, or 'clang' for CLANG
+NDK_TOOLCHAIN_VERSION=clang
+
+# Specify architectures to compile, 'all' or 'y' to compile for all architectures.
+# Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a
+MultiABI='armeabi-v7a'
+
+# Optional shared libraries to compile - removing some of them will save space
+# MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed
+# Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 
+CompiledLibraries="sdl_image freetype glu"
+
+# Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n)
+CustomBuildScript=n
+
+# Aditional CFLAGS for application
+AppCflags='-O2 -flto'
+
+# Aditional C++-specific compiler flags for application, added after AppCflags
+AppCppflags=''
+
+# Additional LDFLAGS for application
+AppLdflags='-lEGL -flto'
+
+# If application has headers with the same name as system headers, this option tries to fix compiler flags to make it compilable
+AppOverlapsSystemHeaders=n
+
+# Build only following subdirs (empty will build all dirs, ignored with custom script)
+AppSubdirsBuild='src/src src/src/base/system.c src/src/engine src/src/engine/client src/src/engine/shared src/src/engine/external/pnglite src/src/engine/external/wavpack src/src/engine/external/json-parser src/src/game src/src/game/client/* src/src/game/editor src/src/game/generated/protocol.cpp src/src/game/generated/client_data.cpp'
+
+# Exclude these files from build
+AppBuildExclude=''
+
+# Application command line parameters, including app name as 0-th param
+AppCmdline=''
+
+# Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens
+# Minimum screen size that application supports: (s)mall / (m)edium / (l)arge
+MinimumScreenSize=n
+
+# Your AdMob Publisher ID, (n) if you don't want advertisements
+AdmobPublisherId=n
+
+# Your AdMob test device ID, to receive a test ad
+AdmobTestDeviceId=
+
+# Your AdMob banner size (BANNER/FULL_BANNER/LEADERBOARD/MEDIUM_RECTANGLE/SMART_BANNER/WIDE_SKYSCRAPER/FULL_WIDTH:Height/Width:AUTO_HEIGHT/Width:Height)
+AdmobBannerSize=
+
+# Google Play Game Services application ID, required for cloud saves to work
+GooglePlayGameServicesId=
+
diff --git a/project/jni/application/ninslash/AndroidPreBuild.sh b/project/jni/application/ninslash/AndroidPreBuild.sh
new file mode 100755
index 000000000..af7f259fe
--- /dev/null
+++ b/project/jni/application/ninslash/AndroidPreBuild.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+LOCAL_PATH=`dirname $0`
+LOCAL_PATH=`cd $LOCAL_PATH && pwd`
+
+cd $LOCAL_PATH/src
+
+[ -n "`find datasrc/*.py -cnewer src/game/generated/protocol.cpp 2>&1`" ] && {
+echo "Building autogenerated files"
+python --version > /dev/null 2>&1 || { echo "Error: no Python installed" ; exit 1 ; }
+
+mkdir -p src/game/generated
+python datasrc/compile.py network_source > src/game/generated/protocol.cpp
+python datasrc/compile.py network_header > src/game/generated/protocol.h
+python datasrc/compile.py client_content_source > src/game/generated/client_data.cpp
+python datasrc/compile.py client_content_header > src/game/generated/client_data.h
+python datasrc/compile.py server_content_source > src/game/generated/server_data.cpp
+python datasrc/compile.py server_content_header > src/game/generated/server_data.h
+
+python scripts/cmd5.py src/engine/shared/protocol.h src/game/generated/protocol.h src/game/tuning.h src/game/gamecore.cpp src/game/generated/protocol.h > src/game/generated/nethash.cpp
+}
+
+[ -n "`find data *.txt *.cfg -cnewer ../AndroidData/data.zip 2>&1`" ] && {
+echo "Archiving data"
+mkdir -p ../AndroidData
+zip -r ../AndroidData/data.zip data *.txt *.cfg >/dev/null
+}
+
+for ARCH in armeabi-v7a x86; do
+	[ -e ../AndroidData/binaries-$ARCH.zip ] && continue
+	rm -rf teeworlds_srv
+	mkdir -p objs
+	# server-sources.txt generated by running bam server_release 2>&1 | tee build.log
+	# and parsing logs with grep -o ' [^ ]*[.]cp\?p\?' build.log | grep -v /zlib/ > ../server-sources.txt
+	echo "Building teeworlds_srv for $ARCH"
+	env BUILD_EXECUTABLE=1 NO_SHARED_LIBS=1 ../../setEnvironment-$ARCH.sh \
+		sh -c '
+		OBJS=
+		for F in `cat ../server-sources.txt`; do
+			dirname objs/$F.o | xargs mkdir -p
+			echo $F
+			OBJS="$OBJS objs/$F.o"
+			$CXX $CFLAGS -fno-exceptions -fno-rtti --std=c++11 -flto -Wall -DCONF_RELEASE -I src -c $F -o objs/$F.o || exit 1
+		done
+		echo Linking teeworlds_srv
+		$CXX $CFLAGS -fno-exceptions -fno-rtti $LDFLAGS -pie -flto -pthread -o teeworlds_srv $OBJS || exit 1
+		$STRIP --strip-unneeded teeworlds_srv
+		' || exit 1
+	cp teeworlds_srv bin-$ARCH/
+	cd bin-$ARCH
+	zip ../../AndroidData/binaries-$ARCH.zip *
+	cd ..
+done
+
+cp -f logo.png ../AndroidData/
+
+exit 0
diff --git a/project/jni/application/ninslash/icon.png b/project/jni/application/ninslash/icon.png
new file mode 120000
index 000000000..41e20552e
--- /dev/null
+++ b/project/jni/application/ninslash/icon.png
@@ -0,0 +1 @@
+src/data/texasmask.png
\ No newline at end of file
diff --git a/project/jni/application/ninslash/readme.txt b/project/jni/application/ninslash/readme.txt
new file mode 100644
index 000000000..7104071e5
--- /dev/null
+++ b/project/jni/application/ninslash/readme.txt
@@ -0,0 +1,11 @@
+Quick compilation guide for Debian/Ubuntu (Windows is not supported, MacOsX should be okay though):
+Download SDL Git repo from https://github.com/pelya/commandergenius,
+install latest Java, Android SDK, Android NDK, and "ant" tool (sudo apt-get install ant openjdk-8-jdk),
+then launch commands:
+    git submodule update --init project/jni/application/ninslash/src
+    rm project/jni/application/src # ignore the error
+    ln -s ninslash project/jni/application/src
+    ./changeAppSettings.sh -a
+    android update project -p project -t android-23
+    ./build.sh
+That should do it.
diff --git a/project/jni/application/ninslash/server-sources.txt b/project/jni/application/ninslash/server-sources.txt
new file mode 100644
index 000000000..ddc25d6b9
--- /dev/null
+++ b/project/jni/application/ninslash/server-sources.txt
@@ -0,0 +1,77 @@
+ src/engine/shared/engine.cpp
+ src/engine/shared/kernel.cpp
+ src/engine/shared/network_server.cpp
+ src/engine/shared/compression.cpp
+ src/engine/shared/config.cpp
+ src/engine/shared/jobs.cpp
+ src/engine/shared/huffman.cpp
+ src/engine/shared/network.cpp
+ src/engine/shared/datafile.cpp
+ src/engine/shared/masterserver.cpp
+ src/engine/shared/econ.cpp
+ src/engine/shared/stream.cpp
+ src/engine/shared/network_console.cpp
+ src/engine/shared/memheap.cpp
+ src/engine/shared/console.cpp
+ src/engine/shared/network_console_conn.cpp
+ src/engine/shared/ringbuffer.cpp
+ src/engine/shared/linereader.cpp
+ src/engine/shared/netban.cpp
+ src/engine/shared/mapchecker.cpp
+ src/engine/shared/map.cpp
+ src/engine/shared/network_client.cpp
+ src/engine/shared/storage.cpp
+ src/engine/shared/demo.cpp
+ src/engine/shared/packer.cpp
+ src/engine/shared/snapshot.cpp
+ src/engine/shared/network_conn.cpp
+ src/engine/shared/filecollection.cpp
+ src/base/system.c
+ src/engine/server/register.cpp
+ src/engine/server/server.cpp
+ src/game/gamecore.cpp
+ src/game/localization.cpp
+ src/game/collision.cpp
+ src/game/astar.cpp
+ src/game/layers.cpp
+ src/game/pathfinding.cpp
+ src/game/generated/nethash.cpp
+ src/game/generated/protocol.cpp
+ src/game/server/eventhandler.cpp
+ src/game/server/ai.cpp
+ src/game/server/gameworld.cpp
+ src/game/server/gamecontroller.cpp
+ src/game/server/ai/tdm_ai.cpp
+ src/game/server/ai/dm_ai.cpp
+ src/game/server/ai/texas_ai.cpp
+ src/game/server/entity.cpp
+ src/game/server/gamemodes/texasrun.cpp
+ src/game/server/gamemodes/tdm.cpp
+ src/game/server/gamemodes/ctf.cpp
+ src/game/server/gamemodes/dm.cpp
+ src/game/server/gamemodes/base.cpp
+ src/game/server/entities/spinlaser.cpp
+ src/game/server/entities/powerupper.cpp
+ src/game/server/entities/building.cpp
+ src/game/server/entities/pickup.cpp
+ src/game/server/entities/character.cpp
+ src/game/server/entities/character.cpp
+ src/game/server/entities/character.cpp
+ src/game/server/entities/character.cpp
+ src/game/server/entities/character.cpp
+ src/game/server/entities/laser.cpp
+ src/game/server/entities/lightning.cpp
+ src/game/server/entities/deathray.cpp
+ src/game/server/entities/monster.cpp
+ src/game/server/entities/flag.cpp
+ src/game/server/entities/bomb.cpp
+ src/game/server/entities/arrow.cpp
+ src/game/server/entities/electro.cpp
+ src/game/server/entities/superexplosion.cpp
+ src/game/server/entities/smokescreen.cpp
+ src/game/server/entities/turret.cpp
+ src/game/server/entities/projectile.cpp
+ src/game/server/entities/staticlaser.cpp
+ src/game/server/player.cpp
+ src/game/server/gamecontext.cpp
+ src/game/generated/server_data.cpp
diff --git a/project/jni/application/ninslash/src b/project/jni/application/ninslash/src
new file mode 160000
index 000000000..ec8223f1e
--- /dev/null
+++ b/project/jni/application/ninslash/src
@@ -0,0 +1 @@
+Subproject commit ec8223f1e2f895cb852cc972b7e2fbde4d5a9b46