Commit graph

948 commits

Author SHA1 Message Date
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
humbletim
7cab0363a9 standalone 21180 branch with just the C++ changes 2017-06-05 15:57:54 -04:00
Brad Davis
1f95daf5c1 Add dev menu option to wipe KTX cache on next launch 2017-06-02 11:19:43 -07:00
Anthony J. Thibault
e99001d86c debug draw ik chains, bug fix for flex coef on tips
And opened up hip constraints.
2017-05-18 16:29:55 -07:00
Anthony J. Thibault
93b8dc550c Merge branch 'master' into feature/ik-solver-init-config 2017-05-10 09:03:21 -07:00
Anthony J. Thibault
7af93f9fea Hooked up IK constraint rendering 2017-05-08 15:06:29 -07:00
Andrew Meadows
e21bd7a67a help avatar walk up steps 2017-05-05 09:35:49 -07:00
Brad Davis
425405f72d Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
more cleanup in preparation for moving Avatar class to lib
2017-05-02 10:37:22 -07:00
Brad Davis
5e1bc0d908 Remove faceshift 2017-04-28 16:34:54 -07:00
Andrew Meadows
00b05ed137 connect menu options to avatar render features 2017-04-27 13:16:50 -07:00
Triplelexx
a154879001 change menu item text Audio Noise Reduction to Noise Reduction 2017-04-27 03:25:24 +01:00
Triplelexx
f9c6cb27f4 change menu item for avatar collisions to "Collide with world" 2017-04-27 03:16:04 +01:00
Triplelexx
50e35a220b Merge remote-tracking branch 'upstream/master' into 21224 2017-03-30 01:25:27 +01:00
Anthony J. Thibault
dd17b2e2f3 Added developer option to draw IK targets in world.
(cherry picked from commit 7e7803c648)
2017-03-24 16:20:52 -07:00
Triplelexx
bda1d54209 create AvatarBookmarks
derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass
at integration, QML issues noted
2017-03-24 22:58:36 +00:00
Chris Collins
ea13151d55 Merge pull request #9945 from mnafees/21233
21233: Remove Scripts Editor option from Edit menu and all related files
2017-03-21 08:01:36 -07:00
Chris Collins
af2748410d Merge pull request #9932 from Triplelexx/21231
21231 - Remove About Interface from File menu
2017-03-20 09:55:57 -07:00
Chris Collins
509057c6d8 Merge pull request #9941 from Triplelexx/21232
21232 - Remove Mini Mirror from View menu
2017-03-20 09:55:37 -07:00
Mohammed Nafees
3612b9fccc Remove Edit > Scripts Editor and all related source files 2017-03-20 00:25:50 -04:00
Triplelexx
a9b1a38665 remove Mini Mirror from View menu
Avatar inputs only contains the audio meter now.
2017-03-18 00:53:13 +00:00
David Rowe
e3b9d588ec Merge branch 'master' into 21235
# Conflicts:
#	interface/src/Menu.cpp
#	interface/src/ui/DialogsManager.h
2017-03-18 09:42:36 +13:00
Triplelexx
eba6c8de5e remove About Interface from File menu 2017-03-17 17:37:19 +00:00
David Rowe
939b4f1612 Remove Developer > Network > Disk Cache Editor menu item and dialog 2017-03-17 13:49:09 +13:00
David Rowe
e21d7d9edf Add Developer > Network > Clear Disk Cache menu action 2017-03-17 13:34:11 +13:00
David Rowe
dc71f502f0 Delete Developer > Network > RAM Caches Size menu item and dialog 2017-03-17 13:09:06 +13:00
David Rowe
51739f2f99 Remove Developer > Network > Bandwith Details dialog 2017-03-07 15:02:26 +13:00
Atlante45
191121888c Add log window to the ESS log 2017-02-09 13:04:43 -08:00
Stephen Birarda
b66ddbdbdb add email field, error handling for sign up inputs 2016-12-08 16:16:37 -08:00
Chris Collins
6d4b1c4b97 Merge pull request #9155 from jherico/text_degrade_fix
Fix drop in text rendering quality when texture memory is low
2016-12-06 09:23:32 -08:00
Andrew Meadows
7db8e8f31b Merge pull request #9156 from hyperlogic/out-of-body-revert
Revert Out of Body experience
2016-12-06 08:37:20 -08:00
Anthony J. Thibault
89ae3b3d6e Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
This reverts commit efe9571ab8, reversing
changes made to 333e9ec7f4.
2016-12-05 15:18:03 -08:00
Bradley Austin Davis
2ca4d0ab29 Fix drop in text rendering quality on texture memory constrained systems 2016-12-05 14:12:57 -08:00
Ryan Jones
094857949d tabs -> spaces, remove raw ptr, remove unnecessary spec diff 2016-12-05 12:57:21 -08:00
Ryan Jones
3eecba77f2 working menu item 2016-12-03 19:34:38 -08:00
Andrew Meadows
6bb3dd6830 Merge hifi/master into hifi/out-of-body-experience 2016-11-14 15:08:04 -08:00
Brad Davis
db98a742b6 Remove incremental transfers 2016-11-10 08:35:35 -08:00
Brad Davis
192c72ff99 Update menu, initial state for texture management 2016-11-09 12:09:25 -08:00
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
Atlante45
5a0beec1f5 Replace old drag&drop with new UI 2016-03-09 11:47:31 -08:00
Brad Davis
95f5d82d37 Add a watchdog thread to trigger a crash on detecting a deadlock 2016-03-09 00:32:46 -08:00
Atlante45
ded449072f Rename window 2016-03-08 13:13:45 -08:00
Atlante45
784f669998 First draft Assets Manager 2016-03-08 13:13:45 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
Brad Hefta-Gaub
5828c32041 add toggleOverlays menu item and action 2016-02-25 08:31:11 -08:00
Zach Pomerantz
7ae9752272 Remove Render > Ambient Light menu 2016-02-23 16:24:43 -08:00
Brad Hefta-Gaub
0de5c1cf71 don't capture the mouse if you're not the active window or if a menu is popped up 2016-02-18 17:11:40 -08:00
howard-stearns
20406a5a14 Remove comfortMode menu item, but add a Settings for snapTurn within MyAvatar. 2016-02-15 13:26:40 -08:00
samcake
f4e0352f61 Merge pull request #6930 from zzmp/feat/bubble-render-settings
Bubble up render settings from CPP to JS/QML
2016-01-27 14:20:51 -08:00
Zach Pomerantz
e770d7b679 Add PhysicsShowOwned back to Menu 2016-01-26 18:56:52 -08:00
Zach Pomerantz
5009e8702e Cleanup new render settings 2016-01-26 15:58:50 -08:00
Anthony J. Thibault
3cee3cbb5a Avatar Developer Menu: added animation debug options
This options are for for developers only and might help debug animation related issues.

* Enable Inverse Kinematics: this can be toggled to disable IK for the avatar.
* Enable Anim Pre and Post Rotations: this option can be used to use FBX pre-rotations from source avatar animations, instead of the current default, which is to use them from the source model.
  This only effects FBX files loaded by the animation system, it does not affect changing model orientations via JavaScript.
2016-01-25 18:52:13 -08:00