Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 11:17:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66659 commits 76 branches 59 tags 1.2 GiB
Commit graph

27483 commits

Author SHA1 Message Date
Zach Fox
3b8e52ea41
Merge pull request #12862 from zfox23/discovery_April2018 
Discovery: April 2018 (Huge PR; see description)
 2018-04-17 15:11:50 -07:00
Sam Gateau
19aa49832b
Merge pull request #12750 from SamGondelman/androidPrimitives 
Forward pipelines for primitives
 2018-04-16 11:18:56 -07:00
John Conklin II
5705bac87f
Merge pull request #12723 from ctrlaltdavid/21801 
HMD API JSDoc
 2018-04-16 11:12:26 -07:00
Sam Gateau
3ac4a1db2d
Merge pull request #12850 from SimonWalton-HiFi/early-trace 
Enable Interface tracing from earliest execution point
 2018-04-16 10:24:55 -07:00
Zach Fox
071bf35683 Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018 2018-04-16 10:11:44 -07:00
Seth Alves
7f285c5f90
Merge pull request #12571 from Atlante45/fix/es-concurrent-traversal 
Fix unprotected tree traversals
 2018-04-14 14:33:25 -07:00
Anthony Thibault
f2c38a77a6
Merge pull request #12877 from hyperlogic/bug-fix/avatar-recording-mtu-overflow 
Fix for avatar recording playback on avatars with many joints
 2018-04-13 14:26:32 -07:00
John Conklin II
008c7be369
Merge pull request #12787 from druiz17/fix-offscreen-windows 
hide desktop windows when switching into HMD mode
 2018-04-13 12:17:15 -07:00
John Conklin II
98f6899c3d
Merge pull request #12839 from SamGondelman/matMigrate 
Migrate materials from userData to materialData
 2018-04-12 18:24:33 -07:00
John Conklin II
ec10fcb7b7
Merge pull request #12868 from SamGondelman/missingAlpha 
Fix for missing alpha on server restart
 2018-04-12 16:42:34 -07:00
John Conklin II
5322195eee
Merge pull request #12867 from ctrlaltdavid/21836-a 
Fix location.protocol value for serverless domains
 2018-04-12 16:28:31 -07:00
John Conklin II
3d90f93cf1
Merge pull request #12812 from SamGondelman/compression 
Support ETC2/EAC compressed textures
 2018-04-12 16:04:08 -07:00
John Conklin II
67a8e6c82e
Merge pull request #12824 from SamGondelman/matFix 
Fix non-client-only material entities applied to avatar by session ID not being removed on domain switch
 2018-04-12 15:30:11 -07:00
John Conklin II
9123c05eb3
Merge pull request #12859 from samcake/one 
Fix a bug when switching shadow on/off in front of mirror
 2018-04-12 15:25:05 -07:00
Anthony J. Thibault
da319b9af6 Changed version constants into a enum class, to fix macosx warnings. 2018-04-12 15:09:01 -07:00
John Conklin II
40ae2913eb
Merge pull request #12847 from SamGondelman/clientMat 
Fix client-only materials on non-avatars
 2018-04-12 14:53:34 -07:00
John Conklin II
1834325970
Merge pull request #12788 from sethalves/fix-immediate-last-edited-by 
set lastEditedBy in local tree whenever a script adds or edits an entity
 2018-04-12 13:02:05 -07:00
John Conklin II
e47dca77ec
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership 
entity-server will expire stale simulation ownership
 2018-04-12 12:04:52 -07:00
Sam Gateau
77a27b2be7
Merge pull request #12835 from NissimHadar/speedUp1 
ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG
 2018-04-12 11:48:09 -07:00
Anthony J. Thibault
568af7a072 Fix for avatar recording playback on avatars with many joints 
Before this fix, playback of avatar recording frames could overflow the maximum UDP packet size (MTU).
This is playback of a recording was causing all the rotations and translations to be transmitted,
even if the translations were not any different then the avatar default pose.

This explicitly records the rotationIsDefaultPose and translationIsDefaultPose in the recording stream.
This does not break backwards compatibility.
However, it does require new recordings for avatars with large numbers of bones.
 2018-04-12 11:24:26 -07:00
Sam Gateau
20ae247185
Merge pull request #12784 from Zvork/zeye 
Potential bug correction when constructing eye position from Z-buffer depths in shaders
 2018-04-12 11:10:09 -07:00
Simon Walton
a584d67acd Tweaks for clang error and gcc warning 2018-04-12 10:44:41 -07:00
John Conklin II
ef133806be
Merge pull request #12813 from ctrlaltdavid/21826 
Fix Controller.getActions(), .getHardware(), and .getStandard()
 2018-04-12 10:42:25 -07:00
Simon Walton
5c141aa5e9 Add --disableWatchdog command-line option 
Watchdog still runs but doesn't abort on timeout.
Also fixes for previous tracing improvements.
 2018-04-12 09:28:28 -07:00
Simon Walton
888fca2127 Qualify getName in task template to satisfy gcc 2018-04-11 18:31:09 -07:00
Simon Walton
adcf991125 Improvements to profiling data capture 
Use code-provided task names for profile blocks; record QML URLs for
loadInternal.
 2018-04-11 17:36:32 -07:00
John Conklin II
5c26166bd6
Merge pull request #12841 from SamGondelman/simAssert 
Fix asserts on domain switch
 2018-04-11 16:02:45 -07:00
David Rowe
c2f0f7ef5f Doc review 2018-04-12 10:54:35 +12:00
David Rowe
7a9e3388fa Merge branch 'master' into 21801 2018-04-12 09:48:51 +12:00
SamGondelman
3270409b7b possible fix for missing alpha on server restart 2018-04-11 14:06:30 -07:00
David Rowe
b82f2510f2 Fix location.protocol value for serverless domains 2018-04-12 08:55:47 +12:00
John Conklin II
7a905ed420
Merge pull request #12777 from ctrlaltdavid/21813 
Fix Window API position and size reporting
 2018-04-11 13:48:21 -07:00
SamGondelman
e0b2c076ef cleanup and fix forward procedural rendering 2018-04-11 13:03:57 -07:00
John Conklin II
88a151481d
Merge pull request #12763 from sethalves/ess-can-edit-localX 
allow ESS to make relative-to-parent edits when entity is not in ESS's octree
 2018-04-11 12:08:35 -07:00
John Conklin II
19bf793910
Merge pull request #12761 from ctrlaltdavid/21821 
Add Controller.Actions.Sprint as synonym of Controller.Actions.SPRINT
 2018-04-11 12:07:32 -07:00
Andrew Meadows
a0f3e3a031 add simulation ownership expiry 2018-04-11 09:40:32 -07:00
Sam Gateau
167db14bdb restoring the sampler desc layout to fix ktx cache and fixing the bug shadow when turning global shadow on off 2018-04-11 00:00:11 -07:00
SamGondelman
d841eeb6e9 Merge remote-tracking branch 'upstream/master' into androidPrimitives 2018-04-10 16:52:08 -07:00
Zach Fox
b9d0360ea2 Finally fix the grey security pic bug! 2018-04-10 16:00:53 -07:00
SamGondelman
0c069574c5 forward pipelines for primitives 2018-04-10 15:56:08 -07:00
Zach Fox
a9b9a1cb10 Commerce: Gifts 2018-04-10 15:54:19 -07:00
Simon Walton
9b6306601a Merge Clement's PR12700 diffs for early trace start 2018-04-10 13:13:46 -07:00
SamGondelman
bba47ba2b4 materials on client only entities 2018-04-10 11:35:24 -07:00
Sam Gondelman
d781cf43ee
Merge pull request #12775 from Cristo86/android_jump 
Android Control - jump and view sensitivity
 2018-04-09 17:32:57 -07:00
SamGondelman
8f65813924 fix asserts on domain switch 2018-04-09 17:10:49 -07:00
Cristian Luis Duarte
1242446c52 Cleanup controller code 2018-04-09 19:57:55 -03:00
Clément Brisset
c62a701a2d
Merge pull request #12838 from highfidelity/RC66 
RC66 merge back to master
 2018-04-09 13:17:12 -07:00
SamGondelman
9b07880aab migrate materials from userData to materialData 2018-04-09 12:49:03 -07:00
John Conklin II
d281d7b2cb
Merge pull request #12819 from Atlante45/fix/location-hostname 
Fix location.hostname
 2018-04-09 09:42:41 -07:00
NissimHadar
f610d6b201 Merge branch 'master' of github.com:highfidelity/hifi into speedUp1 2018-04-07 20:36:57 -07:00