Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 03:03:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66502 commits 76 branches 59 tags 1.2 GiB
Commit graph

66502 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
c329b8605a
Merge pull request #12798 from AndrewMeadows/workload-009 
workload: stubbed prototype job for feedback to physics
 2018-04-05 13:31:00 -07:00
Andrew Meadows
8035dde5dd fix Windows warnings 2018-04-05 12:54:43 -07:00
Andrew Meadows
4f0980b94b hook up prototype PhysicsBoundary job 2018-04-05 12:11:57 -07:00
Andrew Meadows
d9ab166aac initial PhysicsBoundary job implementation 2018-04-05 12:10:46 -07:00
Andrew Meadows
299f2a92e0 merge 'master' into 'workload' 2018-04-05 12:01:19 -07:00
Sam Gateau
c27971eeed
Merge pull request #12792 from NissimHadar/addMDtoAutoTester 
Minor changes to autoTester
 2018-04-05 11:08:14 -07:00
John Conklin II
9e21bab67e
Merge pull request #12748 from AndrewMeadows/untangle-003 
cleanup around simulation-ownership
 2018-04-05 10:58:45 -07:00
NissimHadar
b19fcc340d Start test steps from 1 (not from 0). 2018-04-05 10:01:29 -07:00
NissimHadar
2fbe6f9393 Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester 2018-04-04 18:39:05 -07: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
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
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
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
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
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
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
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
samcake
efd2b2720b Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-03 12:46:10 -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
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