Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 02:07:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
43789 commits 69 branches 56 tags 1.2 GiB
Commit graph

43789 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
251e2137d3 Remove old use of connectedDevice 2016-06-21 13:31:10 -07:00
Ryan Huffman
6c2c7f1eec Fix connected_device user activity event 2016-06-21 13:28:40 -07:00
Ryan Huffman
6d753e317b Fix more osx warning 2016-06-21 10:51:31 -07:00
Ryan Huffman
a77dea9048 Fix osx warning 2016-06-21 10:30:05 -07:00
Ryan Huffman
cee897d6d3 Fix osx warning 2016-06-20 16:44:07 -07:00
Ryan Huffman
154ccb8932 Add glVersionToInteger to GLHelpers 2016-06-20 16:10:07 -07:00
Ryan Huffman
ab057010d6 Add changed display mode tracking 2016-06-20 16:09:34 -07:00
Ryan Huffman
1eaa9e40cd Cleanup nearby avatar tracking 2016-06-20 16:09:17 -07:00
Ryan Huffman
3aac0cc4fb Update fps useractivity with more general stats 2016-06-20 16:02:36 -07:00
Ryan Huffman
7b3b01a96a Add more values to launch UserActivity 2016-06-20 16:02:14 -07:00
Ryan Huffman
0393777b03 Add getMemoryInfo helper function 2016-06-20 16:01:44 -07:00
Ryan Huffman
1fa274a527 Fix GPUIdent name trailing whitespace 2016-06-20 16:01:03 -07:00
Ryan Huffman
c2ebcd1f77 Make activity logging from scripts only available for certain events 2016-06-16 13:49:25 -07:00
Ryan Huffman
bce05df56b Update enabled_edit to only get sent when you have permission 2016-06-16 13:25:14 -07:00
Ryan Huffman
56c84bbc27 Add opened_marketplace and enabled_edit to edit.js 2016-06-16 13:18:08 -07:00
Ryan Huffman
3650377745 Clean up NULL => nullptr 2016-06-16 13:17:31 -07:00
Ryan Huffman
c7955900ab Add new user activity events 2016-06-16 13:17:18 -07:00
Ryan Huffman
8b3b62aad7 Add UserActivityLogger scripting interface 2016-06-16 10:25:38 -07:00
Ryan Huffman
ed88232fb0 Move session id storage to AccountManager 2016-06-16 09:19:42 -07:00
Brad Hefta-Gaub
f2bedc546f Merge pull request #8019 from jherico/settings 
Eliminate file IO contentions for settings
 2016-06-04 21:04:50 -07:00
Brad Hefta-Gaub
9ef7e82270 Merge pull request #8020 from highfidelity/revert-7991-aoighost_builddocs_securityfixes 
Revert "Update the build docs for a better OpenSSL security posture."
 2016-06-04 21:01:03 -07:00
Andrew Meadows
062711b202 Revert "Update the build docs for a better OpenSSL security posture." 2016-06-04 20:51:21 -07:00
Brad Davis
65d8f65ed7 Fix unix builds, make settings ACID 2016-06-04 18:39:46 -07:00
Brad Davis
39dcd1f9bd Eliminate file IO contentions for the settings 2016-06-04 17:55:30 -07:00
Brad Hefta-Gaub
d9542107c2 Merge pull request #8006 from AndrewMeadows/convexification-2 
fix bad convex hull simplification
 2016-06-04 16:58:03 -07:00
Brad Hefta-Gaub
5390d50ab8 Merge pull request #8015 from kencooke/master 
Replace the linear interpolation embedded in the .WAV/.RAW loader with high quality polyphase resampling.
 2016-06-04 16:55:42 -07:00
Brad Hefta-Gaub
eeb08fb401 Merge pull request #8014 from imgntn/leaphands 
add leap hands to /system
 2016-06-04 16:43:30 -07:00
Brad Hefta-Gaub
0a79ab5ff8 Merge pull request #8017 from ctrlaltdavid/toolbar-positioning 
Save toolbar position when moving it only when stopped moving it
 2016-06-04 16:00:30 -07:00
David Rowe
b6cb5617d3 Save toolbar position when moving it only when stopped moving it 2016-06-05 08:55:27 +12:00
Brad Hefta-Gaub
5805c0cf9e Merge pull request #8016 from howard-stearns/do-not-send-stale-vive-data-as-valid-for-master 
do not send stale vive data as valid after deactivating
 2016-06-04 09:26:43 -07:00
howard-stearns
849bee977a Do not send stale vive data as valid after deactivating. 
(cherry picked from commit e6cc1fabe0)
 2016-06-04 09:07:51 -07:00
Ken Cooke
89bfa5bc09 fixed typo 2016-06-03 19:22:29 -07:00
Ken Cooke
280289045c Revert change to reverb settings. 2016-06-03 18:48:23 -07:00
Ken Cooke
cd29aac185 Merge branch 'master' of github.com:kencooke/hifi 2016-06-03 18:42:30 -07:00
Ken Cooke
54293fdad0 Replace the linear interpolation embedded in the .WAV/.RAW loader with high quality polyphase resampling. 
When downsampling 48khz to 24khz, linear interpolation creates aliasing distortion that is quite audible.  This change greatly improves the audio quality for all sound assets.
 2016-06-03 18:39:43 -07:00
Andrew Meadows
e92f1a8c5a Merge pull request #7991 from aoighost/aoighost_builddocs_securityfixes 
Update the build docs for a better OpenSSL security posture.
 2016-06-03 16:17:50 -07:00
James B. Pollack
da023bfbe3 leap 2016-06-03 15:40:04 -07:00
Andrew Meadows
c2317adf06 undo ambitious cleanup (try again another day) 2016-06-03 11:06:36 -07:00
Andrew Meadows
3280a2b967 fix indentation 2016-06-03 10:47:54 -07:00
Andrew Meadows
f17330ea82 diff method for capping convex hull point count 2016-06-03 10:47:54 -07:00
Andrew Meadows
c73757f740 use many colors for collision hull rendering 2016-06-03 10:47:54 -07:00
Andrew Meadows
2a3da60ed4 remove some magic numbers 2016-06-03 10:47:54 -07:00
Andrew Meadows
eff59d3fd3 build compound sub meshes shapes with less copying 2016-06-03 10:47:54 -07:00
Andrew Meadows
bce8879d7c remove ShapeInfo::clearPoints() 
use getPoints() by ref and then clear
 2016-06-03 10:47:54 -07:00
Andrew Meadows
9dc0fa7796 don't automatically clear ShapeInfo points 2016-06-03 10:47:54 -07:00
Andrew Meadows
211bbb88e6 purge SHAPE_TYPE_ELLIPSOID which wasn't used 2016-06-03 10:47:54 -07:00
Andrew Meadows
7858ef84b3 don't copy points onto itself 2016-06-03 10:47:54 -07:00
Andrew Meadows
c066b4d4ac purge collision shape for ParticleEffectEntityItem 2016-06-03 10:47:54 -07:00
Andrew Meadows
5d9e320dd7 purge SHAPE_TYPE_LINE 2016-06-03 10:47:54 -07:00
Andrew Meadows
654468619c swap order of if-else blocks 2016-06-03 10:47:54 -07:00