samcake
|
00addcad9e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-11-10 17:57:34 -08:00 |
|
samcake
|
1d3fc1b647
|
Fix a bad conversion to integer for negative values of the GRid COordinates
|
2016-11-10 17:57:11 -08:00 |
|
Brad Hefta-Gaub
|
f55b660820
|
Merge pull request #9033 from huffman/fix/usersjs-hide-show-laser
Fix users.js maximize button unclickable with hand controllers
|
2016-11-10 17:53:17 -08:00 |
|
Brad Hefta-Gaub
|
6db3556dc5
|
Merge pull request #9048 from howard-stearns/disable-viewpoint-menus-in-hmd
Disable viewpoint menus in hmd
|
2016-11-10 17:52:50 -08:00 |
|
David Kelly
|
186451fcbe
|
Merge pull request #9027 from samcake/green
Fix crashes in OpenGLVersionChecker
|
2016-11-10 17:22:29 -08:00 |
|
Brad Davis
|
16060d50af
|
Merge pull request #9041 from jherico/disable_incremental
Remove incremental texture transfers
|
2016-11-10 15:43:20 -08:00 |
|
howard-stearns
|
b20d4a4b03
|
Merge branch 'master' of https://github.com/highfidelity/hifi into disable-viewpoint-menus-in-hmd
|
2016-11-10 15:15:51 -08:00 |
|
howard-stearns
|
8299e23cc3
|
diable some viewpoint menu options when in hmd.
|
2016-11-10 15:15:11 -08:00 |
|
howard-stearns
|
4d18a3cc3d
|
expose menu enablement to javascript
|
2016-11-10 15:01:06 -08:00 |
|
Chris Collins
|
5b91c8f32b
|
Merge pull request #8984 from sethalves/fix-setLocalJointRotation-name
fix names of model-entity joint setters
|
2016-11-10 13:39:14 -08:00 |
|
Chris Collins
|
cd0416b5e9
|
Merge pull request #9039 from humbletim/fix-users-online-interactions
Disable Users Online interactions while window is hidden.
|
2016-11-10 10:37:13 -08:00 |
|
Brad Hefta-Gaub
|
af2f6e831a
|
Merge pull request #9044 from birarda/higher-mute-permissions
elevate permissions required for mute environment to kick
|
2016-11-10 10:18:06 -08:00 |
|
Brad Hefta-Gaub
|
ff559aa4a1
|
Merge pull request #9042 from hyperlogic/feature/jsdoc
Generate JS documentation from comments in C++ source
|
2016-11-10 10:17:39 -08:00 |
|
samcake
|
784a0540ed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-11-10 10:05:03 -08:00 |
|
Anthony J. Thibault
|
d111f7c409
|
Moved jsdoc folder from scripts to tools directory
|
2016-11-10 09:33:56 -08:00 |
|
Stephen Birarda
|
f56a5d1d98
|
elevate permissions required for mute environment
|
2016-11-10 09:23:01 -08:00 |
|
Brad Davis
|
db98a742b6
|
Remove incremental transfers
|
2016-11-10 08:35:35 -08:00 |
|
Seth Alves
|
f6318fe619
|
Merge pull request #9043 from ZappoMan/avatarEntityGreifingVector
add support for whitelist entity scripts
|
2016-11-10 08:17:30 -08:00 |
|
Brad Hefta-Gaub
|
8758e4a9ba
|
add support for whitelist entity scripts
|
2016-11-09 19:17:24 -08:00 |
|
samcake
|
0ab4a781f5
|
Back to the correct code
|
2016-11-09 18:25:37 -08:00 |
|
samcake
|
c01b39b54b
|
And test that again
|
2016-11-09 18:16:51 -08:00 |
|
Anthony J. Thibault
|
940edd4a6d
|
Added interface/src/scripting dir to doc search path
|
2016-11-09 18:09:42 -08:00 |
|
Anthony J. Thibault
|
839b1a3c5e
|
Added some jsdoc comments to the C++ source
|
2016-11-09 18:09:10 -08:00 |
|
Anthony J. Thibault
|
5b244357e0
|
Add jsdoc readme and plugin
|
2016-11-09 18:03:42 -08:00 |
|
samcake
|
941e5a57b1
|
trying a test with 4.4 as the minimum gl context to be able to break on Intel integrated
|
2016-11-09 17:25:46 -08:00 |
|
samcake
|
f5fd4bf8d1
|
Merge pull request #9014 from jherico/texture_derez
Re-enable downsampling for non-sparse textures
|
2016-11-09 17:18:03 -08:00 |
|
Brad Davis
|
4ae6cbad7b
|
Merge pull request #9035 from druiz17/vrmenu
Fixed unable to remove menus from VrMenu context
|
2016-11-09 16:28:53 -08:00 |
|
Seth Alves
|
a907d1b5b3
|
Merge pull request #9038 from ZappoMan/avatarEntityGreifingVector
remove scripts from avatar attached entities for other avatars
|
2016-11-09 14:31:52 -08:00 |
|
Brad Hefta-Gaub
|
770bf35d2b
|
CR feedback
|
2016-11-09 14:31:18 -08:00 |
|
Brad Hefta-Gaub
|
cf3d1011f4
|
remove scripts from avatar attached entities for other avatars
|
2016-11-09 12:26:57 -08:00 |
|
Brad Davis
|
f7d1b3c823
|
Fix non-incremental transfers when sparse enabled
|
2016-11-09 12:13:35 -08:00 |
|
Brad Davis
|
192c72ff99
|
Update menu, initial state for texture management
|
2016-11-09 12:09:25 -08:00 |
|
Bradley Austin Davis
|
9e929ca629
|
Re-enable downsampling for non-sparse textures
|
2016-11-09 12:09:24 -08:00 |
|
samcake
|
b7381c30cb
|
Including the fix for the bad Major Version number from David K
|
2016-11-09 10:38:44 -08:00 |
|
humbletim
|
35f857ef9d
|
inhibit user interactions when window is disabled
|
2016-11-09 13:21:24 -05:00 |
|
samcake
|
67c99703ae
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-11-08 18:21:45 -08:00 |
|
samcake
|
0f39934ec3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into green
|
2016-11-08 14:52:21 -08:00 |
|
samcake
|
a4e75b4dcf
|
FIx an obvious mistake, good catch MR Zappoman
|
2016-11-08 14:51:48 -08:00 |
|
Howard Stearns
|
666d2dd2fc
|
Merge pull request #9031 from davidkelly/dk/2178
Log snapshot upload and user story creation errors
|
2016-11-08 12:11:16 -08:00 |
|
Howard Stearns
|
0a56f7c4fe
|
Merge pull request #9009 from howard-stearns/fix-numeric-keyboard-for-window-prompt
fix numeric keyboard for hmd Window.prompt
|
2016-11-08 12:05:13 -08:00 |
|
Dante Ruiz
|
4b087a2718
|
fixed unable to remove menus from vrmenu context
|
2016-11-08 12:03:53 -08:00 |
|
Dante Ruiz
|
7f355c48b1
|
saving work progress
|
2016-11-08 12:03:53 -08:00 |
|
Ryan Huffman
|
5dab2ac2a7
|
Add margin to left and right side of users.js
|
2016-11-08 09:47:09 -08:00 |
|
Ryan Huffman
|
284b458148
|
Increase margin at bottom of users.js
|
2016-11-08 09:46:47 -08:00 |
|
David Kelly
|
1766ebab2c
|
Added a bit more logging
|
2016-11-08 09:08:34 -08:00 |
|
Brad Hefta-Gaub
|
5454dca82e
|
Merge pull request #9030 from highfidelity/stable
Update master with Stable hotfix
|
2016-11-07 18:48:54 -08:00 |
|
David Kelly
|
3105299670
|
Log snapshot upload and user story creation errors
Plus, if the body of the error is empty, put something in there so
the script will not think it was successful.
|
2016-11-07 18:13:10 -08:00 |
|
samcake
|
af438ae31b
|
Fix the buid
|
2016-11-07 17:56:54 -08:00 |
|
samcake
|
cab699464e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-11-07 17:31:06 -08:00 |
|
Chris Collins
|
31ff26368d
|
Merge pull request #9029 from highfidelity/hotfix-steam-auto-updater
Disable Sandbox auto-update popup when the application is running from Steam
|
2016-11-07 17:21:19 -08:00 |
|