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

43974 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
4cad94216c Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-03 13:16:08 -07:00
Seth Alves
b88bba8672 add code to convert older domain-settings to current style 2016-06-03 13:15:53 -07:00
SamGondelman
c1eab61241 sdl haptics aren't working, but might be a bug in sdl: http://stackoverflow.com/questions/23974908/why-is-sdl-hapticopenfromjoystick-not-working-in-sdl-2 2016-06-03 11:22:06 -07:00
Anthony J. Thibault
8f9fc08226 Add version number to avatar recording frame 
New recordings will have a version number of 1.
A missing version field indicates the initial version of 0.
Warn when playing back version 0 files which are no longer fully supported and fall back to default pose.
Playback of version 1 files should work as expected.
 2016-06-03 11:08:05 -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
Andrew Meadows
d591561a88 remove RenderableModelEntityItem::_points 
use ShapeInfo::_points instead
 2016-06-03 10:47:54 -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
SamGondelman
e2c4b4d306 added haptic support to sdl and touch (needs testing) 2016-06-03 10:17:08 -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
Atlante45
e2fa734024 Set collision threashold to walking speed 2016-06-02 19:15:55 -07:00
Seth Alves
0e3e2ea331 Merge branch 'ui' of github.com:sethalves/hifi into permissions-grid 2016-06-02 19:13:05 -07:00
Atlante45
4e8b61dea0 Limit collision injectors count to 3 2016-06-02 19:12:37 -07:00
David Rowe
f2e5b6056f Make table switches smaller 2016-06-03 14:03:19 +12:00
Seth Alves
d1abdb07ab Merge branch 'ui' of github.com:sethalves/hifi into permissions-grid 2016-06-02 18:20:27 -07:00
SamGondelman
912b35693b added vive single pulse haptics 2016-06-02 18:13:33 -07:00
Brad Hefta-Gaub
7ed35399e9 make the application of redundant physics update idempotent to improve action glitches 2016-06-02 18:01:23 -07:00
Atlante45
854bf82631 Raise and stretch collision sounds threshold 2016-06-02 17:37:36 -07:00
Zach Pomerantz
5c293646b9 Segment metadata users 2016-06-02 17:22:39 -07:00
David Rowe
8a2685325b Make localhost, anonymous, and logged-in rows non-deletable 2016-06-03 12:06:51 +12:00
Zach Pomerantz
85055d82bf Regenerate Domain metadata on user (dis)connect 2016-06-02 17:05:58 -07:00
James B. Pollack
f6644ad2bb change artemis url 2016-06-02 16:58:48 -07:00
Seth Alves
41a8e9fa91 missed a protocol change 2016-06-02 16:53:52 -07:00
SamGondelman
8b76af531b made touch hand orientation more comfortable, fixed all the touch key mappings, exposed capacitive touch keys for use later 2016-06-02 16:52:17 -07:00
Atlante45
3ca158265a Make sure getVelocityChange returns the velocityChange 2016-06-02 16:44:13 -07:00
Brad Davis
bf734395e5 More invisible web entity fixes 2016-06-02 16:37:45 -07:00
Brad Davis
cc85ce9c01 fix crash on click on non-visible web-entity 2016-06-02 16:37:45 -07:00
samcake
681da201fc COrrect the name of the Unlit dbug view 2016-06-02 16:25:14 -07:00
samcake
079f6af2cc Fixing the gamma correction for the debug view of occlusion 2016-06-02 16:14:46 -07:00
Zach Pomerantz
b13e7a1a8f Encapsulate metadata in DomainMetadata 2016-06-02 16:04:27 -07:00
David Rowe
fd77f8401c Style new code like old 2016-06-03 10:40:32 +12:00
Seth Alves
fc92268641 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-02 15:38:24 -07:00
Zach Pomerantz
18696144f1 Move metadata generation to DomainMetadata 2016-06-02 15:36:29 -07:00
Zach Pomerantz
87e27d9570 Factor out metadata generation from heartbeat 2016-06-02 15:35:47 -07:00
Zach Pomerantz
bf920c2b80 Compact Domain heartbeat JSON 2016-06-02 15:34:36 -07:00
David Rowe
21ba4f3394 Make editibility of switch columns be configurable 2016-06-03 10:27:38 +12:00