Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 16:52:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66624 commits 75 branches 59 tags 1.2 GiB
Commit graph

66624 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Conklin II
c8a0561e20
Merge pull request #12791 from sethalves/always-use-serverless-tutorial 
on first run, send user to serverless tutorial rather than checking for local sandbox
 2018-04-05 07:28:43 -07:00
NissimHadar
2fbe6f9393 Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester 2018-04-04 18:39:05 -07:00
samcake
78053b8b48 Refix the normal map case foro translucents 2018-04-04 18:33:27 -07:00
Seth Alves
4b0d338e57 on first run, send user to serverless tutorial rather than checking for a local sandbox 2018-04-04 18:00:11 -07:00
Cristian Luis Duarte
1a967e45a6 Android View control - Remove limit, use a scale filter, remove deadZone to increase sensitivity 2018-04-04 21:54:12 -03:00
NissimHadar
99a4bd65a0 Corrected message to user. 
Changed ::ReadWrite to ::WriteOnly when creating MD file.
 2018-04-04 17:12:46 -07:00
John Conklin II
2e37b4a312
Merge pull request #12747 from Zvork/fade 
Update to Transitions debugging / editing script
 2018-04-04 14:31:59 -07:00
Cristian Luis Duarte
b61a436a84 Android fly - Use new asset and screen position - missing cpp 2018-04-04 18:23:03 -03:00
Cristian Luis Duarte
ffb8b0a60e Android fly - Use new asset and screen position 2018-04-04 18:19:01 -03:00
John Conklin II
89127a06b3
Merge pull request #12714 from dback2/editUpDownArrowFix 
Fix Y arrow translation handle issues
 2018-04-04 13:46:31 -07:00
Sam Gateau
4870ce1d76
Merge pull request #12771 from NissimHadar/addMDtoAutoTester 
Add .md creation to autoTester
 2018-04-04 12:30:11 -07:00
John Conklin II
c3cad62bff
Merge pull request #12774 from howard-stearns/RC66-commerce-workaround-for-broken-qt5.10 
Rc66 commerce workaround for broken qt5.10
 2018-04-04 11:39:44 -07:00
NissimHadar
235996911a Fixed gcc warning. 2018-04-04 11:38:14 -07:00
NissimHadar
bb0d4a66b6 Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester 2018-04-04 11:03:56 -07:00
John Conklin II
cba307f28b
Merge pull request #12762 from samcake/one 
Remove notifications and print outs when degrading LOD
 2018-04-04 10:35:05 -07:00
NissimHadar
7a6b071e46 Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester 2018-04-04 10:20:35 -07:00
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
Andrew Meadows
8c065506e4
Merge pull request #12780 from samcake/workload 
Workload : adding helper feature on the task and job config to inspect them and start proper ui lib around it
 2018-04-04 09:21:45 -07:00
samcake
a704085444 Fix typos 2018-04-04 09:18:19 -07: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
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
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
samcake
88a5105b81 Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-04-03 18:00:16 -07:00
Andrew Meadows
83fa831c08
Merge pull request #12781 from samcake/upstream-workload 
Workload: Upstream workload update with upstream master
 2018-04-03 17:58:49 -07:00
samcake
fa35d659dc Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload 2018-04-03 17:56:41 -07:00
samcake
ff5b418ddf Starting to buiuild on the jet component and adding the widget to luci and workload inspectors 2018-04-03 17:21:37 -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