Fixed bindings, tweaked UI, added new UI theme to default themes, fixed IDE network stuff

Assets/UIThemes/dark_theme/theme.xml

@@ -0,0 +1,164 @@
+<?xml version="1.0"?>
+<PolyConfig>
+	<uiDefaultFontName>sans</uiDefaultFontName>
+	<uiDefaultFontColor>0xe4e0e3ab</uiDefaultFontColor>
+
+	<uiBgColor>0x322d2bff</uiBgColor>
+	<uiAccentColor>0x1f3234ff</uiAccentColor>
+	<uiHeaderBgColor>0x262120ff</uiHeaderBgColor>
+	<uiSmallHeaderBgColor>0x2b2624ff</uiSmallHeaderBgColor>
+	<uiHeaderFontColor>0xe4e3e0ad</uiHeaderFontColor>
+
+	<uiTextInputFontName>sans</uiTextInputFontName>
+	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
+	<uiDefaultFontSize>12</uiDefaultFontSize>
+	<uiTextInputFontSize>12</uiTextInputFontSize>
+	<uiTextInputFontSizeMultiline>13</uiTextInputFontSizeMultiline>	
+	<uiTreeArrowIconImage>arrowIcon.png</uiTreeArrowIconImage>
+	<uiTreeCellHeight>20</uiTreeCellHeight>
+	<uiTreeCellPadding>4</uiTreeCellPadding>
+	
+	<textBgSkin>textfield.png</textBgSkin>
+	<textBgSkinMultiline>textfield_multi.png</textBgSkinMultiline>
+	<textBgSkinT>9</textBgSkinT>
+	<textBgSkinR>9</textBgSkinR>
+	<textBgSkinB>9</textBgSkinB>
+	<textBgSkinL>9</textBgSkinL>
+	<textBgSkinPadding>5</textBgSkinPadding>
+	<textEditLineSpacing>14</textEditLineSpacing>
+	
+	<uiTreeCellSkin>treeCellBg.png</uiTreeCellSkin>
+	<uiTreeCellSkinPadding>0</uiTreeCellSkinPadding>
+	<uiTreeCellSkinT>3</uiTreeCellSkinT>
+	<uiTreeCellSkinR>3</uiTreeCellSkinR>
+	<uiTreeCellSkinB>3</uiTreeCellSkinB>
+	<uiTreeCellSkinL>3</uiTreeCellSkinL>
+	<uiTreeFontColor>0xe4e0e3c8</uiTreeFontColor>
+	<uiTreeCellSelectorSkin>selector.png</uiTreeCellSelectorSkin>
+	<uiTreeCellSelectorSkinPadding>4</uiTreeCellSelectorSkinPadding>
+	<uiTreeCellSelectorSkinT>4</uiTreeCellSelectorSkinT>
+	<uiTreeCellSelectorSkinR>3</uiTreeCellSelectorSkinR>
+	<uiTreeCellSelectorSkinB>4</uiTreeCellSelectorSkinB>
+	<uiTreeCellSelectorSkinL>0</uiTreeCellSelectorSkinL>
+	
+	<uiTreeContainerSkin>treeBg.png</uiTreeContainerSkin>
+	<uiTreeContainerSkinPadding>0</uiTreeContainerSkinPadding>
+	<uiTreeContainerSkinT>2</uiTreeContainerSkinT>
+	<uiTreeContainerSkinR>2</uiTreeContainerSkinR>
+	<uiTreeContainerSkinB>2</uiTreeContainerSkinB>
+	<uiTreeContainerSkinL>2</uiTreeContainerSkinL>
+	
+	<uiScrollDefaultSize>19</uiScrollDefaultSize>	
+	<uiScrollPanePadding>0</uiScrollPanePadding>
+
+	<uiButtonSkin>button.png</uiButtonSkin>
+	<uiButtonFocusedSkin>buttonFocused.png</uiButtonFocusedSkin>
+	<uiButtonFontSize>12</uiButtonFontSize>	
+	<uiButtonFontColor>0xe4e0e3c8</uiButtonFontColor>
+	<uiButtonLabelOffsetX>0</uiButtonLabelOffsetX>
+	<uiButtonLabelOffsetY>4</uiButtonLabelOffsetY>	
+	<uiButtonSkinT>12</uiButtonSkinT>
+	<uiButtonSkinR>12</uiButtonSkinR>
+	<uiButtonSkinB>12</uiButtonSkinB>
+	<uiButtonSkinL>12</uiButtonSkinL>
+
+	<uiWindowSkin>windowBg.png</uiWindowSkin>
+	<uiWindowSkinT>24</uiWindowSkinT>
+	<uiWindowSkinR>17</uiWindowSkinR>
+	<uiWindowSkinB>17</uiWindowSkinB>
+	<uiWindowSkinL>17</uiWindowSkinL>
+	<uiWindowSkinPadding>15</uiWindowSkinPadding>		
+	<uiWindowTitleFont>sans</uiWindowTitleFont>
+	<uiWindowFontColor>0xe4e0e3c8</uiWindowFontColor>	
+	<uiWindowTitleFontSize>14</uiWindowTitleFontSize>
+	<uiWindowTitleX>15</uiWindowTitleX>	
+	<uiWindowTitleY>10</uiWindowTitleY>
+	<uiWindowTitleBarHeight>25</uiWindowTitleBarHeight>
+	<uiWindowTitleBarOffset>5</uiWindowTitleBarOffset>
+	<uiWindowCloseIcon>closeIcon.png</uiWindowCloseIcon>
+	<uiCloseIconX>11</uiCloseIconX>	
+	<uiCloseIconY>11</uiCloseIconY>		
+
+	<uiScrollBgSkin>scrollBg.png</uiScrollBgSkin>
+	<uiScrollBgSkinPadding>1</uiScrollBgSkinPadding>
+	<uiScrollBgSkinT>8</uiScrollBgSkinT>
+	<uiScrollBgSkinR>8</uiScrollBgSkinR>
+	<uiScrollBgSkinB>8</uiScrollBgSkinB>
+	<uiScrollBgSkinL>8</uiScrollBgSkinL>
+	
+	<uiScrollHandleSkin>scrollHandle.png</uiScrollHandleSkin>
+	<uiScrollHandleSkinT>6</uiScrollHandleSkinT>
+	<uiScrollHandleSkinR>6</uiScrollHandleSkinR>
+	<uiScrollHandleSkinB>6</uiScrollHandleSkinB>
+	<uiScrollHandleSkinL>6</uiScrollHandleSkinL>
+		
+	<uiScrollHandleMinSize>30</uiScrollHandleMinSize>	
+	<uiTreeContainerScrollBarOffset>27</uiTreeContainerScrollBarOffset>
+	
+	<uiCheckBoxFont>sans</uiCheckBoxFont>
+	<uiCheckBoxFontSize>12</uiCheckBoxFontSize>	
+	<uiCheckBoxCheckedImage>checkbox_checked.png</uiCheckBoxCheckedImage>
+	<uiCheckBoxUncheckedImage>checkbox_unchecked.png</uiCheckBoxUncheckedImage>
+	<uiCheckBoxLabelOffsetX>4</uiCheckBoxLabelOffsetX>
+	<uiCheckBoxLabelOffsetY>3</uiCheckBoxLabelOffsetY>
+		
+	<uiComboBoxFont>sans</uiComboBoxFont>
+	<uiComboBoxFontSize>12</uiComboBoxFontSize>
+	<uiComboBoxDropdownImage>combobox_drop.png</uiComboBoxDropdownImage>
+	<uiComboBoxBgImage>combobox_bg.png</uiComboBoxBgImage>
+	<uiComboBoxHeight>24</uiComboBoxHeight>
+	<uiComboBoxBgT>6</uiComboBoxBgT>
+	<uiComboBoxBgR>6</uiComboBoxBgR>
+	<uiComboBoxBgB>6</uiComboBoxBgB>
+	<uiComboBoxBgL>6</uiComboBoxBgL>
+	<uiComboBoxDropX>6</uiComboBoxDropX>
+	<uiComboBoxDropY>5</uiComboBoxDropY>
+	<uiComboBoxTextOffsetX>7</uiComboBoxTextOffsetX>
+	<uiComboBoxTextOffsetY>4</uiComboBoxTextOffsetY>		
+
+
+	<uiMenuFont>sans</uiMenuFont>
+	<uiMenuFontSize>12</uiMenuFontSize>
+	<uiMenuTextOffsetX>10</uiMenuTextOffsetX>
+	<uiMenuTextOffsetY>-1</uiMenuTextOffsetY>		
+	<uiMenuPaddingX>3</uiMenuPaddingX>
+	<uiMenuPaddingY>10</uiMenuPaddingY>
+	<uiMenuItemHeight>22</uiMenuItemHeight>
+	<uiMenuBgImage>menu_bg.png</uiMenuBgImage>	
+	<uiMenuBgT>4</uiMenuBgT>
+	<uiMenuBgR>6</uiMenuBgR>
+	<uiMenuBgB>9</uiMenuBgB>
+	<uiMenuBgL>6</uiMenuBgL>			
+	<uiMenuSelectorBgImage>menu_selector.png</uiMenuSelectorBgImage>	
+	<uiMenuSelectorBgT>0</uiMenuSelectorBgT>
+	<uiMenuSelectorBgR>0</uiMenuSelectorBgR>
+	<uiMenuSelectorBgB>0</uiMenuSelectorBgB>
+	<uiMenuSelectorBgL>0</uiMenuSelectorBgL>
+	<uiMenuSelectorPadding>3</uiMenuSelectorPadding>
+
+	<uiColorBoxFrameImage>colorboxFrame.png</uiColorBoxFrameImage>
+	<uiColorBoxFrameImageT>7</uiColorBoxFrameImageT>
+	<uiColorBoxFrameImageR>7</uiColorBoxFrameImageR>
+	<uiColorBoxFrameImageB>7</uiColorBoxFrameImageB>
+	<uiColorBoxFrameImageL>7</uiColorBoxFrameImageL>					
+	<uiColorBoxBgImage>colorboxBg.png</uiColorBoxBgImage>
+	<uiColorBoxFrameInset>4</uiColorBoxFrameInset>
+
+	<uiColorPickerMainBg>colorPickerMainBg.png</uiColorPickerMainBg>
+	<uiColorPickerMainFrame>colorPickerMainFrame.png</uiColorPickerMainFrame>
+	<uiColorPickerHueFrame>colorPickerHue.png</uiColorPickerHueFrame>
+	<uiColorPickerHueSelector>colorPickerHueSelector.png</uiColorPickerHueSelector>
+	<uiColorPickerMainSelector>colorPickerTarget.png</uiColorPickerMainSelector>
+
+	<uiHSliderGrip>hsliderHandle.png</uiHSliderGrip>
+	<uiHSliderBg>hsliderBg.png</uiHSliderBg>
+	<uiHSliderBgHeight>10</uiHSliderBgHeight>
+	<uiHSliderBgT>5</uiHSliderBgT>
+	<uiHSliderBgR>6</uiHSliderBgR>
+	<uiHSliderBgB>5</uiHSliderBgB>
+	<uiHSliderBgL>6</uiHSliderBgL>
+
+	<uiFileBrowserFileIcon>file.png</uiFileBrowserFileIcon>
+	<uiFileBrowserFolderIcon>folder.png</uiFileBrowserFolderIcon>
+	<uiFileBrowserPlaceIcon>boxIcon.png</uiFileBrowserPlaceIcon>
+</PolyConfig>

Assets/UIThemes/default_theme/theme.xml

@@ -0,0 +1,165 @@
+<?xml version="1.0"?>
+<PolyConfig>
+	<uiDefaultFontName>sans</uiDefaultFontName>
+	<uiDefaultFontColor>0x000000c8</uiDefaultFontColor>
+
+	<uiBgColor>0xc8c8c8ff</uiBgColor>
+	<uiAccentColor>0x31687fff</uiAccentColor>	
+	<uiHeaderBgColor>0x616161ff</uiHeaderBgColor>
+	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
+	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
+	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+
+	<uiTextInputFontName>sans</uiTextInputFontName>
+	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
+	<uiDefaultFontSize>12</uiDefaultFontSize>
+	<uiTextInputFontSize>12</uiTextInputFontSize>
+	<uiTextInputFontSizeMultiline>13</uiTextInputFontSizeMultiline>	
+	<uiTreeArrowIconImage>UIThemes/default_theme/arrowIcon.png</uiTreeArrowIconImage>
+	<uiTreeCellHeight>20</uiTreeCellHeight>
+	<uiTreeCellPadding>4</uiTreeCellPadding>
+	
+	<textBgSkin>textfield.png</textBgSkin>
+	<textBgSkinMultiline>UIThemes/default_theme/textfield_multi.png</textBgSkinMultiline>
+	<textBgSkinT>9</textBgSkinT>
+	<textBgSkinR>9</textBgSkinR>
+	<textBgSkinB>9</textBgSkinB>
+	<textBgSkinL>9</textBgSkinL>
+	<textBgSkinPadding>5</textBgSkinPadding>
+	<textEditLineSpacing>14</textEditLineSpacing>
+	
+	<uiTreeCellSkin>UIThemes/default_theme/treeCellBg.png</uiTreeCellSkin>
+	<uiTreeCellSkinPadding>0</uiTreeCellSkinPadding>
+	<uiTreeCellSkinT>3</uiTreeCellSkinT>
+	<uiTreeCellSkinR>3</uiTreeCellSkinR>
+	<uiTreeCellSkinB>3</uiTreeCellSkinB>
+	<uiTreeCellSkinL>3</uiTreeCellSkinL>
+	<uiTreeFontColor>0x000000c8</uiTreeFontColor>
+	<uiTreeCellSelectorSkin>UIThemes/default_theme/selector.png</uiTreeCellSelectorSkin>
+	<uiTreeCellSelectorSkinPadding>4</uiTreeCellSelectorSkinPadding>
+	<uiTreeCellSelectorSkinT>4</uiTreeCellSelectorSkinT>
+	<uiTreeCellSelectorSkinR>3</uiTreeCellSelectorSkinR>
+	<uiTreeCellSelectorSkinB>4</uiTreeCellSelectorSkinB>
+	<uiTreeCellSelectorSkinL>0</uiTreeCellSelectorSkinL>
+	
+	<uiTreeContainerSkin>UIThemes/default_theme/treeBg.png</uiTreeContainerSkin>
+	<uiTreeContainerSkinPadding>0</uiTreeContainerSkinPadding>
+	<uiTreeContainerSkinT>2</uiTreeContainerSkinT>
+	<uiTreeContainerSkinR>2</uiTreeContainerSkinR>
+	<uiTreeContainerSkinB>2</uiTreeContainerSkinB>
+	<uiTreeContainerSkinL>2</uiTreeContainerSkinL>
+	
+	<uiScrollDefaultSize>19</uiScrollDefaultSize>	
+	<uiScrollPanePadding>0</uiScrollPanePadding>
+
+	<uiButtonSkin>UIThemes/default_theme/button.png</uiButtonSkin>
+	<uiButtonFocusedSkin>UIThemes/default_theme/buttonFocused.png</uiButtonFocusedSkin>
+	<uiButtonFontSize>12</uiButtonFontSize>	
+	<uiButtonFontColor>0xffffffff</uiButtonFontColor>
+	<uiButtonLabelOffsetX>0</uiButtonLabelOffsetX>
+	<uiButtonLabelOffsetY>4</uiButtonLabelOffsetY>	
+	<uiButtonSkinT>12</uiButtonSkinT>
+	<uiButtonSkinR>12</uiButtonSkinR>
+	<uiButtonSkinB>12</uiButtonSkinB>
+	<uiButtonSkinL>12</uiButtonSkinL>
+
+	<uiWindowSkin>UIThemes/default_theme/windowBg.png</uiWindowSkin>
+	<uiWindowSkinT>24</uiWindowSkinT>
+	<uiWindowSkinR>17</uiWindowSkinR>
+	<uiWindowSkinB>17</uiWindowSkinB>
+	<uiWindowSkinL>17</uiWindowSkinL>
+	<uiWindowSkinPadding>15</uiWindowSkinPadding>		
+	<uiWindowTitleFont>sans</uiWindowTitleFont>
+	<uiWindowFontColor>0x000000c8</uiWindowFontColor>	
+	<uiWindowTitleFontSize>14</uiWindowTitleFontSize>
+	<uiWindowTitleX>15</uiWindowTitleX>	
+	<uiWindowTitleY>10</uiWindowTitleY>
+	<uiWindowTitleBarHeight>25</uiWindowTitleBarHeight>
+	<uiWindowTitleBarOffset>5</uiWindowTitleBarOffset>
+	<uiWindowCloseIcon>UIThemes/default_theme/closeIcon.png</uiWindowCloseIcon>
+	<uiCloseIconX>11</uiCloseIconX>	
+	<uiCloseIconY>11</uiCloseIconY>		
+
+	<uiScrollBgSkin>UIThemes/default_theme/scrollBg.png</uiScrollBgSkin>
+	<uiScrollBgSkinPadding>1</uiScrollBgSkinPadding>
+	<uiScrollBgSkinT>8</uiScrollBgSkinT>
+	<uiScrollBgSkinR>8</uiScrollBgSkinR>
+	<uiScrollBgSkinB>8</uiScrollBgSkinB>
+	<uiScrollBgSkinL>8</uiScrollBgSkinL>
+	
+	<uiScrollHandleSkin>UIThemes/default_theme/scrollHandle.png</uiScrollHandleSkin>
+	<uiScrollHandleSkinT>6</uiScrollHandleSkinT>
+	<uiScrollHandleSkinR>6</uiScrollHandleSkinR>
+	<uiScrollHandleSkinB>6</uiScrollHandleSkinB>
+	<uiScrollHandleSkinL>6</uiScrollHandleSkinL>
+		
+	<uiScrollHandleMinSize>30</uiScrollHandleMinSize>	
+	<uiTreeContainerScrollBarOffset>27</uiTreeContainerScrollBarOffset>
+	
+	<uiCheckBoxFont>sans</uiCheckBoxFont>
+	<uiCheckBoxFontSize>12</uiCheckBoxFontSize>	
+	<uiCheckBoxCheckedImage>UIThemes/default_theme/checkbox_checked.png</uiCheckBoxCheckedImage>
+	<uiCheckBoxUncheckedImage>UIThemes/default_theme/checkbox_unchecked.png</uiCheckBoxUncheckedImage>
+	<uiCheckBoxLabelOffsetX>4</uiCheckBoxLabelOffsetX>
+	<uiCheckBoxLabelOffsetY>3</uiCheckBoxLabelOffsetY>
+		
+	<uiComboBoxFont>sans</uiComboBoxFont>
+	<uiComboBoxFontSize>12</uiComboBoxFontSize>
+	<uiComboBoxDropdownImage>UIThemes/default_theme/combobox_drop.png</uiComboBoxDropdownImage>
+	<uiComboBoxBgImage>UIThemes/default_theme/combobox_bg.png</uiComboBoxBgImage>
+	<uiComboBoxHeight>24</uiComboBoxHeight>
+	<uiComboBoxBgT>6</uiComboBoxBgT>
+	<uiComboBoxBgR>10</uiComboBoxBgR>
+	<uiComboBoxBgB>6</uiComboBoxBgB>
+	<uiComboBoxBgL>10</uiComboBoxBgL>
+	<uiComboBoxDropX>6</uiComboBoxDropX>
+	<uiComboBoxDropY>5</uiComboBoxDropY>
+	<uiComboBoxTextOffsetX>7</uiComboBoxTextOffsetX>
+	<uiComboBoxTextOffsetY>5</uiComboBoxTextOffsetY>		
+
+
+	<uiMenuFont>sans</uiMenuFont>
+	<uiMenuFontSize>12</uiMenuFontSize>
+	<uiMenuTextOffsetX>10</uiMenuTextOffsetX>
+	<uiMenuTextOffsetY>-1</uiMenuTextOffsetY>		
+	<uiMenuPaddingX>3</uiMenuPaddingX>
+	<uiMenuPaddingY>10</uiMenuPaddingY>
+	<uiMenuItemHeight>22</uiMenuItemHeight>
+	<uiMenuBgImage>UIThemes/default_theme/menu_bg.png</uiMenuBgImage>	
+	<uiMenuBgT>4</uiMenuBgT>
+	<uiMenuBgR>6</uiMenuBgR>
+	<uiMenuBgB>9</uiMenuBgB>
+	<uiMenuBgL>6</uiMenuBgL>			
+	<uiMenuSelectorBgImage>UIThemes/default_theme/menu_selector.png</uiMenuSelectorBgImage>	
+	<uiMenuSelectorBgT>0</uiMenuSelectorBgT>
+	<uiMenuSelectorBgR>0</uiMenuSelectorBgR>
+	<uiMenuSelectorBgB>0</uiMenuSelectorBgB>
+	<uiMenuSelectorBgL>0</uiMenuSelectorBgL>
+	<uiMenuSelectorPadding>3</uiMenuSelectorPadding>
+
+	<uiColorBoxFrameImage>UIThemes/default_theme/colorboxFrame.png</uiColorBoxFrameImage>
+	<uiColorBoxFrameImageT>10</uiColorBoxFrameImageT>
+	<uiColorBoxFrameImageR>10</uiColorBoxFrameImageR>
+	<uiColorBoxFrameImageB>10</uiColorBoxFrameImageB>
+	<uiColorBoxFrameImageL>10</uiColorBoxFrameImageL>					
+	<uiColorBoxBgImage>UIThemes/default_theme/colorboxBg.png</uiColorBoxBgImage>
+	<uiColorBoxFrameInset>4</uiColorBoxFrameInset>
+
+	<uiColorPickerMainBg>UIThemes/default_theme/colorPickerMainBg.png</uiColorPickerMainBg>
+	<uiColorPickerMainFrame>UIThemes/default_theme/colorPickerMainFrame.png</uiColorPickerMainFrame>
+	<uiColorPickerHueFrame>UIThemes/default_theme/colorPickerHue.png</uiColorPickerHueFrame>
+	<uiColorPickerHueSelector>UIThemes/default_theme/colorPickerHueSelector.png</uiColorPickerHueSelector>
+	<uiColorPickerMainSelector>UIThemes/default_theme/colorPickerTarget.png</uiColorPickerMainSelector>
+
+	<uiHSliderGrip>UIThemes/default_theme/hsliderHandle.png</uiHSliderGrip>
+	<uiHSliderBg>UIThemes/default_theme/hsliderBg.png</uiHSliderBg>
+	<uiHSliderBgHeight>10</uiHSliderBgHeight>
+	<uiHSliderBgT>5</uiHSliderBgT>
+	<uiHSliderBgR>6</uiHSliderBgR>
+	<uiHSliderBgB>5</uiHSliderBgB>
+	<uiHSliderBgL>6</uiHSliderBgL>
+
+	<uiFileBrowserFileIcon>UIThemes/default_theme/file.png</uiFileBrowserFileIcon>
+	<uiFileBrowserFolderIcon>UIThemes/default_theme/folder.png</uiFileBrowserFolderIcon>
+	<uiFileBrowserPlaceIcon>UIThemes/default_theme/boxIcon.png</uiFileBrowserPlaceIcon>
+</PolyConfig>

Bindings/Contents/LUA/API/defaults.lua

@@ -69,9 +69,6 @@ Services.Config.__ptr = Polycore.CoreServices_getConfig(Polycore.CoreServices_ge
 Services.MaterialManager = MaterialManager("__skip_ptr__")
 Services.MaterialManager.__ptr = Polycore.CoreServices_getMaterialManager(Polycore.CoreServices_getInstance())
 
-Services.ScreenManager = ScreenManager("__skip_ptr__")
-Services.ScreenManager.__ptr = Polycore.CoreServices_getScreenManager(Polycore.CoreServices_getInstance())
-
 Services.SceneManager = SceneManager("__skip_ptr__")
 Services.SceneManager.__ptr = Polycore.CoreServices_getSceneManager(Polycore.CoreServices_getInstance())
 

Bindings/Scripts/create_lua_library/create_lua_library.py

@@ -122,7 +122,7 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 
 	# list of classes that don't get the garbage collection in their meta table
 
-	disable_gc = ["Entity", "ScreenEntity", "ScreenShape", "ScreenMesh", "ScreenLine", "ScreenLabel", "SceneLabel", "SceneMesh", "Screen", "Scene", "Texture", "Image", "Camera", "ScreenParticleEmitter", "SceneParticleEmitter", "Mesh", "Vertex", "Polygon", "Polycode::Polygon", "Material", "ScenePrimitive", "SceneLine", "SceneLight", "SceneSound", "ScreenImage", "SceneEntity", "ScreenEntityInstance"]
+	disable_gc = ["Entity","SceneLabel", "SceneMesh", "Scene", "Texture", "Image", "Camera", "SceneParticleEmitter", "Mesh", "Vertex", "Polygon", "Polycode::Polygon", "Material", "ScenePrimitive", "SceneLine", "SceneLight", "SceneSound", "SceneImage", "SceneEntity", "SceneEntityInstance", "SceneSprite"]
 
 	# Special case: If we are building the Polycode library itself, inject the LuaEventHandler class.
 	# Note: so that event callbacks can work, any object inheriting from EventHandler will secretly
@@ -148,7 +148,7 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 	# Iterate, process each input file
 	for fileName in filteredFiles:
 		# "Package owned" classes that ship with Polycode
-		inheritInModule = ["PhysicsSceneEntity", "CollisionScene", "CollisionSceneEntity", "UIElement", "UIWindow", "UIMenuItem"]
+		inheritInModule = ["PhysicsEntity", "CollisionScene", "CollisionEntity", "UIElement", "UIWindow", "UIMenuItem"]
 		
 		# A file or comma-separated list of files can be given to specify classes which are "package owned"
 		# and should not be inherited out of Polycode/. The files should contain one class name per line,

Core/Contents/Include/PolyBezierCurve.h

@@ -19,6 +19,7 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  */
+ 
 
 
 #pragma once 

Core/Contents/Include/PolyEntity.h

@@ -650,8 +650,6 @@ namespace Polycode {
 			
 			Entity *getEntityById(String id, bool recursive) const;
 			std::vector<Entity*> getEntitiesByTag(String tag, bool recursive) const;
-						
-			Vector3 getChildCenter() const;
 			
 			std::vector <EntityProp> entityProps;
 			String getEntityProp(const String& propName);

Core/Contents/Include/PolyParticle.h

@@ -38,7 +38,6 @@ namespace Polycode {
 			void Reset(bool continuious);
 			
 			void createSceneParticle(int particleType, Material *material, Mesh *particleMesh);
-			void createScreenParticle(int particleType, Texture *texture, Mesh *particleMesh);
 		
 			Entity *particleBody;						
 			

Core/Contents/Include/PolyParticleEmitter.h

@@ -228,8 +228,6 @@ namespace Polycode {
 			Number particleSize;
 			
 			Texture *getParticleTexture() const;
-			
-			void setParticleTexture(Texture *texture);
 		
 			Vector3 emitterRadius;
 					

Core/Contents/Include/PolyRay.h

@@ -32,6 +32,7 @@ namespace Polycode {
 	*/
 	class _PolyExport Ray : public PolyBase {
 		public:
+			Ray();
 			Ray(const Vector3 &origin, const Vector3 &direction);
 	
 			bool boxIntersect(const Vector3 &box, const Matrix4 &transformMatrix, float near = 0.0, float far = 9999.0) const;			

Core/Contents/Include/PolyScene.h

@@ -45,17 +45,19 @@ namespace Polycode {
 	*/ 
 	class _PolyExport Scene : public EventDispatcher {
 	public:
-		
-		/**
-		* Default constructor. Defaults to type Scene::SCENE_3D
-		*/
-		Scene();
+
 		/**
 		* Default constructor with options. 
 		* @param sceneType Type of scene to create. Can be Scene::SCENE_2D, Scene::SCENE_3D or Scene::SCENE_2D_TOPLEFT
 		* @param virtualScene If this flag is set to true, the scene is not rendered to the screen. Use this if you want to render the scene only to a texture.
 		*/		
 		Scene(int sceneType, bool virtualScene = false);
+				
+		/**
+		* Default constructor. Defaults to type Scene::SCENE_3D
+		*/
+		Scene();
+
 		virtual ~Scene();
 		
 		/**

Core/Contents/Include/PolySceneLabel.h

@@ -38,6 +38,9 @@ namespace Polycode {
 	class _PolyExport SceneLabel : public ScenePrimitive {
 		public:
 			
+			
+			SceneLabel(const String& text, int size, const String& fontName = "sans", int amode = 0, bool premultiplyAlpha = false);
+			
 			/**
 			* Constructor.
 			* @param fontName Name of a registered font to use. @see FontManager for info on how to register fonts.
@@ -48,8 +51,6 @@ namespace Polycode {
 			*/			
 			SceneLabel(const String& fontName, const String& text, int size, Number scale, int amode, bool premultiplyAlpha = false);
 			
-			SceneLabel(const String& text, int size, const String& fontName = "sans", int amode = 0, bool premultiplyAlpha = false);
-
 			String getText();
 			
 			void Render();

Core/Contents/Include/PolySceneLine.h

@@ -34,6 +34,14 @@ namespace Polycode {
 	*/ 
 	class _PolyExport SceneLine : public SceneMesh {
 		public:
+		
+			/**
+			* Constructs the line with two taraget positions.
+			* @param start Starting position.
+			* @param end Ending position.
+			*/			
+			SceneLine(Vector3 start, Vector3 end);
+		
 			/**
 			* Constructs the line with two taraget entities.
 			* @param ent1 Starting entity.
@@ -41,12 +49,6 @@ namespace Polycode {
 			*/
 			SceneLine(Entity *ent1, Entity *ent2);
 			
-			/**
-			* Constructs the line with two taraget positions.
-			* @param start Starting position.
-			* @param end Ending position.
-			*/			
-			SceneLine(Vector3 start, Vector3 end);
 
 			/**
 			* Constructs the line with two taraget positions.

Core/Contents/Include/PolySound.h

@@ -149,6 +149,8 @@ namespace Polycode {
 		void soundCheck(bool result, const String& err);
 		static unsigned long readByte32(const unsigned char buffer[4]);		
 		static unsigned short readByte16(const unsigned char buffer[2]);
+		
+//		std::vector<Number> *getFloatBuffer();
 
 	protected:
 	
@@ -167,5 +169,6 @@ namespace Polycode {
 		ALuint soundSource;
 		int sampleLength;
 		
+//		std::vector<Number> floatBuffer;
 	};
 }

Core/Contents/Source/PolyParticle.cpp

@@ -31,11 +31,7 @@ Mesh *Particle::billboardMesh = 0;
 
 Particle::Particle(int particleType, bool isScreenParticle, Material *material, Texture *texture, Mesh *particleMesh) {
 	life = 0;
-	if(isScreenParticle) {
-		createScreenParticle(particleType, texture, particleMesh);		
-	} else {
-		createSceneParticle(particleType, material, particleMesh);
-	}
+	createSceneParticle(particleType, material, particleMesh);
 	
 	Reset(true);
 }

Core/Contents/Source/PolyParticleEmitter.cpp

@@ -356,6 +356,11 @@ void ParticleEmitter::resetParticle(Particle *particle) {
 			
 }
 
+Vector3 SceneParticleEmitter::getParticleCompoundScale() {
+	return getCompoundScale();
+}
+
+
 Vector3 ParticleEmitter::getParticleCompoundScale() {
 	return Vector3();
 }

Core/Contents/Source/PolyRay.cpp

@@ -25,6 +25,15 @@
 
 using namespace Polycode;
 
+Ray::Ray() {
+	inv_direction = Vector3(1.0/direction.x, 1.0/direction.y, 1.0/direction.z);
+	sign[0] = (inv_direction.x < 0);
+	sign[1] = (inv_direction.y < 0);
+	sign[2] = (inv_direction.z < 0);
+	this->origin = origin;
+	this->direction = direction;
+}
+
 Ray::Ray(const Vector3 &origin, const Vector3 &direction) {
 	inv_direction = Vector3(1.0/direction.x, 1.0/direction.y, 1.0/direction.z);
 	sign[0] = (inv_direction.x < 0);

Core/Contents/Source/PolyScene.cpp

@@ -124,6 +124,7 @@ void Scene::Update() {
 }
 
 Scene::~Scene() {
+	core->getInput()->removeAllHandlersForListener(this);
 	CoreServices::getInstance()->getSceneManager()->removeScene(this);	
 	delete defaultCamera;
 }

Core/Contents/Source/PolySceneManager.cpp

@@ -46,7 +46,7 @@ void SceneManager::removeScene(Scene *scene) {
 	for(int i=0;i<scenes.size();i++) {
 		if(scenes[i] == scene) {
 			scenes.erase(scenes.begin()+i);
-//			delete scene;
+			return;
 		}
 	}
 }

Core/Contents/Source/PolyServer.cpp

@@ -78,6 +78,11 @@ void Server::handleEvent(Event *event) {
 				world->getWorldState(client, &worldData, &worldDataSize);			
 				sendData(client->connection->address, (char*)worldData, worldDataSize, PACKET_TYPE_SERVER_DATA);			
 			}
+		} else {
+			for(int i=0; i < clients.size(); i++) {
+				client = clients[i];
+				sendData(client->connection->address, 0, 0, PACKET_TYPE_SERVER_DATA);			
+			}
 		}
 	}	
 	

Core/Contents/Source/PolySound.cpp

@@ -295,7 +295,6 @@ Number Sound::getMaxDistance() {
 	return maxDistance;
 }
 
-
 void Sound::setIsPositional(bool isPositional) {
 	this->isPositional = isPositional;
 	if(isPositional) {
@@ -392,6 +391,7 @@ ALuint Sound::loadBytes(const char *data, int size, int freq, int channels, int
 }
 
 ALuint Sound::loadOGG(const String& fileName) {
+//	floatBuffer.clear();
 	vector<char> data;
 	
 	alGenBuffers(1, &buffer);
@@ -443,10 +443,21 @@ ALuint Sound::loadOGG(const String& fileName) {
 	sampleLength = data.size() / sizeof(unsigned short);
 	
 	alBufferData(buffer, format, &data[0], static_cast<ALsizei>(data.size()), freq);
-	
+/*	
+	int32_t *ptr32 = (int32_t*) &data[0];
+	for(int i=0; i < data.size()/2; i++ ) {
+		floatBuffer.push_back(((Number)ptr32[i])/((Number)INT32_MAX));
+	}	
+*/	
 	return buffer;
 }
 
+/*
+std::vector<Number> *Sound::getFloatBuffer() {
+	return &floatBuffer;
+}
+*/
+
 ALuint Sound::loadWAV(const String& fileName) {
 	long bytes;
 	vector <char> data;

IDE/Contents/Include/PolycodeFrame.h

@@ -196,21 +196,46 @@ class PolycodeProjectTab : public UIElement {
 		PolycodeProjectTab(PolycodeProject *project, PolycodeEditorManager *editorManager);
 		~PolycodeProjectTab();
 		
+		void handleEvent(Event *event);
+		
 		EditorHolder *getEditorHolder();
-		void Resize(Number width, Number height);
-				
-		void showEditor(PolycodeEditor *editor);		
+		void Resize(Number width, Number height);				
+		void showEditor(PolycodeEditor *editor);
+		
+		void setActive(bool val);
+		bool isActive();
+		
+		String getTabName();
+		void setTabName(String newName);		
 		
 		PolycodeProjectBrowser *getProjectBrowser();
 			
 	protected:
 	
+		bool active;
+		String tabName;
 		UIHSizer *mainSizer;	
 		PolycodeProjectBrowser *projectBrowser;
 		EditorHolder *editorHolder;
 		PolycodeEditorManager *editorManager;
 };
 
+class PolycodeTabButton : public UIElement {
+	public:
+		PolycodeTabButton(PolycodeProjectTab *tab);
+		~PolycodeTabButton();
+
+		void setActive(bool val);
+		void handleEvent(Event *event);
+
+		PolycodeProjectTab *getTab();		
+	protected:
+		PolycodeProjectTab *tab;
+		UIRect *bgRect;
+		UILabel *tabLabel;
+	
+};
+
 class PolycodeProjectFrame : public UIElement {
 	public:
 		PolycodeProjectFrame(PolycodeProject *project, PolycodeEditorManager *editorManager);
@@ -219,7 +244,13 @@ class PolycodeProjectFrame : public UIElement {
 		PolycodeProject *getProject();
 		
 		PolycodeProjectTab *addNewTab();
+		
+		void showTab(PolycodeProjectTab *tab);
+		
 		PolycodeProjectTab *getActiveTab();
+		void handleEvent(Event *event);
+		
+		void restructTabs();
 		
 		void Resize(Number width, Number height);
 		
@@ -228,10 +259,15 @@ class PolycodeProjectFrame : public UIElement {
 	protected:
 	
 		PolycodeProject *project;
+		
+		UIElement *tabButtonAnchor;
+		
+		UIImageButton *newTabButton;
 	
 		PolycodeEditorManager *editorManager;
 		PolycodeProjectTab *activeTab;
-		std::vector<PolycodeProjectTab*> tabs;
+		std::vector<PolycodeProjectTab*> tabs;		
+		std::vector<PolycodeTabButton*> tabButtons;
 };
 
 

IDE/Contents/Resources/UIThemes/dark/theme.xml

@@ -4,6 +4,7 @@
 	<uiDefaultFontColor>0xe4e0e3ab</uiDefaultFontColor>
 
 	<uiBgColor>0x322d2bff</uiBgColor>
+	<uiAccentColor>0x1f3234ff</uiAccentColor>
 	<uiHeaderBgColor>0x262120ff</uiHeaderBgColor>
 	<uiSmallHeaderBgColor>0x2b2624ff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0xe4e3e0ad</uiHeaderFontColor>

IDE/Contents/Source/PolycodeFrame.cpp

@@ -812,10 +812,14 @@ void EditorHolder::Resize(Number width, Number height) {
 }
 
 PolycodeProjectTab::PolycodeProjectTab(PolycodeProject *project, PolycodeEditorManager *editorManager) : UIElement() {
+
+	tabName = "Default";
+	
 	this->editorManager = editorManager;
 
 	editorHolder = new EditorHolder(project, editorManager, NULL);
 	editorHolder->setActive(true);
+	editorHolder->addEventListener(this, UIEvent::CLOSE_EVENT);
 	
 	mainSizer = new UIHSizer(100,100,200,true);
 	addChild(mainSizer);					
@@ -823,9 +827,34 @@ PolycodeProjectTab::PolycodeProjectTab(PolycodeProject *project, PolycodeEditorM
 	mainSizer->addLeftChild(projectBrowser);
 	mainSizer->addRightChild(editorHolder);
 
+	active = false;
+
 	projectBrowser->treeContainer->getRootNode()->addEventListener(this, UITreeEvent::DRAG_START_EVENT);
 }
 
+void PolycodeProjectTab::setActive(bool val) {
+	active = val;
+}
+
+bool PolycodeProjectTab::isActive() {
+	return active;
+}
+
+void PolycodeProjectTab::handleEvent(Event *event) {
+	if(event->getDispatcher() == editorHolder && event->getEventCode() == UIEvent::CLOSE_EVENT) {
+		dispatchEvent(new UIEvent(), UIEvent::CLOSE_EVENT);
+	}
+	UIElement::handleEvent(event);
+}
+
+String PolycodeProjectTab::getTabName() {
+	return tabName;
+}
+
+void PolycodeProjectTab::setTabName(String newName) {
+	tabName = newName;
+}
+
 void PolycodeProjectTab::Resize(Number width, Number height) {
 	mainSizer->Resize(width, height);
 	UIElement::Resize(width, height);
@@ -853,11 +882,60 @@ PolycodeProjectTab::~PolycodeProjectTab() {
 
 }
 
+PolycodeTabButton::PolycodeTabButton(PolycodeProjectTab *tab) : UIElement() {
+	this->tab = tab;
+	bgRect = new UIRect("Images/tab_bg.png");
+	addChild(bgRect);
+	bgRect->setColor(1.0, 1.0, 1.0, 0.4);
+	bgRect->processInputEvents = true;
+	processInputEvents = true;
+	bgRect->addEventListener(this, InputEvent::EVENT_MOUSEDOWN);
+	
+	setWidth(150);
+	setHeight(30);
+	
+	tabLabel = new UILabel(tab->getTabName().toUpperCase(), 16, "section");
+	tabLabel->setPosition((getWidth()-tabLabel->getWidth())/2.0, ((getHeight()-tabLabel->getHeight())/2.0) - 3.0);
+	addChild(tabLabel);
+}
+
+void PolycodeTabButton::handleEvent(Event *event) {
+	if(event->getDispatcher() == bgRect) {
+		dispatchEvent(new Event(), Event::SELECT_EVENT);
+	}
+	UIElement::handleEvent(event);
+}
+
+void PolycodeTabButton::setActive(bool val) {
+	if(val) {
+		bgRect->color.a = 0.4;
+	} else {
+		bgRect->color.a = 0.2;	
+	}
+}
+
+PolycodeProjectTab *PolycodeTabButton::getTab() {
+	return tab;
+}
+
+PolycodeTabButton::~PolycodeTabButton() {
+
+}
+
 PolycodeProjectFrame::PolycodeProjectFrame(PolycodeProject *project, PolycodeEditorManager *editorManager) {
 	this->editorManager = editorManager;
 	this->project = project;
 	lastActiveEditorHolder = NULL;
-	activeTab = addNewTab();
+	tabButtonAnchor = new UIElement();
+	addChild(tabButtonAnchor);
+	tabButtonAnchor->setPosition(400, -30);
+	
+	activeTab = NULL;
+	
+	newTabButton = new UIImageButton("Images/new_tab_button.png");
+	tabButtonAnchor->addChild(newTabButton);
+	newTabButton->addEventListener(this, UIEvent::CLICK_EVENT);
+	addNewTab();
 }
 
 PolycodeProjectTab *PolycodeProjectFrame::getActiveTab() {
@@ -867,16 +945,66 @@ PolycodeProjectTab *PolycodeProjectFrame::getActiveTab() {
 PolycodeProjectTab *PolycodeProjectFrame::addNewTab() {
 	PolycodeProjectTab *newTab = new PolycodeProjectTab(project, editorManager);
 	tabs.push_back(newTab);
-	addChild(newTab);
+	
+	PolycodeTabButton *newTabButton = new PolycodeTabButton(newTab);
+	tabButtonAnchor->addChild(newTabButton);
+	tabButtons.push_back(newTabButton);
+	newTabButton->addEventListener(this, Event::SELECT_EVENT);
+	showTab(newTab);
 	return newTab;
 }
 
+void PolycodeProjectFrame::showTab(PolycodeProjectTab *tab) {
+	if(activeTab) {
+		activeTab->setActive(false);
+		activeTab->removeAllHandlersForListener(this);
+		removeChild(activeTab);
+	}
+
+	addChild(tab);
+	tab->addEventListener(this, UIEvent::CLOSE_EVENT);
+	tab->setActive(true);
+	tab->getEditorHolder()->setActive(true);
+	tab->Resize(getWidth(), getHeight());
+	activeTab = tab;
+	restructTabs();		
+}
+
+void PolycodeProjectFrame::restructTabs() {
+	int i;
+	for(i=0; i < tabButtons.size(); i++) {
+		tabButtons[i]->setPosition(i * 155.0, 0.0);
+		tabButtons[i]->setActive(tabButtons[i]->getTab()->isActive());		
+	}
+	newTabButton->setPosition((i * 155), 0.0);
+}
+
+void PolycodeProjectFrame::handleEvent(Event *event) {
+	if(event->getEventCode() == UIEvent::CLOSE_EVENT) {
+		dispatchEvent(new UIEvent, UIEvent::CLOSE_EVENT);
+	} else {
+		if(event->getDispatcher() == newTabButton) {
+			addNewTab();
+		} else {
+			for(int i=0; i < tabButtons.size(); i++) {
+				if(event->getDispatcher() == tabButtons[i]) {
+					if(event->getEventCode() == Event::SELECT_EVENT) {
+						showTab(tabButtons[i]->getTab());
+						break;
+					}
+				}
+			}
+		}
+	}
+}
+
 PolycodeProject *PolycodeProjectFrame::getProject() {
 	return project;
 }
 
 void PolycodeProjectFrame::Resize(Number width, Number height) {
 	activeTab->Resize(width, height);
+	UIElement::Resize(width, height);
 }
 
 PolycodeProjectFrame::~PolycodeProjectFrame() {
@@ -915,11 +1043,6 @@ PolycodeFrame::PolycodeFrame(PolycodeEditorManager *editorManager) : UIElement()
 	welcomeEntity->addChild(newProjectButton);
 	welcomeEntity->addChild(examplesButton);
 	
-	consoleSizer = new UIVSizer(100,100,200, false);
-	console = new PolycodeConsole();	
-	consoleSizer->addBottomChild(console);
-	addChild(consoleSizer);
-	consoleSizer->setPosition(0.0, 45);
 	
 	topBarBg = new UIRect(2,2);
 	topBarBg->setColorInt(21, 18, 17, 255);
@@ -928,6 +1051,12 @@ PolycodeFrame::PolycodeFrame(PolycodeEditorManager *editorManager) : UIElement()
 	topBarBg->addEventListener(this, InputEvent::EVENT_MOUSEMOVE);
 	topBarBg->blockMouseInput = true;
 	addChild(topBarBg);
+
+	consoleSizer = new UIVSizer(100,100,200, false);
+	console = new PolycodeConsole();	
+	consoleSizer->addBottomChild(console);
+	addChild(consoleSizer);
+	consoleSizer->setPosition(0.0, 45);
 	
 	logo = new UIImage("Images/barlogo.png");
 	addChild(logo);		
@@ -1136,6 +1265,12 @@ void PolycodeFrame::showAssetBrowser(std::vector<String> extensions) {
 
 void PolycodeFrame::handleEvent(Event *event) {
 
+	if(event->getDispatcher() == activeProjectFrame) {
+		if(event->getEventCode() == UIEvent::CLOSE_EVENT) {
+			dispatchEvent(new UIEvent(), UIEvent::CLOSE_EVENT);
+		}
+	}
+
 	if(event->getDispatcher() == currentProjectSelector) {
 		PolycodeProject *project = (PolycodeProject*)currentProjectSelector->getSelectedItem()->data;
 		projectManager->setActiveProject(project);
@@ -1317,6 +1452,7 @@ void PolycodeFrame::switchToProjectFrame(PolycodeProjectFrame *projectFrame) {
 		if(editorManager->getCurrentEditor()) {
 			activeProjectFrame->lastActiveEditorHolder = editorManager->getCurrentEditor()->getEditorHolder();
 		}
+		activeProjectFrame->removeAllHandlersForListener(this);
 	} 
 	activeProjectFrame = projectFrame;
 	consoleSizer->addTopChild(activeProjectFrame);
@@ -1325,6 +1461,7 @@ void PolycodeFrame::switchToProjectFrame(PolycodeProjectFrame *projectFrame) {
 	} else {
 		activeProjectFrame->getActiveTab()->getEditorHolder()->setActive(true);
 	}
+	activeProjectFrame->addEventListener(this, UIEvent::CLOSE_EVENT);
 	Resize(getWidth(), getHeight());	
 }
 

IDE/Contents/Source/PolycodeIDEApp.cpp

@@ -592,7 +592,6 @@ void PolycodeIDEApp::openFile(OSFileEntry file) {
 	if(editor) {
 		editorManager->setCurrentEditor(editor);
 	}
-		
 }
 
 void PolycodeIDEApp::handleEvent(Event *event) {

IDE/Contents/Source/PolycodeRemoteDebugger.cpp

@@ -30,7 +30,8 @@ PolycodeRemoteDebugger::PolycodeRemoteDebugger(PolycodeProjectManager *projectMa
 
 	server->addEventListener(this, ServerEvent::EVENT_CLIENT_CONNECTED);
 	server->addEventListener(this, ServerEvent::EVENT_CLIENT_DISCONNECTED);		
-	
+	server->addEventListener(this, ServerEvent::EVENT_CLIENT_DATA);		
+		
 	hasErred = false;
 
 }
@@ -55,58 +56,48 @@ void PolycodeRemoteDebugger::Disconnect() {
 }
 
 void PolycodeRemoteDebugger::handleEvent(Event *event) {
-
-	for(int i=0; i < debuggerClients.size(); i++) {
-		if(event->getDispatcher() == debuggerClients[i]->client) {		
-			ServerClientEvent *clientEvent = (ServerClientEvent*) event;
-			switch(clientEvent->getEventCode()) {
-				case ServerClientEvent::EVENT_CLIENT_DATA:				
-					switch(clientEvent->dataType) {			
-						case EVENT_DEBUG_PRINT:
-						{
-							String printStr = String(clientEvent->data);
-							PolycodeConsole::print(printStr);		
-							PolycodeConsole::print("\n");
-						}
+	
+	if(event->getDispatcher() == server) {
+		ServerEvent *serverEvent = (ServerEvent*) event;	
+		switch(event->getEventCode()) {
+			case ServerEvent::EVENT_CLIENT_DATA:		
+			{	
+				switch(serverEvent->dataType) {			
+					case EVENT_DEBUG_PRINT:
+					{
+						String printStr = String(serverEvent->data);
+						PolycodeConsole::print(printStr);		
+						PolycodeConsole::print("\n");
+					}
 						break;	
-						case EVENT_DEBUG_ERROR:
-						{		
+					case EVENT_DEBUG_ERROR:
+					{		
 						
-							if(!hasErred) {
-								RemoteErrorData *data = (RemoteErrorData*)clientEvent->data;			
-								PolycodeConsole::print("Error in file "+String(data->fileName)+" on line "+String::IntToString(data->lineNumber)+"\n");
-								PolycodeConsole::print(String(data->errorMessage)+"\n");
-								PolycodeConsole::print("Backtrace:\n");
-							
-								CoreServices::getInstance()->getCore()->makeApplicationMain();
-							}
-							
-//							hasErred = true;
+						if(!hasErred) {
+							RemoteErrorData *data = (RemoteErrorData*)serverEvent->data;			
+							PolycodeConsole::print("Error in file "+String(data->fileName)+" on line "+String::IntToString(data->lineNumber)+"\n");
+							PolycodeConsole::print(String(data->errorMessage)+"\n");
+							PolycodeConsole::print("Backtrace:\n");
 							
+							CoreServices::getInstance()->getCore()->makeApplicationMain();
 						}
+						//							hasErred = true;
+					}
 						break;			
-						case EVENT_DEBUG_BACKTRACE_INFO:
-						{			
-
-							RemoteBacktraceData *data = (RemoteBacktraceData*)clientEvent->data;			
-							PolycodeConsole::print("In file "+String(data->fileName)+" on line "+String::IntToString(data->lineNumber)+"\n");
-							
-							PolycodeConsole::addBacktrace(String(data->fileName), data->lineNumber, projectManager->getActiveProject());
-							
-						}
-						break;							
-										
+					case EVENT_DEBUG_BACKTRACE_INFO:
+					{			
+						
+						RemoteBacktraceData *data = (RemoteBacktraceData*)serverEvent->data;			
+						PolycodeConsole::print("In file "+String(data->fileName)+" on line "+String::IntToString(data->lineNumber)+"\n");
+						
+						PolycodeConsole::addBacktrace(String(data->fileName), data->lineNumber, projectManager->getActiveProject());
+						
 					}
+						break;							
+						
+				}
+				}
 				break;
-			}
-		}
-	}
-
-
-	if(event->getDispatcher() == server) {
-		ServerEvent *serverEvent = (ServerEvent*) event;
-		switch(serverEvent->getEventCode()) {
-		
 			case ServerEvent::EVENT_CLIENT_DISCONNECTED:		
 			{
 				for(int i=0;i<debuggerClients.size();i++) {
@@ -118,19 +109,17 @@ void PolycodeRemoteDebugger::handleEvent(Event *event) {
 					}
 				}
 			}	
-			break;
-			
+				break;
+				
 			case ServerEvent::EVENT_CLIENT_CONNECTED:
 			{
 				DebuggerClient *newClient = new DebuggerClient();
 				newClient->client = serverEvent->client;
-				newClient->client->addEventListener(this, ServerClientEvent::EVENT_CLIENT_DATA);
 				PolycodeConsole::print("Remote debugger client connected...\n");printf("CLIENT CONNECTED\n");		
 				debuggerClients.push_back(newClient);				
 			}
-			break;
+				break;
+				
 		}
-		
-	}
-
+	}				
 }