Andrzej Kapolka
|
1eace78e47
|
Hide distances; they no longer need to be publicly visible.
|
2014-05-29 17:46:25 -07:00 |
|
Andrzej Kapolka
|
34091128d8
|
Distance tweak.
|
2014-05-29 17:22:59 -07:00 |
|
Andrzej Kapolka
|
67921c474e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cascade
|
2014-05-29 17:09:09 -07:00 |
|
Andrzej Kapolka
|
12beef7fec
|
Apply the new shadow distances to the models, too.
|
2014-05-29 17:08:36 -07:00 |
|
Andrzej Kapolka
|
0b4484a153
|
Trying a different way of determining the cascade threshold distances.
|
2014-05-29 16:49:51 -07:00 |
|
Clément Brisset
|
6864fc3b99
|
Merge pull request #2951 from ZappoMan/perfstats
add improved detailed rendering and FPS debugging stats
|
2014-05-29 15:37:07 -07:00 |
|
ZappoMan
|
7e3ef34e6c
|
CR feedback
|
2014-05-29 15:34:20 -07:00 |
|
Andrzej Kapolka
|
391902f79b
|
Cascaded shadow maps for models.
|
2014-05-29 15:30:40 -07:00 |
|
Clément Brisset
|
21d1a18bd5
|
Merge pull request #2949 from AndrewMeadows/inertia
safe copy of JointState data
|
2014-05-29 14:44:05 -07:00 |
|
Brad Hefta-Gaub
|
2c8da2bda7
|
Merge pull request #2950 from wangyix/flighttime_fix_pull
Fix for unreasonable flight times
|
2014-05-29 14:43:15 -07:00 |
|
wangyix
|
4c4ff45f31
|
removed duplicate function bodies
|
2014-05-29 14:31:40 -07:00 |
|
wangyix
|
d8b0b03e59
|
removed _sequenceNumber from OctreeSendThread
inlined getSequenceNumber and incrementSequenceNumber
|
2014-05-29 13:39:57 -07:00 |
|
wangyix
|
f82be105e8
|
moved _sequenceNumber back to OctreeQueryNode
|
2014-05-29 12:54:34 -07:00 |
|
Andrzej Kapolka
|
09231f01f3
|
Retain "simple" shadows, supply cascaded as option.
|
2014-05-29 12:48:41 -07:00 |
|
ZappoMan
|
e6966c2155
|
add improved detailed rendering and FPS debugging stats
|
2014-05-29 12:12:23 -07:00 |
|
Brad Hefta-Gaub
|
669cafbe24
|
Merge pull request #2941 from binaryking/disable_keyevents_RSD
remove all key bindings from the running scripts dialog
|
2014-05-29 12:08:06 -07:00 |
|
wangyix
|
65508b2016
|
updated packet type version numbers
|
2014-05-29 11:42:35 -07:00 |
|
wangyix
|
fe1a0e4565
|
removed debug stuff i missed
|
2014-05-29 11:27:14 -07:00 |
|
wangyix
|
c87c474877
|
removed debug info, cleaned code for pull req
|
2014-05-29 10:39:40 -07:00 |
|
Mohammed Nafees
|
2c3784c7d5
|
Merge branch master of upstream
|
2014-05-29 22:31:32 +05:30 |
|
wangyix
|
a0f9d2c106
|
Merge remote-tracking branch 'upstream/master'
|
2014-05-29 09:20:30 -07:00 |
|
AndrewMeadows
|
b849c07faf
|
Merge pull request #2945 from huffman/19725
Code Review for Job #19725
|
2014-05-29 09:06:43 -07:00 |
|
AndrewMeadows
|
31237003db
|
Merge pull request #2944 from Barnold1953/master
Disable oculus overlay until it is curved.
|
2014-05-29 09:01:52 -07:00 |
|
AndrewMeadows
|
6f2e481638
|
Merge pull request #2948 from huffman/19728
Code Review for Job #19728
|
2014-05-29 08:59:00 -07:00 |
|
AndrewMeadows
|
21f045ebe0
|
Merge pull request #2939 from huffman/19648
Code Review for Job #19648
|
2014-05-29 08:53:31 -07:00 |
|
Ryan Huffman
|
425632e072
|
Add 'f' to end of const float to follow coding standard
|
2014-05-29 08:48:22 -07:00 |
|
Andrew Meadows
|
86d6fd45de
|
safe copy of JointState data
|
2014-05-29 08:19:43 -07:00 |
|
Philip Rosedale
|
79405444d1
|
Merge pull request #2947 from PhilipRosedale/master
Set max voxel size of 16 meters in script for voxel creation
|
2014-05-28 21:05:23 -07:00 |
|
Philip Rosedale
|
e0d68607cd
|
Set max voxel size of 16 meters in script for voxel creation
|
2014-05-28 21:02:33 -07:00 |
|
Ryan Huffman
|
cfe176c60e
|
Add locationsMenu.js
|
2014-05-28 20:50:39 -07:00 |
|
Andrzej Kapolka
|
ff77644caa
|
Progress on selecting cascades.
|
2014-05-28 18:35:30 -07:00 |
|
Clément Brisset
|
859461a1aa
|
Merge pull request #2946 from AndrewMeadows/inertia
cleanup: JointState transitions toward a proper class
|
2014-05-28 18:18:41 -07:00 |
|
Andrew Meadows
|
0925da05d5
|
merge upstream/master into andrew/inertia
|
2014-05-28 17:53:47 -07:00 |
|
Andrew Meadows
|
ec25982a58
|
add JointState::updateWorldTransform()
|
2014-05-28 17:51:17 -07:00 |
|
wangyix
|
5d4b0df108
|
added flag,seq,st to EnvironmentData, untested
removed/commented out debug prints
|
2014-05-28 17:41:38 -07:00 |
|
Andrew Meadows
|
b15b0fd96c
|
cleaner initialization of JointState
|
2014-05-28 17:31:07 -07:00 |
|
wangyix
|
c799077379
|
added flag,seq,ts to ParticleErase and ModelErase
... this fixes unreasonable flight-time issue
|
2014-05-28 17:20:10 -07:00 |
|
barnold1953
|
81ed0d99f7
|
Added prediction for Oculus rift to reduce apparent latency.
|
2014-05-28 17:13:59 -07:00 |
|
Andrew Meadows
|
9f2a4ae626
|
Make JointState a proper class
JointState gets a pointer to its corresponding FBXJoint
|
2014-05-28 16:49:39 -07:00 |
|
Andrzej Kapolka
|
698ecbf9c5
|
Fix for shadow map rendering.
|
2014-05-28 15:58:45 -07:00 |
|
barnold1953
|
e6d12bf239
|
Disabled overlay for oculus. We still have to call
applicationOverlay.renderOverlay(true) or prioVR cant calibrate.
|
2014-05-28 15:56:14 -07:00 |
|
Clément Brisset
|
e286250bb5
|
Merge pull request #2943 from ZappoMan/aacube
Support for ray picking non-axis-aligned bounding box of models
|
2014-05-28 15:54:33 -07:00 |
|
Ryan Huffman
|
8f6ad2faab
|
Add 'Load default scripts' button to preferences
|
2014-05-28 15:27:50 -07:00 |
|
Andrzej Kapolka
|
c3f6cab199
|
Working on cascading shadow maps.
|
2014-05-28 15:20:09 -07:00 |
|
Andrew Meadows
|
e74da5f2a0
|
merge upstream/master into andrew/inertia
|
2014-05-28 14:55:08 -07:00 |
|
Andrew Meadows
|
13f11e1056
|
Remove "fromBind" arg in Model::setJointRotation
It was always set 'true'.
|
2014-05-28 14:53:32 -07:00 |
|
barnold1953
|
9311eeb8f5
|
Fixed compiler warning
|
2014-05-28 14:41:30 -07:00 |
|
ZappoMan
|
574bca38e6
|
clean up comments and variable names
|
2014-05-28 12:10:51 -07:00 |
|
Andrzej Kapolka
|
16a370303f
|
Merge pull request #2942 from ey6es/master
Fix arguments to applyRotationDelta.
|
2014-05-28 12:04:43 -07:00 |
|
ZappoMan
|
d88dd90d79
|
revert dead code
|
2014-05-28 12:04:24 -07:00 |
|