projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fuckin hell
[carveJwlIkooP6JGAAIwe30JlM.git]
/
common.h
diff --git
a/common.h
b/common.h
index 82b08082e16ad4810a75facb00d2e49f3efef959..3d60978f2da5d64f23145acec6392f96a97041d0 100644
(file)
--- a/
common.h
+++ b/
common.h
@@
-129,12
+129,12
@@
VG_STATIC float
k_mmdecay = 12.0f,
k_spring_angular = 1.0f,
k_mmdecay = 12.0f,
k_spring_angular = 1.0f,
- k_spring_force =
13
0.0f,
+ k_spring_force =
30
0.0f,
k_spring_dampener = 5.0f,
k_spring_dampener = 5.0f,
- k_grind_spring =
10
0.0f,
+ k_grind_spring =
5
0.0f,
k_grind_aligment = 10.0f,
k_grind_aligment = 10.0f,
- k_grind_dampener =
40
.0f,
+ k_grind_dampener =
5
.0f,
k_board_spring = 100.0f,
k_board_dampener = 40.0f,
k_board_spring = 100.0f,
k_board_dampener = 40.0f,
@@
-144,8
+144,10
@@
VG_STATIC float
k_grind_decayxy = 30.0f,
k_grind_axel_min_vel = 3.0f,
k_grind_decayxy = 30.0f,
k_grind_axel_min_vel = 3.0f,
- k_grind_axel_max_angle = 0.97f, /* cosine(|a|) */
+ k_grind_axel_max_angle = 0.95f, /* cosine(|a|) */
+ k_grind_axel_max_vangle = 0.4f,
k_grind_max_friction = 3.0f,
k_grind_max_friction = 3.0f,
+ k_grind_max_edge_angle = 0.97f,
k_board_length = 0.45f,
k_board_width = 0.13f,
k_board_length = 0.45f,
k_board_width = 0.13f,