瀏覽代碼

Merged branch scratch into develop

Mark Sibly 8 年之前
父節點
當前提交
56a4496561

+ 1 - 0
.gitignore

@@ -36,6 +36,7 @@ __MANPAGES__/
 /modules/png2polygon
 /modules/linq
 /modules/spine
+/modules/pyro-framework
 
 /modules/module-manager/backups
 

+ 3 - 0
.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/ted2go"]
+	path = src/ted2go
+	url = https://github.com/engor/Ted2Go.git

+ 2 - 2
README.TXT

@@ -1,14 +1,14 @@
 
 ***** Welcome to Monkey2! *****
 
-W A R N I N G ! The master branch is super-volatile. Grabbing the most recently tagged version is recommended if you just want to give monkey2 a try.
+W A R N I N G ! The master branch is super-volatile, and the develop branch is event worse! Grabbing the most recently tagged version is recommended if you just want to give monkey2 a try.
 
 
 ***** Building monkey2 on Windows *****
 
 1) Install the mingw-64 compiler. There is a self-extracting archive of mingw-64 that has been tested with monkey2 here:
 
-http://www.monkey-x.com/mak/devtools/i686-5.3.0-posix-dwarf-rt_v4-rev0.exe
+http://monkey2.monkey-x.com/mak/get-file?file=i686-6.2.0-posix-dwarf-rt_v5-rev1.exe
 
 If you install this to the monkey2 'devtools' directory, the following steps should 'just work'.
 

二進制
bin/mx2cc_linux


二進制
bin/mx2cc_macos


二進制
bin/mx2cc_windows.exe


+ 0 - 4
docs/docs_page_template.html

@@ -34,16 +34,12 @@
 
 <body class="docs_body">
 
-<div class="docs_content">
-
 <!-- CONTENT -->
 
 ${CONTENT}
 
 <!-- END -->
 
-</div>
-
 </body>
 
 </html>

+ 0 - 4
docs/docs_template.html

@@ -50,8 +50,6 @@
 
 <body class="page_body">
 
-<div class="modules_content">
-
 <!-- CONTENT -->
 
 <div class="modules_nav_wrapper">
@@ -113,8 +111,6 @@ jQuery( function($){
 
 <!-- END -->
 
-</div>
-
 </body>
 
 </html>

二進制
docs/img/Monkey2-logo-48.png


二進制
docs/img/btn_donate_SM.gif


二進制
docs/img/heart.png


二進制
docs/img/monkey2logo_32.png


二進制
docs/img/patreon_20.png


+ 90 - 0
docs/index.html

@@ -0,0 +1,90 @@
+<!doctype html>
+
+<html>
+
+<head>
+
+<title>Monkey2 Documentation</title>
+
+<link rel="stylesheet" href="js-treeview/treeview.css">
+
+<link rel="stylesheet" href="style.css">
+
+<script type="text/javascript">
+
+function navto( url ){
+	document.getElementById( 'content' ).src=url;
+	return false;
+}
+
+window.onload=function(){
+	navto( 'docs.html' );
+}
+
+</script>
+
+</head>
+
+<body class="page_body">
+
+<!-- fixed header -->
+<div class="page_header">
+
+	<span class="header_title_strip">
+
+		<span class="header_logo">
+			<a href="http://monkey2.monkey-x.com"><img src="img/monkey2logo_32.png"></a>
+		</span>
+
+		<span class="header_text">Monkey 2</span>
+		
+	</span>
+
+	<span class="header_button_strip">
+
+		<a class="header_button" href="http://monkey2.monkey-x.com">Blog</a></button>
+		<a class="header_button" href="http://monkey2.monkey-x.com/monkey2-files">Files</a>
+		<a class="header_button" href="http://monkey2.monkey-x.com/forums">Forums</a>
+		<a class="header_button" href="http://monkey2.monkey-x.com/about-monkey-2">About</a>
+	
+	</span>
+	
+	<span class="header_donate_strip">
+	
+		<form class="header_paypal" action='https://www.paypal.com/cgi-bin/webscr' method='post' target='_top'>
+			<input type='hidden' name='cmd' value='_s-xclick'>
+			<input type='hidden' name='hosted_button_id' value='SEPSTY3L7J6B6'>
+			<input type='image' class="header_paypal_button" src="img/btn_donate_SM.gif" border='0' name='submit' alt='PayPal - The safer, easier way to pay online!' style='vertical-align:middle'>
+		</form>
+	
+		<a class="header_patreon" href="https://www.patreon.com/monkey2">
+			<img src="img/patreon_20.png">
+		</a>
+
+	</span>
+
+</div>
+<!-- end header -->
+
+<div style="
+	position:relative;
+	top: 40px;
+	width:100%;
+	height: calc( 100% - 40px );
+	">
+
+<iframe id="content" name="content" href="docs.html" style="
+	display:block;
+	width:100%;
+	height:100%;
+	padding:0;
+	border:0;
+	margin:0;">
+</iframe>
+
+</div>
+	
+</body>
+
+</html>
+

+ 51 - 21
docs/style.css

@@ -76,7 +76,7 @@ fieldset{
 
 legend{
 	float: left;
-	font-size: 16px;
+	font-size: 14px;
 	font-weight: 400;
 	padding: 16px 0;
 }
@@ -159,7 +159,7 @@ button.wp-switch-editor{
 	border-color: #456 !important;
 	border-radius: 6px 6px 0 0 !important;
 	box-shadow: none !important;
-	margin-bottom: 1px;
+	margin-bottom: 1px !important;
 }
 
 button.wp-switch-editor:hover{
@@ -172,17 +172,39 @@ div.mce-panel{
 
 div.mce-toolbar-grp{
 	background: #abc !important;
+	border: none !important;
+}
+
+div.mce-statusbar{
+	border: none !important;
+}
+
+#crayon-te-table{
+	padding:0px !important;
+}
+
+/* Hacks for crayon */
+#colorbox{
+	width:720px !important;
+}
+
+#cboxWrapper{
+	width:100% !important;
+}
+
+#cboxContent{
+	width:100% !important;
 }
 
-/* Hack for crayon */
-div#cboxLoadedContent{
-	color: #123 !important;
+#cboxLoadedContent{
+	color: #eee !important;
 	background: #abc !important;
-	font-size: 14px !important;
+	font-size: 16px !important;
+	width:100% !important;
 }
 
 #crayon-te-bar-content{
-	font-size: 14px !important;
+	font-size: 16px !important;
 }
 
 .crayon-setting{
@@ -227,7 +249,6 @@ hr{
 /* ***** table ***** */
 
 table{
-	table-layout: fixed;
 	border-spacing: 0;
 	width: 100%;
 	margin: 16px 0;
@@ -261,6 +282,14 @@ th{
 	font-weight: 500;
 }
 
+th.mx2docs:first-child{
+	width: 200px;
+}
+
+td.mx2docs:first-child{
+	width: 200px;
+}
+
 th.modman{
 	padding: 0 8px;
 }
@@ -285,33 +314,33 @@ h6{
 }
 
 h1{
-	font-size: 40px;
-	margin: 38px 0 28px;
+	font-size: 26px;
+	margin: 26px 0 26px;
 }
 
 h2{
-	font-size: 40px;
-	margin: 34px 0 24px;
+	font-size: 24px;
+	margin: 24px 0 24px;
 }
 
 h3{
-	font-size: 28px;
-	margin: 40px 0 22px;
+	font-size: 22px;
+	margin: 22px 0 22px;
 }
 
 h4{
-	font-size: 24px;
-	margin: 30px 0 20px;
+	font-size: 20px;
+	margin: 20px 0 20px;
 }
 
 h5{
-	font-size: 20px;
-	margin: 28px 0 18px;
+	font-size: 18px;
+	margin: 18px 0 18px;
 }
 
 h6{
 	font-size: 16px;
-	margin: 26px 0 16px;
+	margin: 16px 0 16px;
 }
 
 /* ***** wordpress css ***** */
@@ -366,6 +395,7 @@ span.header_text{
 	font-size: 16px;
 	color: #123;
 	margin-left: 8px;
+	margin-right: 68px;
 }
 
 /* parent: page_header */
@@ -379,7 +409,7 @@ a.header_button{
 	border: 1px solid #456;
 	border-radius: 3px;
 	padding: 4px 7px;
-	font-size: 11px;
+	font-size: 10px;
 	font-weight: 400;
 	color: #fcfcfc;
 	cursor: pointer;
@@ -524,4 +554,4 @@ body.forums.post_content {
 
 div.toc{
 	display:none;
-}
+}

+ 5 - 4
scripts/common.bat

@@ -1,10 +1,11 @@
 
 set mx2cc=..\bin\mx2cc_windows.exe
-set mx2cc_new=..\src\mx2cc\mx2cc.buildv1.0.91\windows_release\mx2cc.exe
-set mx2cc_raspbian_new=..\src\mx2cc\mx2cc.buildv1.0.91\raspbian_release\mx2cc
+set mx2cc_new=..\src\mx2cc\mx2cc.buildv1.1.01\windows_release\mx2cc.exe
+set mx2cc_raspbian_new=..\src\mx2cc\mx2cc.buildv1.1.01\raspbian_release\mx2cc
 
 set ted2=..\bin\ted2_windows
-set ted2_new=..\src\ted2\ted2.buildv1.0.91\windows_release
+set ted2_new=..\src\ted2\ted2.buildv1.1.01\windows_release
+set ted2go_new=..\src\ted2go\ted2.buildv1.1.01\windows_release
 
 set launcher="..\Monkey2 (Windows).exe"
-set launcher_new=..\src\launcher\launcher.buildv1.0.91\windows_release\launcher.exe
+set launcher_new=..\src\launcher\launcher.buildv1.1.01\windows_release\launcher.exe

+ 9 - 6
scripts/common.sh

@@ -9,13 +9,14 @@ launcher_new=""
 if [ "$OSTYPE" = "linux-gnu" ]
 then
 	mx2cc="../bin/mx2cc_linux"
-	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.91/linux_release/mx2cc"
+	mx2cc_new="../src/mx2cc/mx2cc.buildv1.1.01/linux_release/mx2cc"
 	
 	ted2="../bin/ted2_linux"
-	ted2_new="../src/ted2/ted2.buildv1.0.91/linux_release"
+	ted2_new="../src/ted2/ted2.buildv1.1.01/linux_release"
+	ted2go_new="../src/ted2go/ted2.buildv1.1.01/linux_release"
 	
 	launcher="../Monkey2 (Linux)"
-	launcher_new="../src/launcher/launcher.buildv1.0.91/linux_release/launcher"
+	launcher_new="../src/launcher/launcher.buildv1.1.01/linux_release/launcher"
 	
 elif [ "$OSTYPE" = "linux-gnueabihf" ]
 then
@@ -24,16 +25,18 @@ then
 	
 	ted2="../bin/ted2_raspbian"
 	ted2_new="../src/ted2/ted2.buildv1.0.9/raspbian_release"
+	ted2go_new="../src/ted2go/ted2.buildv1.0.9/raspbian_release"
 	
 	launcher="../Monkey2 (Raspbian)"
 	launcher_new="../src/launcher/launcher.buildv1.0.9/raspbian_release/launcher"
 else
 	mx2cc="../bin/mx2cc_macos"
-	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.91/macos_release/mx2cc"
+	mx2cc_new="../src/mx2cc/mx2cc.buildv1.1.01/macos_release/mx2cc"
 	
 	ted2="../bin/ted2_macos.app"
-	ted2_new="../src/ted2/ted2.buildv1.0.91/macos_release/ted2.app"
+	ted2_new="../src/ted2/ted2.buildv1.1.01/macos_release/ted2.app"
+	ted2go_new="../src/ted2go/ted2.buildv1.1.01/macos_release/ted2.app"
 	
 	launcher="../Monkey2 (Macos).app"
-	launcher_new="../src/launcher/launcher.buildv1.0.91/macos_release/launcher.app"
+	launcher_new="../src/launcher/launcher.buildv1.1.01/macos_release/launcher.app"
 fi

+ 6 - 0
scripts/rebuildall2go.bat

@@ -0,0 +1,6 @@
+
+echo off
+
+call rebuildmods
+call rebuildted2go
+call makedocs

+ 4 - 0
scripts/rebuildall2go.sh

@@ -0,0 +1,4 @@
+
+./rebuildmods.sh
+./rebuildted2go.sh
+./makedocs.sh

+ 16 - 0
scripts/rebuildted2go.bat

@@ -0,0 +1,16 @@
+
+echo off
+
+call common.bat
+
+echo.
+echo ***** Rebuilding ted2 *****
+echo.
+
+%mx2cc% makeapp -clean -apptype=gui -build -config=release -target=desktop ../src/ted2go/ted2.monkey2
+xcopy %ted2go_new%\assets %ted2%\assets /Q /I /S /Y
+xcopy %ted2go_new%\*.dll %ted2% /Q /I /S /Y
+xcopy %ted2go_new%\*.exe %ted2% /Q /I /S /Y
+
+%mx2cc% makeapp -clean -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
+copy %launcher_new% %launcher%

+ 42 - 0
scripts/rebuildted2go.sh

@@ -0,0 +1,42 @@
+
+source common.sh
+
+echo ""
+echo "***** Rebuilding ted2 *****"
+echo ""
+
+$mx2cc makeapp -apptype=gui -clean -build -config=release -target=desktop ../src/ted2go/ted2.monkey2
+
+$mx2cc makeapp -apptype=gui -clean -build -config=release -target=desktop ../src/launcher/launcher.monkey2
+
+if [ "$OSTYPE" = "linux-gnu" ]
+then
+
+	rm -r -f "$ted2"
+	mkdir "$ted2"
+	cp -R "$ted2go_new/assets" "$ted2/assets"
+	cp "$ted2go_new/ted2" "$ted2/ted2"
+	rm -r -f "$launcher"
+	cp "$launcher_new" "$launcher"
+
+elif [ "$OSTYPE" = "linux-gnueabihf" ]
+then
+
+	rm -r -f "$ted2"
+	mkdir "$ted2"
+	cp -R "$ted2go_new/assets" "$ted2/assets"
+	cp "$ted2go_new/ted2" "$ted2/ted2"
+	rm -r -f "$launcher"
+	cp "$launcher_new" "$launcher"
+
+else
+
+	rm -r -f "$ted2"
+	cp -R "$ted2go_new" "$ted2"
+	rm -r -f "$launcher"
+	cp -R "$launcher_new" "$launcher"
+	
+	cp ../src/launcher/info.plist "$launcher/Contents"
+	cp ../src/launcher/Monkey2logo.icns "$launcher/Contents/Resources"
+	
+fi

+ 16 - 0
scripts/updateted2go.bat

@@ -0,0 +1,16 @@
+
+echo off
+
+call common.bat
+
+echo.
+echo ***** Updating ted2 *****
+echo.
+
+%mx2cc% makeapp -apptype=gui -build -config=release -target=desktop ../src/ted2go/ted2.monkey2
+xcopy %ted2go_new%\assets %ted2%\assets /Q /I /S /Y
+xcopy %ted2go_new%\*.dll %ted2% /Q /I /S /Y
+xcopy %ted2go_new%\*.exe %ted2% /Q /I /S /Y
+
+%mx2cc% makeapp -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
+copy %launcher_new% %launcher%

+ 42 - 0
scripts/updateted2go.sh

@@ -0,0 +1,42 @@
+
+source common.sh
+
+echo ""
+echo "***** Updating ted2 *****"
+echo ""
+
+$mx2cc makeapp -apptype=gui -build -config=release -target=desktop ../src/ted2go/ted2.monkey2
+
+$mx2cc makeapp -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
+
+if [ "$OSTYPE" = "linux-gnu" ]
+then
+
+	rm -r -f "$ted2"
+	mkdir "$ted2"
+	cp -R "$ted2go_new/assets" "$ted2/assets"
+	cp "$ted2go_new/ted2" "$ted2/ted2"
+	rm -r -f "$launcher"
+	cp "$launcher_new" "$launcher"
+
+elif [ "$OSTYPE" = "linux-gnueabihf" ]
+then
+
+	rm -r -f "$ted2"
+	mkdir "$ted2"
+	cp -R "$ted2go_new/assets" "$ted2/assets"
+	cp "$ted2go_new/ted2" "$ted2/ted2"
+	rm -r -f "$launcher"
+	cp "$launcher_new" "$launcher"
+
+else
+
+	rm -r -f "$ted2"
+	cp -R "$ted2go_new" "$ted2"
+	rm -r -f "$launcher"
+	cp -R "$launcher_new" "$launcher"
+	
+	cp ../src/launcher/info.plist "$launcher/Contents"
+	cp ../src/launcher/Monkey2logo.icns "$launcher/Contents/Resources"
+
+fi

+ 1 - 1
src/createrelease/createrelease.monkey2

@@ -5,7 +5,7 @@
 Using libc..
 Using std..
 
-Const MX2CC_VERSION:="1.0.8"
+Const MX2CC_VERSION:="1.1.01"
 
 Const OUTPUT:="Monkey2-v"+MX2CC_VERSION
 

+ 9 - 0
src/mx2cc/geninfo/geninfo.monkey2

@@ -68,6 +68,15 @@ Class ParseInfoGenerator
 		
 		Return MakeNode( decl )
 	End
+
+	Method GenNode:JsonObject( decl:FileDecl )
+	
+		local node:=MakeNode( decl )
+		
+		If decl.imports node.SetValue( "imports",GenNode( decl.imports ) )
+		
+		Return node
+	End
 	
 	Method GenNode:JsonObject( decl:ClassDecl )
 	

+ 1 - 1
src/mx2cc/mx2.monkey2

@@ -50,4 +50,4 @@ Using libc
 ' 3) edit .sh and .bat files to use new version (common.sh, common.bat)
 ' 4) ./rebuildall
 '
-Const MX2CC_VERSION:="1.0.91"
+Const MX2CC_VERSION:="1.1.01"

+ 24 - 48
src/ted2/assets/about.html

@@ -4,44 +4,39 @@
 <style>
 
 body{
-	background: #323232;
-	color: #fff;
+	background: transparent;
+	color: #eee;
 	font-size: 18px;
 	margin: 8px;
 	padding: 0px;
 	line-height:20px;
 }
 
-a{
-	color: #ff0;
-	text-decoration: none;
-}
-
 h1{
-	color: #eeee00;
+	color: #fc0;
 	font-size: 28px;
 	text-align: center;
 }
 
 h2{
-	color: #eeee00;
+	color: #fc0;
 	font-size: 24px;
 	text-align: center;
 }
 
 div.awesome{
-	color: #ddd;
+	color: #ccc;
 	font-size: 14px;
 }
 
 a{
-	color: #44eeff;
+	color: #4ef;
 	text-decoration: none;
 	cursor: pointer;
 }
 
 a:hover{
-	color: #00ee00;
+	color: #0e0;
 }
 
 </style>
@@ -49,45 +44,33 @@ a:hover{
 
 <body>
 
-<h1>Monkey2 v1.0.8</h1>
+<h1>Monkey2 v1.1.01</h1>
 
 <p>Welcome to monkey2, a new, open source, user friendly, multi target programming language by Mark Sibly.
 
-<p>Work on monkey2 is on-going and there is still a lot left to add, but it should be in a mostly usable state.
+<p>Please post any bug reports or feature requests to the monkey2 github repository: <a href="https://github.com/blitz-research/monkey2">https://github.com/blitz-research/monkey2</a>.
 
-<p>Please post any bug reports to the monkey2 github repository:
-
-<p><a href="https://github.com/blitz-research/monkey2">https://github.com/blitz-research/monkey2</a>.
-
-<p>For monkey2 discussion and programming help, feel free to drop by the monkey2 forums:
-
-<p><a href="http://monkey2.monkey-x.com/forums">http://monkey2.monkey-x.com/forums</a>.
+<p>For monkey2 discussion and programming help, feel free to drop by the monkey2 forums: <a href="http://monkey2.monkey-x.com/forums">http://monkey2.monkey-x.com/forums</a>.
 
+<p>Monkey2 is a crowd funded project. If you like what you see, please consider contributing to development either via paypal donation or by becoming a Patreon supporter.
 
 <h2>Building Desktop apps</h2>
 
 <p>If you are reading this in Ted2 on a Windows machine, you should theoretically be able to build desktop apps with no extra hassle.
 
-<p>On Macos, it's a little bit trickier but not much. First, You will need to install xcode from the App Store. Once that's done, go into a shell
-and enter 'xcode-select --install' to install the 'xcode command line tools'. Note that if you are already using Blitzmax or Monkey1 on a Mac, you 
-many not have to do anything.
+<p>On Macos, it's a little bit trickier but not much. First, you will need to install xcode from the App Store. Once that's done, go into a shell and enter 'xcode-select --install' to install the 'xcode command line tools'. Note that if you are already using Blitzmax or Monkey1 on a Mac, you may not have to do anything.
 
-<p>On Linux, you will need the standard set of development tools and libs such as g++, mesa-gl, a ton of X stuff etc. Sorry I can't be more specific
-here, but past attempts to produce a definitive list of 'what you need to code in linux' have proved fruitless - it changes from distro to distro
-and version to version.
+<p>On Linux, you will need the standard set of development tools and libs such as g++, mesa-gl, a ton of X stuff etc. Sorry I can't be more specific here, but past attempts to produce a definitive list of 'what you need to code in linux' have proved fruitless - it changes from distro to distro and version to version.
 
-<p>Once you're ready to go, try clicking on the 'hello-world.monkey2' file in the 'Files' browser to the right, and then selecting 'Build and Run'
-from the 'Build' menu.
+<p>Once you're ready to go, try clicking on the 'hello-world.monkey2' file in the 'Files' browser to the right, and then selecting 'Build and Run' from the 'Build' menu.
 
-<p>This will bring up a little 'Build Settings' dialog. Just click OK to use the defaults and build and run the app. If everything is working properly,
-a simple 'Hello World' window should appear.
+<p>This will bring up a little 'Build Settings' dialog. Just click OK to use the defaults and build and run the app. If everything is working properly, a simple 'Hello World' window should appear.
 
 <p>Note that the build settings dialog will only appear automatically the first time you build an app for each target. After that, you can manually
 activate it by selecting 'Build Settings' from the 'Build' menu - not that it does a lot right now!
 
 <p>There are a few more examples in the 'bananas' directory on the right - more coming!
 
-
 <h2>Building Emscripten apps</h2>
 
 <p>To build emscripten apps, you will first need to install emscripten: 
@@ -96,17 +79,15 @@ activate it by selecting 'Build Settings' from the 'Build' menu - not that it do
 
 <p>(On MacOS, you may also need to modify your bin/env_macos.txt file to let monkey2 know where emscripten has been installed).
 
-<p>Once emscripten is installed, you will then need to 'rebuild modules' for the emscripten target. This involves selecting 'Rebuild Modules' 
-from the 'Build' menu, and then selecting 'Emscripten'. This will take a while, as monkey2 needs to rebuild ALL source code used behind the scenes.
+<p>Once emscripten is installed, you will then need to 'rebuild modules' for the emscripten target. This involves selecting 'Rebuild modules' from the 'Build' menu in Ted2, and then selecting 'Emscripten'. This will take a while, as monkey2 needs to rebuild ALL source code used behind the scenes.
 
 <p>Once done, you should be able to build emscripten apps. However, to also actually run them you will need to install the 'mserver' package:
 
 <p><a href="http://www.monkey-x.com/mak/devtools/mserver-v86c.zip">http://www.monkey-x.com/mak/devtools/mserver-v86c.zip</a>.
 
-<p>(On Macos and Linux, you may need to change file permissions to 'execute').
+<p>(On Macos and Linux, you may also need to change file permissions to 'execute').
 
-<p>This needs to be unzipped into your monkey2 'devtools' directory. MServer is actually a mini 'http' server, and is necessary because emscripten apps 
-can't be run directly from the filesystem - they must always be run from a server.
+<p>This needs to be unzipped into your monkey2 'devtools' directory. MServer is actually a mini 'http' server, and is necessary because emscripten apps can't be run directly from the filesystem - they must always be run from a server.
 
 <p>Now, select the 'Emscripten' target from the 'Build Targets' menu and you should be able to build and run emscripten apps.
 
@@ -117,13 +98,11 @@ can't be run directly from the filesystem - they must always be run from a serve
 
 <p><a href="https://developer.android.com/studio/index.html">https://developer.android.com/studio/index.html</a>.
 
-<p>Once installed, make sure everything's working properly and that you can build and deploy android apps. The best way to do this is by building and
-deploying one of the simple 'template' apps in android studio.
+<p>Once installed, make sure everything's working properly and that you can build and deploy android apps from inside Android studio. The best way to do this is by building and deploying one of the simple 'template' apps in android studio.
 
 <p>Next, install the Android NDK (native development kit) via the SDK Manager->SDK Tools section.
 
-<p>Once android studio and the NDK are installed, you will then need to rebuild modules for android. Once this is done, you should (finally)
-be able to build android apps.
+<p>Once android studio and the NDK are installed, you will then need to rebuild modules for android. Once this is done, you should (finally!) be able to build android apps.
 
 <p>Android apps are produced in the form of android studio projects, and can be found in the '.products' directory next to your monkey2 source file.
 
@@ -132,11 +111,9 @@ be able to build android apps.
 
 <h2>Building iOS apps</h2>
 
-<p>Monkey2 iOS apps cannot currently be run on the simulator, so the first thing you will need is a real iOS device plus the necessary
-'code signing skills' to be able to actually deploy to it.
+<p>Monkey2 iOS apps cannot currently be run on the simulator, so the first thing you will need is a real iOS device plus the necessary 'code signing skills' to be able to actually deploy to it.
 
-<p>Apart from that, all you need to build for iOS is the latest version of xcode. Once you have xcode installed, you will to 'rebuild modules'
-for iOS after which you should be able to build iOS apps.
+<p>Apart from that, all you need to build for iOS is the latest version of xcode. Once you have xcode installed, you will to 'rebuild modules' for iOS after which you should be able to build iOS apps.
 
 <p>iOS apps are produced in the form of xcode projects, and can be found in the '.products' directory next to your monkey2 source file.
 
@@ -145,10 +122,9 @@ for iOS after which you should be able to build iOS apps.
 
 <h2>That's all Folks!</h2>
 
-<p>Monkey2 is a crowd funded project. If you like what you see, please consider contributing to development either via paypal donation or by becoming a 
-Patreon supporter.
+<p>Monkey2 is a crowd funded project. If you like what you see, please consider contributing to development either via paypal donation or by becoming a Patreon supporter.
 
-<p>Finally, a big shout out to everyone who has contributed to Monkey2 to date! Including...
+<p>Finally, a big shout out to everyone who has contributed to Monkey2 to date, including...
 
 <div class="awesome">
 Shane Raffa,

+ 3 - 3
src/ted2/modulemanager.monkey2

@@ -288,9 +288,9 @@ Class ModuleManager Extends Dialog
 			_procmods.Push( module )
 			
 			If module.status="Installed"
-				docker.AddView( New Label( "Update module:"+module.name ),"top" )
+				docker.AddView( New Label( "Update module: "+module.name ),"top" )
 			Else
-				docker.AddView( New Label( "Install module:~t"+module.name ),"top" )
+				docker.AddView( New Label( "Install module: "+module.name ),"top" )
 			Endif
 		Next
 		
@@ -399,7 +399,7 @@ Class ModuleManager Extends Dialog
 		
 		EnumRemoteModules()
 		
-		_filters["Local"].Checked=True
+		_filters["Local"].Checked=False
 		_filters["Installed"].Checked=True
 		_filters["Uninstalled"].Checked=True
 		

+ 1 - 0
src/ted2go

@@ -0,0 +1 @@
+Subproject commit dca5e0ca4ab08c059eca095264efb72b95c4ad3c