Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 17:47:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59796 commits 25 branches 0 tags 1.1 GiB
Commit graph

24484 commits

Author SHA1 Message Date
Ryan Huffman
de2c1aabac Add removal of temporary files in FBXBaker 2017-10-05 09:08:42 -07:00
Sam Gateau
25dae2f24e Merge pull request #11499 from samcake/blue 
Moving Camera update and render frame to Game Loop (Main thread)
 2017-10-04 18:42:02 -07:00
Sam Gateau
02bcbe6d5f Merge pull request #11512 from AndrewMeadows/more-profile-details 
expose performance hot spot in stats details
 2017-10-04 18:34:19 -07:00
samcake
d7333d3fa3 Merging with master 2017-10-04 10:55:38 -07:00
Brad Hefta-Gaub
a1979a2600 Merge branch 'master' into RC-56 2017-10-03 18:16:21 -07:00
Seth Alves
75d2a2bd47 Merge pull request #11517 from SamGondelman/registration 
Fix entities with registration points rendering in the wrong place
 2017-10-03 16:09:27 -07:00
SamGondelman
fc6e5df2cb fix text/web registration point usage 2017-10-03 15:02:21 -07:00
SamGondelman
c9d2d40e1e possibly fix registration offset issue 2017-10-03 14:44:11 -07:00
Anthony Thibault
2dc080479c Merge pull request #11513 from hyperlogic/bug-fix/set-compund-shape-url-deadlock 
Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()
 2017-10-03 13:31:01 -07:00
SamGondelman
a6f2545511 fix local t pose 2017-10-03 12:51:37 -07:00
Andrew Meadows
46e809bbb2 use a better variable name 2017-10-03 12:35:03 -07:00
Andrew Meadows
ef326a3851 expose performance hot spot in stats details 2017-10-03 12:35:02 -07:00
Anthony J. Thibault
1389c2e31d Bug fix for deadlock in ModelEntityItem::setCompundShapeURL() 
The fix was to prevent ModelEntityItem::hasCompoundShapeURL() from taking
a readlock on the entity, instead a finer grained lock (ThreadSafeValueCache)
is made around the _compoundShapeURL QString.
 2017-10-03 12:15:23 -07:00
Zach Fox
ea3da6c9dd Merge pull request #11495 from zfox23/pop_interfaceChanges2 
Commerce: One step closer!
 2017-10-03 11:56:00 -07:00
Sam Gateau
ab8757eeb2 Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit 
Tweak debug stats for more clarity
 2017-10-03 11:23:16 -07:00
Howard Stearns
22f0ef33ed Merge pull request #11496 from howard-stearns/certificate-properties 
Certificate properties
 2017-10-03 10:06:48 -07:00
Seth Alves
41dfdf4d82 Merge pull request #11509 from druiz17/fix-hud-module 
Hud module. check if laser is pointing at UI element without moving the reticle first
 2017-10-03 09:44:45 -07:00
Sam Gateau
316156db46 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-02 21:31:59 -07:00
Sam Gateau
acb99592ee fixing th e bug on exit due to the debug anim draw of the avatars 2017-10-02 21:31:30 -07:00
druiz17
8a0ecf4e6f propertly determine is laser intersects with HUD UI 2017-10-02 16:46:43 -07:00
Howard Stearns
9b0ebf0e07 doh! string not boolean 2017-10-02 16:18:28 -07:00
Howard Stearns
0b7af66016 more linux warnings 2017-10-02 15:38:59 -07:00
druiz17
68780f56b7 Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module 2017-10-02 14:06:26 -07:00
Howard Stearns
136381adb9 fatal compiler warning on mac/linux 2017-10-02 13:56:15 -07:00
Andrew Meadows
8d2153d2f3 cleanup debug stats, use more correct names 2017-10-02 13:08:17 -07:00
Andrew Meadows
e9d48a2713 fix warning about double-to-float conversion 2017-10-02 13:08:17 -07:00
Andrew Meadows
7df8816a81 faster rate counting 2017-10-02 13:08:17 -07:00
Howard Stearns
7b0321c1e1 guess for mac/linux openssl 2017-10-02 12:30:25 -07:00
beholder
cc8f1352da 7951 Reload button in Running Scripts dialog stops script 2017-10-02 22:18:03 +03:00
Howard Stearns
5c5f052bc2 explicit free, and remove header that isn't available on mac/linux 2017-10-02 10:28:47 -07:00
Howard Stearns
0f6884dd80 fix mac/linux compiler error 2017-10-02 09:44:10 -07:00
Zach Fox
1ec0f5d9a0 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-10-02 09:26:59 -07:00
samcake
577378f539 Adding stuff that seems to break? 2017-09-29 17:45:10 -07:00
druiz17
20918641f4 saving work 2017-09-29 16:48:25 -07:00
Howard Stearns
73c8da99dc Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-29 16:46:43 -07:00
Howard Stearns
58255abe12 animation url and computing certificateID 2017-09-29 16:32:25 -07:00
samcake
225d2bbbb4 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-29 13:47:37 -07:00
SamGondelman
b8ea6c22fa no tpose when switching avatars 
(cherry picked from commit fcfac9efc0)
 2017-09-29 13:47:09 -07:00
Sam Gateau
fb5fd346ff Merge pull request #11492 from SamGondelman/tPose 
Fix getting stuck in T-Pose on avatar switch
 2017-09-29 13:37:31 -07:00
Zach Fox
96b6a2f013 Fix entity add after incomplete rezCertified implementation 
(cherry picked from commit 0f66fb41fd)
 2017-09-29 13:27:21 -07:00
Andrew Meadows
8134e2b7f9 fix const violation 2017-09-29 11:34:36 -07:00
Andrew Meadows
32910e6f40 use [this] for lambda capture list 2017-09-29 11:34:35 -07:00
Andrew Meadows
f5f1a64c92 use const ref on pointer, and use dynamic_cast 2017-09-29 11:34:35 -07:00
Andrew Meadows
b16d666026 remove dupe addToNeedsParentFixupList() call 2017-09-29 11:34:35 -07:00
Andrew Meadows
0c934e863b clarify some comments 2017-09-29 11:34:35 -07:00
Andrew Meadows
5dcd6bc496 namechange: apparentAngle --> angularDiameter 2017-09-29 11:34:35 -07:00
Andrew Meadows
1c30f7424e remove cruft and add comments 2017-09-29 11:34:35 -07:00
Andrew Meadows
49e11d2173 fix Differential scan logic for LOD culling 2017-09-29 11:34:35 -07:00
SamGondelman
f2de03bc38 small fixes and LOD cull children instead of parent 2017-09-29 11:34:35 -07:00
Andrew Meadows
b1b7764056 use 20 degrees of OVERSEND 2017-09-29 11:34:35 -07:00