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

26877 commits

Author SHA1 Message Date
samcake
b6b7cb3394 Adressing warnings issue and implementing the independent intersection test per region spheres 2018-03-06 12:39:28 -08:00
Sam Gateau
7e96608699 introducing the first stage of the workload engine to setup view and expand the view definition 2018-03-06 01:35:16 -08:00
samcake
450786404c Adding more detailed classes and introducing an upfront setupVIew job 2018-03-05 18:04:25 -08:00
samcake
0ab5fc178f Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-03-05 11:12:27 -08:00
samcake
7d32efb5e6 Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload 2018-03-05 11:03:11 -08:00
samcake
660c4c30e9 Representing the view spheres 2018-03-02 18:22:51 -08:00
samcake
7179a31d17 Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-03-02 17:51:19 -08:00
samcake
cc392944b5 Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload 2018-03-02 17:49:10 -08:00
Atlante45
85b4c3b422 Protect session UUID from concurrent read/writes 2018-03-02 17:34:18 -08:00
Sam Gateau
8856d4af4f
Merge pull request #12530 from samcake/punk 
Fixing the graphics bugs introduced since last recent dual quaternion change
 2018-03-02 16:12:23 -08:00
John Conklin II
8f403ebc23
Merge pull request #12543 from zfox23/improveFontLoading 
Improve font loading via QRC instead of file path
 2018-03-02 14:22:17 -08:00
samcake
fc8f1c1e65 Resolving conflicts 2018-03-02 14:20:33 -08:00
Brad Hefta-Gaub
762e36ef19
Merge pull request #12545 from birarda/bug/fix-nlpacket-ascii 
fix ASCII art for packet headers in NLPacket
 2018-03-02 13:49:27 -08:00
Stephen Birarda
4f151a4237 fix ASCII art for packet headers in NLPacket 2018-03-02 12:41:22 -08:00
Brad Davis
9e8368e50e Disable virtual trackpad rendering on non-Android builds 2018-03-02 11:12:44 -08:00
samcake
b8fb97c824 Resolving conflicts 2018-03-02 10:36:55 -08:00
samcake
a40f8cefa2 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-03-02 09:01:16 -08:00
samcake
d4d5f3a7f0 Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload 2018-03-02 08:50:47 -08:00
samcake
5b8e18f15d Adding the pipeline to render the view spheres 2018-03-01 17:57:44 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
Brad Hefta-Gaub
d24cea2f07
Merge pull request #12521 from sethalves/no-prelocked-for-non-lockers 
if a node can't change locks, don't allow it to create an already-locked entity
 2018-03-01 14:56:29 -08:00
samcake
6e7ef1e609 Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-03-01 13:42:51 -08:00
samcake
3a9a93f502 Introducing a ui app for debugging the workload and fixing the vissible/invisisble behavior of the render item 2018-03-01 13:40:58 -08:00
Andrew Meadows
1e1d9907a4 also clear _staleProxies when clearing all else 2018-03-01 12:22:42 -08:00
Andrew Meadows
7a852a0e31 clear the Space 2018-03-01 12:11:30 -08:00
Andrew Meadows
18a6ac057a add Space::clear() method 2018-03-01 12:09:28 -08:00
samcake
a227cf1edb Fixing bad key/pipeline pair 2018-03-01 10:49:58 -08:00
Andrew Meadows
67c78a2df1 remember list of stale proxies 2018-03-01 10:21:25 -08:00
Andrew Meadows
f9db9e999e Merge 'master' into 'workload' 2018-03-01 10:19:06 -08:00
Zach Fox
877fa52034 Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading 2018-03-01 10:14:23 -08:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update 
Image entity has correct orientation and is collisionless
 2018-03-01 09:57:08 -08:00
samcake
94fa2ef6a0 Adding debug color of the region 2018-02-28 17:59:59 -08:00
Zach Fox
67034274fa Improve font loading by using QRC instead of relative paths 2018-02-28 17:59:37 -08:00
samcake
b1b539e07a Adding debug color of the region 2018-02-28 17:56:37 -08:00
samcake
dc286544c5 Merging with nissim's pr 2018-02-28 17:54:54 -08:00
samcake
a7542d5b90 fixing the shadow 2018-02-28 17:46:22 -08:00
samcake
d91fb543f3 Fix the ssbo in GL4.5 and represent the workload proxies of the space and expose the workload engine to the JS api 2018-02-28 17:15:40 -08:00
NissimHadar
5d7e6651a7 Use correct pixel shader. 2018-02-28 11:05:02 -08:00
samcake
e6d5f90847 Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-02-28 10:30:14 -08:00
Andrew Meadows
3ca21dda67 Merge hifi/master of into hifi/workload 2018-02-28 10:28:31 -08:00
samcake
31462a87c3 now identifying the issue with ResourceBUffer 2018-02-28 10:13:13 -08:00
samcake
66f1b7f1fc Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-02-28 09:25:24 -08:00
NissimHadar
faad930e35 WIP. 2018-02-28 08:44:01 -08:00
NissimHadar
7ae37c21e0 Merge branch 'master' of github.com:highfidelity/hifi into fixDualQuats 2018-02-28 08:13:00 -08:00
NissimHadar
5764a21c4a WIP. 2018-02-28 08:12:48 -08:00
Ken Cooke
328b5a1e8b
Merge pull request #12479 from kencooke/audio-nearfield-hrtf 
Near-field HRTF
 2018-02-28 07:44:24 -08:00
Ken Cooke
bc7b983f48 Fast approximation of the azimuth parallax correction 2018-02-28 04:44:20 -08:00
Seth Alves
31115b3cb6 make sure rezzer doesn't ignore adjustment 2018-02-27 20:14:00 -08:00
Seth Alves
9d131a6547 if a node can't change locks, don't allow them to create an already-locked entity 2018-02-27 19:53:54 -08:00
samcake
3360c5a968 Debugging the ssbo bug 2018-02-27 18:46:12 -08:00