Merged branch develop into master

src/createrelease/createrelease.monkey2

@@ -78,15 +78,15 @@ Function CopyRelease()
 
 	DeleteDir( output,True )
 	CreateDir( output )
+	
+	CreateDir( output+"/devtools" )
+	
 	CopyFiles( "bin" )
 	CopyFiles( "docs" )
 	CopyFiles( "modules" )
 	CopyFiles( "bananas" )
 	CopyFiles( "products" )
 	CopyFiles( "src" )
-	DeleteDir( "src/c2mx2",True )
-	DeleteDir( "src/mx23d",True )
-	CreateDir( output+"/devtools" )
 	
 	Copy( "hello-world.monkey2" )
 	Copy( "LICENSE.TXT" )
@@ -95,12 +95,17 @@ Function CopyRelease()
 	
 #if __TARGET__="windows"
 	Copy( "Monkey2 (Windows).exe" )
-#else if __TARGET__="macos"
+#Else if __TARGET__="macos"
 	CopyFiles( "Monkey2 (Macos).app" )
-#else if __TARGET__="linux"
+#Else if __TARGET__="linux"
 	Copy( "Monkey2 (Linux)" )
-#endif
+#Endif
 
+	DeleteDir( output+"/src/c2mx2",True )
+	DeleteDir( output+"/src/mx23d",True )
+	DeleteDir( output+"/modules/bullet",True )
+	DeleteDir( output+"/modules/gles30",True )
+	
 End
 
 Function MakeInno()

src/mojox_r/mojox_r.monkey2

@@ -1,83 +0,0 @@
-
-Class OptionsView Extends View
-
-	Method AddInt( text:String,value:Int,modified:Int( value:Int ) )
-	End
-	
-	Method AddString( text:String,value:String,modified:String( value:String ) )
-	End
-	
-	Method AddFilePath( text:String,value:String )
-	End
-	
-	Method AddDirectoryPath( text:String,value:String )
-	End
-	
-	Private
-	
-	Class Option
-	
-		Field label:Label
-		Field view:View
-		
-		Method New( text:String )
-		End
-		
-	End
-	
-	Class IntField Extends Option
-	End
-	
-	Class StringField Extends Option
-	End
-	
-	Class FilePathField Extends Option
-	End
-	
-	Class DirectoryPathField Extends Option
-	End
-	
-	Protected
-	
-	Method OnMeasure:Vec2i() Override
-	
-		Local w0:=0,w1:=0,h:=0
-		
-		For Local opt:=Eachin _options
-			w0=Max( w0,opt.label.MeasuredSize.x )
-			w1=Max( w1,opt.view.MeasuredSize.x )
-			h+=Max( opt.label.MeasuredSize.y,opt.view.MeasuredSize.y )
-		Next
-		
-		_w0=w0
-		_w1=w1
-		
-		Return New Vec2i( w0+w1,h )
-	End
-	
-	Method OnLayout() Override
-	
-		For Local opt:=Eachin _options
-		
-			opt.Frame=New Recti( x,y,x+_w0,y
-		
-		Next
-	
-	End
-	
-	Private
-	
-	Field _w0:Int,_w1:Int
-	
-	Field _options:=New Stack<Option>
-
-End
-
-Class ObjectView Extends View
-
-	Method New( obj:Object )
-	
-		
-	End
-
-End

src/ted2/modulemanager.monkey2

@@ -26,11 +26,11 @@ Class ModuleManager Extends Dialog
 '		_table.Style=App.Theme.GetStyle( "TableView" )
 '		_table.Style.BackgroundColor=App.Theme.GetColor( "content" )
 		
-		_table.AddColumn( "Module",,"24%" )
+		_table.AddColumn( "Module",,"20%" )
 		_table.AddColumn( "About",,"40%" )
-		_table.AddColumn( "Version",,"12%" )
-		_table.AddColumn( "Status",,"12%" )
-		_table.AddColumn( "Action",,"12%" )
+		_table.AddColumn( "Version",,"10%" )
+		_table.AddColumn( "Status",,"17%" )
+		_table.AddColumn( "Action",,"13%" )
 		
 		_docker=New DockingView
 		_docker.ContentView=_table
@@ -97,8 +97,11 @@ Class ModuleManager Extends Dialog
 	
 	Private
 	
-	Const downloadUrl:="http://monkey2.monkey-x.com/wp-content/uploads/mx2-modules/public/"
+'	Const downloadUrl:="http://monkey2.monkey-x.com/wp-content/uploads/mx2-modules/public/"
+	Const downloadUrl:="http://monkey2.monkey-x.com/send-file?file="
+	
 	Const downloadDir:="modules/module-manager/downloads/"
+	
 	Const backupDir:="modules/module-manager/backups/"
 	
 	Field _console:Console