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
Zach Pomerantz
29f9d15af0
Remove render engine items from developer menu
2016-01-25 12:14:58 -08:00
Zach Pomerantz
dee8e0ba9d
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
2016-01-22 10:03:06 -08:00
Brad Hefta-Gaub
e1c369dc10
Merge pull request #6766 from samcake/hdr
...
Ambient Occlusion
2016-01-21 18:10:52 -08:00
Brad Davis
b8109af196
Ignite the atmosphere
2016-01-21 15:15:15 -08:00
Zach Pomerantz
1b36d56b7a
Add shadowmap as a debug feature
2016-01-18 17:12:42 -08:00
samcake
2494623bc7
Cleaning the code for review
2016-01-15 10:55:43 -08:00
Brad Hefta-Gaub
2177765b09
wire up audio show level meter menu
2016-01-14 13:12:16 -08:00
Brad Hefta-Gaub
e2a3903def
add support for advanced/developer plugins and change diplay modes to match spec
2016-01-08 16:58:25 -08:00
Brad Hefta-Gaub
d51f514281
reworking of view/camera mode to match spec
2016-01-07 12:42:18 -08:00
Brad Hefta-Gaub
1508a637ab
Menu restructuring
2016-01-07 12:09:02 -08:00
Howard Stearns
9c8a04ce1e
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2016-01-04 09:26:14 -08:00
howard-stearns
23ffcdca3e
big sweep
2015-12-16 17:01:14 -08:00
samcake
b4b541178d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-16 09:42:06 -08:00
Brad Hefta-Gaub
3dcdfbc0f1
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 13:59:22 -08:00
samcake
3554f54e17
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-14 17:38:56 -08:00
Brad Hefta-Gaub
be058398a2
remove blue sphere while speaking
2015-12-13 12:02:39 -08:00
Brad Hefta-Gaub
2815cb0fef
first cut at adding advanced and developer menu groupings
2015-12-12 18:12:36 -08:00
Atlante45
b45b1cc513
More work on live g-buffer debug
2015-12-04 17:43:00 -08:00
Brad Hefta-Gaub
0ad4efeeb9
Merge pull request #6555 from howard-stearns/remove-unimplemented-collision-shapes-menu-item
...
Remove unimplemented collision menu items
2015-12-04 11:25:08 -08:00
Howard Stearns
cb67f05103
Remove unimplemented menu items Developer->Avatar->Show Skeleton/Head Collision Shapes.
2015-12-04 10:47:27 -08:00
Brad Davis
2cea593fbd
Remove RealSense & MIDI
2015-12-03 11:00:01 -08:00
Anthony J. Thibault
31cecdc174
Menu: removed Enable Avatar Threading option.
...
To re-enable, you can set ENABLE_AVATAR_UPDATE_THREADING to true on line 2552 of Application.cpp.
Also, removed other unused strings.
2015-11-30 15:45:23 -08:00
Anthony J. Thibault
821264a031
Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states
2015-11-22 16:15:03 -08:00
Anthony J. Thibault
6cfd831a5a
Menu: Added Developer > Avatar > Debug Draw Position
...
Also renamed "Debug Draw Bind Pose" to "Debug Draw Default Pose"
2015-11-21 09:50:56 -08:00
Anthony J. Thibault
a4116e633a
Removed last consumer of JointState class
...
Removed option to render IK constraints used by old animation system
2015-11-20 11:26:54 -08:00
Brad Hefta-Gaub
35677d3a48
Merge pull request #6418 from birarda/test-ds-settings-fail
...
move keepalive pings transparently to NL
2015-11-18 11:12:16 -08:00
Stephen Birarda
0e3d3451d7
make keep alive pings the responsibility of NL
2015-11-18 10:24:10 -08:00
Thijs Wenker
a58bd4ff05
Merge branch 'master' of https://github.com/worklist/hifi into 20724
2015-11-09 22:37:44 +01:00
Brad Davis
11733c039f
Allow shared libraries to access core global objects
2015-11-06 16:57:31 -08:00
Thijs Wenker
de98a17ada
- rename CameraEntityItem to AnchorEntityItem
2015-11-06 01:58:08 +01:00
Thijs Wenker
d7279e4c88
Support for Camera Entities.
...
- New entity type: camera, with just the basic properties of an entity (position, rotation, name etc.).
- New CameraMode: CameraEntity
- Example script using the new cameraEntity
- Updated edit.js to use the CameraEntities (with button to preview the camera)
2015-11-04 02:51:23 +01:00
Clément Brisset
efd106e68c
Merge pull request #6075 from birarda/default-asset-server
...
add a migrator to move assets to ATP
2015-10-14 17:02:10 -07:00
Brad Hefta-Gaub
ad96d76921
implement comfort mode hack
2015-10-13 15:06:11 -07:00
Stephen Birarda
cf74cfb50e
add an ATPAssetMigrator for bulk ATP migration
2015-10-13 10:38:52 -07:00
Brad Hefta-Gaub
6e5847bb1c
make Hand Input Mouse off by default
2015-10-06 19:58:25 -07:00
Andrew Meadows
5296ddade9
remove unused menu item
2015-09-11 13:22:11 -07:00
Howard Stearns
eb67254e54
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 16:54:14 -07:00
Howard Stearns
d3106de7c1
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-04 14:32:58 -07:00
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
Anthony J. Thibault
df28c7bf1a
Merge branch 'master' into ajt/new-anim-system
2015-09-04 09:27:02 -07:00
Brad Hefta-Gaub
20bd14c8db
Merge pull request #5684 from rabedik/fxaa
...
Post-process anti-aliasing effect
2015-09-04 09:01:39 -07:00
Howard Stearns
c0fec44f32
Menu item to switch between threaded and not (without restart!).
2015-09-03 19:34:25 -07:00
Anthony J. Thibault
30264e9c3d
Added animation debug draw items to menu.
...
* Debug Draw Bind Pose - used to display the current avatar's bind pose
* Debug Draw Animation - used to display the current avatar's AnimGraph animation.
Currently does not work with old animation so it's only valid when Enable Anim Graph is true.
* Draw Mesh - used to hide or display the avatar mesh.
2015-09-02 21:04:29 -07:00
Anthony J. Thibault
d151474446
Merge branch 'master' into ajt/new-anim-system
2015-09-02 10:00:36 -07:00
Anthony J. Thibault
7b4cb8655c
First pass integration of new anim system into rig.
2015-09-01 17:57:01 -07:00
Stephen Birarda
33f6933544
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-01 14:36:16 -06:00
Andrew Meadows
fba7478c52
remove menu items for legacy IK options
2015-09-01 09:51:14 -07:00
Raffi Bedikian
59a758b5ec
Add AA state to RenderContext and Menu
2015-08-30 20:38:05 -07:00
Stephen Birarda
e3e529c4e5
resolve conflicts on merge with origin/protocol
2015-08-27 14:52:29 -07:00
Howard Stearns
96c74ebbd5
Enable Rig Animations is now a developer menu item (rather than requiring javascript to set). Also turning it off resets you to bind pose and deliberately throws away old animations.
...
Default animations are the new ones for our standard T-pose. (Had been for the double-A pose fightbot.)
Rig state machine now does "backup", and doesn't apply strafe while turning.
2015-08-27 12:25:40 -07:00
Stephen Birarda
16eee10cab
repairs to permission error for asset-server upload
2015-08-27 12:13:20 -07:00
Brad Hefta-Gaub
79a9694d4a
Merge pull request #5648 from ctrlaltdavid/20663
...
Clean Interface.ini after a crash
2015-08-27 10:52:25 -07:00
Stephen Birarda
5b5941fea2
move asset upload to AssetUploadDialogFactory
2015-08-26 16:30:09 -07:00
Brad Davis
270f2f7a3b
Fixing framerate limit, moving vsync to 2d plugin
2015-08-26 15:47:45 -07:00
David Rowe
f6cf77ae68
Add Developer > Display Crash Options menu item
...
Is enabled by default. Disabling it stops the display of the crash
handling options dialog at start-up.
2015-08-24 13:24:31 -07:00
David Rowe
07c9a0e2bb
Add Developer > Crash Interface menu item
2015-08-24 10:48:58 -07:00
Thijs Wenker
748625399e
"View -> World Axes" menu option
2015-08-23 17:59:58 +02:00
