Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
67165 commits 2 branches 0 tags 1.1 GiB
Commit graph

67165 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
33bbbcef83 Merging with master 2018-04-24 11:49:34 -07:00
Sam Gateau
da154d3e00
Merge pull request #12969 from jherico/fix/web_crash 
Attempt to shutdown web surfaces more consistently
 2018-04-24 10:15:25 -07:00
Sam Gateau
f50b2fab2b Exposing timing and regulated radiuses 2018-04-23 22:38:50 -07:00
Brad Davis
ecaf162afb Fixing PR build 2018-04-23 20:41:36 -07:00
samcake
f686ef1f25 Exposing more uniforms to ui for refining the controller 2018-04-23 18:02:09 -07:00
John Conklin II
5cf93ebd1f
Merge pull request #12966 from SamGondelman/audio 
Fix audio level meter
 2018-04-23 14:56:57 -07:00
John Conklin II
2e6a563c87
Merge pull request #12959 from davidkelly/dk/14375 
Don't populate user list in pal until you connect the events up
 2018-04-23 14:47:31 -07:00
John Conklin II
6af6423056
Merge pull request #12905 from dback2/desktopEquip 
Desktop equip/unequip
 2018-04-23 14:35:29 -07:00
Brad Davis
861200db27 Attempt to shutdown web surfaces more consistently 2018-04-23 14:32:38 -07:00
John Conklin II
91197cadcf
Merge pull request #12967 from SimonWalton-HiFi/hmac-shortid-merge-fix 
Fix for null sourceNode use
 2018-04-23 14:11:06 -07:00
Stephen Birarda
0de1a49c78
Merge pull request #12949 from birarda/feat/installer-marketing-images 
add default or campaigned marketing slideshow during install
 2018-04-23 13:52:53 -07:00
John Conklin II
70689dd297
Merge pull request #12968 from birarda/bug/wrong-domain-local-id 
fix setting of domain local ID from domain list
 2018-04-23 13:50:21 -07:00
John Conklin II
5a3f44fa15
Merge pull request #12965 from NissimHadar/bug12979 
Fix for bug #12979: Setting colors [0, 0, 254] from js api ends up as black color
 2018-04-23 13:49:41 -07:00
Sam Gateau
d3fccc4104
Merge pull request #12881 from SamGondelman/scaleAssert 
Minimum entity dimension (1mm)
 2018-04-23 13:40:53 -07:00
John Conklin II
b3dbf7a025
Merge pull request #12943 from vladest/fix_spinbox 
Fix SpinBox.
 2018-04-23 13:02:01 -07:00
Stephen Birarda
779386fbc4 fix setting of domain local ID from domain list 2018-04-23 12:29:02 -07:00
Simon Walton
f849d6f937 Change packetSourceAndHashMatchAndTrackBandwidth logging in same manner 2018-04-23 12:26:02 -07:00
Simon Walton
2f72b789a3 Fix for null sourceNode use 2018-04-23 12:13:31 -07:00
SamGondelman
1deb38f06d fix copy error 2018-04-23 12:05:30 -07:00
NissimHadar
ea6585a0b9 Corrected tosRGBFloat() computation. 2018-04-23 11:53:35 -07:00
samcake
35bbc6e61f Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-23 10:20:22 -07:00
Sam Gateau
d1e2e9ce71
Merge pull request #12921 from SamGondelman/precisionq 
Fix AMD shader compilation
 2018-04-23 10:17:35 -07:00
samcake
990ee83f04 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-23 10:07:58 -07:00
vladest
cf070e6e92 Cleanup 2018-04-23 18:56:16 +02:00
Sam Gateau
7842ee8eac
Merge pull request #12962 from SamGondelman/menu 
Android: Hide menu and fix shader compilation
 2018-04-23 09:51:20 -07:00
Ken Cooke
ae33205d80
Merge pull request #12944 from humbletim/fix-pal-adjusted-injector-gain 
Support per-avatar gain adjustment on positional audio streams
 2018-04-23 09:22:53 -07:00
Sam Gateau
97934fe563 Adjusting the regulators and moving task to use chrono nad interesting tests 2018-04-23 00:07:00 -07:00
Sam Gateau
99a0e42b5d Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-22 20:26:49 -07:00
Seth Alves
9e1bd69af3
Merge pull request #12918 from kitely/fix-addentity-failure 
Fixed null pointer exception if importing an entity from JSON fails
 2018-04-21 18:12:48 -07:00
Sam Gateau
ec569b0e51 adjusting the bounding box for debug rendering 2018-04-21 12:05:27 -07:00
vladest
60115752ad Fixed saving after editing 2018-04-21 20:18:24 +02:00
MiladNazeri
3710ce593d
Merge pull request #12922 from ctrlaltdavid/21815 
Controller API JSDoc
 2018-04-21 10:44:05 -07:00
vladest
2e44220b80 Merge branch 'master' into fix_spinbox 2018-04-21 19:38:28 +02:00
Sam Gateau
f16d0c712e Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-21 08:16:59 -07:00
David Rowe
34d0a892a0 Point to example using Hardware.Application item 2018-04-21 15:01:46 +12:00
David Rowe
3792b28a3e Add input recorder examples 2018-04-21 14:53:40 +12:00
David Rowe
f865a13326 Doc review 2018-04-21 14:10:14 +12:00
SamGondelman
ac7e8623bf quiet shader warnings 2018-04-20 18:25:30 -07:00
MiladNazeri
080e26f408
Merge pull request #12952 from ctrlaltdavid/21851 
Vec3 API JSDoc
 2018-04-20 18:10:18 -07:00
samcake
b66ab6deaa Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-20 17:55:45 -07:00
samcake
d1b0e89fa3 merging with upstream correctly 2018-04-20 17:55:34 -07:00
samcake
b554aec317 Trying more drastic changes and learnign to use std::chrono the right way 2018-04-20 17:53:24 -07:00
David Rowe
748052614f Doc review 2018-04-21 12:45:00 +12:00
Sam Gateau
07350b02c7
Merge pull request #12958 from AndrewMeadows/workload 
workload: merge from master
 2018-04-20 17:38:52 -07:00
SamGondelman
d59f368ad6 hide menu, fix shaders 2018-04-20 17:38:38 -07:00
David Kelly
d84ea6bf0f Don't populate user list in pal until you connect the events up 2018-04-20 16:09:20 -07:00
David Rowe
7087abd201 Merge branch 'master' into 21815 2018-04-21 10:49:56 +12:00
John Conklin II
39ad8be1b8
Merge pull request #12743 from SimonWalton-HiFi/short-id 
Use 16-bit local IDs for Nodes in NL packets
 2018-04-20 15:28:18 -07:00
Andrew Meadows
3858e7b43c update workload::Engine to agree with new API 2018-04-20 15:08:51 -07:00
Andrew Meadows
06af31594e merge 'master' into 'workload' 2018-04-20 15:07:46 -07:00