Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-15 00:46:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63297 commits 17 branches 0 tags 1.1 GiB
Commit graph

25901 commits

Author SHA1 Message Date
Nissim Hadar
8396997dec Renamed enum element. 2018-01-10 13:35:57 -08:00
Nissim Hadar
c99a936720 Bumped up protocol version. 2018-01-10 11:45:37 -08:00
Nissim Hadar
9f25b01b10 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-10 09:30:05 -08:00
Sam Gateau
539ee82937
Merge pull request #12033 from Zvork/compactvb 
More compact representation of meshes on GPU
 2018-01-10 09:11:33 -08:00
Sam Gateau
8c80247925
Merge pull request #12123 from SamGondelman/meta 
Model meta render item is only withTypeShape if visual geometry request fails
 2018-01-10 09:09:19 -08:00
Sam Gateau
6d6aad4aa8
Merge pull request #12060 from SamGondelman/burp5 
Reduce EntityItem access in EntityRenderer::needsRenderUpdateFromEntity
 2018-01-10 09:08:54 -08:00
Olivier Prat
5ae4b99b90 Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2018-01-10 11:20:00 +01:00
Nissim Hadar
bb04b68e42 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-09 15:51:46 -08:00
Nissim Hadar
5b1f8e83d4 Removed gcc warning. 2018-01-09 15:46:15 -08:00
Nissim Hadar
0b1e321ccf Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-09 15:25:03 -08:00
Nissim Hadar
b53e411184 Corrected pushing of default lights. 2018-01-09 15:24:46 -08:00
Melissa Brown
7b50480a43
Merge pull request #12070 from 1st-BrainStormer/master 
WL#21651: Extend MIDI javascript support.
 2018-01-09 14:06:15 -08:00
Nissim Hadar
4ecb056210 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-09 13:44:13 -08:00
Nissim Hadar
c3f6faed00 Deal correctly with inheritance at top-most level. 2018-01-09 13:27:57 -08:00
SamGondelman
7c56a9ffb2 model meta is only withTypeShape if visual geometry request fails 2018-01-09 12:43:43 -08:00
Olivier Prat
db9e5fdae8 Merged from master but rendering seems broken 2018-01-09 11:05:34 +01:00
Bruce Brown
e9f8dafbc8 Corrected bitwise operators, Removed midiRaw signal. 2018-01-08 20:10:22 -08:00
Nissim Hadar
c841ec6c8c Copy Skybox URL to Ambient URL if background mode is Skybox and Ambient URL is blank. 2018-01-08 18:15:20 -08:00
SamGondelman
4f5727e6b0 add _needsRenderUpdate flag 2018-01-08 17:10:44 -08:00
Nissim Hadar
7811ddb904 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-08 15:39:09 -08:00
Nissim Hadar
b2b1807490 Changes per code review. 2018-01-08 15:37:06 -08:00
Nissim Hadar
46b494c802 Removed the Stage functionality - it is now implemented as a script. 2018-01-08 14:34:46 -08:00
SamGondelman
7c17603f3e Merge remote-tracking branch 'upstream/master' into burp5 2018-01-08 14:27:31 -08:00
Melissa Brown
2fddace71e
Merge pull request #12019 from Delanir/C10594 
Case 10594 - Fix entity property href not being able to reset (empty) ...
 2018-01-08 14:22:28 -08:00
Nissim Hadar
569cf1a30e Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-08 14:16:03 -08:00
John Conklin II
fab28e7d44
Merge pull request #12106 from SamGondelman/overlayFix 
Fix avatar texture loading
 2018-01-08 14:01:15 -08:00
SamGondelman
97c0b33975 fix avatar texture loading 2018-01-08 12:50:05 -08:00
Nissim Hadar
452c16e706 Removed backgroundPropertiesChanged 2018-01-08 12:11:36 -08:00
Nissim Hadar
0a21e5de04 Removed _backgroundPropertiesChanged 2018-01-08 12:07:21 -08:00
MiladNazeri
56d4429a8b
Merge pull request #12020 from ctrlaltdavid/21646 
Window JSDoc
 2018-01-08 11:53:34 -08:00
Nissim Hadar
a33f3446f6 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-08 11:51:13 -08:00
Nissim Hadar
d0c0d6a388 Set skybox mode as per legacy background mode if needed. 2018-01-08 11:50:28 -08:00
Nissim Hadar
93fffb4bbe Removed PROP_BACKGROUND_MODE. 2018-01-07 14:21:22 -08:00
Nissim Hadar
8e793e790a Deleted unused include file. 2018-01-07 14:11:26 -08:00
Nissim Hadar
8206ae6ffb Removed BackgroundMode packet type. 2018-01-07 13:50:42 -08:00
Howard Stearns
724db93389
Merge pull request #12002 from howard-stearns/consistent-goToUser 
Consistent go to user
 2018-01-07 11:07:39 -08:00
Nissim Hadar
bc98cbd58f Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-06 23:26:28 -08:00
nissim.hadar
1acf7bae20 Removed reference to BackgroundMode. 2018-01-06 23:24:28 -08:00
Nissim Hadar
d5be9365fe Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-06 10:02:12 -08:00
nissim.hadar
33cc17a52f Removing unused Background mode. 2018-01-06 02:27:49 -08:00
nissim.hadar
d2ac27f1b8 Code clean-up 2018-01-06 01:48:58 -08:00
nissim.hadar
579aec7118 Only check for zone fields. 2018-01-06 01:37:23 -08:00
Olivier Prat
b296b96e5e Merged with master 2018-01-06 10:01:00 +01:00
Nissim Hadar
f742ab7952 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-05 23:14:51 -08:00
Nissim Hadar
9e5eba4d3a Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-05 23:11:40 -08:00
Bruce Brown
f233c93aaa Requested updates 2018-01-05 19:50:16 -08:00
Anthony Thibault
1a97d1de0f
Merge pull request #11953 from hyperlogic/feature/exp-smoothing-input-filter 
Added exponential smoothing filter for vive pucks.
 2018-01-05 16:50:55 -08:00
Andrew Meadows
4745a0e32d
Merge pull request #12093 from AndrewMeadows/simulation-ownership-004 
more stable simulation ownership for system of constraints
 2018-01-05 14:17:53 -08:00
Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661 
Laser auto-on with tablet and Web overlays
 2018-01-05 14:08:01 -08:00
Brad Hefta-Gaub
7a3835eb33
Merge pull request #11945 from jherico/android_nov 
Updating android toolchain for QML
 2018-01-05 13:34:03 -08:00