Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:13:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48161 commits 71 branches 56 tags 1.2 GiB
Commit graph

48161 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Kelly
186451fcbe Merge pull request #9027 from samcake/green 
Fix crashes in OpenGLVersionChecker
 2016-11-10 17:22:29 -08:00
David Kelly
80d4033767 oops forgot one thing... 2016-11-10 17:13:50 -08:00
Stephen Birarda
7f46714645 drop the incorrect scale from domain settings 2016-11-10 16:53:56 -08:00
Stephen Birarda
020942c826 better handling for a flipped min/max scale 2016-11-10 16:50:36 -08:00
David Kelly
285520dff7 Initial cut 
No script work yet, just first stab at underpinnings
 2016-11-10 16:24:35 -08:00
Stephen Birarda
88c63332de protect flipped min/max scale in avatar mixer settings 2016-11-10 16:21:48 -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
Stephen Birarda
f14037979a fix a typo in help text for minimum scale 2016-11-10 15:31:23 -08:00
Seth Alves
850361f222 lastEditedBy property for entities 2016-11-10 15:26:28 -08:00
Stephen Birarda
272d0c845e add clarifying comments about target scale changes 2016-11-10 15:25:15 -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
Stephen Birarda
d5722c1654 fix clamping of scale and DRY it up 2016-11-10 15:03:13 -08:00
howard-stearns
4d18a3cc3d expose menu enablement to javascript 2016-11-10 15:01:06 -08:00
Stephen Birarda
53769f4edf change scale for avatar if domain limited scale changes 2016-11-10 14:58:04 -08:00
Stephen Birarda
9fdde49d14 clamp target scale changes on both ends 2016-11-10 14:54:42 -08:00
Stephen Birarda
6f442a74b1 request settings from agents and debug results 2016-11-10 14:43:15 -08:00
Stephen Birarda
64d9fa0f39 clamp avatar scale to domain limit in avatar mixer 2016-11-10 14:19:32 -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
Stephen Birarda
77ede81fc9 limit MyAvatar scale to limits from domain settings 2016-11-10 13:27:13 -08:00
Brad Davis
c7d68aa9cf Add stutter stat logging 2016-11-10 13:15:35 -08:00
Brad Davis
90f55f0cd5 Add stutter tracking 2016-11-10 11:56:38 -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 Davis
e2991c3665 Change minimum cores to 3 to enable OpenVR 2016-11-10 10:35:05 -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
Stephen Birarda
563322d08d add min and max avatar scale to domain-server settings 2016-11-10 10:04:01 -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
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