Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 23:56:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77835 commits 71 branches 56 tags 1.2 GiB
Commit graph

77835 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
4f97899045 Moved position of GPU vendor combo. 2019-04-04 11:31:06 -07:00
Shannon Romano
65a039e228
Merge pull request #15312 from roxanneskelly/Case19858 
Case 19858 - crashpad_handler is duplicated outside of the Interface/…
 2019-04-04 11:27:20 -07:00
Sam Gateau
eee5f87dcd
Merge pull request #15264 from Zvork/hdr 
Case 22045: Added support for OpenEXR files (mostly for skyboxes)
 2019-04-04 10:32:11 -07:00
Angus Antley
9afbf76ec1 removed unnecessary getFauxJointIndex call, this is handled in getJointIndex 2019-04-04 10:22:24 -07:00
Angus Antley
72264203db corrected the lock positions to cover the getJointIndex calls 2019-04-04 10:08:50 -07:00
Andrew Meadows
72ac35c6f7 avoid nan in Model::_scale 2019-04-04 08:28:03 -07:00
Olivier Prat
b71a8f7902 Switched to split sum model for ambient (as Unreal) 2019-04-04 16:10:33 +02:00
Olivier Prat
57de55c5ce Fixed crash in lasterpointer 2019-04-04 10:15:38 +02:00
Olivier Prat
acded5488e Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-04 08:58:49 +02:00
David Rowe
1bc38cab28 Camera JSDoc polish 2019-04-04 18:03:14 +13:00
r3tk0n
17e559f8e8 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 16:17:00 -07:00
r3tk0n
283ec97bb9 Fix desktop movement. 2019-04-03 16:09:13 -07:00
Sam Gateau
0d8169bd35
Merge pull request #15311 from danteruiz/double-avatars 
Case 21415: Avatars stay behind after they disconnect
 2019-04-03 16:07:35 -07:00
Sam Gateau
5730e92871
Merge pull request #15317 from jherico/fix/21911_alt 
Case 21730:  Restore composite framebuffer to display plugins
 2019-04-03 16:02:47 -07:00
NissimHadar
3ba5f8e574 Use place holder instead of RCC file. 
(cherry picked from commit 709515dd74)
(cherry picked from commit 4e4526fbb2)
 2019-04-03 15:25:34 -07:00
SamGondelman
2b376f7881 handle weird material name case 2019-04-03 14:26:45 -07:00
David Rowe
2a17ad3da5 AvatarList and AvatarManager JSDoc 2019-04-04 10:11:54 +13:00
Roxanne Skelly
75671be2de Case 22025 - Create temporary placename doesn't appear when no places are listed 2019-04-03 13:57:37 -07:00
maspring
05cab9a3cc
Merge pull request #15122 from raveenajain/gltf_skinning 
Case 21502: skinned gltf
 2019-04-03 13:45:41 -07:00
Brad Davis
44fc0d21db Revert "Remove _compositeFramebuffer from display plugins" 
This reverts commit cb311408c6.
 2019-04-03 13:43:39 -07:00
r3tk0n
8b670110a9 Fix omitted return in MyAvatar::scaleMotorSpeed 2019-04-03 13:06:22 -07:00
Angus Antley
857a4ab739 enabled MyAvatar.get and .set rotation 2019-04-03 13:04:55 -07:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
r3tk0n
ac2971894b Fix sprint mode scalar. 2019-04-03 11:42:40 -07:00
Roxanne Skelly
1e4398c950 Revert "Temporary crashpad debugging" 
This reverts commit df0996cdc9.
 2019-04-03 11:31:35 -07:00
SamGondelman
cf7230f023 fix non-embedded textures 2019-04-03 11:26:07 -07:00
Shannon Romano
451b2eb391
Merge pull request #15308 from roxanneskelly/Case20410 
Case 20410 - Automatic Content Archives doesn't restore correctly with old Tutorial content set
 2019-04-03 11:07:16 -07:00
Sam Gondelman
1cc2cd3194
Merge pull request #15237 from SamGondelman/particleShapes 
Case 21859: Particle Entity emitter shapes, including model
 2019-04-03 11:03:33 -07:00
Shannon Romano
f2ff5bebc7
Merge pull request #15275 from howard-stearns/ddv-all 
DDV all, including domainUnlimited
 2019-04-03 11:03:16 -07:00
danteruiz
5f5e7d5f4e a better fix 2019-04-03 10:45:40 -07:00
Roxanne Skelly
df0996cdc9 Temporary crashpad debugging 2019-04-03 10:17:12 -07:00
Sam Gateau
d0bf102695
Merge pull request #15314 from AndrewMeadows/more-correct-collision-groups 
Case 20991: more correct collision group during grabs
 2019-04-03 09:38:30 -07:00
r3tk0n
ec37ad7dc6 Address Wayne and Angus' comments on github. 2019-04-03 09:38:14 -07:00
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
unknown
8dbdee4262 better fix for trailing key events 2019-04-03 09:08:29 -07:00
unknown
e2387b053b Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleContinualTranslateFix 2019-04-03 08:33:26 -07:00
NissimHadar
facf8a9305
Merge pull request #15287 from NissimHadar/21893-enableTheUrlCommandLineParameterOnAndroid 
Case 21893: Remove disabling of --url for Android.
 2019-04-03 07:50:31 -07:00
NissimHadar
813d467f49 Ready. 2019-04-03 07:43:07 -07:00
Andrew Meadows
1860e61a30 more correct collision group during grabs 2019-04-03 07:42:56 -07:00
NissimHadar
863fce6321 Change version number. 2019-04-03 07:42:00 -07:00
NissimHadar
a856d10798 Improved error message. 2019-04-03 07:39:59 -07: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
SamGondelman
770b863604 fixing embedded textures and materialMapping priority 2019-04-02 19:04:23 -07:00
Roxanne Skelly
80683a7b7a Crashpad fix 2nd try 2019-04-02 17:35:09 -07:00
Roxanne Skelly
ac97a82bad Address a CR comment. 2019-04-02 17:25:00 -07:00
SamGondelman
14bd5ed687 remove need for destination path 2019-04-02 16:53:49 -07:00