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

73771 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeff Clinton
62e3e87ba6
Merge pull request #14325 from huffman/fix/new-model-dynamic 
Fix new models not obeying dynamic checkbox
 2018-11-08 10:22:12 -08:00
Zach Fox
e0ca535853 CR round 2 2018-11-08 10:08:42 -08:00
Zach Fox
142dfab9ac CR round 1 2018-11-08 10:05:57 -08:00
Jeff Clinton
30ff3f676a
Merge pull request #14310 from thoys/fix/create/tooltips-refinement 
Create APP tooltip / Adressed CR comments / Regression
 2018-11-08 10:03:17 -08:00
Dante Ruiz
358aa547b1 feedback changes 2018-11-08 09:58:53 -08:00
Dante Ruiz
f664421fe0 addressing code review feedback 2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Gabriel Calero
1d059d9650 Fix NullPointerException and bug in login menu navigation 2018-11-08 14:51:42 -03:00
Zach Fox
b97fd6eb95
Merge pull request #14255 from zfox23/textToSpeech 
Text to Speech App
 2018-11-08 09:44:59 -08:00
Jeff Clinton
49bf01294a
Merge pull request #14320 from huffman/fix/default-collision-values 
Update the default edit.js collidesWith to include myAvatar
 2018-11-08 09:17:40 -08:00
Andrew Meadows
5bfb9c1f71 fix ShapeInfo::contains() logic for capsule shapes 2018-11-08 08:39:43 -08:00
Olivier Prat
be7806644a Removed ternary operators with mix (try to limit branching) 2018-11-08 17:29:00 +01:00
Olivier Prat
87e6bffc46 Added sampler2Darray precision for GLES 2018-11-08 14:28:00 +01:00
Olivier Prat
d64127aa9c Android shader compilation fix 2018-11-08 13:48:19 +01:00
Olivier Prat
829e5ff44f Same android problem fix, but elsewhere 2018-11-08 13:37:22 +01:00
Olivier Prat
09b26db650 Shader fix for android... <sigh> 2018-11-08 13:19:42 +01:00
Olivier Prat
40b7b42f5b Bis 2018-11-08 12:29:01 +01:00
Olivier Prat
cd89ce5388 Another stupid android shader compilation error fix 2018-11-08 12:07:17 +01:00
Olivier Prat
de2f1c52cc Another android shader compilation fix 2018-11-08 11:44:47 +01:00
Olivier Prat
05ac2fccb6 Still android fixes 2018-11-08 11:24:46 +01:00
Olivier Prat
851cfff960 Again, android shader compilatio fix 2018-11-08 11:06:28 +01:00
Olivier Prat
c79c403a52 More android shader compilation fixes 2018-11-08 10:47:24 +01:00
Olivier Prat
7e93d91bfa Fixed android shader compilation 2018-11-08 09:29:02 +01:00
Olivier Prat
9d5dcec0a0 Merge from master 2018-11-08 09:14:42 +01:00
David Rowe
371919b923 Fix mini tablet always displaying if start up in HMD mode 2018-11-08 17:47:02 +13:00
David Rowe
e5fe2622ae Merge branch 'master' into M19768 2018-11-08 17:13:02 +13:00
Clement
ef54a63de6 Use uint8_t instead of bool on the wire 2018-11-07 17:54:49 -08:00
Clement
8f763dfd50 Fix bug and crash in solo logic 2018-11-07 17:46:18 -08:00
Sam Gateau
4489efa58b
Merge pull request #14346 from AndrewMeadows/fix-crash-19654 
Case 19654: fix crash in btCollisionWorld::updateSingleAabb()
 2018-11-07 16:09:36 -08:00
David Back
0597d15771 tabs 2018-11-07 16:06:18 -08:00
David Back
708f6a9402 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListColumns 2018-11-07 16:02:33 -08:00
David Back
f0c2ec1fa4 entity list data-driven resizable addable/removable columns 2018-11-07 16:02:15 -08:00
Shannon Romano
7e96ceb222
Merge pull request #14254 from samcake/black-bis 
Case 19140: Clean up Luci ui to aggregate more tools
 2018-11-07 15:10:48 -08:00
Zach Fox
cee1454f6e CR feedback - thanks Ken! 2018-11-07 15:09:53 -08:00
SamGondelman
d316fe15ce fix tablet culling 2018-11-07 15:02:32 -08:00
Zach Fox
48d3450c5a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-07 14:59:23 -08:00
Zach Fox
3cbaec818d
Merge pull request #14360 from zfox23/MS19743_updateCheckoutBug 
Fix MS19743: Fix case where user couldn't update certain items
 2018-11-07 14:57:35 -08:00
Gabriel Calero
ccd0d8299f Change oauth parameter to env variables 2018-11-07 19:56:41 -03:00
Jeff Clinton
e507e91bfd
Merge pull request #14227 from ElderOrb/FB19396 
FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: Type…
 2018-11-07 13:36:41 -08:00
sam gateau
c40ded598d REmoving any attempt to fix anything in this pr 2018-11-07 12:18:52 -08:00
sam gateau
9ada9a7ad3 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-11-07 12:07:15 -08:00
sabrina-shanman
4d9c20343a Link shared library in hfm 2018-11-07 11:44:58 -08:00
Clement
65a83cb026 Resend solo nodes on mixer reconnect 2018-11-07 11:41:04 -08:00
Jeff Clinton
63bf077776
Merge pull request #14263 from ElderOrb/better_imports_for_controls_and_styles 
Better imports for controls and styles
 2018-11-07 11:19:55 -08:00
Sam Gateau
e6cd9a4ffa
Merge pull request #14301 from NissimHadar/fixPath 
case 19636 - Make path to VCPKG relative  to ENV variable
 2018-11-07 10:58:56 -08:00
Sam Gateau
e28560a9c7
Merge pull request #14311 from SamGondelman/interstitial 
Case 19682: Disable interstitial on android
 2018-11-07 10:47:31 -08:00
Sam Gateau
d15c8a8854
Merge pull request #14313 from SamGondelman/macFix 
Case 19686: Possibly fix mac debug deferred issue
 2018-11-07 10:33:41 -08:00
Sam Gateau
8cda3f729b
Merge pull request #14316 from AndrewMeadows/workload-views-include-MyAvatar 
Case 19394: always keep entities near MyAvatar in physics simulation
 2018-11-07 10:26:47 -08:00
Sam Gateau
5d0be31fe7
Merge pull request #14354 from SamGondelman/deadlock 
Case 19735: Fix ResourceCache mutex issues
 2018-11-07 09:55:41 -08:00