Andrew Meadows
b5aca45ab6
smaller timescale for slaving shapes to skeleton
2014-06-23 12:59:38 -07:00
Andrew Meadows
7f4ffb363b
merge upstream/master into andrew/ragdoll
2014-06-23 12:33:21 -07:00
Andrew Meadows
add556719c
fixed perf stats on phys simulation
2014-06-23 12:31:36 -07:00
Andrew Meadows
9713e3d513
remove some unused var warnings in Release build
2014-06-23 12:30:53 -07:00
Brad Hefta-Gaub
29a8307825
Merge pull request #3050 from ctrlaltdavid/fix_fullscreen_shortcut
...
Fix fullscreen toggle shortcut
2014-06-23 11:42:20 -07:00
Andrew Meadows
8ad2a679c4
move code to SkeletonModel::stepRagdollForward()
2014-06-23 11:16:18 -07:00
Andrew Meadows
9a2197a23c
draw skeleton shapes at at correct positions
2014-06-23 10:55:34 -07:00
Andrew Meadows
5e4d757e4e
merge upstream/master into andrew/ragdoll
2014-06-23 10:43:40 -07:00
Andrew Meadows
8986be5f1c
remove old collideAgaintsOurself() code
2014-06-23 10:36:31 -07:00
Andrew Meadows
eba03ddb8a
re-enable some basic avatar collisions
2014-06-23 10:05:51 -07:00
Andrew Meadows
8b24e9cd67
Update SkeletonModel::_boundingShape position
2014-06-23 09:39:14 -07:00
Andrew Meadows
b2ea8c0bf9
Compute more correct masses for ragdoll parts
...
also pin root ragdoll shape at the local-frame origin
for stability
2014-06-23 08:37:11 -07:00
Andrew Meadows
c17b8fdb60
collisions update shapes
...
VerletShapes keep pointers to VerletPoints (rather than to glm::vec3's)
VerletShapes compute lagrangian coefficients
VerletShapes send their movement accumulations to their VerletPoints
2014-06-20 16:31:39 -07:00
Ryan Huffman
0e6abe3359
Update inactive chat window opacity to 0.8
2014-06-20 16:31:22 -07:00
David Rowe
633746ab16
Different fullscreen shortcuts for Mac and Windows
...
Revert to the original Mac OSX key combination and provide alternative for Windows.
2014-06-20 13:30:04 -07:00
Ryan Huffman
0c87f0aabc
Update chat window behavior
...
Lower opacity when inactive
Move focus to main window when pressing escape, instead of hiding
2014-06-19 19:45:43 -07:00
Andrew Meadows
4a0ce7a9ae
support disabling collisions btw adjacent joints
2014-06-19 17:39:50 -07:00
Andrew Meadows
f0c2417206
Split PhysicsSimulation::stepForward() into parts
2014-06-19 15:50:16 -07:00
Andrew Meadows
716ae3e479
add MyAvatar's skeleton to its PhysicsSimulation
2014-06-19 12:32:17 -07:00
Andrew Meadows
fbafcb6fd8
Fix distance constraint lengths
2014-06-19 11:46:09 -07:00
David Rowe
2dbf8d7daf
Fix fullscreen toggle shortcut
...
Remove the "Meta" modifier so that the shortcut works on Windows.
2014-06-19 11:08:21 -07:00
Andrew Meadows
2453e9c36a
build ragdoll constraints again
2014-06-19 10:31:55 -07:00
Andrew Meadows
5e74ee8c05
VerletPoint has position, lastPosition, and mass
2014-06-19 09:54:32 -07:00
Andrew Meadows
10ee307752
merge upstream/master into andrew/ragdoll
2014-06-19 08:35:29 -07:00
Andrew Meadows
a8c2003fe6
namechange SimulationEngine --> PhysicsSimulation
2014-06-19 08:34:12 -07:00
David Rowe
afab5f1cbf
Fix startup crash where Hydra controllers are not properly plugged in
...
Crash occurs if the left controller is plugged in but right one isn't.
2014-06-18 20:52:17 -07:00
Andrew Meadows
c98631f820
merge upstream/master into andrew/ragdoll
2014-06-18 17:23:24 -07:00
Andrew Meadows
d4b5550cda
Skeleton now creates VerletShape
2014-06-18 17:22:39 -07:00
Brad Hefta-Gaub
f2b2784fa9
Merge pull request #3045 from wangyix/edit_nack_pull
...
Changed octree data NACK handling to repeatedly NACK missing seq numbers, like edit NACKs
2014-06-18 15:02:40 -07:00
wangyix
29723d0ef3
changed octree data nacks to repeatedly nack missing seq nums
2014-06-18 13:36:54 -07:00
Clément Brisset
7597191081
Merge pull request #3042 from ZappoMan/editModelFeatures
...
add support for changing the model URL of a model
2014-06-18 11:52:01 -07:00
Brad Hefta-Gaub
c49ff59725
Merge pull request #3037 from wangyix/edit_nack_pull
...
Edit nack pull
2014-06-18 11:43:25 -07:00
ZappoMan
26075d9d26
add support for changing the model URL of a model
2014-06-18 11:29:56 -07:00
Andrew Meadows
9e839f0980
Shape::getCenter() -> Shape::getTranslation()
2014-06-18 08:55:48 -07:00
Brad Hefta-Gaub
dead474e6b
Merge pull request #3034 from Barnold1953/OculusOverlay
...
New Oculus Magnification Windows
2014-06-17 17:29:09 -07:00
Brad Hefta-Gaub
cee6f1be6a
Merge pull request #3031 from stojce/19755
...
Code Review for Job #19755
2014-06-17 17:28:55 -07:00
barnold1953
64725dd21b
Unneeded comment
2014-06-17 17:15:43 -07:00
barnold1953
fa32ad5b11
De-janked code by removing magic numbers
2014-06-17 17:14:26 -07:00
Andrew Meadows
b9d4545aef
merge upstream/master into andrew/ragdoll
...
Conflicts:
libraries/shared/src/Shape.h
libraries/shared/src/ShapeCollider.h
2014-06-17 17:03:16 -07:00
barnold1953
9f66eeb37f
Added a const variable for readability
2014-06-17 16:48:06 -07:00
barnold1953
7cbb19551a
Switched time query method and fixed horrifying bug
2014-06-17 16:38:19 -07:00
Brad Hefta-Gaub
df27de3c73
Merge pull request #3036 from huffman/19788
...
Code Review for Job #19788
2014-06-17 16:28:03 -07:00
Andrew Meadows
ecbf5043d7
code out of Model into base and derived classes
...
PhysicalEntity (base class) gets some shape management stuff
SkeletonModel (derived class) gets some boundary shape and
joint-shape stuff
2014-06-17 16:22:18 -07:00
barnold1953
6c74650552
Attempt to fix build errors
2014-06-17 15:40:11 -07:00
Stojce Slavkovski
591ab448a1
remove unused variable
2014-06-17 23:54:55 +02:00
Stojce Slavkovski
9824072300
remove unused parameter in AccountScriptingInterface::updateBalance
2014-06-17 23:51:02 +02:00
Stojce Slavkovski
8b5e3486a3
Merge branch 'master' of https://github.com/highfidelity/hifi into 19755
2014-06-17 23:22:03 +02:00
barnold1953
bee84a064c
Dont render red border for mouse magnifier
2014-06-17 12:41:53 -07:00
barnold1953
2eda35ff1d
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2014-06-17 12:25:09 -07:00
barnold1953
e775d645a7
Fixed NAN error with magnification windows
2014-06-17 12:19:15 -07:00
