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

78274 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon Walton
5f986bbeb7 New banner cpp files 2019-04-24 17:49:35 -07:00
Simon Walton
de97af5c02 Minimal working version for avatar's client 
Also merge of Wayne's proof-of-concept
 2019-04-24 17:42:51 -07:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Shannon Romano
404be42bfb
Merge pull request #15409 from wayne-chen/fixShieldIconBehavior 
Case 22290: Fixing Shield Icon Behavior in Desktop Mode
 2019-04-24 16:35:02 -07:00
Shannon Romano
0051693da8
Merge pull request #15414 from wayne-chen/fixRelaunchMuteSettings 
Case 22298: Persist Mute Settings Between Sessions
 2019-04-24 16:34:34 -07:00
Andrew Meadows
084759a918 send update after changing entity 2019-04-24 16:32:39 -07:00
Shannon Romano
70c2b8b8c4
Merge pull request #15443 from Atlante45/fix/asset-server-baking-master 
Case 22333: Master: Fix asset server auto-baking
 2019-04-24 16:30:14 -07:00
Dante Ruiz
0bdc37859d Refresh Rate Controller 2019-04-24 16:16:08 -07:00
Shannon Romano
10cfa9557d
Merge pull request #15448 from wayne-chen/fixMarketplaceLoginBug-83 
Case 22346: Market -- Please Login -- does not work
 2019-04-24 16:13:43 -07:00
Angus Antley
93b49a86db fixed build error 2019-04-24 15:50:00 -07:00
Angus Antley
eb0506ee12 updated json 2019-04-24 14:58:30 -07:00
Angus Antley
45f4cb2018 added animation files and updated ease in function in rig 2019-04-24 14:56:38 -07:00
Sam Gondelman
1540c5d203
Merge pull request #15401 from SamGondelman/grid 
Case 22229: Create Grid ignorePickIntersection
 2019-04-24 12:24:27 -07:00
Shannon Romano
1b67042091
Merge pull request #15428 from raveenajain/gltf_debug 
case 22347: glTF move debug code
 2019-04-24 10:31:49 -07:00
amerhifi
cc3c75c8d1 adding mac default for screen scale 2019-04-24 10:24:48 -07:00
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-24 09:52:12 -07:00
Shannon Romano
4148ebfd18
Merge pull request #15447 from SamGondelman/materialData 
Case 22329: Don't try to bake materialURL if it points to materialData
 2019-04-24 09:26:52 -07:00
Shannon Romano
839aa0ebe8
Merge pull request #15446 from amerhifi/questCrashFix 
Case 22340 : turning on blit present for quest
 2019-04-24 09:24:24 -07:00
Shannon Romano
26e65b7ca6
Merge pull request #15444 from SamGondelman/warning 
Case 22262: Comment out QScript type warning
 2019-04-24 09:22:58 -07:00
Shannon Romano
42fb23ed5d
Merge pull request #15435 from samcake/blackProp 
Case 22327: Add a qml library to represent and interact with the engine configs, enhance Luci
 2019-04-24 09:22:11 -07:00
Shannon Romano
6da5608ae4
Merge pull request #15430 from huffman/fix/domain-baker-not-finishing 
Case 22309: Fix domain baker not finishing (merge to master)
 2019-04-24 09:19:25 -07:00
Shannon Romano
0768cd58dc
Merge pull request #15427 from SamGondelman/materialMap 
Case 22079: Bake existing materialMap in FST
 2019-04-24 09:16:12 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems 
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
 2019-04-24 09:13:59 -07:00
Angus Antley
5aee2f35f0 updated the ease in function 2019-04-24 08:27:36 -07:00
amantley
7f3101eefb working on the ease in function for the talk idle 2019-04-23 18:13:15 -07:00
Wayne Chen
464e5924d6 changing method name to reflect recent change in code 2019-04-23 16:59:12 -07:00
SamGondelman
3b746384ca really fix texture baking, and turn off irradiance generation during baking 2019-04-23 16:01:31 -07:00
Clement
2c3dd153dd Fix typo 2019-04-23 14:54:12 -07:00
Clement
86b6341098 Add error reporting + Make temp dir erase safer 2019-04-23 14:54:12 -07:00
Clement
77c5ea5fa8 Fix Asset Server reporting bad status for textures 2019-04-23 14:54:12 -07:00
Atlante45
329a76d4d6 Fix unix warning 2019-04-23 14:54:12 -07:00
Atlante45
3605b3d560 Patch interface redirect code 2019-04-23 14:54:12 -07:00
SamGondelman
b1f00d6f22 attempt to handle atp redirects from .fbx to .baked.fst 2019-04-23 14:54:10 -07:00
SamGondelman
1c888d63f0 don't try to bake materialURL if it points to materialData 2019-04-23 13:44:36 -07:00
NissimHadar
6f4ee601fb CR corrections. 2019-04-23 13:27:21 -07:00
NissimHadar
ec69fd38eb Added set minimum GPU texture memory cycles to API. 2019-04-23 12:26:13 -07:00
Gayathri
50583d337b
Merge pull request #15441 from dback2/materialTargetBadMerge 
Case 22195: Fix material target parentIDChanged
 2019-04-23 12:24:50 -07:00
Simon Walton
db411cc456
Merge pull request #15431 from SimonWalton-HiFi/readkeys-double-free 
Don't double-free an openssl structure in readKeys()
 2019-04-23 12:06:19 -07:00
amer cerkic
8a7503ef51 turning on blit present for quest 2019-04-23 11:45:25 -07:00
SamGondelman
48aef3e6d9 build error 2019-04-23 10:46:53 -07:00
amantley
70d8200bdc added on done for movement7 to json 2019-04-23 10:40:37 -07:00
Wayne Chen
ad22af1379 set AudioClient mute state as catch-all 2019-04-23 09:47:15 -07:00
luiscuenca
b10aca10d4
Fix code standard issues 2019-04-23 09:45:39 -07:00
Shannon Romano
7a9dd49eed
Merge pull request #15411 from Zvork/shadow 
Case 22117: Shadows Appear Incorrectly Placed Relative to Avatars
 2019-04-23 09:32:53 -07:00
Simon Walton
c03839e49f Fix threaded issues; add verify failed flag to avatar identity packet 
Bump packet version
 2019-04-23 09:26:17 -07:00
SamGondelman
9deb4e47ad comment out warning 2019-04-23 08:46:54 -07:00
Angus Antley
1291ee5ebc added new animations to the resource 2019-04-23 07:43:31 -07:00
David Rowe
7dde764907 Merge branch 'master' into M21956 
# Conflicts:
#	libraries/audio/src/Sound.h
 2019-04-23 14:58:23 +12:00
David Rowe
fbc8e1c347 Miscellaneous fixes 2019-04-23 14:49:14 +12:00
David Rowe
6e09c4885f Review updates 2019-04-23 14:35:25 +12:00