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

57438 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
ddf2312dc6 code review 2017-07-12 12:45:52 -07:00
Zach Fox
d6798c070e Merge pull request #10957 from zfox23/spectatorCamera_noFarClipMagicNumbers 
Cleanup; no magic numbers for default cam params
 2017-07-12 12:35:14 -07:00
Zach Fox
bd4fe416b4 Cleanup; no magic numbers for default cam params 2017-07-12 12:08:36 -07:00
Zach Fox
34d0363ae5 Merge pull request #10955 from zfox23/spectatorCamera_farClipDistance 
Make far clip plane distance equal to main camera's
 2017-07-12 11:37:43 -07:00
Zach Fox
9fe6fbd811 View frustums are strange. 2017-07-12 11:37:18 -07:00
Stephen Birarda
d347eab42c Merge pull request #10952 from highfidelity/revert-10922-revert-10835-bug/invisible-avatars 
Revert "Revert "fix for invisible avatars after radius ignore""
 2017-07-12 11:20:16 -07:00
utkarshgautamnyu
6b969bc39d added code to record total number of ATP/HTTP/File bytes downloaded during session 
Update FileResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update HTTPResourceRequest.cpp

Update AssetResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update AssetResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update FileResourceRequest.cpp

Update HTTPResourceRequest.cpp

Update FileResourceRequest.cpp

Update FileResourceRequest.cpp

Update Application.cpp

Update Application.cpp
 2017-07-12 11:13:13 -07:00
Andrew Meadows
364600c447 fix rendering of simulation ownership debug icons 2017-07-12 11:12:47 -07:00
Brad Davis
0e9f8cc103 Still trying to address QML crashes 2017-07-12 11:04:33 -07:00
Zach Fox
79cf242fc9 Make far clip plane distance equal to main camera's 2017-07-12 10:51:14 -07:00
Atlante45
b3d73fd0df Add comments to DebugDraw instanciation 2017-07-12 10:39:15 -07:00
Stephen Birarda
f6d9a79fb5 Revert "Revert "fix for invisible avatars after radius ignore"" 2017-07-12 10:36:53 -07:00
Dante Ruiz
12206cf711 Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes 2017-07-12 16:56:25 +01:00
Ken Cooke
77705c5ffa Merge pull request #10948 from Tingjin/Tingjin-V1 
Change AudioDevices.cpp
 2017-07-12 08:38:06 -07:00
Sam Gateau
5394ac8672 Cleaning up changes, removing comments and dead code etc... 2017-07-12 17:33:05 +02:00
Seth Alves
b556ddc0ef remove unneeded AudioInjectorPointer constructor 2017-07-12 07:24:19 -07:00
Sam Gateau
49779754ff Remove unecessary shaders and apply the custom shader pipeline to polyvox 2017-07-12 15:50:06 +02:00
Sam Gateau
258f1654f2 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2017-07-12 14:14:27 +02:00
Sam Gateau
98cc8c0683 Refining the custom shader pipeline design and registration mechanism 2017-07-12 14:13:58 +02:00
David Rowe
23ebb791e8 Fix don't scale with hands if scaling multiple entities with handles 2017-07-12 19:22:08 +12:00
David Rowe
1fc2d7ed1b Display corner scale handles 2017-07-12 18:44:08 +12:00
Seth Alves
084a989a7a stopAndDeleteLater is now just stop 2017-07-11 21:21:42 -07:00
David Rowe
972cf1a1be Size handles to compensate for physical distance 2017-07-12 16:11:59 +12:00
Tingjin
80916b62bb Remove unnecessary code 
Remove two lines of unnecessary code.
 2017-07-11 20:52:28 -07:00
David Rowe
2c3cd53f8d Display face scale handles only for single entities 2017-07-12 15:30:13 +12:00
David Rowe
850b94220f Display face scale handles 2017-07-12 15:22:44 +12:00
Seth Alves
3897ab2723 don't call deleteLater on smartpointered object 2017-07-11 20:16:00 -07:00
Seth Alves
972dc4d1b2 more const ref 2017-07-11 19:56:34 -07:00
Seth Alves
c52e7e180a use const AudioInjectorPointer& in some places 2017-07-11 19:42:03 -07:00
Seth Alves
81489ea6c4 use QEnableSharedFromThis 2017-07-11 18:44:37 -07:00
Seth Alves
dbd46fc4b8 Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers 2017-07-11 17:48:29 -07:00
David Rowe
196f5a43b1 Don't scale with hands if scaling with handles 2017-07-12 12:18:59 +12:00
Atlante45
bf13d0cc80 Send ordered packet lists for ignore feature 2017-07-11 17:12:12 -07:00
Seth Alves
0b2f13dacc don't use deleteLater on smartpointered object 2017-07-11 17:07:44 -07:00
Seth Alves
59c586bc5d remove unused code 2017-07-11 16:58:19 -07:00
Dante Ruiz
bedd0628b9 allowed tablet to toggle when a dialog is open 2017-07-12 00:51:07 +01:00
Seth Alves
3c8c87cff5 i hate you, milkman dan 2017-07-11 16:48:28 -07:00
Zach Fox
d786820670 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-11 16:16:37 -07:00
David Rowe
db37417ccd Tidying 2017-07-12 11:15:55 +12:00
Zach Fox
5af5b4516a Merge pull request #10943 from zfox23/spectatorCamera_removeAvatarEntityWorkaround 
Workaround the bug where Avatar Entities can't get deleted after switching domains
 2017-07-11 16:12:21 -07:00
David Rowe
68cdc23530 Display selection bounding box for scaling with handles 2017-07-12 11:04:02 +12:00
Zach Fox
a27644ae4d Magic numbers 2017-07-11 15:52:12 -07:00
Zach Fox
51c22eb7db Also re-enable spectator camera after switching domains 2017-07-11 15:38:10 -07:00
Zach Fox
1001097f92 Fix button state 2017-07-11 15:29:00 -07:00
Zach Fox
b0639be8bd Use function pointers correctly 2017-07-11 15:23:50 -07:00
Zach Fox
c4a4623ba8 Workaround the bug where Avatar Entities can't get deleted after switching domains 2017-07-11 15:18:08 -07:00
Andrew Meadows
1fe7718b9f restore wasted byte count when unable to fit stats 2017-07-11 15:02:45 -07:00
Liv
62be0af32d string pass on Chat.js 2017-07-11 14:57:11 -07:00
Andrew Meadows
782155e9ea Merge pull request #10876 from Atlante45/fix/ac-crash 
Fix AC crash (buffer overflow)
 2017-07-11 14:26:08 -07:00
Seth Alves
ead461dca7 Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers 2017-07-11 14:25:12 -07:00