Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
64252 commits 29 branches 0 tags 1.1 GiB
Commit graph

23719 commits

Author SHA1 Message Date
Zach Fox
679d53e2cf This works, but is it correct? 2018-02-08 10:41:10 -08:00
Zach Fox
3a7e626463 Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign 
Commerce: Inspection Certificate Redesign
 2018-02-08 10:41:04 -08:00
Seth Alves
8d35bcb3e5
Merge pull request #12347 from AndrewMeadows/quickfix-tractor 
remove initial glitch in Tractor (grab) action
 2018-02-07 14:22:12 -08:00
Seth Alves
84ed23f547
Merge pull request #12292 from ElderOrb/FB11855 
FB11855 - Change bubble icon on tablet
 2018-02-07 14:03:16 -08:00
Zach Fox
3c34d13ec6
Revert "Commerce: Inspection Certificate Redesign" 2018-02-07 13:22:09 -08:00
Seth Alves
3e516cd2dd Merge branch 'quickfix-tractor' of github.com:AndrewMeadows/hifi into test-12347 2018-02-07 10:48:19 -08:00
Seth Alves
3e913cfcfe AvatarActionHold has positional and rotational targets 2018-02-07 10:45:13 -08:00
Zach Fox
a40244b5d2
Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign 
Commerce: Inspection Certificate Redesign
 2018-02-07 10:19:30 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
John Conklin II
9c1cb60a43
Merge pull request #12333 from ctrlaltdavid/fix-spectator-camera 
Fix the spectator camera
 2018-02-05 11:06:59 -08:00
Stephen Birarda
761321875c
Merge pull request #12195 from birarda/bug/connection-refused 
clear silent connection attempt counter on DomainHandler soft reset
 2018-02-05 11:35:02 -07:00
David Rowe
3af7701cac Fix the spectator camera 2018-02-04 12:06:20 +13:00
John Conklin II
c8bb26ae74
Merge pull request #12294 from samcake/pastel 
Improve startup time by optimizing shader bookkeeping
 2018-02-02 16:37:44 -08:00
Zach Fox
2a0d85a119
Merge pull request #12315 from zfox23/commerce_SendMoneyNearbyParticle 
Commerce: Send Money Nearby particle effect!
 2018-02-02 14:17:48 -08:00
Stephen Birarda
eb9d100fc8 reset count on conn refusal, soft reset DH in Interface on limit reached 2018-02-02 13:47:48 -08:00
Stephen Birarda
e16a3859c2 reset silent check in packet check on domain connection reset 2018-02-02 13:47:48 -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
f26477b3e1 Slight wording change to Optional Message placeholder 2018-02-02 11:00:32 -08:00
Zach Fox
2f3448ed1f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle 2018-02-02 10:59:49 -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
Zach Fox
dd2b7eb107 Send Money Effect & Lightbox 2018-02-01 15:17:50 -08:00
Zach Fox
fa69ea0352 Small comment addition 2018-02-01 13:57:05 -08:00
Zach Fox
d4f9287e3f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign 2018-02-01 13:15:38 -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
Zach Fox
ce79504f03 Fix checkbox 2018-02-01 11:51:08 -08:00
Zach Fox
268c12e47a Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle 2018-02-01 11:38:47 -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
Zach Fox
bd26c9dfc0 More improvements 2018-02-01 09:36:41 -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
Sam Gateau
a650c5bbc6 Move a define to resume watchdog a bit further 2018-01-31 23:31:31 -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
Zach Fox
b1be12a5d4 Remove errant GPUCache files 2018-01-31 17:38:26 -08:00
Zach Fox
14051bce0c This logic is insane 2018-01-31 17:20:20 -08:00
Zach Fox
fb5308e517 This logic is insane 2018-01-31 17:06:29 -08:00
Zach Fox
ab3a91a1da Oooooh it's so pretty 2018-01-31 16:53:23 -08:00
vladest
bca903a6df Fix build 2018-01-31 23:31:18 +01:00
Alexander Ivash
a0c41f26d1 FB11855 - Change bubble icon on tablet 2018-02-01 01:25:29 +03:00
samcake
0885b00ab8 Merge branch 'master' of https://github.com/highfidelity/hifi into pastel 2018-01-31 14:18:38 -08: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
Zach Fox
7879fb293f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign 2018-01-31 13:19:39 -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
Zach Fox
90c2371f0c It's working! 2018-01-31 12:09:23 -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