Andrew Meadows
ccdf383151
Merge hifi/master into hifi/out-of-body-experience
2016-11-07 08:24:26 -08:00
Andrew Meadows
38e4ac0ae9
Merge master into out-of-body-experience
2016-10-26 16:59:31 -07:00
Brad Davis
1c89fa2291
Make threaded submit in OpenVR controllable from menu
2016-10-26 15:28:42 -07:00
Chris Collins
9846614468
Merge pull request #8879 from AndrewMeadows/show-physics-stats
...
add Bullet profile info to PerformanceTimer stats
2016-10-25 06:29:27 -07:00
Andrew Meadows
51a9a99381
Merge hifi/master into hifi/out-of-body-experience
2016-10-24 08:13:42 -07:00
Andrew Meadows
e44672180a
add Bullet profile info to PerformanceTimer stats
2016-10-21 13:22:22 -07:00
Clément Brisset
b63eb6ba9f
Merge pull request #8665 from zzmp/feat/audio-stats
...
move audio stats to QML/JS, with graphs
2016-10-20 16:43:49 -07:00
Anthony J. Thibault
eccd01e88f
Merge remote-tracking branch 'upstream/master' into out-of-body-experience
2016-09-29 16:36:25 -07:00
Brad Hefta-Gaub
38eccd32a8
add developer menu support to enable/disable dynamic texture management
2016-09-29 10:18:54 -07:00
Anthony Thibault
27e6c0f872
Added debug draw path trace for left and right feet
2016-09-24 13:01:16 -07:00
Zach Pomerantz
277eefafd7
remove the audio stats dialog
2016-09-23 14:39:07 -07:00
Anthony J. Thibault
98ffea2fb9
Merge branch 'master' into out-of-body-experience
2016-09-22 18:08:23 -07:00
Anthony J. Thibault
d51898f60d
Merge branch 'out-of-body-experience' of github.com:highfidelity/hifi into out-of-body-experience
2016-09-15 14:23:38 -07:00
Andrew Meadows
f5c5c68937
adding kinematic character controller demo
2016-09-14 11:43:52 -07:00
Anthony J. Thibault
bc130eaf26
ramp support with comfort mode option
2016-09-13 16:26:10 -07:00
Andrew Meadows
954d690b8a
expose setting avatar collisionless
2016-09-12 16:24:08 -07:00
Anthony J. Thibault
7e7803c648
Added developer option to draw IK targets in world.
2016-09-09 12:50:34 -07:00
Atlante45
a8de6f0a57
Add settings to change local port
2016-09-06 10:18:42 -07:00
Andrew Meadows
d7bb555987
make menu wording more correct
2016-08-25 08:53:08 -07:00
Ryan Huffman
eaa77edc25
Replace 'Stars' menu option with 'Default Skybox'
2016-08-08 16:03:03 -07:00
Stephen Birarda
e4ebafa0d8
add a menu option to force the wrong DS connect version
2016-06-09 15:53:19 -07:00
Atlante45
ee62a211ac
Remove "Input Devices" menu
2016-06-06 13:28:36 -07:00
Brad Hefta-Gaub
1d9981e624
first cut at support for verifying all protocol version compatibility
2016-05-24 13:31:19 -07:00
Brad Hefta-Gaub
ac49feda22
Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS
...
Conflicts:
libraries/entities/src/EntityEditPacketSender.h
2016-05-21 09:23:45 -07:00
Brad Davis
07562f72af
Doing a pass over the input plugins and controller code
2016-05-20 14:50:23 -07:00
Brad Hefta-Gaub
770fab956f
remove dead code
2016-05-20 12:23:06 -07:00
Brad Hefta-Gaub
335d9abddd
Merge pull request #7874 from AndrewMeadows/vertical-thrust
...
allow MyAvatar.addThrust() to raise avatar from standing on ground
2016-05-18 11:41:37 -07:00
Andrew Meadows
c64612c42b
namechange keyboardMotor --> actionMotor
2016-05-17 14:46:50 -07:00
Atlante45
38f74c1843
Remove the last of the glow level
2016-05-14 14:49:31 -07:00
Anthony J. Thibault
80a349c65b
Merge branch 'master' into tony/improved-avatar-debug-draw
2016-05-10 14:50:13 -07:00
Atlante45
5c196f3df5
Remove Deadlock status
2016-05-09 15:53:45 -07:00
Anthony J. Thibault
641e152699
Eye tracking bug fix and debug rendering improvement
...
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
2016-05-08 16:20:32 -07:00
David Rowe
7406e5fd9c
Add Navigate > Set Home Location menu item
2016-04-27 07:57:43 +12:00
Brad Davis
6c30194916
Support lowering the minimum mip of a texture at runtime
2016-04-21 14:46:12 -07:00
Ryan Huffman
47c2a1722b
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu
2016-04-13 14:40:46 -07:00
Ryan Huffman
fa49c213cc
Add threaded crashes
2016-04-13 10:24:56 -07:00
Brad Hefta-Gaub
93f8cfc80a
new default LOD settings, and support for reset settings without crashing
2016-04-13 09:26:01 -07:00
Ryan Huffman
0c1277ae7a
Add CrashHelpers.h and add to separate submenu
2016-04-12 16:44:11 -07:00
Brad Hefta-Gaub
2c3aeddbe4
reduce log spam for the deadlock watchdog
2016-04-07 10:25:08 -07:00
Stephen Birarda
309d327a37
change My Asset Server to Asset Browser in Menu
2016-04-01 13:02:26 -07:00
Zach Pomerantz
5e953c9833
Rm Enable3DTVMode const
2016-03-17 15:56:57 -07:00
Stephen Birarda
66e572f226
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-11 14:44:49 -08:00
Philip Rosedale
e87ef52a4c
Merge pull request #7302 from hyperlogic/tony/wrong-way-overlay
...
More reliable and usable UI sphere overlay location
2016-03-10 17:43:50 -08:00
Stephen Birarda
8cc0ae3148
menu and naming changes for asset server directory
2016-03-10 14:48:44 -08:00
Stephen Birarda
5ad4645b47
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-10 13:28:59 -08:00
Anthony J. Thibault
886457939d
Merge branch 'master' into tony/wrong-way-overlay
2016-03-09 16:50:18 -08:00
Anthony Thibault
5df616be37
OpenVR: More usable UI Sphere overlay location
...
Also, added a debug option to display SensorToWorld matrix in Developer > Avatar menu.
2016-03-09 16:24:08 -08:00
Stephen Birarda
57ea51d244
Merge pull request #84 from Atlante45/feat/atp
...
Replace old drag&drop with new UI
2016-03-09 14:26:49 -08:00
Brad Davis
d428f3b96f
Working on crash bugs
2016-03-09 14:00:05 -08:00
Stephen Birarda
9a2b2b4c16
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-09 12:16:46 -08:00
