shuvit 4 years ago
parent
commit
1e2becefed

+ 2
- 2
assets/car1.blend View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:a162f0545c0b2e0399455980706e1c2fe5a6c881be2222b31c26425eac78f550
3
-size 2003452
2
+oid sha256:201b5cce15fe189350d6d8145c7b3a4891ea8f8c7a0d2a0735036434f38a2372
3
+size 2003556

+ 3
- 0
assets/ledges.blend View File

1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:1257f85158652bcb9e3538f71844c6d3e9aa76ff424f2b03bb97b08a07b88b26
3
+size 5655216

+ 2
- 2
assets/roads.blend View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:7bca54bebf1841f270accc171b67350ad904324a6d4ab2f0dbb6b26988ad2531
3
-size 19632312
2
+oid sha256:a6d14e8cd3b6eceba87234defa958a750191cb8f5dc8efe3b9389df7b146fb2b
3
+size 19630604

+ 3
- 0
assets/textures/Floors_A.png View File

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

+ 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:646ea4d4c0554f2a357c06b54bab13bd8ab1926a692cb7d1da60b03c7fce6b28
3
-size 6393344
2
+oid sha256:360113ba4041dd9ff4dd58cc407875bcd4497814a32b0aa6f220f1f357bd13e4
3
+size 5501496

+ 2
- 2
assets/user2_working.blend View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:d1316685d3683e430d6f5d0b4ff646caeab58d552f3b101f5c1d88d41e6c1ce1
3
-size 4902668
2
+oid sha256:9624f238b3ac3dcf002347b568c66605adcdf8b88d952255e786787674b0d2f6
3
+size 4859740

+ 3
- 0
assets/utils/park_creator20.blend View File

1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:26233316d0e9d09cb87c3a7c1b0227de6b5f9fa35c77b0fc6e3cd79a47bc5759
3
+size 10205048

+ 6
- 6
config.ini View File

91
 ###################
91
 ###################
92
 
92
 
93
 #brightness / contrast
93
 #brightness / contrast
94
-bc = 0
95
-BC_BRIGHTNESS = 1.03
94
+bc = 1
95
+BC_BRIGHTNESS = 1.12
96
 BC_CONTRAST = 1.06
96
 BC_CONTRAST = 1.06
97
 
97
 
98
 #HDR
98
 #HDR
99
-hdr = 0
100
-avgL = 0.75
99
+hdr = 1
100
+avgL = 0.72
101
 HDRamount = 0.3
101
 HDRamount = 0.3
102
 
102
 
103
 #Ambient Occlusion
103
 #Ambient Occlusion
104
-ao = 0
104
+ao = 1
105
 onlyAO = 0
105
 onlyAO = 0
106
 aowidth = 0.2
106
 aowidth = 0.2
107
 aoradius = 2.4
107
 aoradius = 2.4
108
 
108
 
109
 #Depth of Field
109
 #Depth of Field
110
-dof_on = 0
110
+dof_on = 1
111
 
111
 
112
 #Bloom
112
 #Bloom
113
 bloom_on = 0
113
 bloom_on = 0

+ 2
- 2
scripts/cars.py View File

84
 		self.parent = own
84
 		self.parent = own
85
 		self.navmesh =None
85
 		self.navmesh =None
86
 		self.cars = []
86
 		self.cars = []
87
-		self.max_cars = 10
88
-		self.max_active = 8
87
+		self.max_cars = 2
88
+		self.max_active = 1
89
 		self.targets = []
89
 		self.targets = []
90
 		self.target_loc = None
90
 		self.target_loc = None
91
 		self.parking_spots = get_parking_spots()
91
 		self.parking_spots = get_parking_spots()

+ 13
- 12
scripts/controller2.py View File

397
         if timer > 20:
397
         if timer > 20:
398
             own['manual_v2'] = 1
398
             own['manual_v2'] = 1
399
         own['manual_v2_timer'] = timer
399
         own['manual_v2_timer'] = timer
400
-    if rUD < .04 and rUD > -.04:
400
+    if rUD < dict['man_sens_l'] and rUD > -dict['man_sens_l']:
401
         own['manual_v2_timer'] = 0
401
         own['manual_v2_timer'] = 0
402
         own['manual_v2'] = 0
402
         own['manual_v2'] = 0
403
         own['manual_v2_type'] = None
403
         own['manual_v2_type'] = None
404
     if own['manual_v2'] == 1:
404
     if own['manual_v2'] == 1:
405
         if own['last_manual_v2'] == 0:
405
         if own['last_manual_v2'] == 0:
406
             if STANCE == 0:
406
             if STANCE == 0:
407
-                if rUD > .04 and rUD < .07:
407
+                if rUD > dict['man_sens_l'] and rUD < dict['man_sens_r']:
408
                     #print("reg manual")
408
                     #print("reg manual")
409
                     own['manual_v2_type'] = 'reg manual'
409
                     own['manual_v2_type'] = 'reg manual'
410
-                if rUD < -.04 and rUD > -.07:
410
+                if rUD < -dict['man_sens_l'] and rUD > -dict['man_sens_r']:
411
                     own['manual_v2_type'] = 'reg nose manual'
411
                     own['manual_v2_type'] = 'reg nose manual'
412
 
412
 
413
             if STANCE == 1:
413
             if STANCE == 1:
414
-                if rUD > .04 and rUD < .07:
414
+                if rUD > dict['man_sens_l'] and rUD < dict['man_sens_r']:
415
                     own['manual_v2_type'] = 'fak manual'
415
                     own['manual_v2_type'] = 'fak manual'
416
                     if lRequest == 'reg_air_tail to manual':
416
                     if lRequest == 'reg_air_tail to manual':
417
                         #print('chaaaaange init')
417
                         #print('chaaaaange init')
418
                         own['manual_v2_type'] = 'fak nose manual'
418
                         own['manual_v2_type'] = 'fak nose manual'
419
-                if rUD < -.04 and rUD > -.07:
419
+                if rUD < -dict['man_sens_l'] and rUD > -dict['man_sens_r']:
420
                     own['manual_v2_type'] = 'fak nose manual'
420
                     own['manual_v2_type'] = 'fak nose manual'
421
 
421
 
422
         else:
422
         else:
463
         timer = own["reg_manual_timer"]
463
         timer = own["reg_manual_timer"]
464
         timer = timer + 1
464
         timer = timer + 1
465
         own["reg_manual_timer"] = timer
465
         own["reg_manual_timer"] = timer
466
-        if timer > 20 and rUD < .04:
466
+        if timer > 20 and rUD < dict['man_sens_l']:
467
             own["reg_manual"] = 0
467
             own["reg_manual"] = 0
468
-    if rUD <= dict['man_sens_l'] and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
468
+    if rUD <= dict['man_sens_l'] and (STANCE == 1 or STANCE == 0) and rUD >= -dict['man_sens_l']:
469
         own["reg_manual_timer"] = 0
469
         own["reg_manual_timer"] = 0
470
         own["reg_manual"] = 0
470
         own["reg_manual"] = 0
471
     #####
471
     #####
483
         own["fak_manual_timer"] = timer
483
         own["fak_manual_timer"] = timer
484
         if timer > 20:
484
         if timer > 20:
485
             own["fak_manual"] = 0
485
             own["fak_manual"] = 0
486
-    if rUD <= dict['man_sens_l'] and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
486
+    if rUD <= dict['man_sens_l'] and (STANCE == 1 or STANCE == 0) and rUD >= -dict['man_sens_l']:
487
         own["fak_manual_timer"] = 0
487
         own["fak_manual_timer"] = 0
488
         own["fak_manual"] = 0
488
         own["fak_manual"] = 0
489
     if own["fak_manual_timer"] > 10 and own["reg_manual"] == 0:
489
     if own["fak_manual_timer"] > 10 and own["reg_manual"] == 0:
499
         own["reg_nmanual_timer"] = timer
499
         own["reg_nmanual_timer"] = timer
500
         if timer > 20:
500
         if timer > 20:
501
             own["reg_nmanual"] = 0
501
             own["reg_nmanual"] = 0
502
-    if rUD >= -dict['man_sens_l'] and (STANCE == 1 or STANCE == 0) and rUD <= .04:
502
+    if rUD >= -dict['man_sens_l'] and (STANCE == 1 or STANCE == 0) and rUD <= dict['man_sens_l']:
503
         own["reg_nmanual_timer"] = 0
503
         own["reg_nmanual_timer"] = 0
504
         own["reg_nmanual"] = 0
504
         own["reg_nmanual"] = 0
505
 
505
 
519
         own["fak_nmanual_timer"] = timer
519
         own["fak_nmanual_timer"] = timer
520
         if timer > 20:
520
         if timer > 20:
521
             own["fak_nmanual"] = 0
521
             own["fak_nmanual"] = 0
522
-    if rUD >= -dict['man_sens_l'] and (STANCE == 1 or STANCE == 0) and rUD <= .04:
522
+    if rUD >= -dict['man_sens_l'] and (STANCE == 1 or STANCE == 0) and rUD <= dict['man_sens_l']:
523
         own["fak_nmanual_timer"] = 0
523
         own["fak_nmanual_timer"] = 0
524
         own["fak_nmanual"] = 0
524
         own["fak_nmanual"] = 0
525
     if own["fak_nmanual_timer"] > 10 and own["reg_nmanual"] == 0 and own['fak_manual'] == 0 and own['reg_manual'] == 0:
525
     if own["fak_nmanual_timer"] > 10 and own["reg_nmanual"] == 0 and own['fak_manual'] == 0 and own['reg_manual'] == 0:
3086
         sr.reset()        
3086
         sr.reset()        
3087
 
3087
 
3088
     #nollie
3088
     #nollie
3089
-    if sr.q5 > 0 and sr.q1 > 0 and sr.q5 < sr.q1:
3089
+    if sr.q5 > 0 and sr.q1 > 0 and sr.q5 > sr.q1:
3090
         nollie()
3090
         nollie()
3091
+        print('nollie')
3091
         sr.reset()
3092
         sr.reset()
3092
 
3093
 
3093
     #kickflip
3094
     #kickflip
4428
 
4429
 
4429
  
4430
  
4430
 
4431
 
4431
-
4432
+    print(dict['rUD'])

Loading…
Cancel
Save