Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-14 01:06:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66675 commits 6 branches 1 tag 1.1 GiB
Commit graph

66675 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
3a428bc44f
Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1 
Fix 'Private' HMD preview texture enable/disable...again
 2018-04-04 10:03:18 -07:00
Zach Fox
752246d950
Merge pull request #12760 from zfox23/inspection_rightClickTweaking 
Inspection: Tweak mouse-right-click-to-inspect behavior
 2018-04-04 09:32:29 -07:00
Zach Fox
b641f87792
Merge pull request #12778 from zfox23/MS13792 
Prevent Context Overlay from flashing when briefly hovering over certified entity
 2018-04-04 09:31:33 -07:00
WolfGang
f9bcd23463 make subimage update the image anchors 2018-04-04 17:28:55 +01:00
Seth Alves
a980361afc
Merge pull request #12706 from druiz17/baking 
adding python baking scripts
 2018-04-04 09:08:31 -07:00
Seth Alves
2df334c50e
Merge pull request #12663 from ElderOrb/FB12870 
Fix for not updating checkbox state on 'baking' / 'unbaking'.
 2018-04-04 09:03:03 -07:00
Gabriel Calero
ddbf4417ff Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-04 12:24:25 -03:00
Seth Alves
db82c464eb
Merge pull request #12741 from ctrlaltdavid/21816 
Remove Entities.currentAvatarEnergy and related from the API
 2018-04-04 08:07:46 -07:00
Olivier Prat
e3908662fe Merge branch 'master' of http://github.com/highfidelity/hifi into zeye 2018-04-04 09:50:37 +02:00
Andrew Meadows
f0fcfc432c fix typo in comment 2018-04-03 22:16:10 -07:00
Andrew Meadows
d57cb0b5d7 use list.empty() instead of comparing list.size() 2018-04-03 22:15:57 -07:00
Andrew Meadows
6d7574cab9 use std::numeric_limtis<uint64_t>::max() instead of -1 2018-04-03 22:13:25 -07:00
Andrew Meadows
70d6aa99e8 more 'const uint64_t&' purges 2018-04-03 21:55:31 -07:00
Andrew Meadows
bd2bfb6807 DRY: simpler removal of element from middle of std::vector 2018-04-03 18:28:07 -07:00
Andrew Meadows
0a2b4a8d1d add comment about returning smart pointer by ref 2018-04-03 18:26:43 -07:00
samcake
1629756d53 Adding more budget options for memory texture 2018-04-03 18:08:43 -07:00
Anthony Thibault
00bec7310e
Merge pull request #12731 from hyperlogic/feature/log-exceptions-in-controller-js 
JavaScript exceptions during Controller system callbacks are now logged
 2018-04-03 16:22:44 -07:00
Cristian Luis Duarte
88c83f3bfe Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-03 19:59:21 -03:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66 
RC66 mergeback
 2018-04-03 15:39:16 -07:00
Zach Fox
5f47d51171 Prevent Context Overlay from flashing when briefly hovering over certified entity 2018-04-03 15:35:46 -07:00
David Rowe
095c1b837c Update JSDoc 2018-04-04 09:48:33 +12:00
David Rowe
6868ca971f Make Window.x and Window.y report top left of drawable area of window 2018-04-04 09:43:39 +12:00
David Rowe
a3c8b2792d Fix Window.geometryChanged() values for moving and resizing window 2018-04-04 09:42:05 +12:00
howard-stearns
01d90ea1a5 Introduce safeLoading. 2018-04-03 13:49:09 -07:00
howard-stearns
f229e24e60 fix help.js noisy log reference to undefined string#startsWith 2018-04-03 13:48:51 -07:00
Zach Fox
f20eddefc8 Fix 'Private' HMD preview texture enable/disable...again 2018-04-03 13:46:02 -07:00
John Conklin II
5151041e4a
Merge pull request #12770 from sethalves/pr12769-for-rc66 
Fix move after import
 2018-04-03 13:41:56 -07:00
howard-stearns
38f26a2647 Introduce safeLoading. 2018-04-03 13:34:05 -07:00
NissimHadar
cb5bd4c080 Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester 2018-04-03 13:25:30 -07:00
John Conklin II
db56656fcc
Merge pull request #12768 from ElderOrb/FB13789_RC66 
Fix regression with 'Log in/Sign up' dialog is missing "Forgot Username?" and "Forgot Password?" links
 2018-04-03 13:24:50 -07:00
howard-stearns
ff88956d13 fix help.js noisy log reference to undefined string#startsWith 2018-04-03 13:22:47 -07:00
NissimHadar
4f5895cb16 Added MD file to autoTester. 2018-04-03 13:17:37 -07:00
samcake
2dc4630e68 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-04-03 12:55:21 -07:00
Seth Alves
a1ce9481bb
Merge pull request #12739 from druiz17/fix-mapping-mistake 
map flying down back to C key
 2018-04-03 12:39:46 -07:00
Seth Alves
5f13df4102
Merge pull request #12722 from druiz17/fix-entities-outline 
fix ContextOverlayInferface highlighing unspecified entities.
 2018-04-03 12:29:19 -07:00
Seth Alves
249a97b5d0 don't move or rotate children if a parent is being changed by the same action 2018-04-03 12:14:59 -07:00
Seth Alves
08b7326bd1 when moving a group of selections, don't move a child if a parent is being moved 2018-04-03 12:14:40 -07:00
Cristian Luis Duarte
cbf13c9f8c Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-03 16:12:17 -03:00
Cristian Luis Duarte
1ea056a8a9 Android - Initial Jump button implementation 2018-04-03 16:07:40 -03:00
Gabriel Calero
085dd5aeec Fix build 2018-04-03 15:47:57 -03:00
Alexander Ivash
ccea3efe1e FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links 2018-04-03 21:43:40 +03:00
Gabriel Calero
78c50410b3 Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash 2018-04-03 14:37:19 -03:00
Sam Gateau
987aa40783
Merge pull request #12566 from jherico/bindless 
Bindless Textures
 2018-04-03 10:14:12 -07:00
John Conklin II
53a5261905
Merge pull request #12712 from zfox23/newUpdateCertLocation 
Fix cert location for content sets; handle .content.zip content sets
 2018-04-03 09:10:11 -07:00
Olivier Prat
01cba0c591 Merge branch 'master' of http://github.com/highfidelity/hifi into zeye 2018-04-03 08:03:35 +02:00
David Rowe
ab55f20976 Fix text sizing per text3d overlay lineHeight property 
Makes text size correct for multiple lines of text.
 2018-04-03 16:54:07 +12:00
David Rowe
63603ff97c Fix window height reported by Window.geometryChanged() signal 2018-04-03 14:21:15 +12:00
samcake
077b2dab30 Code review fixes 2018-04-02 16:09:43 -07:00
Seth Alves
71d6dbf9bf allow ESS to edit local version of properties even if the entity isn't in the ESS's local octree 2018-04-02 15:52:28 -07:00
samcake
5a1eac563b Code review fixes 2018-04-02 15:50:18 -07:00