Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-27 11:45:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65328 commits 29 branches 28 tags 1.2 GiB
Commit graph

26892 commits

Author SHA1 Message Date
samcake
87b159e491 merge with upstream, fixed a smal typo bug and clean up the ui 2018-03-07 17:30:11 -08:00
Andrew Meadows
77d0c211df fix warnings on windows 2018-03-07 15:46:42 -08:00
Andrew Meadows
0d9b1a7368 jobflow: RegionTracker --> RegionState 2018-03-07 11:19:47 -08:00
samcake
b26faf55e3 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-03-07 10:54:02 -08:00
Andrew Meadows
03a5a6f4e0 more correct proxy classification for multiple views 2018-03-07 08:41:01 -08:00
samcake
4a91ac11c9 Adding controls of the regions 2018-03-06 18:19:02 -08:00
samcake
e2ac5353b1 Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-03-06 18:03:07 -08:00
Andrew Meadows
43920b548f fix proxy-region distance math 2018-03-06 17:05:49 -08:00
Atlante45
edeed95ccc Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-06 15:33:12 -08:00
samcake
7cb4afc6b4 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-03-06 13:34:37 -08:00
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
John Conklin II
7bc3848c36
Merge pull request #12533 from druiz17/stereo-checkbox 
Adding Stereo checkbox in Audio settings
 2018-03-05 12:45:01 -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
Brad Hefta-Gaub
746f43c0fc
Merge pull request #12538 from huffman/fix/gzipped-json-export 
Fix Edit -> Export Entities exporting gzipped json
 2018-03-02 13:34:23 -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
Dante Ruiz
55d8cfd4c1 make sure dont make audio devices that don't use stereo use stereo 2018-03-02 10:56: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
Ryan Huffman
70bdedc4b3 Fix Edit -> Export Entities exporting gzipped json 
We were not respecting the doGzip flag.
 2018-03-01 16:42:41 -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
samcake
5440f62860 fixing a bad key /pipeline pair 2018-03-01 10:46:47 -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