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

66624 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
9c4c1bf10f Better experimentation 2018-04-12 00:03:04 -07:00
Sam Gateau
6a7ae55d9c Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-11 19:08:57 -07:00
John Conklin II
5c26166bd6
Merge pull request #12841 from SamGondelman/simAssert 
Fix asserts on domain switch
 2018-04-11 16:02:45 -07:00
Sam Gateau
f355bd86c2
Merge pull request #12783 from samcake/blue 
Hack: Adding more budget options for memory texture
 2018-04-11 15:46:08 -07:00
Stephen Birarda
2759f3a51c
Merge pull request #12869 from highfidelity/RC66 
RC66 merge back to master
 2018-04-11 15:11:34 -07:00
John Conklin II
7a905ed420
Merge pull request #12777 from ctrlaltdavid/21813 
Fix Window API position and size reporting
 2018-04-11 13:48:21 -07:00
John Conklin II
005b55f997
Merge pull request #12853 from birarda/new-serverless-tutorial 
RC66: fix unreadable baked textures in serverless tutorial
 2018-04-11 13:44:21 -07:00
John Conklin II
42a3834e1a
Merge pull request #12772 from howard-stearns/commerce-workaround-for-broken-qt5.10 
Commerce workaround for broken qt5.10
 2018-04-11 13:08:42 -07:00
John Conklin II
854d3d7804
Merge pull request #12765 from ctrlaltdavid/21822 
Fix text sizing per text3d overlay lineHeight property
 2018-04-11 12:16:51 -07:00
John Conklin II
88a151481d
Merge pull request #12763 from sethalves/ess-can-edit-localX 
allow ESS to make relative-to-parent edits when entity is not in ESS's octree
 2018-04-11 12:08:35 -07:00
John Conklin II
19bf793910
Merge pull request #12761 from ctrlaltdavid/21821 
Add Controller.Actions.Sprint as synonym of Controller.Actions.SPRINT
 2018-04-11 12:07:32 -07:00
John Conklin II
2f4bc5bd04
Merge pull request #12701 from misslivirose/fix-edit-grid-color 
Fix for grid color changes not applying
 2018-04-11 12:06:09 -07:00
John Conklin II
b2bc2b6e43
Merge pull request #12852 from birarda/client-only-installer-name 
RC66: remove the installer information file during uninstall
 2018-04-11 12:02:46 -07:00
John Conklin II
28168e6e45
Merge pull request #12699 from misslivirose/fix/save-settings-for-editing 
Fix for edit preferences not persisting
 2018-04-11 11:59:58 -07:00
MiladNazeri
9f7a765ec3
Merge pull request #12729 from ctrlaltdavid/21814 
Settings API JSDoc
 2018-04-11 11:48:15 -07:00
Zach Fox
0c9d65bc15
Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError 
Commerce: Fix Certificate Info error
 2018-04-11 09:38:43 -07:00
samcake
68e45127e1 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-10 17:57:22 -07:00
Stephen Birarda
7ec65e8c0c fix unreadable baked textures in serverless tutorial 2018-04-10 17:02:37 -07:00
Stephen Birarda
0d237f84b0 remove the installer information file during uninstall 2018-04-10 14:56:47 -07:00
Liv
c7be6e0934
Update edit.js 
remove the unneeded manual removal of the create setting - it's handled with the rest of the menu items now, and this was causing it to default to false every start..

tested locally but might have gotten in a weird state, so fixing in GH editor.
 2018-04-10 12:15:57 -07:00
Seth Alves
d8f0cfa89a
Merge pull request #12797 from druiz17/update-bake-tool 
update python bake tool
 2018-04-10 10:20:38 -07:00
Liv Erickson
20ee169054 two more spaces 2018-04-10 09:23:14 -07:00
Liv Erickson
6c15577653 style fixes for eslint 2018-04-10 09:18:54 -07:00
Sam Gateau
6acda83f5c Bringing the test to the workload ui 2018-04-09 23:13:39 -07:00
Sam Gateau
9cb918a4ad Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-09 20:03:26 -07:00
Sam Gateau
62d5229811
Merge pull request #12842 from samcake/workload 
Workload: building a test script for the physics /simulation workload
 2018-04-09 19:56:18 -07:00
Sam Gondelman
d781cf43ee
Merge pull request #12775 from Cristo86/android_jump 
Android Control - jump and view sensitivity
 2018-04-09 17:32:57 -07:00
samcake
87b3f9bd1f More featuers for the view of the workload and test scrtpts to stress the system) 2018-04-09 17:27:55 -07:00
samcake
72649f5c06 More featuers for the view of the workload and test scrtpts to stress the system) 2018-04-09 17:27:40 -07:00
SamGondelman
8f65813924 fix asserts on domain switch 2018-04-09 17:10:49 -07:00
Cristian Luis Duarte
1242446c52 Cleanup controller code 2018-04-09 19:57:55 -03:00
Clément Brisset
c62a701a2d
Merge pull request #12838 from highfidelity/RC66 
RC66 merge back to master
 2018-04-09 13:17:12 -07:00
John Conklin II
4dcab95b40
Merge pull request #12828 from Atlante45/fix/skybox-baking 
Fix skybox baking
 2018-04-09 11:55:51 -07:00
John Conklin II
890a63afb4
Merge pull request #12833 from ElderOrb/FB14015_RC66 
Close 'goto' app on pressing 'forward' / 'backward' buttons
 2018-04-09 11:42:17 -07:00
John Conklin II
d281d7b2cb
Merge pull request #12819 from Atlante45/fix/location-hostname 
Fix location.hostname
 2018-04-09 09:42:41 -07:00
John Conklin II
be3d5d03cc
Merge pull request #12808 from ElderOrb/FB13962_RC66 
Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)
 2018-04-09 09:42:00 -07:00
Alexander Ivash
faddc556d7 FB14015 - Go To app does not close when selecting forward and back arrows on desktop 2018-04-07 17:57:22 +03:00
samcake
49977d7fc3 Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-04-06 17:42:45 -07:00
Sam Gateau
476b75488c
Merge pull request #12827 from AndrewMeadows/lhf-needsToCallUpdate 
Workload: low hanging fruit optimization: don't unneccessarily update() entities
 2018-04-06 17:38:54 -07:00
Andrew Meadows
9c84f05275 rollback change to MaterialEntityItem, we'll fix later 2018-04-06 17:32:57 -07:00
Clement
6e7f8a2ef6 Fix value collision for baking version 2018-04-06 17:24:16 -07:00
Andrew Meadows
353afb47b3 more correct needsToCallUpdate() implementations 2018-04-06 16:53:08 -07:00
Andrew Meadows
b515fd50fc remove unused data member 2018-04-06 16:52:49 -07:00
samcake
694baa81e8 removing logging around physics 2018-04-06 16:12:02 -07:00
Andrew Meadows
b523b2a81a more correct proxyID validation 2018-04-06 15:41:38 -07:00
Sam Gateau
f996989a40
Merge pull request #12825 from AndrewMeadows/workload 
only add to physics simulation that when necessary
 2018-04-06 15:29:41 -07:00
Andrew Meadows
2cfb835b56 only add to physics simulation that when necessary 2018-04-06 15:26:33 -07:00
Sam Gateau
ae0af3ab62
Merge pull request #12823 from druiz17/fix-selection-api 
fix enableHighlightList  and disableHihglightList function for Selection API
 2018-04-06 15:13:15 -07:00
Cristian Luis Duarte
f556c8d3a7 Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-06 18:02:30 -03:00
Dante Ruiz
00713ab225 fix selection api 2018-04-06 14:00:50 -07:00