Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-03 23:04:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43798 commits 25 branches 0 tags 1.1 GiB
Commit graph

43798 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
b836a580ff Updated some debug print information 2016-06-06 14:40:58 -07:00
Anthony J. Thibault
6d462a477d Change equip-hotspot to a green sphere. 2016-06-06 14:40:57 -07:00
Anthony J. Thibault
c9f440a49d handControllerGrab: initial rendering of equip hot-spots 
* When trigger is depressed, any entities that are marked with a wearable equip-point
  will become highlighted by a wireframe box (temporary art).
* The grab state machine is now defined by the CONTROLLER_STATE_MACHINE object.
  this includes each state's name and updateMethod name.
* Support was added for entry and exit methods when changing states, this
  functionality is used to draw and delete the hot spots when entering
  and exiting the searching state.
 2016-06-06 14:40:57 -07:00
Brad Davis
b7d1659852 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-06 09:32:33 -07:00
Howard Stearns
fc33e1746f Merge pull request #8008 from howard-stearns/goto-button 
Basic address bar toggle button.
 2016-06-05 11:19:24 -07:00
Howard Stearns
91450addd3 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into goto-button 2016-06-05 10:46:18 -07:00
Howard Stearns
dbc688f445 Merge pull request #8005 from howard-stearns/pointer-cleanup 
pointer cleanup -- see comment on #8012
 2016-06-05 10:17:36 -07:00
Howard Stearns
8debe494f3 Merge pull request #8012 from howard-stearns/hmd-button 
hmd button -- I'm going to go ahead in merge this myself because it's isolated and I want to bring the branch to a consistent/known/planned state for evaluation. (We will be modifying the implementation going forward.) It's too confusing to equivocate as to what functionality "in" the vive-ui branch when this is pending.
 2016-06-05 10:16:47 -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
Brad Hefta-Gaub
c2a34f24cb Merge pull request #7999 from howard-stearns/do-not-send-stale-vive-data-as-valid 
Do not send stale vive data as valid after deactivating.
 2016-06-04 08:41:26 -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
howard-stearns
6881956117 Basic HMD toggle button. 2016-06-03 14:57:46 -07:00
howard-stearns
247286c71f Basic address bar toggle button. 2016-06-03 11:55:33 -07:00
Andrew Meadows
c2317adf06 undo ambitious cleanup (try again another day) 2016-06-03 11:06:36 -07:00
Howard Stearns
af6ec8d8bd Merge pull request #7994 from jherico/pinned 
Pinned UI support
 2016-06-03 11:02:59 -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
Andrew Meadows
d591561a88 remove RenderableModelEntityItem::_points 
use ShapeInfo::_points instead
 2016-06-03 10:47:54 -07:00
howard-stearns
3e919cb7ac cleanup 2016-06-03 10:42:02 -07:00
Brad Hefta-Gaub
c85923c69b Merge pull request #7956 from jherico/web_entity_crash 
fix crash on click on non-visible web-entity
 2016-06-03 10:29:55 -07:00
Brad Hefta-Gaub
2e4480ee15 Merge pull request #7979 from jherico/steam_vr_exit_fix 
Fix crash on shutdown of SteamVR
 2016-06-03 10:28:53 -07:00
Andrew Meadows
a22de76052 Merge pull request #8003 from ZappoMan/improveActionGlitches 
fix glitches when observer client watches object with action
 2016-06-03 09:35:12 -07:00
Brad Hefta-Gaub
1075ba1599 CR feedback 2016-06-03 08:01:09 -07:00
Brad Hefta-Gaub
e891a53ddd Merge pull request #8002 from Atlante45/fix/avatar-collision-sounds 
Fix Avatar collision sounds triggering all the time.
 2016-06-02 20:35:06 -07:00