Commit graph

301 commits

Author SHA1 Message Date
Andrew Meadows
83d54eb46b merge upstream/master into andrew/bispinor 2015-04-16 12:07:22 -07:00
Andrew Meadows
4bef5b7b73 Merge pull request #4638 from Triplelexx/myavatar-targetvelocity
Myavatar targetvelocity
2015-04-15 14:22:02 -07:00
Andrew Meadows
7da1c51877 whoops, missed a file 2015-04-14 14:55:42 -07:00
Andrew Meadows
da9091a99d remove SHAPE_TYPE_CONVEX_HULL from libs and tests 2015-04-14 14:54:43 -07:00
Triplelexx
d2b643d389 Add targetVelocity into MyAvatar simulation
MyAvatar sets a target velocity to achieve, this is parsed in the
preSimulation controller step.
2015-04-13 23:57:08 +01:00
Andrew Meadows
86f89a1d6f fix bug where fly speed is limited to walk speed 2015-04-13 13:23:15 -07:00
Seth Alves
4ada3fc9a4 don't keep large things out of physics engine 2015-04-09 15:12:51 -07:00
Andrew Meadows
2ccc25e380 remove old kinematic CharacterController 2015-04-07 16:29:52 -07:00
Andrew Meadows
40c94fa00e merge upstream/master into andrew/isentropic 2015-04-07 16:23:38 -07:00
Andrew Meadows
d9146b1033 jump to hover works again 2015-04-07 16:23:06 -07:00
Andrew Meadows
b5f0c57dd1 jumping and hovering works with dynamic controller 2015-04-07 15:07:46 -07:00
Seth Alves
ef5dffecf6 fix filenames in comments 2015-04-07 10:03:14 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
55bab2efd6 put physics into its own logging group 2015-04-06 18:09:45 -07:00
Andrew Meadows
e2ea940249 more cleanup 2015-04-06 16:21:04 -07:00
Andrew Meadows
23951620bb cleanup DynamicCharacterController 2015-04-06 16:19:14 -07:00
Andrew Meadows
435ce106eb Add DynamicCharacterController prototype 2015-04-06 16:03:13 -07:00
Andrew Meadows
568050686d replace tabs with spaces for indentation 2015-04-04 13:50:16 -07:00
Andrew Meadows
27d6d9f720 add Bullet profiling hooks for physics simulation 2015-04-02 15:20:16 -07:00
Andrew Meadows
f4f219ca36 tweak jump velocity and hover transition 2015-04-02 09:03:33 -07:00
Andrew Meadows
f804b2311d remove hover-friendly behavior 2015-04-02 08:40:47 -07:00
Andrew Meadows
b37384d759 exit hover now not quite automatic when over floor
remove MyAvatar::jump() method for more general API
2015-04-01 15:13:27 -07:00
Andrew Meadows
0249b8c9c5 fix backwards comparison logic 2015-04-01 13:56:05 -07:00
Andrew Meadows
e27f800c75 Merge pull request #4561 from sethalves/island
scaling hints to hash, larger collision shapes
2015-04-01 09:40:18 -07:00
Philip Rosedale
8114fdd1e2 move button locations, names some constants in avatar controller 2015-03-31 21:51:50 -07:00
Seth Alves
859628a4fd fix comment 2015-03-31 17:20:16 -07:00
Seth Alves
164e5ff816 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-03-31 17:00:48 -07:00
Seth Alves
05cb0b830c make max collision size be 1000x1000x1000 rather than 100x100x100 2015-03-31 16:59:43 -07:00
Philip Rosedale
9635c6d248 Merge branch 'master' of https://github.com/worklist/hifi 2015-03-31 16:29:55 -07:00
Philip Rosedale
b7f0be761c gun buildings fall on creation, dice stops correctly 2015-03-31 16:27:09 -07:00
Andrew Meadows
9739d68370 fix typo that broke avatar motion 2015-03-31 13:20:06 -07:00
andrew
a2b5fdb540 merge 2015-03-31 09:28:23 -07:00
andrew
fdfb8bd1b4 fix intermittent crash on windows during login 2015-03-31 09:26:33 -07:00
Andrew Meadows
94c1cf12f5 deleting _dynamicsWorld doesn't crash on shutdown 2015-03-30 17:12:19 -07:00
Philip Rosedale
f116ac131d Merge pull request #4532 from AndrewMeadows/inertia
fix crash in PhysicsEngine on shutdown
2015-03-30 16:31:34 -07:00
Andrew Meadows
c6b34df06c unlock after character is properly updated 2015-03-30 16:07:56 -07:00
Seth Alves
ee7247a5b4 fix a couple of crashes 2015-03-30 15:56:01 -07:00
Andrew Meadows
9b13f186e3 remove character from PhysicsEngine on shutdown 2015-03-30 15:51:58 -07:00
Andrew Meadows
10af59296d Merge pull request #4499 from sethalves/multi-hull-collisions
Multi hull collisions
2015-03-30 12:11:56 -07:00
Andrew Meadows
2404fb126f Merge pull request #4527 from sethalves/valgrind
Valgrind told me to do it
2015-03-30 11:56:17 -07:00
Seth Alves
e730109c51 quiet debuging spew 2015-03-30 11:46:48 -07:00
Andrew Meadows
da9ceac9ae fix crash for bad avatar body on login 2015-03-30 11:06:02 -07:00
Andrew Meadows
adf076a630 optimizations when creating convex hull shapes 2015-03-30 09:56:30 -07:00
Seth Alves
7137b41375 free these so it's easier to see other leaks in valgrind 2015-03-30 09:30:37 -07:00
Seth Alves
1e166eef0f valgrind says _ghostObject is used before it's initialized 2015-03-28 17:12:55 -07:00
Seth Alves
90f51e7d4c print a warning when ShapeManager is skipping over a too-large or too-small shape 2015-03-27 16:15:54 -07:00
Seth Alves
fd69a54f10 Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions 2015-03-27 15:55:20 -07:00
Andrew Meadows
bee8c0e237 "hover" if the "jump" key is held down long enough 2015-03-27 13:56:03 -07:00
Andrew Meadows
be5fdbf217 enable avatar collisions by default
also remove old gravity features
2015-03-27 13:36:20 -07:00
Andrew Meadows
821ac605f5 smoother motion on steps
faster motion when "flying"
cleanup of MyAvatar::updatePosition()
2015-03-26 19:48:52 -07:00