Update 'README.md'

CommitLog |
Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator
2022-04-26 02:19:38 +00:00 · 2021-03-18 19:02:36 +13:00 · 2021-03-18 19:01:49 +13:00 · 2021-03-18 19:01:07 +13:00 · 2021-03-18 18:58:00 +13:00 · 2021-03-18 18:57:25 +13:00
293 changed files with 4809 additions and 32 deletions
--- a/Spaceinator.gmx/Configs/Default.config.gmx
+++ b/Spaceinator.gmx/Configs/Default.config.gmx
@ -436,14 +436,14 @@
    <option_savekey>true</option_savekey>
    <option_scale>-1</option_scale>
    <option_scaleprogress>true</option_scaleprogress>
-    <option_sci_UseSCI>0</option_sci_UseSCI>
-    <option_sci_serverLocation></option_sci_serverLocation>
+    <option_sci_UseSCI>-1</option_sci_UseSCI>
+    <option_sci_serverLocation>https://bitbucket.org/SilicaAndPina/spaceinator.git</option_sci_serverLocation>
    <option_screenkey>True</option_screenkey>
    <option_screenshotkey>true</option_screenshotkey>
    <option_shortcircuit>True</option_shortcircuit>
    <option_showcursor>True</option_showcursor>
    <option_showprogress>1</option_showprogress>
-    <option_sizeable>False</option_sizeable>
+    <option_sizeable>True</option_sizeable>
    <option_stayontop>false</option_stayontop>
    <option_sync_vertex>0</option_sync_vertex>
    <option_textureGroup0_border>2</option_textureGroup0_border>
@ -485,7 +485,7 @@
    <option_tvos_splash_png>Configs\Default\tvos\splash.png</option_tvos_splash_png>
    <option_tvos_splash_time>0</option_tvos_splash_time>
    <option_tvos_texture_page>2048</option_tvos_texture_page>
-    <option_use_fast_collision>False</option_use_fast_collision>
+    <option_use_fast_collision>True</option_use_fast_collision>
    <option_use_new_audio>True</option_use_new_audio>
    <option_variableerrors>False</option_variableerrors>
    <option_version>100</option_version>
@ -590,7 +590,7 @@
    <option_windows_splash_screen>Configs\Default\windows\splash.png</option_windows_splash_screen>
    <option_windows_steam_app_id>0</option_windows_steam_app_id>
    <option_windows_texture_page>2048</option_windows_texture_page>
-    <option_windows_use_splash>-1</option_windows_use_splash>
+    <option_windows_use_splash>0</option_windows_use_splash>
    <option_windows_vertex_buffer_method2>1</option_windows_vertex_buffer_method2>
    <option_winphone_480_splash_image>Configs\Default\WinPhone\SplashScreenImage480.jpg</option_winphone_480_splash_image>
    <option_winphone_720_splash_image>Configs\Default\WinPhone\SplashScreenImage720.jpg</option_winphone_720_splash_image>
--- a/Spaceinator.gmx/Configs/Default/AmazonFire/icons/banner.png
+++ b/Spaceinator.gmx/Configs/Default/AmazonFire/icons/banner.png
--- a/Spaceinator.gmx/Configs/Default/AmazonFire/icons/icon_hdpi.png
+++ b/Spaceinator.gmx/Configs/Default/AmazonFire/icons/icon_hdpi.png
--- a/Spaceinator.gmx/Configs/Default/AmazonFire/icons/icon_ldpi.png
+++ b/Spaceinator.gmx/Configs/Default/AmazonFire/icons/icon_ldpi.png
--- a/Spaceinator.gmx/Configs/Default/AmazonFire/icons/icon_mdpi.png
+++ b/Spaceinator.gmx/Configs/Default/AmazonFire/icons/icon_mdpi.png
--- a/Spaceinator.gmx/Configs/Default/AmazonFire/icons/icon_xhdpi.png
+++ b/Spaceinator.gmx/Configs/Default/AmazonFire/icons/icon_xhdpi.png
--- a/Spaceinator.gmx/Configs/Default/AmazonFire/icons/icon_xxhdpi.png
+++ b/Spaceinator.gmx/Configs/Default/AmazonFire/icons/icon_xxhdpi.png
--- a/Spaceinator.gmx/Configs/Default/AmazonFire/icons/icon_xxxhdpi.png
+++ b/Spaceinator.gmx/Configs/Default/AmazonFire/icons/icon_xxxhdpi.png
--- a/Spaceinator.gmx/Configs/Default/AmazonFire/icons/ouyaIcon.png
+++ b/Spaceinator.gmx/Configs/Default/AmazonFire/icons/ouyaIcon.png
--- a/Spaceinator.gmx/Configs/Default/AmazonFire/portrait_splash.png
+++ b/Spaceinator.gmx/Configs/Default/AmazonFire/portrait_splash.png
--- a/Spaceinator.gmx/Configs/Default/AmazonFire/splash.png
+++ b/Spaceinator.gmx/Configs/Default/AmazonFire/splash.png
--- a/Spaceinator.gmx/Configs/Default/AndroidTV/icons/banner.png
+++ b/Spaceinator.gmx/Configs/Default/AndroidTV/icons/banner.png
--- a/Spaceinator.gmx/Configs/Default/AndroidTV/icons/icon_hdpi.png
+++ b/Spaceinator.gmx/Configs/Default/AndroidTV/icons/icon_hdpi.png
--- a/Spaceinator.gmx/Configs/Default/AndroidTV/icons/icon_ldpi.png
+++ b/Spaceinator.gmx/Configs/Default/AndroidTV/icons/icon_ldpi.png
--- a/Spaceinator.gmx/Configs/Default/AndroidTV/icons/icon_mdpi.png
+++ b/Spaceinator.gmx/Configs/Default/AndroidTV/icons/icon_mdpi.png
--- a/Spaceinator.gmx/Configs/Default/AndroidTV/icons/icon_xhdpi.png
+++ b/Spaceinator.gmx/Configs/Default/AndroidTV/icons/icon_xhdpi.png
--- a/Spaceinator.gmx/Configs/Default/AndroidTV/icons/icon_xxhdpi.png
+++ b/Spaceinator.gmx/Configs/Default/AndroidTV/icons/icon_xxhdpi.png
--- a/Spaceinator.gmx/Configs/Default/AndroidTV/icons/icon_xxxhdpi.png
+++ b/Spaceinator.gmx/Configs/Default/AndroidTV/icons/icon_xxxhdpi.png
--- a/Spaceinator.gmx/Configs/Default/AndroidTV/icons/ouyaIcon.png
+++ b/Spaceinator.gmx/Configs/Default/AndroidTV/icons/ouyaIcon.png
--- a/Spaceinator.gmx/Configs/Default/AndroidTV/splash.png
+++ b/Spaceinator.gmx/Configs/Default/AndroidTV/splash.png
--- a/Spaceinator.gmx/Configs/Default/PS3/PARAM.SFO
+++ b/Spaceinator.gmx/Configs/Default/PS3/PARAM.SFO
--- a/Spaceinator.gmx/Configs/Default/PS3/icon0.png
+++ b/Spaceinator.gmx/Configs/Default/PS3/icon0.png
--- a/Spaceinator.gmx/Configs/Default/PS3/pic1.png
+++ b/Spaceinator.gmx/Configs/Default/PS3/pic1.png
--- a/Spaceinator.gmx/Configs/Default/PS4/sce_sys/icon0.png
+++ b/Spaceinator.gmx/Configs/Default/PS4/sce_sys/icon0.png
--- a/Spaceinator.gmx/Configs/Default/PS4/sce_sys/nptitle.dat
+++ b/Spaceinator.gmx/Configs/Default/PS4/sce_sys/nptitle.dat
--- a/Spaceinator.gmx/Configs/Default/PS4/sce_sys/param.sfo
+++ b/Spaceinator.gmx/Configs/Default/PS4/sce_sys/param.sfo
--- a/Spaceinator.gmx/Configs/Default/PS4/sce_sys/pic1.png
+++ b/Spaceinator.gmx/Configs/Default/PS4/sce_sys/pic1.png
--- a/Spaceinator.gmx/Configs/Default/PS4/sce_sys/pronunciation.sig
+++ b/Spaceinator.gmx/Configs/Default/PS4/sce_sys/pronunciation.sig
--- a/Spaceinator.gmx/Configs/Default/PS4/sce_sys/pronunciation.xml
+++ b/Spaceinator.gmx/Configs/Default/PS4/sce_sys/pronunciation.xml
--- a/Spaceinator.gmx/Configs/Default/PS4/sce_sys/save_data.png
+++ b/Spaceinator.gmx/Configs/Default/PS4/sce_sys/save_data.png
--- a/Spaceinator.gmx/Configs/Default/PS4/sce_sys/shareoverlayimage.png
+++ b/Spaceinator.gmx/Configs/Default/PS4/sce_sys/shareoverlayimage.png
--- a/Spaceinator.gmx/Configs/Default/PSVita/sce_sys/icon0.png
+++ b/Spaceinator.gmx/Configs/Default/PSVita/sce_sys/icon0.png
--- a/Spaceinator.gmx/Configs/Default/PSVita/sce_sys/livearea/contents/bg0.png
+++ b/Spaceinator.gmx/Configs/Default/PSVita/sce_sys/livearea/contents/bg0.png
--- a/Spaceinator.gmx/Configs/Default/PSVita/sce_sys/livearea/contents/startup.png
+++ b/Spaceinator.gmx/Configs/Default/PSVita/sce_sys/livearea/contents/startup.png
--- a/Spaceinator.gmx/Configs/Default/PSVita/sce_sys/livearea/contents/template.xml
+++ b/Spaceinator.gmx/Configs/Default/PSVita/sce_sys/livearea/contents/template.xml
--- a/Spaceinator.gmx/Configs/Default/PSVita/sce_sys/param.sfo
+++ b/Spaceinator.gmx/Configs/Default/PSVita/sce_sys/param.sfo
--- a/Spaceinator.gmx/Configs/Default/PSVita/sce_sys/pic0.png
+++ b/Spaceinator.gmx/Configs/Default/PSVita/sce_sys/pic0.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/ApplicationIcon.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/ApplicationIcon.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/CycleSmall.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/CycleSmall.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide1.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide1.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide2.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide2.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide3.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide3.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide4.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide4.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide5.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide5.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide6.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide6.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide7.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide7.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide8.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide8.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide9.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/CycleWide9.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/FlipMedBack.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/FlipMedBack.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/FlipMedFront.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/FlipMedFront.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/FlipSmallBack.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/FlipSmallBack.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/FlipSmallFront.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/FlipSmallFront.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/FlipWideBack.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/FlipWideBack.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/FlipWideFront.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/FlipWideFront.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/IconicSmall.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/IconicSmall.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/IconicWide.png
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/IconicWide.png
--- a/Spaceinator.gmx/Configs/Default/WinPhone/SplashScreenImage.jpg
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/SplashScreenImage.jpg
--- a/Spaceinator.gmx/Configs/Default/WinPhone/SplashScreenImage480.jpg
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/SplashScreenImage480.jpg
--- a/Spaceinator.gmx/Configs/Default/WinPhone/SplashScreenImage720.jpg
+++ b/Spaceinator.gmx/Configs/Default/WinPhone/SplashScreenImage720.jpg
--- a/Spaceinator.gmx/Configs/Default/Windows8/Win8NativeRunner_TemporaryKey.pfx
+++ b/Spaceinator.gmx/Configs/Default/Windows8/Win8NativeRunner_TemporaryKey.pfx
--- a/Spaceinator.gmx/Configs/Default/Windows8/Windows8_TemporaryKey.pfx
+++ b/Spaceinator.gmx/Configs/Default/Windows8/Windows8_TemporaryKey.pfx
--- a/Spaceinator.gmx/Configs/Default/Windows8/logos/logo150.png
+++ b/Spaceinator.gmx/Configs/Default/Windows8/logos/logo150.png
--- a/Spaceinator.gmx/Configs/Default/Windows8/logos/logo30.png
+++ b/Spaceinator.gmx/Configs/Default/Windows8/logos/logo30.png
--- a/Spaceinator.gmx/Configs/Default/Windows8/logos/logo310.png
+++ b/Spaceinator.gmx/Configs/Default/Windows8/logos/logo310.png
--- a/Spaceinator.gmx/Configs/Default/Windows8/logos/logo50.png
+++ b/Spaceinator.gmx/Configs/Default/Windows8/logos/logo50.png
--- a/Spaceinator.gmx/Configs/Default/Windows8/splashscreen.png
+++ b/Spaceinator.gmx/Configs/Default/Windows8/splashscreen.png
--- a/Spaceinator.gmx/Configs/Default/WindowsUAP/SplashScreen.scale-100.png
+++ b/Spaceinator.gmx/Configs/Default/WindowsUAP/SplashScreen.scale-100.png
--- a/Spaceinator.gmx/Configs/Default/WindowsUAP/WinUWPRunner_TemporaryKey.pfx
+++ b/Spaceinator.gmx/Configs/Default/WindowsUAP/WinUWPRunner_TemporaryKey.pfx
--- a/Spaceinator.gmx/Configs/Default/WindowsUAP/logos/LargeLogo.scale-100.png
+++ b/Spaceinator.gmx/Configs/Default/WindowsUAP/logos/LargeLogo.scale-100.png
--- a/Spaceinator.gmx/Configs/Default/WindowsUAP/logos/Logo.scale-100.png
+++ b/Spaceinator.gmx/Configs/Default/WindowsUAP/logos/Logo.scale-100.png
--- a/Spaceinator.gmx/Configs/Default/WindowsUAP/logos/SmallLogo.scale-100.png
+++ b/Spaceinator.gmx/Configs/Default/WindowsUAP/logos/SmallLogo.scale-100.png
--- a/Spaceinator.gmx/Configs/Default/WindowsUAP/logos/SmallishLogo.scale-100.png
+++ b/Spaceinator.gmx/Configs/Default/WindowsUAP/logos/SmallishLogo.scale-100.png
--- a/Spaceinator.gmx/Configs/Default/WindowsUAP/logos/StoreLogo.scale-100.png
+++ b/Spaceinator.gmx/Configs/Default/WindowsUAP/logos/StoreLogo.scale-100.png
--- a/Spaceinator.gmx/Configs/Default/WindowsUAP/logos/WideLogo.scale-100.png
+++ b/Spaceinator.gmx/Configs/Default/WindowsUAP/logos/WideLogo.scale-100.png
--- a/Spaceinator.gmx/Configs/Default/XBoxOne/Logo.png
+++ b/Spaceinator.gmx/Configs/Default/XBoxOne/Logo.png
--- a/Spaceinator.gmx/Configs/Default/XBoxOne/SmallLogo.png
+++ b/Spaceinator.gmx/Configs/Default/XBoxOne/SmallLogo.png
--- a/Spaceinator.gmx/Configs/Default/XBoxOne/SplashScreen.png
+++ b/Spaceinator.gmx/Configs/Default/XBoxOne/SplashScreen.png
--- a/Spaceinator.gmx/Configs/Default/XBoxOne/StoreLogo.png
+++ b/Spaceinator.gmx/Configs/Default/XBoxOne/StoreLogo.png
--- a/Spaceinator.gmx/Configs/Default/XBoxOne/WideLogo.png
+++ b/Spaceinator.gmx/Configs/Default/XBoxOne/WideLogo.png
--- a/Spaceinator.gmx/Configs/Default/android/icons/icon_hdpi.png
+++ b/Spaceinator.gmx/Configs/Default/android/icons/icon_hdpi.png
--- a/Spaceinator.gmx/Configs/Default/android/icons/icon_ldpi.png
+++ b/Spaceinator.gmx/Configs/Default/android/icons/icon_ldpi.png
--- a/Spaceinator.gmx/Configs/Default/android/icons/icon_mdpi.png
+++ b/Spaceinator.gmx/Configs/Default/android/icons/icon_mdpi.png
--- a/Spaceinator.gmx/Configs/Default/android/icons/icon_xhdpi.png
+++ b/Spaceinator.gmx/Configs/Default/android/icons/icon_xhdpi.png
--- a/Spaceinator.gmx/Configs/Default/android/icons/icon_xxhdpi.png
+++ b/Spaceinator.gmx/Configs/Default/android/icons/icon_xxhdpi.png
--- a/Spaceinator.gmx/Configs/Default/android/icons/icon_xxxhdpi.png
+++ b/Spaceinator.gmx/Configs/Default/android/icons/icon_xxxhdpi.png
--- a/Spaceinator.gmx/Configs/Default/android/icons/ouyaIcon.png
+++ b/Spaceinator.gmx/Configs/Default/android/icons/ouyaIcon.png
--- a/Spaceinator.gmx/Configs/Default/android/portrait_splash.png
+++ b/Spaceinator.gmx/Configs/Default/android/portrait_splash.png
--- a/Spaceinator.gmx/Configs/Default/android/splash.png
+++ b/Spaceinator.gmx/Configs/Default/android/splash.png
--- a/Spaceinator.gmx/Configs/Default/html5/fav.ico
+++ b/Spaceinator.gmx/Configs/Default/html5/fav.ico
--- a/Spaceinator.gmx/Configs/Default/html5/splash.png
+++ b/Spaceinator.gmx/Configs/Default/html5/splash.png
--- a/Spaceinator.gmx/Configs/Default/ios/iPadRetinaSplash.png
+++ b/Spaceinator.gmx/Configs/Default/ios/iPadRetinaSplash.png
--- a/Spaceinator.gmx/Configs/Default/ios/iPadRetinaSplashPortrait.png
+++ b/Spaceinator.gmx/Configs/Default/ios/iPadRetinaSplashPortrait.png
--- a/Spaceinator.gmx/Configs/Default/ios/iPadsplash.png
+++ b/Spaceinator.gmx/Configs/Default/ios/iPadsplash.png
--- a/Spaceinator.gmx/Configs/Default/ios/iPadsplashPortrait.png
+++ b/Spaceinator.gmx/Configs/Default/ios/iPadsplashPortrait.png
--- a/Spaceinator.gmx/Configs/Default/ios/iPhone5splash.png
+++ b/Spaceinator.gmx/Configs/Default/ios/iPhone5splash.png
--- a/Spaceinator.gmx/Configs/Default/ios/iPhone5splashPortrait.png
+++ b/Spaceinator.gmx/Configs/Default/ios/iPhone5splashPortrait.png
--- a/Spaceinator.gmx/Configs/Default/ios/iPhone6PlusSplash.png
+++ b/Spaceinator.gmx/Configs/Default/ios/iPhone6PlusSplash.png
--- a/Spaceinator.gmx/Configs/Default/ios/iPhone6PlusSplashPortrait.png
+++ b/Spaceinator.gmx/Configs/Default/ios/iPhone6PlusSplashPortrait.png
--- a/Spaceinator.gmx/Configs/Default/ios/iPhone6Splash.png
+++ b/Spaceinator.gmx/Configs/Default/ios/iPhone6Splash.png
--- a/Spaceinator.gmx/Configs/Default/ios/iPhone6SplashPortrait.png
+++ b/Spaceinator.gmx/Configs/Default/ios/iPhone6SplashPortrait.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
DiamondCreeper75	e13f9037bc	Update 'README.md'	2022-04-26 02:19:38 +00:00
SilicaAndPina	ae39a79df0	CommitLog \|	2021-03-18 19:02:36 +13:00
JoshuanBurger12	93358d1a91	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2021-03-18 19:01:49 +13:00
JoshuanBurger12	e2a6b539a5	CommitLog \|	2021-03-18 19:01:07 +13:00
SilicaAndPina	e2ecfabcfe	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2021-03-18 18:58:00 +13:00
SilicaAndPina	242b257004	CommitLog \|	2021-03-18 18:57:25 +13:00
JoshuanBurger12	2103401b42	CommitLog \| \|	2020-09-23 09:11:38 +12:00
JoshuanBurger12	010aa23ca7	CommitLog \|	2020-09-22 12:23:37 +12:00
JoshuanBurger12	6f3fc5c779	CommitLog \|	2020-09-22 12:16:07 +12:00
JoshuanBurger12	062e170c3b	CommitLog \|	2020-09-22 11:53:47 +12:00
JoshuanBurger12	4b0515434f	CommitLog \|	2020-09-22 11:36:56 +12:00
JoshuanBurger12	469bb90e57	CommitLog \|	2020-09-22 11:34:18 +12:00
JoshuanBurger12	b2c8f6649e	CommitLog \|	2020-09-22 11:28:01 +12:00
JoshuanBurger12	3b2a69ca2a	CommitLog \|	2020-09-22 11:15:19 +12:00
JoshuanBurger12	81c390c7d4	CommitLog \|	2020-09-22 11:10:51 +12:00
JoshuanBurger12	c7ceb5dff8	CommitLog \|	2020-09-18 14:51:10 +12:00
JoshuanBurger12	a67d3f78f0	CommitLog \|	2020-09-18 14:37:06 +12:00
JoshuanBurger12	d1e39e75a6	CommitLog \|	2020-09-18 14:09:32 +12:00
SilicaAndPina	82965bb8bb	abc	2020-09-10 13:11:24 +12:00
SilicaAndPina	249b5003cb	Fix HTML5	2020-09-10 13:05:45 +12:00
JoshuanBurger12	f9d4ac9a3d	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-09-10 12:53:54 +12:00
JoshuanBurger12	47ca5b84bb	CommitLog \|	2020-09-10 12:53:33 +12:00
SilicaAndPina	55c8206078	fix shoot	2020-09-10 12:53:22 +12:00
SilicaAndPina	c6a011307e	fix shoot	2020-09-10 12:41:55 +12:00
SilicaAndPina	4ccb261f44	fix shoot	2020-09-10 12:40:31 +12:00
JoshuanBurger12	87c44404af	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-09-10 12:31:40 +12:00
JoshuanBurger12	1ee96309d1	CommitLog \|	2020-09-10 12:30:39 +12:00
SilicaAndPina	aaff749236	Add more crafitng	2020-09-10 12:30:19 +12:00
JoshuanBurger12	374a987b10	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-09-10 11:53:29 +12:00
SilicaAndPina	1ee935e406	Fix crafting	2020-09-10 11:53:11 +12:00
JoshuanBurger12	b9c965c6ae	CommitLog \|	2020-09-10 11:52:49 +12:00
SilicaAndPina	b56635f6b1	add broken ships	2020-09-09 11:53:55 +12:00
SilicaAndPina	63ada3dd33	add broken ships	2020-09-09 11:53:46 +12:00
SilicaAndPina	a9faaf94e6	CommitLog \|	2020-08-10 10:27:01 +12:00
JoshuanBurger12	74202c44a8	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-08-10 10:13:41 +12:00
JoshuanBurger12	327a187129	CommitLog \|	2020-08-10 10:13:32 +12:00
SilicaAndPina	bd80cf385a	CommitLog \|	2020-08-10 10:13:19 +12:00
SilicaAndPina	a5240df77c	CommitLog \|	2020-08-06 12:30:28 +12:00
SilicaAndPina	075b65c2ed	Commit Message	2020-07-29 14:27:23 +12:00
SilicaAndPina	6fcb731b31	Commit Message	2020-07-29 14:12:42 +12:00
SilicaAndPina	baa19120e7	Commit Message	2020-07-29 14:11:35 +12:00
SilicaAndPina	65013df7ed	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-29 13:47:35 +12:00
SilicaAndPina	92e13fdf7b	Commit Message	2020-07-29 13:47:22 +12:00
SilicaAndPina	f20c4b7469	Commit Message	2020-07-29 13:23:42 +12:00
SilicaAndPina	4d8d04bc75	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-29 13:22:50 +12:00
SilicaAndPina	88da5bc5f0	Commit Message	2020-07-29 13:22:35 +12:00
SilicaAndPina	2b60cde872	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-29 12:26:20 +12:00
SilicaAndPina	799d450301	Commit Message	2020-07-29 12:26:04 +12:00
Joshua Nice	8cb93b4e5c	README.md edited online with Bitbucket	2020-07-28 23:45:44 +00:00
SilicaAndPina	382fc965d3	Commit Message	2020-07-29 11:43:59 +12:00
SilicaAndPina	1f4a8a24be	Add inventory.	2020-07-29 11:29:00 +12:00
JoshuanBurger12	3136ad4a51	CommitLog \|	2020-07-29 01:35:34 +12:00
JoshuanBurger12	93b9476f7e	CommitLog \|	2020-07-29 01:08:27 +12:00
SilicaAndPina	ddc1b3a6ce	CommitLog \|	2020-07-27 10:39:19 +12:00
SilicaAndPina	821f1768fa	CommitLog \|	2020-07-27 10:30:29 +12:00
JoshuanBurger12	2bde2d7dc7	CommitLog \|	2020-07-27 10:16:04 +12:00
JoshuanBurger12	b37153cba3	CommitLog \|	2020-07-25 21:12:26 +12:00
SilicaAndPina	e4f967b8cf	CommitLog \|	2020-07-25 20:49:06 +12:00
JoshuanBurger12	c350894cec	CommitLog \|	2020-07-25 20:48:47 +12:00
JoshuanBurger12	17be86def3	CommitLog \|	2020-07-25 20:45:13 +12:00
SilicaAndPina	4369babdea	CommitLog \|	2020-07-25 20:40:52 +12:00
JoshuanBurger12	3652f71f76	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-25 20:35:58 +12:00
JoshuanBurger12	c0ec8fe1b4	CommitLog \|	2020-07-25 20:34:32 +12:00
JoshuanBurger12	fe60097782	CommitLog \|	2020-07-25 20:30:28 +12:00
SilicaAndPina	520095a5f2	CommitLog \|	2020-07-25 20:10:48 +12:00
SilicaAndPina	7abf812cfa	CommitLog \|	2020-07-25 19:50:59 +12:00
SilicaAndPina	71f77f2ae9	CommitLog \|	2020-07-25 19:47:36 +12:00
SilicaAndPina	29110d6a69	CommitLog \|	2020-07-25 18:26:58 +12:00
SilicaAndPina	e064f6d571	CommitLog \|	2020-07-25 18:20:00 +12:00
SilicaAndPina	bc21fc5141	CommitLog \|	2020-07-25 18:03:40 +12:00
SilicaAndPina	e60c04be85	CommitLog \|	2020-07-25 01:50:25 +12:00
SilicaAndPina	5519e5bf70	CommitLog \|	2020-07-25 00:24:30 +12:00
SilicaAndPina	a951c8908b	CommitLog \|	2020-07-24 20:23:46 +12:00
SilicaAndPina	78e9eff437	CommitLog \|	2020-07-24 20:20:15 +12:00
SilicaAndPina	d89ee661bb	CommitLog \|	2020-07-24 20:17:51 +12:00
SilicaAndPina	616cdab1b6	CommitLog \|	2020-07-24 19:21:59 +12:00
SilicaAndPina	9c46b090cd	CommitLog \|	2020-07-24 18:41:57 +12:00
SilicaAndPina	1a1ff2e351	CommitLog \|	2020-07-24 17:30:13 +12:00
SilicaAndPina	d0a28aa811	CommitLog \|	2020-07-24 15:08:32 +12:00
SilicaAndPina	c964df8a67	CommitLog \|	2020-07-24 13:48:09 +12:00
SilicaAndPina	10ab496e57	CommitLog \|	2020-07-24 11:19:56 +12:00
SilicaAndPina	a9c35b6d6c	CommitLog \|	2020-07-24 08:57:47 +12:00
SilicaAndPina	e74edd8841	CommitLog \|	2020-07-23 12:38:08 +12:00
SilicaAndPina	a5d1b47015	CommitLog \|	2020-07-23 12:08:15 +12:00
SilicaAndPina	ee7afa2a68	CommitLog \|	2020-07-23 12:06:36 +12:00
SilicaAndPina	e3a65c1d57	CommitLog \|	2020-07-23 12:04:39 +12:00
SilicaAndPina	3bb1a3d7ca	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-23 12:02:03 +12:00
SilicaAndPina	80607ec47c	CommitLog \|	2020-07-23 12:01:43 +12:00
JoshuanBurger12	77ba2cdd46	CommitLog \|	2020-07-23 12:01:18 +12:00
SilicaAndPina	00d04b4900	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-23 11:07:25 +12:00
SilicaAndPina	267d92eb20	CommitLog \|	2020-07-23 11:07:08 +12:00
JoshuanBurger12	8bd54af757	CommitLog \|	2020-07-23 11:05:56 +12:00
SilicaAndPina	7a50f88451	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-23 10:53:42 +12:00
SilicaAndPina	2e6e2af246	CommitLog \|	2020-07-23 10:50:27 +12:00
JoshuanBurger12	59b60aedb7	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-22 16:59:45 +12:00
JoshuanBurger12	483de8c89b	CommitLog \|	2020-07-22 16:59:28 +12:00
SilicaAndPina	ad28a64f2e	CommitLog \|	2020-07-22 15:55:49 +12:00
SilicaAndPina	e69645af21	CommitLog \|	2020-07-22 15:52:51 +12:00
SilicaAndPina	e5760a10a4	CommitLog \|	2020-07-22 15:52:06 +12:00
SilicaAndPina	afc96e2015	CommitLog \|	2020-07-22 15:51:06 +12:00
SilicaAndPina	21c906d32e	CommitLog \|	2020-07-22 15:45:40 +12:00
SilicaAndPina	feb3a5ddec	CommitLog \|	2020-07-22 15:45:22 +12:00
SilicaAndPina	a88deb688d	CommitLog \|	2020-07-22 15:43:09 +12:00
SilicaAndPina	08d942cc68	CommitLog \|	2020-07-22 15:39:55 +12:00
SilicaAndPina	8e2d3f2746	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-22 15:39:24 +12:00
SilicaAndPina	6fb56f4fe0	CommitLog \|	2020-07-22 15:39:16 +12:00
JoshuanBurger12	f14a6fa98a	CommitLog \|	2020-07-22 15:39:00 +12:00
JoshuanBurger12	724fdb42e0	CommitLog \|	2020-07-22 15:36:52 +12:00
SilicaAndPina	755e7199c9	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-22 15:33:24 +12:00
SilicaAndPina	abc0648dc5	CommitLog \|	2020-07-22 15:33:09 +12:00
JoshuanBurger12	19a1e244af	CommitLog \|	2020-07-22 15:32:55 +12:00
SilicaAndPina	5c50f88fd4	CommitLog \|	2020-07-22 15:27:38 +12:00
SilicaAndPina	2922fbde3b	CommitLog \|	2020-07-22 15:26:19 +12:00
SilicaAndPina	c503a7c6dd	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-22 15:23:04 +12:00
SilicaAndPina	1608ac5c56	CommitLog \|	2020-07-22 15:22:45 +12:00
JoshuanBurger12	113fc958a1	CommitLog \|	2020-07-22 15:22:07 +12:00
JoshuanBurger12	a3c66f6fdc	CommitLog \|	2020-07-22 15:19:58 +12:00
JoshuanBurger12	63a9f38f6a	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-22 15:15:48 +12:00
JoshuanBurger12	f564213caf	CommitLog \|	2020-07-22 15:15:36 +12:00
SilicaAndPina	fe2790767b	CommitLog \|	2020-07-22 15:13:56 +12:00
SilicaAndPina	c309df517b	CommitLog \|	2020-07-22 14:56:37 +12:00
SilicaAndPina	142a4efd06	CommitLog \|	2020-07-22 14:51:25 +12:00
SilicaAndPina	dbe6cb4e2d	CommitLog \|	2020-07-22 14:49:41 +12:00
SilicaAndPina	d2f1c3ad3b	CommitLog \|	2020-07-22 14:48:53 +12:00
SilicaAndPina	3e8a20bf53	CommitLog \|	2020-07-22 14:47:12 +12:00
SilicaAndPina	55e56f1c2e	CommitLog \|	2020-07-22 14:26:46 +12:00
SilicaAndPina	6fd275a61e	abc	2020-07-22 14:26:30 +12:00
SilicaAndPina	9b7d1ac8a3	CommitLog \|	2020-07-22 14:24:52 +12:00
SilicaAndPina	1fbad08536	CommitLog \|	2020-07-22 14:24:30 +12:00
JoshuanBurger12	7c676d7f28	CommitLog \|	2020-07-22 14:19:03 +12:00
SilicaAndPina	1868b8c79e	CommitLog \|	2020-07-22 14:00:45 +12:00
SilicaAndPina	ba1c81f35f	CommitLog \|	2020-07-22 13:59:12 +12:00
JoshuanBurger12	88791e47be	CommitLog \|	2020-07-22 13:58:15 +12:00
SilicaAndPina	10471cac07	CommitLog \|	2020-07-22 13:56:09 +12:00
SilicaAndPina	976a0c4caf	CommitLog \|	2020-07-22 13:48:00 +12:00
SilicaAndPina	b2b58f564a	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-22 13:43:32 +12:00
SilicaAndPina	059dfb7410	CommitLog \|	2020-07-22 13:43:17 +12:00
JoshuanBurger12	b5908b3af5	CommitLog \|	2020-07-22 13:42:12 +12:00
SilicaAndPina	552c8807d6	Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator	2020-07-22 13:36:29 +12:00
SilicaAndPina	10e74a9a8d	CommitLog \|	2020-07-22 13:36:22 +12:00
JoshuanBurger12	b409536a80	CommitLog \|	2020-07-22 13:35:50 +12:00
JoshuanBurger12	dddf4ba409	CommitLog \|	2020-07-22 13:29:59 +12:00
JoshuanBurger12	fc974341b1	CommitLog \|	2020-07-22 13:28:55 +12:00
JoshuanBurger12	065f419958	CommitLog \|	2020-07-22 13:26:52 +12:00
SilicaAndPina	949227a477	abc	2020-07-22 13:19:44 +12:00
SilicaAndPina	cd45692aed	Merged in SilicaAndPina (pull request #2 ) no message	2020-07-22 00:13:18 +00:00
SilicaAndPina	da469f3df0	Merged in JoshuanBurger12 (pull request #1 ) JoshuanBurger12	2020-07-22 00:12:34 +00:00
JoshuanBurger12	1a7cef5c5d	no message	2020-07-22 12:11:28 +12:00