Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 21:17:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
77330 commits 69 branches 56 tags 1.2 GiB
Commit graph

77330 commits

Author SHA1 Message Date
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
Olivier Prat
1aedfff6f7 Working convolution 2019-04-02 15:40:42 +02:00
Olivier Prat
ce0254e141 Fixed some crashes 2019-04-01 17:40:09 +02:00
Olivier Prat
4dd4fbdc9f Merge branch 'hdr' into amc 2019-04-01 15:08:06 +02:00
Olivier Prat
e2bc80b46f Fixed for debug 2019-04-01 15:07:29 +02: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
Shannon Romano
6ccf16dfe5
Merge pull request from roxanneskelly/Case21726 
Case 21726 - Domain lost recent entity edits upon restart
 2019-03-29 17:06:31 -07:00
Shannon Romano
c5e7c63d38
Merge pull request from roxanneskelly/Case20499 
Case 20499 - Scripts that use AppUI don't call `that.onClosed()` if the script is restarted while the app is open
 2019-03-29 17:05:21 -07:00
Shannon Romano
dbecf1f611
Merge pull request from thoys/fix/avatarTools/fbxCasing 
Case 20625: On avatar project creation, the .fbx filter for selecting an FBX is case-sensitive.
 2019-03-29 17:04:37 -07:00
Shannon Romano
53c7ade542
Merge pull request from amantley/fbxJointParentBug 
Fix for FBX Root Being Given Non-Zero Parent
 2019-03-29 17:02:02 -07:00
Shannon Romano
f926298020
Merge pull request from NissimHadar/21984-fixNitpickCMake 
Case 21988: Use place holder instead of RCC file.
 2019-03-29 13:16:56 -07:00
Shannon Romano
df97f595f2
Merge pull request 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
NissimHadar
709515dd74 Use place holder instead of RCC file. 2019-03-29 11:48:15 -07:00
Sam Gondelman
968dbb825a
Merge pull request from SamGondelman/proceduralTime 
Case 21876: New procedural uniforms for time, iEntityTime and iLocalCreatedTime
 2019-03-29 11:35:41 -07:00
Shannon Romano
ec44f5fddf
Merge pull request from NissimHadar/21660-updateNitpickForQuest 
Case 21660: unique command line to run Interface on Quest - v3.1.5
 2019-03-29 11:09:36 -07:00
Shannon Romano
c4925ddfa0
Merge pull request 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 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 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 from Atlante45/fix/traits 
Case 21108: Make traits easier to extend
 2019-03-29 10:37:55 -07:00
Ken Cooke
201d115cb6
Merge pull request from kencooke/audio-server-echo-fix 
Case 21947: Fix the audio level of server echo
 2019-03-29 10:12:37 -07:00
Olivier Prat
7455ddb7ba Created Image class to encapsulate some transforms with QImage 2019-03-29 12:23:44 +01:00
Simon Walton
bc7fb10ab9 Fixes from review 2019-03-28 17:54:35 -07:00
Thijs Wenker
7e21a3f372 disable case sensitivity in file browsers (allow .fbx .fBx .FBX instead of only .fbx) 2019-03-29 01:48:57 +01:00
Thijs Wenker
687409b756 ignore case for .fbx file extension in AvatarDoctor 2019-03-29 01:46:57 +01:00
Roxanne Skelly
44b92c542b Case 20499 - Scripts that use AppUI don't call that.onClosed() if the 
script is restarted while the app is open
 2019-03-28 16:05:24 -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
NissimHadar
705e6432a7 Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-28 12:46:36 -07:00
NissimHadar
d230fc86db CR comments. 2019-03-28 12:23:25 -07:00
Roxanne Skelly
73cf51182e
Merge pull request from roxanneskelly/Case20832 
Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.
 2019-03-28 12:01:24 -07:00
NissimHadar
de1c40e994 Changed version. 2019-03-28 11:27:35 -07:00
Anthony Thibault
65507cfe11
Merge pull request from luiscuenca/flowCppFixes 
Fix Flow touch and scale issues
 2019-03-28 11:11:08 -07:00
Anthony Thibault
b0d5a82c80
Merge pull request 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 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
07ce44cd04 Merge branch 'hdr' into amc 2019-03-28 12:00:27 +01:00
Olivier Prat
5bf3cdd592 Working on cubemap seams 2019-03-28 11:59:21 +01:00
Olivier Prat
c480f36dd4 Finally managed to switch to all static for OpenEXR 2019-03-28 10:58:58 +01:00