Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 17:25:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57380 commits 25 branches 28 tags 1.2 GiB
Commit graph

57380 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
98cc8c0683 Refining the custom shader pipeline design and registration mechanism 2017-07-12 14:13:58 +02:00
Seth Alves
084a989a7a stopAndDeleteLater is now just stop 2017-07-11 21:21:42 -07:00
Tingjin
80916b62bb Remove unnecessary code 
Remove two lines of unnecessary code.
 2017-07-11 20:52:28 -07: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
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
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
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
Seth Alves
3670a04d8e switch bare pointers to AudioInjector objects to be QSharedPointers 2017-07-11 14:24:58 -07:00
Andrew Meadows
badbe98097 minor cleanup and constency for packet stats 2017-07-11 14:21:49 -07:00
Seth Alves
d05b353942 Merge pull request #10940 from druiz17/qt-mouse-events 
Fix tablet scrolling for QT 5.9 and  QT 5.6
 2017-07-11 14:06:53 -07:00
Andrew Meadows
3226d33830 use cached OctreeSendThread::_nodeUuid 2017-07-11 14:02:16 -07:00
Andrew Meadows
15879b2832 + OctreeSendThread::traverseTreeAndSendContents() 
this abstracts a portion of OctreeSendThread::packetDistributor()
which will make it easier to split apart the tree traversal
from the sending of packets

also cleaned up some of the packet stats tracking
 2017-07-11 13:53:08 -07:00
Andrew Meadows
9d111d1f92 remove unused OctreeSendThread::_nodeMissingCount 2017-07-11 13:42:35 -07:00
Dante Ruiz
2f192fd48a added scroll fix for qt 5.6 2017-07-11 21:19:06 +01:00
Dante Ruiz
01ca192613 fixed tablet scrolling 2017-07-11 21:16:13 +01:00
David Kelly
8fd02c1d0c Merge pull request #10938 from davidkelly/dk/hmdPreviewFix 
fix hmd preview image
 2017-07-11 12:27:18 -07:00
David Kelly
e2426c538e Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/noPreviewAfterDismissing 2017-07-11 11:01:58 -07:00
David Kelly
e1df3feb5c fix hmd preview 2017-07-11 10:54:35 -07:00
Zach Fox
5bec6cc7f5 Merge pull request #10936 from zfox23/spectatorCamera_activeButtonWhenOn 
Make Spectator Camera icon active when Camera is on
 2017-07-11 10:31:29 -07:00
Zach Fox
2e8bd3c9cb Make Spectator Camera icon active when Camera is on 2017-07-11 10:16:55 -07:00
Andrew Meadows
a5cd11cea7 remove more crufty comments 2017-07-11 10:11:24 -07:00
Andrew Meadows
ca3f0ceecb remove crufty comments 2017-07-11 10:02:18 -07:00
Andrew Meadows
076ae28bed one less strand of spaghetti when counting packets 2017-07-11 09:52:39 -07:00
NeetBhagat
e08e9d6821 The current scale of avatar should not be more than domain's max_avatar_scale and not less than domain's min_avatar_scale. 2017-07-11 20:42:00 +05:30
NeetBhagat
1a47383d4f Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big 2017-07-11 19:23:46 +05:30
Sam Gateau
1f2f539507 Merge branch 'orange' of https://github.com/samcake/hifi into hobbes 2017-07-11 10:26:26 +02:00
Andrew Meadows
b74aad32ed minor cleanup in OctreeSendThread::packetDistributor() 2017-07-10 18:27:40 -07:00
Anthony J. Thibault
b0177c2522 remove comment, it does indeed work 2017-07-10 16:25:37 -07:00
Anthony J. Thibault
1cdc0071f3 Fixed issue with hips and chest not ramping off properly. 2017-07-10 16:17:25 -07:00
Zach Fox
ea62ef165c Fix image container background 2017-07-10 16:13:45 -07:00
Zach Fox
5ce409e2e2 Merge pull request #10935 from zfox23/spectatorCamera_tabletButtonFix 
Ensure tablet button shows up; protections for controller mapping; Ensure instructions show
 2017-07-10 15:52:21 -07:00
Zach Fox
5823efce76 Cleanup 2017-07-10 15:51:27 -07:00
Zach Fox
4a74522884 Ensure tablet button shows up; protections for controller mapping 2017-07-10 15:16:16 -07:00