Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 01:07:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
64155 commits 75 branches 59 tags 1.2 GiB
Commit graph

23682 commits

Author SHA1 Message Date
Dante Ruiz
d593e7107c fix merge conflict 2018-02-02 13:29:31 -08:00
Zach Fox
28c9cd15a4
Merge pull request #12326 from zfox23/commerce_fixPopUpHover 
Fix a bug where hover events incorrectly propagate under popups
 2018-02-02 13:23:36 -08:00
Zach Fox
19235b8d94 Fix a bug where hover events incorrectly propagate under popups 2018-02-02 10:50:35 -08:00
Seth Alves
861497e907 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-02-02 08:56:18 -08:00
Seth Alves
14d5029f4d only update cauterization of child entities when something relevant changes 2018-02-02 08:56:11 -08:00
John Conklin II
cbdbf51ccd
Merge pull request #12317 from hyperlogic/feature/remove-ik-hips-offset 
Removal of hips offset shifting from AnimInverseKinematics node
 2018-02-01 15:30:08 -08:00
Seth Alves
f7027b52e1
Merge pull request #12311 from ElderOrb/FB11511 
FB11511 - position of log windows should be persistent between invocations of interface
 2018-02-01 12:11:30 -08:00
Seth Alves
bdf6736a54 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-02-01 12:04:56 -08:00
Liv
6363ded74b
Merge pull request #12280 from misslivirose/feat/expose-identity-verification 
Expose functionality to enable entity scripts to check ownership verification on avatar entities
 2018-02-01 10:07:58 -08:00
Seth Alves
482be7ba4e Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-02-01 06:36:04 -08:00
Anthony J. Thibault
b23f98b311 Removal of hips offset shifting from AnimInverseKinematics node 
With the addition of the hips IK target, the hips offset shifting code is no longer necessary.
This PR should not effect any behavior, but it removes this unused code from the animation system.
 2018-01-31 17:56:33 -08:00
vladest
bca903a6df Fix build 2018-01-31 23:31:18 +01:00
Alexander Ivash
1ed7d164c4 FB11511 - position of log windows should be persistent between invocations of interface 2018-02-01 01:15:03 +03:00
vladest
2a5b3d97fb AddressBar trigger implemented. Fixed warnings on non existing context properties. Fixed warnings about non notifyable property 2018-01-31 23:05:38 +01:00
Seth Alves
a49097789a
Revert "AddressBar trigger implemented. Fixed warnings on non existing contex…" 2018-01-31 13:32:19 -08:00
Seth Alves
acc5973813 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-31 12:22:50 -08:00
Seth Alves
0df4ae02fc
Merge pull request #12126 from vladest/addressbar_close_fix 
AddressBar trigger implemented. Fixed warnings on non existing contex…
 2018-01-31 11:26:05 -08:00
Seth Alves
50e6864988
Merge pull request #12138 from Triplelexx/21669_prompt_keyboard 
WL#21669: Allow better keyboard navigation of prompt windows such as Window.prompt()
 2018-01-31 11:19:49 -08:00
Seth Alves
64a46bf5df merge from upstream 2018-01-31 10:43:41 -08:00
Bradley Austin Davis
b97c938544
Merge pull request #12216 from thoys/feat/js-script-console-auto-complete 
JS scripting console auto-complete
 2018-01-31 10:39:51 -08:00
Seth Alves
600cc1b48e
Merge pull request #12250 from druiz17/fix-multihighlight 
Don't manually highlight tablet buttons from swipeview.
 2018-01-31 09:33:33 -08:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
John Conklin II
215d03c4ce
Merge pull request #12269 from sethalves/backtrace-for-rc-63 
Backtrace for rc 63
 2018-01-30 15:13:01 -08:00
John Conklin II
0b03632437
Merge pull request #12289 from hyperlogic/bug-fix/mac-os-shader-compile-too-slow-rc63 
RC63: 8x shader compilation optimization and watchdog disable
 2018-01-30 13:26:49 -08:00
Atlante45
019a2d346c Fix spaces 2018-01-30 12:04:01 -08:00
Atlante45
db08f1dda6 Move backtrace to interface 2018-01-30 11:39:48 -08:00
Anthony Thibault
1e8a5485c1 8x shader compilation optimization and watchdog disable 
addPlumberPipeline in RenderPipelines.cpp would recompile
a single program 7 more times then necessary.  This was
causing startup times on Mac OS X to trigger the deadlock
watchdog.

Even with this fix, compiling shaders is still too slow,
As a workaround, we disable the  watchdog thread during
rendering pipeline setup.
 2018-01-30 10:27:06 -08:00
Seth Alves
7d1eb5fef8 Merge branch 'RC63' of github.com:highfidelity/hifi into backtrace-for-rc-63 2018-01-30 09:13:02 -08:00
Liv Erickson
8b7c989508 move emit signals to wallet interface 2018-01-29 16:34:44 -08:00
Liv Erickson
ce8159340b fix vs autoformatting 2018-01-29 15:51:09 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes 
Leopoly_Phase1_004_RayPick-Changes
 2018-01-29 14:02:38 -08:00
Dante Ruiz
264aa7f4d2
Merge pull request #12191 from druiz17/entity-attachment-bookmark 
Bookmark avatar entities
 2018-01-29 12:55:35 -08:00
Liv Erickson
634bc83ed5 fix elses 2018-01-29 12:54:52 -08:00
Liv Erickson
f8f76d6757 changing back to avatar only and making some changes to avoid multiple calls to dependency manager 2018-01-29 12:46:00 -08:00
Seth Alves
98e0e663e7 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-29 12:36:37 -08:00
John Conklin II
e01bbcf10b
Merge pull request #12264 from sethalves/warn-for-head-position-nan 
print warnings if head position contains not-a-number
 2018-01-29 12:25:23 -08:00
samcake
1fd4c5c1a4 Integrating the tag flags to the render item key and adding configration of the render pipelien with the Tag information 2018-01-29 12:20:51 -08:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request 
Leopoly_Phase1_003_Asset-Request
 2018-01-29 11:40:41 -08:00
Liv Erickson
6a971e1362 remove restriction to be avatar only 2018-01-29 11:27:30 -08:00
Dante Ruiz
a637bac2fe remove debug statement 2018-01-29 11:26:28 -08:00
Dante Ruiz
a670a0b9a2 Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark 2018-01-29 11:25:26 -08:00
Liv Erickson
a10f7932bd Merge branch 'master' of https://github.com/highfidelity/hifi into feat/expose-identity-verification 2018-01-29 11:07:38 -08:00
Liv Erickson
0e3a01f1e8 it's working! removed my null pointer and just get it from the dependency manager when required 2018-01-29 10:20:16 -08:00
Andrew Meadows
c2817fc091 HMD low LOD threshold changed: 42 --> 34 2018-01-29 10:18:08 -08:00
Andrew Meadows
6acec39e92 HMD low LOD threshold changed: 45 --> 42 2018-01-29 10:05:23 -08:00
Thijs Wenker
8fdbac521f move ADD_CUSTOM_QRC_PATH function to its own file 2018-01-27 19:58:15 +01:00
Thijs Wenker
898c99e5b8 append file jsdoc json file to resources.rcc resource file 2018-01-27 19:50:52 +01:00
samcake
8dfa3aace3 cleaning en route 2018-01-26 17:34:37 -08:00
Liv Erickson
20635acf27 moving logic to wallet, crashes currently 2018-01-26 17:13:39 -08:00
humbletim
e2afcac534 include .extraInfo as part of RayPick API constructors 2018-01-26 18:34:13 -05:00