Fixing bugs, added girl

resources/config2/gameobjects2.json

@@ -29,7 +29,7 @@
 	  {
         "name": "tree001",
         "texturePath": "resources/w/exterior/tree001.png",
-        "meshPath": "resources/w/exterior/tree002.txt",
+        "meshPath": "resources/w/exterior/tree003.txt",
         "rotationX": 0.0,
         "rotationY": -1.5707963267948966,
         "rotationZ": 0.0,
@@ -42,7 +42,7 @@
 	  {
         "name": "tree002",
         "texturePath": "resources/w/exterior/tree001.png",
-        "meshPath": "resources/w/exterior/tree002.txt",
+        "meshPath": "resources/w/exterior/tree003.txt",
         "rotationX": 0.0,
         "rotationY": 1.5707963267948966,
         "rotationZ": 0.0,
@@ -55,7 +55,7 @@
 	  {
         "name": "tree003",
         "texturePath": "resources/w/exterior/tree001.png",
-        "meshPath": "resources/w/exterior/tree002.txt",
+        "meshPath": "resources/w/exterior/tree003.txt",
         "rotationX": 0.0,
         "rotationY": 0.0,
         "rotationZ": 0.0,
@@ -68,7 +68,7 @@
 	  {
         "name": "tree004",
         "texturePath": "resources/w/exterior/tree001.png",
-        "meshPath": "resources/w/exterior/tree002.txt",
+        "meshPath": "resources/w/exterior/tree003.txt",
         "rotationX": 0.0,
         "rotationY": -1.5707963267948966,
         "rotationZ": 0.0,
@@ -81,7 +81,7 @@
 	  {
         "name": "tree005",
         "texturePath": "resources/w/exterior/tree001.png",
-        "meshPath": "resources/w/exterior/tree002.txt",
+        "meshPath": "resources/w/exterior/tree003.txt",
         "rotationX": 0.0,
         "rotationY": 1.5707963267948966,
         "rotationZ": 0.0,
@@ -94,7 +94,7 @@
 	  {
         "name": "tree006",
         "texturePath": "resources/w/exterior/tree001.png",
-        "meshPath": "resources/w/exterior/tree002.txt",
+        "meshPath": "resources/w/exterior/tree003.txt",
         "rotationX": 0.0,
         "rotationY": 0.0,
         "rotationZ": 0.0,
@@ -107,7 +107,7 @@
 	  {
         "name": "tree007",
         "texturePath": "resources/w/exterior/tree001.png",
-        "meshPath": "resources/w/exterior/tree002.txt",
+        "meshPath": "resources/w/exterior/tree003.txt",
         "rotationX": 0.0,
         "rotationY": -1.5707963267948966,
         "rotationZ": 0.0,
@@ -120,7 +120,7 @@
 	  {
         "name": "tree008",
         "texturePath": "resources/w/exterior/tree001.png",
-        "meshPath": "resources/w/exterior/tree002.txt",
+        "meshPath": "resources/w/exterior/tree003.txt",
         "rotationX": 0.0,
         "rotationY": 1.5707963267948966,
         "rotationZ": 0.0,
@@ -133,7 +133,7 @@
 	  {
         "name": "tree009",
         "texturePath": "resources/w/exterior/tree001.png",
-        "meshPath": "resources/w/exterior/tree002.txt",
+        "meshPath": "resources/w/exterior/tree003.txt",
         "rotationX": 0.0,
         "rotationY": 0.0,
         "rotationZ": 0.0,
@@ -146,7 +146,7 @@
 	  {
         "name": "tree010",
         "texturePath": "resources/w/exterior/tree001.png",
-        "meshPath": "resources/w/exterior/tree002.txt",
+        "meshPath": "resources/w/exterior/tree003.txt",
         "rotationX": 0.0,
         "rotationY": -1.5707963267948966,
         "rotationZ": 0.0,

resources/config2/npcs2.json

@@ -37,16 +37,10 @@
 	  {
         "id": "npc_02_woman",
         "name": "Студентка",
-        "animationIdlePath": "resources/w/jam/woman_idle002.anim",
-		  "animationWalkPath": "resources/w/jam/woman_walk002.anim",
+        "animationIdlePath": "resources/w/new_anims/girl_stand_idle005.txt",
+		  "animationWalkPath": "resources/w/new_anims/girl_walk005.txt",
 		  "meshTextures": {
-			"Body":      "resources/w/jam/female_packed0_diffuse.png",
-			"Bottoms":   "resources/w/jam/female_packed3_diffuse.png",
-			"Eyelashes": "resources/w/jam/female_packed0_diffuse.png",
-			"Eyes":      "resources/w/jam/female_packed0_diffuse.png",
-			"Hair":      "resources/w/jam/female_packed2_diffuse.png",
-			"Shoes":     "resources/w/jam/female_packed1_diffuse.png",
-			"Tops":      "resources/w/jam/female_packed2_diffuse.png"
+			"polySurface1":      "resources/w/new_anims/Chat_02_diff.png"
 		  },
         "positionX": 19.5,
         "positionY": 0.0,
@@ -54,7 +48,7 @@
 		"facingAngle" : 3.141592,
         "walkSpeed": 1.5,
         "rotationSpeed": 8.0,
-        "modelScale": 0.0001,
+        "modelScale": 0.00016,
         "modelCorrectionRotX": 0.0,
         "modelCorrectionRotY": 180.0,
         "modelCorrectionRotZ": 0.0,

resources/config2/ui_inventory.json

@@ -22,6 +22,24 @@
           "hover": "resources/w/red.png",
           "pressed": "resources/w/red.png"
         }
+      },
+	  {
+        "type": "TextButton",
+        "name": "quest_journal_button",
+        "x": 220.0,
+        "y": 50.0,
+        "width": 170.0,
+        "height": 60.0,
+        "text": "Quests",
+        "fontSize": 24,
+        "fontPath": "resources/fonts/DroidSans.ttf",
+        "textCentered": true,
+        "color": [1.0, 1.0, 1.0, 1.0],
+        "textures": {
+          "normal": "resources/w/red.png",
+          "hover": "resources/w/red.png",
+          "pressed": "resources/w/red.png"
+        }
       },
       {
         "type": "FrameLayout",

resources/config2/ui_quest_journal.json

@@ -5,24 +5,6 @@
     "width": "match_parent",
     "height": "match_parent",
     "children": [
-      {
-        "type": "TextButton",
-        "name": "quest_journal_button",
-        "x": 220.0,
-        "y": 50.0,
-        "width": 170.0,
-        "height": 60.0,
-        "text": "Quests",
-        "fontSize": 24,
-        "fontPath": "resources/fonts/DroidSans.ttf",
-        "textCentered": true,
-        "color": [1.0, 1.0, 1.0, 1.0],
-        "textures": {
-          "normal": "resources/w/red.png",
-          "hover": "resources/w/red.png",
-          "pressed": "resources/w/red.png"
-        }
-      },
       {
         "type": "FrameLayout",
         "name": "quest_journal_panel",