Al Bernstein
c628b23895
removed whitespace
2017-04-06 17:21:58 -07:00
Al Bernstein
e737456dcd
used thread safe moving average for the quaternions
2017-04-06 16:56:03 -07:00
Al Bernstein
de1fdfacca
made requested changes in PR10147
2017-04-06 16:18:40 -07:00
David Kelly
34a2cefb98
Merge pull request #10132 from davidkelly/dk/analyticsForConnections
...
initial analytics for connections
2017-04-06 10:45:39 -07:00
Anthony Thibault
be2fdd9388
Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects
...
Vive: Expose all 16 tracked poses to the controller system
2017-04-05 16:53:47 -07:00
David Kelly
1b6bf90843
initial analytics for connections
2017-04-05 11:10:06 -07:00
Seth Alves
384f404602
Merge pull request #10109 from mittens/21240
...
OBJ Loader Rewrite to Support Multiple Materials
2017-04-04 15:56:44 -07:00
Anthony J. Thibault
c58fdb590a
Fix for sliding feet when leaning in HMD mode.
2017-04-04 11:00:34 -07:00
Seth Alves
b0b214012c
Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts
...
Fix broken eventBridge on tablet after Reload All Scripts.
2017-04-04 10:45:08 -07:00
trent
362ffba117
Fixes to OBJReader.cpp style inconsistencies.
2017-04-03 21:54:19 -04:00
Brad Davis
9942770761
Merge pull request #10105 from samcake/ambient
...
Fixing the bad rendering of the instanced primitives on 4.1
2017-04-03 17:04:56 -07:00
trent
5cc87ccc4a
Fixed warning for subtly-stupid unused variable.
2017-04-03 19:38:34 -04:00
Anthony J. Thibault
8ff457a1b6
Fix broken eventBridge on tablet after Reload All Scripts.
...
The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object.
For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.
2017-04-03 16:03:55 -07:00
trent
bec46747dd
Merge branch 'master' of https://github.com/highfidelity/hifi into 21240
2017-04-03 16:46:36 -04:00
trent
2991332652
Rewrote the OBJ reader (again) to use FBXMeshPart instead of separate meshes. Works now! Multi-material support win.
2017-04-03 16:46:22 -04:00
Andrew Meadows
66ff551a7c
Merge pull request #10080 from ZappoMan/footActions
...
add foot IK targets as actions, map Kinect feet to foot targets
2017-04-03 12:06:14 -07:00
samcake
c3c73b209a
Fixing the bad rendering of the instanced primitives on 4.1
2017-04-03 11:49:00 -07:00
Anthony Thibault
999bd0d339
Merge pull request #10075 from sethalves/tablet-ui
...
Tablet ui -- misc changes + landscape mode
2017-04-03 10:43:34 -07:00
Seth Alves
43e1cec8a3
merge from upstream
2017-04-03 06:28:59 -07:00
David Rowe
405e8cfc9e
Fix typo noticed in passing
2017-04-02 12:58:24 +12:00
Chris Collins
6fe210da66
Merge pull request #10094 from sethalves/tablet-ui-fix-hmd-login
...
fix login-screen for hmd+tablet
2017-03-31 17:17:30 -07:00
Zach Fox
8a96969471
Merge pull request #9873 from highfidelity/PAL_v2
...
PAL v2.0
2017-03-31 17:00:41 -07:00
Seth Alves
3cd134d138
fix login-screen for hmd+tablet
2017-03-31 16:41:21 -07:00
Andrew Meadows
0181783290
Merge pull request #10064 from samcake/ambient
...
Fix the sharp reflection happening after pr 10036 and bugs on backend 4.1
2017-03-31 16:04:00 -07:00
samcake
467ea787c6
Adress Seth's review
2017-03-31 14:54:00 -07:00
Howard Stearns
0c07003768
Merge pull request #10049 from AndrewMeadows/avoid-invisible-avatars
...
Avoid invisible avatars
2017-03-31 13:48:41 -07:00
samcake
c8970dd704
Fixing the warning on windows
2017-03-31 11:34:03 -07:00
samcake
6a0c07a692
Fixing a bad counter for numFaces
2017-03-31 10:39:13 -07:00
Sam Cake
dd73cb7b8e
Use a magic number gpu::Texture::SINGLE_MIP instead of 1
2017-03-30 23:46:37 -07:00
Sam Cake
61d78bc931
BRinging the cool texture management of the gl45 backend to gl41, which fixes the broken ao on 41 among other things
2017-03-30 23:29:37 -07:00
ZappoMan
53c439ffba
add foot IK targets as actions
2017-03-30 19:11:16 -07:00
samcake
47e9668b8f
improving the gl41 backend to mimic the gl45
2017-03-30 17:59:59 -07:00
Seth Alves
9ef4d01772
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-30 17:00:07 -07:00
trent
e9035a1efb
More fixes for the OBJ reader. The data seems to be fine. The rendering seems not so fine.
2017-03-30 19:10:15 -04:00
trent
c5bb419bd1
Fixed OBJ reader crash, did not fix OBJ reader not working properly.
2017-03-30 18:16:55 -04:00
samcake
25edb44b75
Fix the problem with the cursor and scattering,
2017-03-30 15:15:14 -07:00
trent
864184a107
wip OBJ loader rewrite; wip because it crashes.
2017-03-30 17:11:40 -04:00
trent
5bf3da9a7f
Restoring hifi version of the OBJ files to get rid of my debug nonsense.
2017-03-30 16:14:42 -04:00
trent
dd2ed559b6
Merge branch 'master' of https://github.com/highfidelity/hifi into 21240
2017-03-30 16:13:28 -04:00
samcake
26000288d7
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-03-30 11:45:12 -07:00
Seth Alves
c62b07d26f
add setLandscape call to tablet
2017-03-30 11:36:21 -07:00
Seth Alves
36ad3af48e
attempt to avoid a hang on shutdown
2017-03-30 11:35:24 -07:00
David Kelly
e66c075f8e
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-30 10:14:29 -07:00
samcake
73a8ec3e72
Merge pull request #10068 from kencooke/audio-debugbuild-fix
...
Fix the crash in Debug builds
2017-03-30 10:12:37 -07:00
David Kelly
348674a267
Merge pull request #10034 from davidkelly/dk/avatarEntityIssue
...
bad serialization of Avatar Entity parentID
2017-03-30 10:12:19 -07:00
Ken Cooke
69863dd735
Fix the crash in Debug builds, caused by undeclared metatype for AudioInjector*
2017-03-30 08:52:04 -07:00
Sam Cake
1c9bc2d71e
Trying to debug the crash on gl4.1
2017-03-29 23:28:06 -07:00
samcake
5584853340
Keep on cleaning
2017-03-29 18:22:21 -07:00
Anthony J. Thibault
d47c040768
Vive: Expose all 16 tracked poses to the controller system.
...
This is in preparation for the Vive hockey puck trackers...
2017-03-29 18:15:29 -07:00
samcake
b6504bba56
Moving the num mips per texture to the creator so it s immutable and simpler
2017-03-29 17:58:56 -07:00
