Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-06 01:12:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77428 commits 6 branches 1 tag 1.1 GiB
Commit graph

31945 commits

Author SHA1 Message Date
Olivier Prat
eadace70f8 Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-03 18:19:46 +02:00
Olivier Prat
150508dc18 Fixed gamma with ETC SRGB8 2019-04-03 18:19:27 +02:00
Olivier Prat
6b876e6a27 Fixed warnings on Mac & Ubuntu 2019-04-03 12:05:29 +02:00
Olivier Prat
50fecf5e01 Ambient map has different hash than sky map to prevent using one instead of the other, even if they are using the same source texture. 2019-04-03 11:29:59 +02:00
Olivier Prat
a79e7a2587 Fixed warning 2019-04-03 11:18:15 +02:00
Olivier Prat
e3355cd6a4 Trying to work uniformly with Image 2019-04-03 10:26:39 +02:00
Anthony Thibault
dd2f8ff2d6
Merge pull request #15309 from hyperlogic/bug-fix/case22010 
Case 22010: Bump protocol number to fix joint order mismatch
 2019-04-02 16:06:11 -07:00
Ryan Huffman
6a16a37339
Merge pull request #15286 from huffman/fix/oven-query-param-in-model-url 
Case 20928: Fix some URLs with query params not working with model baker
 2019-04-02 15:03:59 -07:00
Anthony J. Thibault
782b8f5da6 Case 22010: Bump protocol number to fix joint order mismatch 
The joint order change was introduced in PR #15178, to fix an FBX Serializer bug.
 2019-04-02 13:26:50 -07:00
Shannon Romano
c5c643f90e
Merge pull request #15304 from kitely/fix-invoke-adddelete-wearable 
case 22001: Fixed calls to addingWearable() and deletingWearable()
 2019-04-02 09:09:57 -07:00
Olivier Prat
1aedfff6f7 Working convolution 2019-04-02 15:40:42 +02:00
Shannon Romano
cf7eeb7355
Merge pull request #15285 from danteruiz/avatar-fading 
Case 21415: Avatars stay behind after they disconnect
 2019-04-01 18:04:42 -07:00
danteruiz
8115ef6d36 addressing more requested changes 2019-04-01 16:46:15 -07:00
danteruiz
fcb838a71f addressing review requests 2019-04-01 15:43:04 -07:00
Shannon Romano
1bfa0397f0
Merge pull request #15048 from wayne-chen/newAudioMuteStates 
Case 21899: New Audio Mute States
 2019-04-01 15:27:03 -07:00
Shannon Romano
04eac57950
Merge pull request #15300 from jherico/fix/web_camera_master 
Case 21993: Globally disallow use of the camera or microphone by hosted web content
 2019-04-01 14:05:22 -07:00
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates 2019-04-01 12:24:46 -07:00
Olivier Prat
ce0254e141 Fixed some crashes 2019-04-01 17:40:09 +02:00
Oren Hurvitz
0b822b2cbc Fixed calls to addingWearable() and deletingWearable(). 
The calls used a parameter type of QUuid instead of EntityItemID. This resulted in the following warnings in the log:

[04/01 18:16:11.012] [WARNING] [default] [53296] QMetaObject::invokeMethod: No such method EntityScriptingInterface::addingWearable(QUuid)
[04/01 18:16:11.012] [WARNING] [default] [53296] Candidates are:
[04/01 18:16:11.012] [WARNING] [default] [53296]     addingWearable(EntityItemID)
 2019-04-01 18:26:00 +03:00
Olivier Prat
f895e96500 Fixed wrong sample count 2019-04-01 14:22:26 +02:00
Olivier Prat
706dc0e303 Fixed some issues with merge 2019-04-01 11:31:38 +02:00
Olivier Prat
4e39a063f7 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2019-04-01 11:08:41 +02:00
Olivier Prat
59eeb9361e Corrections after merge 2019-04-01 11:08:23 +02:00
Olivier Prat
7af4a52587 Merge branch 'hdr' into amc 2019-04-01 10:44:38 +02:00
Olivier Prat
7aaf3da11e Before merge with HDR 2019-04-01 10:44:33 +02:00
Olivier Prat
745d41e679 Renamed Image to TextureProcessing 2019-04-01 10:08:35 +02:00
Olivier Prat
20f53f5de3 Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-01 10:04:41 +02:00
Brad Davis
7d4e59bfe3 Force packet version change 2019-03-31 16:44:23 -07:00
Shannon Romano
6ccf16dfe5
Merge pull request #15288 from roxanneskelly/Case21726 
Case 21726 - Domain lost recent entity edits upon restart
 2019-03-29 17:06:31 -07:00
Shannon Romano
53c7ade542
Merge pull request #15178 from amantley/fbxJointParentBug 
Fix for FBX Root Being Given Non-Zero Parent
 2019-03-29 17:02:02 -07:00
danteruiz
db17f094da adding entities to fade out list; 2019-03-29 15:23:16 -07:00
Shannon Romano
df97f595f2
Merge pull request #15279 from kitely/allow-emails-with-plus-sign 
case 21982: Allow logging-in with an email that contains a '+' sign
 2019-03-29 13:04:11 -07:00
Sam Gondelman
968dbb825a
Merge pull request #15243 from SamGondelman/proceduralTime 
Case 21876: New procedural uniforms for time, iEntityTime and iLocalCreatedTime
 2019-03-29 11:35:41 -07:00
Shannon Romano
c4925ddfa0
Merge pull request #15259 from SimonWalton-HiFi/avatar-hero-zone-improvements 
Avatar hero zone improvements
 2019-03-29 10:49:06 -07:00
Shannon Romano
ac0130d4c7
Merge pull request #15234 from SimonWalton-HiFi/clear-connection-on-add-node 
When adding new Node clear any dangling Connection objects
 2019-03-29 10:46:22 -07:00
Shannon Romano
a83b90cdc6
Merge pull request #15044 from sethalves/lock-wearables 
case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables
 2019-03-29 10:41:21 -07:00
John Conklin II
56dde6e240
Merge pull request #15235 from Atlante45/fix/traits 
Case 21108: Make traits easier to extend
 2019-03-29 10:37:55 -07:00
Olivier Prat
7455ddb7ba Created Image class to encapsulate some transforms with QImage 2019-03-29 12:23:44 +01:00
danteruiz
b9d04c6ebb adding entity to a faded list 2019-03-28 16:42:29 -07:00
Roxanne Skelly
88b7687183 Case 21726 - Domain lost recent entity edits upon restart 
When an entity server starts up, grabs the version of the models.json
file locally, and then queries the domain server for its copy of the
models.json file...iff the domain server version is newer.

There was a bug in this process in that the comparison was made between
the wrong version, specifically the 'file format version' which doesn't
change unless there was a protocol change...and not the data version,
which increments every time a change is made to a domain.

Therefore, the version of the models.json on the domain server was never
downloaded to the entity server, even when it was newer.

It would be newer if the entity server assignment was moved to a machine
with an old version of the models.json file, which was in fact the case
on distributed3 during this period of time.
 2019-03-28 13:19:16 -07:00
Ryan Huffman
7e805562ef Fix some URLs with query params not working with model baker 
After talking with Sabrina, we decided that we could safely leave the
query param and fragment intact for a URL in the model baker.
 2019-03-28 11:59:31 -07:00
danteruiz
04d9858f02 fixing remaining issues 2019-03-28 11:43:53 -07:00
Anthony Thibault
65507cfe11
Merge pull request #15180 from luiscuenca/flowCppFixes 
Fix Flow touch and scale issues
 2019-03-28 11:11:08 -07:00
Anthony Thibault
b0d5a82c80
Merge pull request #15169 from hyperlogic/bug-fix/rig-assert-fix 
Rig.cpp: Fix for index out of range assert in debug builds
 2019-03-28 11:10:32 -07:00
Anthony Thibault
cee298acdf
Merge pull request #15205 from amantley/rootTransBug 
Fixed Bug For Old FBX Files That Have An Exported Pose Different From The Bind Pose
 2019-03-28 11:10:03 -07:00
Olivier Prat
5f6f178438 Fixed compression when convolving 2019-03-28 18:50:12 +01:00
Olivier Prat
cef9e454d5 Working beta pipeline 2019-03-28 16:44:22 +01:00
Olivier Prat
2397d5919f Finished convolution code 2019-03-28 15:15:51 +01:00
Olivier Prat
5bf3cdd592 Working on cubemap seams 2019-03-28 11:59:21 +01:00
Oren Hurvitz
3d5035886c Allow logging-in with an email that contains a '+' sign. 
Previously, attempts to login using an email such as "my+name@example.com" didn't work because the username wasn't
URL-encoded when it was sent to the server, so on the server the '+' was changed to a space.
 2019-03-28 10:45:55 +01:00