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

58601 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
9335acc887 Merge and a lot of rewriting the color conversion 2017-08-24 18:02:11 -07:00
Sam Gondelman
4e7818180b Merge branch 'master' into tabletLayer2 2017-08-24 17:56:44 -07:00
Sam Gateau
c5fbd5a2a5 Merge pull request #11131 from jherico/threaded_render_entities 
Threaded rendering of Entities
 2017-08-24 17:34:49 -07:00
Elisa Lupin-Jimenez
3a512e3072 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-24 16:50:58 -07:00
Zach Fox
3980a478d9 Only show 'buy' on costed items' 2017-08-24 16:38:44 -07:00
beholder
cbbe03cee7 6788: You can deselect your current view mode 2017-08-25 02:33:11 +03:00
Chris Collins
43b1e67e4a Merge pull request #11238 from misslivirose/set-home-with-sandbox-starter 
Create home bookmark for new content sets loaded in
 2017-08-24 16:25:04 -07:00
Zach Fox
8d3c394d00 More progress 2017-08-24 16:21:41 -07:00
SamGondelman
abaccf9edd crash on shutdown 2017-08-24 16:00:36 -07:00
Elisa Lupin-Jimenez
e71823a8b5 forgot to track a file 2017-08-24 15:46:22 -07:00
Elisa Lupin-Jimenez
77f93ae84b user agent switch allows downloads 2017-08-24 15:44:22 -07:00
Zach Fox
bdc1f7b236 Progress 2017-08-24 15:39:26 -07:00
Zach Fox
e2c74d8b88 Initial progress 2017-08-24 15:22:30 -07:00
Chris Collins
c0afda859f Merge pull request #11240 from kencooke/audio-gate-threshold 
More aggressive noise gate threshold
 2017-08-24 14:49:18 -07:00
Zach Fox
3c7fadb1ce Final touch 2017-08-24 14:30:42 -07:00
SamGondelman
4a49801217 web overlays and entities are always nonAA 2017-08-24 14:23:21 -07:00
Zach Fox
56950e4614 It's working! 2017-08-24 14:17:39 -07:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
humbletim
9348048387 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-08-24 16:23:47 -04:00
David Kelly
eb9436ba96 Merge pull request #11235 from davidkelly/dk/encryptFile 
Initial wallet app plus some encryption of security image
 2017-08-24 13:17:14 -07:00
Zach Fox
baad5f195e I'm locking something wrong 2017-08-24 12:53:48 -07:00
Elisa Lupin-Jimenez
5c027705ba removed extraneous line from active tablet button code 2017-08-24 12:01:08 -07:00
Elisa Lupin-Jimenez
3444b0e84c blocks icon button now has active state 2017-08-24 11:38:01 -07:00
David Kelly
a299aa7e24 initialize ptr! 2017-08-24 11:37:44 -07:00
Ken Cooke
684b7fee5a DC filter cutoff at 0.5Hz 2017-08-24 11:20:22 -07:00
Zach Fox
d370eeea2f Just gotta test 2017-08-24 11:07:58 -07:00
samcake
b6a4ec910c Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-08-24 11:05:28 -07:00
Elisa Lupin-Jimenez
d81c16ddb1 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-24 11:01:11 -07:00
Zach Fox
e834e9d7a7 Progress 2017-08-24 10:46:18 -07:00
David Kelly
698644c3b4 Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile 2017-08-24 10:37:58 -07:00
Zach Fox
3d0fd76997 Temp fix for inventory and buy 2017-08-24 10:24:06 -07:00
Ken Cooke
4a253023ee float constants 2017-08-24 10:15:54 -07:00
Ken Cooke
c3ff505b73 More aggressive noise gate threshold 2017-08-24 10:06:41 -07:00
Zach Fox
92e8f84dc5 I understood last night at midnight 2017-08-24 09:43:35 -07:00
Sam Gateau
4a18c5c80e Merge pull request #11214 from SamGondelman/image3DFix 
Fix Image3DOverlays with fractional alpha
 2017-08-24 09:04:02 -07:00
David Kelly
d398adc195 warnings 2017-08-24 08:48:26 -07:00
Brad Hefta-Gaub
5c832eae9c Merge pull request #11226 from SamGondelman/miceWithLasers 
EntityTreeRender uses RayPick API with precision picking
 2017-08-24 08:10:21 -07:00
Chris Collins
93457c0e42 Merge pull request #11237 from birarda/feat/ip-check 
add sender sock addr check to DS packet filter operator
 2017-08-24 07:51:23 -07:00
Chris Collins
751440388a Merge pull request #11225 from hyperlogic/bug-fix/simulation-deadlock-fix 
Bug fix for deadlock between EntitySimulation and EntityItem locks.
 2017-08-23 20:50:41 -07:00
samcake
051f8c5b40 AH ah moment and exploring using the tablet with html 2017-08-23 18:48:20 -07:00
David Kelly
c77dafdf12 fix warnings, prepare a bit for hooking up the passphrase 2017-08-23 17:43:37 -07:00
Zach Fox
657beef70f I understand again...getting started again 2017-08-23 17:42:02 -07:00
Liv
1050141b11 Create home path for new content sets loaded in 2017-08-23 17:38:24 -07:00
Stephen Birarda
133b7e66b7 adjust a comment and remove some debug 2017-08-23 16:38:23 -07:00
Zach Fox
52ef0f2037 More progress 2017-08-23 16:37:13 -07:00
Elisa Lupin-Jimenez
20b6cddc56 attempt to add active tablet button 2017-08-23 15:38:11 -07:00
Stephen Birarda
c122b22dfc add additional IP check to DS packet filter operator 2017-08-23 15:32:25 -07:00
David Kelly
57d973851e accidentally left in I guess 2017-08-23 15:11:17 -07:00
Brad Hefta-Gaub
afce8b547a Merge pull request #11197 from hyperlogic/bug-fix/prevent-rig-crash-in-lambda 
Rig: Use a registry to prevent use after free crashes/corruption
 2017-08-23 15:09:28 -07:00
Zach Fox
88c24c16d7 I finally understand - initial progress 2017-08-23 15:02:07 -07:00