shuvit 4 years ago
parent
commit
1ee9279121
44 changed files with 47 additions and 63 deletions
  1. BIN
      __pycache__/_version.cpython-36.pyc
  2. BIN
      __pycache__/configobj.cpython-36.pyc
  3. 2
    2
      assets/materials/base_m_kit.blend
  4. 2
    2
      assets/materials/textures/Tree_A.png
  5. 2
    2
      assets/materials/textures/ledge_concrete_graph_diffusec.png
  6. 2
    2
      assets/materials/textures/ledge_concrete_graph_normal.png
  7. 3
    0
      assets/materials/textures/scratched_metallic_texture.jpg
  8. 2
    2
      assets/user2.blend
  9. 2
    2
      characters/textures/braid01_diffuse.png
  10. 2
    2
      characters/textures/middleage_lightskinned_female_diffuse2.png
  11. BIN
      custom_shaders/__pycache__/custom_shader_base.cpython-36.pyc
  12. BIN
      custom_shaders/__pycache__/custom_shader_utils.cpython-36.pyc
  13. BIN
      custom_shaders/__pycache__/wind.cpython-36.pyc
  14. 8
    8
      scripts/Manager.py
  15. 4
    11
      scripts/Startup.py
  16. BIN
      scripts/__pycache__/Manager.cpython-36.pyc
  17. BIN
      scripts/__pycache__/Record.cpython-36.pyc
  18. BIN
      scripts/__pycache__/Settings.cpython-36.pyc
  19. BIN
      scripts/__pycache__/SortData.cpython-36.pyc
  20. BIN
      scripts/__pycache__/Startup.cpython-36.pyc
  21. BIN
      scripts/__pycache__/active_camera_loc.cpython-36.pyc
  22. BIN
      scripts/__pycache__/co_ActionState.cpython-36.pyc
  23. BIN
      scripts/__pycache__/colors.cpython-36.pyc
  24. BIN
      scripts/__pycache__/controller2.cpython-36.pyc
  25. BIN
      scripts/__pycache__/grindV2.cpython-36.pyc
  26. BIN
      scripts/__pycache__/inputs.cpython-36.pyc
  27. BIN
      scripts/__pycache__/joy_sens.cpython-36.pyc
  28. BIN
      scripts/__pycache__/load_char.cpython-36.pyc
  29. BIN
      scripts/__pycache__/logo_fades.cpython-36.pyc
  30. BIN
      scripts/__pycache__/menuV3.cpython-36.pyc
  31. BIN
      scripts/__pycache__/pause_menu2.cpython-36.pyc
  32. BIN
      scripts/__pycache__/scene_init.cpython-36.pyc
  33. BIN
      scripts/__pycache__/stance.cpython-36.pyc
  34. BIN
      scripts/__pycache__/walk.cpython-36.pyc
  35. 1
    1
      scripts/boneRecord.py
  36. 1
    1
      scripts/camFSM.py
  37. 4
    0
      scripts/menuV3.py
  38. 8
    24
      scripts/scene_init.py
  39. 2
    2
      scripts/stance.py
  40. 2
    2
      shuvit.blend
  41. BIN
      six/__pycache__/__init__.cpython-36.pyc
  42. BIN
      six/__pycache__/six.cpython-36.pyc
  43. BIN
      tinytag/__pycache__/__init__.cpython-36.pyc
  44. BIN
      tinytag/__pycache__/tinytag.cpython-36.pyc

BIN
__pycache__/_version.cpython-36.pyc View File


BIN
__pycache__/configobj.cpython-36.pyc View File


+ 2
- 2
assets/materials/base_m_kit.blend View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:fa5f82801fa46c65dd388118c1c54b36fa1f4adaeb693a4e71b1c98bccf0339d
3
-size 64197308
2
+oid sha256:f69c3a81c7b01a8e545a61b8f6696f85f5de9c437db32fd2fb1bf028121d1a94
3
+size 32630432

+ 2
- 2
assets/materials/textures/Tree_A.png View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:b93943709b221780aeaf21205dbca9ed2a779e70279fb6af7e11a069554cd199
3
-size 1787534
2
+oid sha256:3eff4bddd6ad88d4f952dc49d9aca4826b4c9e0e2a854bac09c7488f4abb50ba
3
+size 496768

+ 2
- 2
assets/materials/textures/ledge_concrete_graph_diffusec.png View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:e3b107b8f377b8bf34c9f04ecb5719494b9f433e95df10106895b42eb730318e
3
-size 7056544
2
+oid sha256:cbeb3c8b324a62ac3ae21d8af93450107eb87ad05d3f53fcf3c4b3f27f5fc2ea
3
+size 2121603

+ 2
- 2
assets/materials/textures/ledge_concrete_graph_normal.png View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:9c2d90b7b320dd39f9ac021f96b623b74b34b38442e0ac228edd3f8145a992f2
3
-size 20632484
2
+oid sha256:b21992b7bb95ae3f274c84583948edf540688141a5f18b4680c1755e0051ac1f
3
+size 1067203

+ 3
- 0
assets/materials/textures/scratched_metallic_texture.jpg View File

1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:ff613a48015b57e70e90476d964b2d112cb7a27761f6bbc73897242b032bae2c
3
+size 397598

+ 2
- 2
assets/user2.blend View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:3128d3d0f960cae9b6d6e292718cf7b76967adad99cb75176ebd91909175a4ff
3
-size 98062056
2
+oid sha256:21e09a91580fb8e0ba8c86fbef328e79718afde731a4b34ee07d4003cec50141
3
+size 79086032

+ 2
- 2
characters/textures/braid01_diffuse.png View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:24c0d2a639f04704734c3e38af97d110777c1b203e5a10c66a5c89563643a018
3
-size 2615248
2
+oid sha256:f9e3ba85c12ee46444f80e48c05aa3760539bf3892d9484e50265c50cf85df91
3
+size 857132

+ 2
- 2
characters/textures/middleage_lightskinned_female_diffuse2.png View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:39c505ca224387bef0b20cd2bf513c3997c27c7e7434447228c9991b87cb8d01
3
-size 3810424
2
+oid sha256:55303bd92c39edcfb7fe1a9da7b035a68abad912b0c51c6eebc0b8d796c7b1d4
3
+size 1032861

BIN
custom_shaders/__pycache__/custom_shader_base.cpython-36.pyc View File


BIN
custom_shaders/__pycache__/custom_shader_utils.cpython-36.pyc View File


BIN
custom_shaders/__pycache__/wind.cpython-36.pyc View File


+ 8
- 8
scripts/Manager.py View File

101
         if own["playback"] != True:    
101
         if own["playback"] != True:    
102
             Record.main(recording_cutoff, cube)
102
             Record.main(recording_cutoff, cube)
103
             
103
             
104
-        if cont.sensors[save_recording_sensor].positive:
105
-            SortData.writeData.saveAll()
104
+        #if cont.sensors[save_recording_sensor].positive:
105
+            #SortData.writeData.saveAll()
106
             
106
             
107
         #if cont.sensors[load_recording_sensor].positive or (cube["sel"] == 1 and cube["last_sel"] == 0):
107
         #if cont.sensors[load_recording_sensor].positive or (cube["sel"] == 1 and cube["last_sel"] == 0):
108
         if own['back_state'] == 1 and back_on == 1 and last_back == 0:
108
         if own['back_state'] == 1 and back_on == 1 and last_back == 0:
123
         if own["playback"]:
123
         if own["playback"]:
124
             Record.loadData()
124
             Record.loadData()
125
         #..................
125
         #..................
126
-        if cont.sensors[track_left_sensor].positive:
127
-            own["objIndex"] -= 2
128
-            logic.setLogicTicRate(frame_rate*own["playbackSpeed"])
126
+        # if cont.sensors[track_left_sensor].positive:
127
+        #     own["objIndex"] -= 2
128
+        #     logic.setLogicTicRate(frame_rate*own["playbackSpeed"])
129
             
129
             
130
-        if cont.sensors[track_right_sensor].positive:
131
-            own["objIndex"] += 2
132
-            logic.setLogicTicRate(frame_rate*own["playbackSpeed"])
130
+        # if cont.sensors[track_right_sensor].positive:
131
+        #     own["objIndex"] += 2
132
+        #     logic.setLogicTicRate(frame_rate*own["playbackSpeed"])
133
 
133
 
134
         if own["playback"] == True: 
134
         if own["playback"] == True: 
135
             #print("objIndex = ", own["lengthPos"],  own['objIndex'])   
135
             #print("objIndex = ", own["lengthPos"],  own['objIndex'])   

+ 4
- 11
scripts/Startup.py View File

1
 import bge
1
 import bge
2
-import GameLogic
3
-from bge import logic, render
4
-
5
 
2
 
6
 def main():
3
 def main():
7
-    cont = GameLogic.getCurrentController() 
8
-    #cont = bge.logic.getCurrentController()
4
+    cont = bge.logic.getCurrentController() 
9
     own = cont.owner
5
     own = cont.owner
10
-    #bge.logic.addScene('Main')
11
     scenes = bge.logic.getSceneList()
6
     scenes = bge.logic.getSceneList()
12
 
7
 
13
     for i in scenes:
8
     for i in scenes:
28
     dict['load_timer'] = 0
23
     dict['load_timer'] = 0
29
     dict['reload_timer'] = 0
24
     dict['reload_timer'] = 0
30
     dict['menu_idle_timer'] = 0
25
     dict['menu_idle_timer'] = 0
31
-    if not any(logic.joysticks):
26
+
27
+    if not any(bge.logic.joysticks):
32
         print("joystick not connnected")
28
         print("joystick not connnected")
33
         dict['joy_con'] = 0
29
         dict['joy_con'] = 0
34
     else:    
30
     else:    
35
         dict['joy_con'] = 1
31
         dict['joy_con'] = 1
32
+
36
     dict['kb_a'] = 0
33
     dict['kb_a'] = 0
37
     dict['kb_d'] = 0
34
     dict['kb_d'] = 0
38
     dict['kb_w'] = 0
35
     dict['kb_w'] = 0
80
     dict['last_rtsBut'] = 0.0   
77
     dict['last_rtsBut'] = 0.0   
81
     dict['last_ldPad'] = 0 
78
     dict['last_ldPad'] = 0 
82
     
79
     
83
-    #dict['shirt_color'] = [.5,1,1,1]
84
-    
85
     dict['mu_last_track'] = ''
80
     dict['mu_last_track'] = ''
86
     dict['mu_artist'] = ''
81
     dict['mu_artist'] = ''
87
     dict['mu_title'] = ''    
82
     dict['mu_title'] = ''    
94
     dict['spawned_npc_decks'] = []
89
     dict['spawned_npc_decks'] = []
95
     dict['spawned_npc_trucks'] = []    
90
     dict['spawned_npc_trucks'] = []    
96
     dict['spawned_npcs'] = []
91
     dict['spawned_npcs'] = []
97
-    #dict['JUMPHEIGHT'] = 800
98
-    #dict['MAX_VEL'] = 6.7
99
     dict['char_loaded'] = 0
92
     dict['char_loaded'] = 0
100
     dict['man_sens_l'] = .03
93
     dict['man_sens_l'] = .03
101
     dict['man_sens_r'] = .08
94
     dict['man_sens_r'] = .08

BIN
scripts/__pycache__/Manager.cpython-36.pyc View File


BIN
scripts/__pycache__/Record.cpython-36.pyc View File


BIN
scripts/__pycache__/Settings.cpython-36.pyc View File


BIN
scripts/__pycache__/SortData.cpython-36.pyc View File


BIN
scripts/__pycache__/Startup.cpython-36.pyc View File


BIN
scripts/__pycache__/active_camera_loc.cpython-36.pyc View File


BIN
scripts/__pycache__/co_ActionState.cpython-36.pyc View File


BIN
scripts/__pycache__/colors.cpython-36.pyc View File


BIN
scripts/__pycache__/controller2.cpython-36.pyc View File


BIN
scripts/__pycache__/grindV2.cpython-36.pyc View File


BIN
scripts/__pycache__/inputs.cpython-36.pyc View File


BIN
scripts/__pycache__/joy_sens.cpython-36.pyc View File


BIN
scripts/__pycache__/load_char.cpython-36.pyc View File


BIN
scripts/__pycache__/logo_fades.cpython-36.pyc View File


BIN
scripts/__pycache__/menuV3.cpython-36.pyc View File


BIN
scripts/__pycache__/pause_menu2.cpython-36.pyc View File


BIN
scripts/__pycache__/scene_init.cpython-36.pyc View File


BIN
scripts/__pycache__/stance.cpython-36.pyc View File


BIN
scripts/__pycache__/walk.cpython-36.pyc View File


+ 1
- 1
scripts/boneRecord.py View File

75
     scene = bge.logic.getCurrentScene()
75
     scene = bge.logic.getCurrentScene()
76
     #own = cont.owner
76
     #own = cont.owner
77
     master = scene.objects['control_cube.002']
77
     master = scene.objects['control_cube.002']
78
-    cam = scene.objects['Camera.003']
78
+    #cam = scene.objects['Camera.003']
79
     armature = scene.objects['Char4']
79
     armature = scene.objects['Char4']
80
     deck = scene.objects['deck_arm']
80
     deck = scene.objects['deck_arm']
81
 
81
 

+ 1
- 1
scripts/camFSM.py View File

188
         self.FSM.stateLife = 1
188
         self.FSM.stateLife = 1
189
         
189
         
190
     def Execute(self):
190
     def Execute(self):
191
-        print('PauseCaming.', self.FSM.stateLife)
191
+        #print('PauseCaming.', self.FSM.stateLife)
192
         self.FSM.stateLife += 1
192
         self.FSM.stateLife += 1
193
         new_state = get_request_state(self.__class__.__name__)
193
         new_state = get_request_state(self.__class__.__name__)
194
         if new_state != None:
194
         if new_state != None:

+ 4
- 0
scripts/menuV3.py View File

1311
     #left
1311
     #left
1312
     if dict['kb_la'] == JUST_ACTIVATED or (dict['ldPad'] == True and dict['last_ldPad'] == False):
1312
     if dict['kb_la'] == JUST_ACTIVATED or (dict['ldPad'] == True and dict['last_ldPad'] == False):
1313
         aud.device().play(obj['sound_a'])
1313
         aud.device().play(obj['sound_a'])
1314
+        print('left')
1314
         if dict['current_opt'] in dict['menu_end_points']:
1315
         if dict['current_opt'] in dict['menu_end_points']:
1315
             funct = dict['current_opt']
1316
             funct = dict['current_opt']
1316
             motion = 'dec'
1317
             motion = 'dec'
1317
             endpoint(funct, motion, dict, cont)         
1318
             endpoint(funct, motion, dict, cont)         
1319
+            print('left2')
1318
     
1320
     
1319
     #right
1321
     #right
1320
     if dict['kb_ra'] == JUST_ACTIVATED or (dict['rdPad'] == True and dict['last_rdPad'] == False):
1322
     if dict['kb_ra'] == JUST_ACTIVATED or (dict['rdPad'] == True and dict['last_rdPad'] == False):
1321
         aud.device().play(obj['sound_b'])
1323
         aud.device().play(obj['sound_b'])
1324
+        print('right')
1322
         if dict['current_opt'] in dict['menu_end_points']:
1325
         if dict['current_opt'] in dict['menu_end_points']:
1323
             funct = dict['current_opt']
1326
             funct = dict['current_opt']
1324
             motion = 'inc'
1327
             motion = 'inc'
1325
             endpoint(funct, motion, dict, cont)              
1328
             endpoint(funct, motion, dict, cont)              
1329
+            print('right2')
1326
     
1330
     
1327
     modder = 15                                  
1331
     modder = 15                                  
1328
     #left repeater
1332
     #left repeater

+ 8
- 24
scripts/scene_init.py View File

2
 import colors
2
 import colors
3
 
3
 
4
 def main():
4
 def main():
5
-    import bge
6
-    #import GameLogic
7
-    cont = bge.logic.getCurrentController()
8
-    scene = bge.logic.getCurrentScene()
9
-    own = cont.owner
10
-    #own = scene.objects['control_cube.002']
5
+    
11
     dict = bge.logic.globalDict
6
     dict = bge.logic.globalDict
12
 
7
 
13
-
14
-
15
-
16
-
17
-
18
     if dict['scene_inited'] == False:
8
     if dict['scene_inited'] == False:
19
-
9
+        cont = bge.logic.getCurrentController()
10
+        scene = bge.logic.getCurrentScene()
11
+        own = cont.owner
12
+        
20
         own['last_stBut'] = False
13
         own['last_stBut'] = False
21
         level = dict['level']
14
         level = dict['level']
22
         
15
         
29
 
22
 
30
         objList = scene.objects
23
         objList = scene.objects
31
 
24
 
32
-        # get object named MainCharacter
33
         parent = objList["control_cube.002"]
25
         parent = objList["control_cube.002"]
34
-
35
         # combine child's shape with parent's
26
         # combine child's shape with parent's
36
         compound = True
27
         compound = True
37
         obj = scene.objects['Char4']
28
         obj = scene.objects['Char4']
43
         ghost = False
34
         ghost = False
44
         # set parent
35
         # set parent
45
         obj.setParent( parent, compound, ghost) 
36
         obj.setParent( parent, compound, ghost) 
46
-        parent.worldPosition.z += .5 
37
+        parent.worldPosition.z += .75
38
+        parent.applyRotation([0,0,3.14], True) 
47
       
39
       
48
         scene.gravity = [0,0,dict['gravity']]    
40
         scene.gravity = [0,0,dict['gravity']]    
49
         for i in scenes:
41
         for i in scenes:
55
                 print('ending fade_out', scenes)
47
                 print('ending fade_out', scenes)
56
                 scene2 = i
48
                 scene2 = i
57
                 scene2.end()  
49
                 scene2.end()  
58
-                   
59
-
60
          
50
          
61
         if dict['bc'] == 1:
51
         if dict['bc'] == 1:
62
             cont.activate(cam.actuators["bc"])
52
             cont.activate(cam.actuators["bc"])
99
         else:
89
         else:
100
             print('not starting music', dict['music_player'])        
90
             print('not starting music', dict['music_player'])        
101
             
91
             
102
-        
103
-
104
         for x in scene.objects:
92
         for x in scene.objects:
105
             if 'hemi' in x:
93
             if 'hemi' in x:
106
                 if 'down' in x:
94
                 if 'down' in x:
167
         
155
         
168
         print('scene init ran')
156
         print('scene init ran')
169
         dict['scene_inited'] = True
157
         dict['scene_inited'] = True
170
-      
171
-             
172
-
173
-    
174
-#main()
158
+      

+ 2
- 2
scripts/stance.py View File

24
         print("no stance")
24
         print("no stance")
25
 
25
 
26
     own["stance"] = STANCE           
26
     own["stance"] = STANCE           
27
-    dict = bge.logic.globalDict #Get the global dictionary
28
-    dict['stance'] = STANCE #Store the new score
27
+    dict = bge.logic.globalDict 
28
+    dict['stance'] = STANCE
29
 
29
 

+ 2
- 2
shuvit.blend View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:51ec3d0444f485a827e6774f21d9eb3e2949864c7ad82545638133b36ed32a8d
3
-size 137194504
2
+oid sha256:1b3ad5f28572b88f3ca0e31d4b87a6372c05d51231224749f95f628d4337f83e
3
+size 136886508

BIN
six/__pycache__/__init__.cpython-36.pyc View File


BIN
six/__pycache__/six.cpython-36.pyc View File


BIN
tinytag/__pycache__/__init__.cpython-36.pyc View File


BIN
tinytag/__pycache__/tinytag.cpython-36.pyc View File


Loading…
Cancel
Save