Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 16:54:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73653 commits 25 branches 0 tags 1.1 GiB
Commit graph

73653 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thijs Wenker
08da8c4190 createApp - world/local switch 2018-11-09 01:28:37 +01:00
Brad Davis
5f6369daf6 Don't wipe explicit vcpkg directories 2018-11-08 15:44:28 -08:00
Dante Ruiz
f5b89ee7aa reverting previous change 2018-11-08 15:43:45 -08:00
Dante Ruiz
5d000495df making requested changes 2018-11-08 15:33:18 -08:00
Dante Ruiz
2a16ba57ac fix image entity crash 2018-11-08 15:24:57 -08:00
Gabriel Calero
c1174ad1ef Set dimensions for android devices thinner than 385dp 2018-11-08 20:04:59 -03:00
Brad Davis
3d2e723438 Adding new package guidance 2018-11-08 14:55:29 -08:00
David Rowe
cdae5cd03d Front-load interstitial scripts and resources 2018-11-09 10:53:34 +13:00
John Conklin II
3fabe557c2
Merge pull request #13948 from danteruiz/3d-keyboard 
3D Keyboard.
 2018-11-08 13:35:13 -08:00
Brad Davis
2691c39d66 PR feedback 2018-11-08 12:47:53 -08:00
Jeff Clinton
d349c1e672
Merge pull request #14336 from huffman/fix/horizontal-vertical-angle-particles 
Fix horizontal and vertical props in entity properties being swapped
 2018-11-08 12:42:48 -08:00
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
Brad Davis
8c4237b520 Fix warnings 2018-11-08 12:27:56 -08:00
Brad Davis
caf952c252 Fix duplicated window member 2018-11-08 12:27:55 -08:00
Brad Davis
bbba7d1b1d Updating build notes 2018-11-08 12:27:55 -08:00
Jeff Clinton
cc7ce83f28
Merge pull request #14328 from roxanneskelly/Case19373 
Case 19373 - Lowering volume on another user in PAL mutes them
 2018-11-08 12:07:20 -08:00
Jeff Clinton
ea8dc8ae68
Merge pull request #14334 from danteruiz/interstitial-bug-fixes 
Interstitial bug fixes
 2018-11-08 11:43:38 -08:00
Clement
f337579616 CR 2018-11-08 11:31:22 -08:00
Zach Fox
1b2593fd26
CR round 4 2018-11-08 11:28:07 -08:00
John Conklin II
ab9c494fef
Merge pull request #14367 from SamGondelman/tablet 
Case 17284: Fix tablet culling
 2018-11-08 11:14:12 -08:00
Ryan Huffman
1ff644b619
Merge pull request #14256 from ctrlaltdavid/M17008 
Fix Interface crash importing JSON with duplicate entity IDs in file
 2018-11-08 11:04:43 -08:00
Roxanne Skelly
0dc8a798a1 Merge branch 'master' of https://github.com/highfidelity/hifi into Case19373 2018-11-08 10:51:21 -08:00
Jamil Akram
7c22a1954c
Merge pull request #14237 from NissimHadar/addNoLogin 
case 18450: Do not show login dialog if requested not to on the command line.
 2018-11-08 10:43:21 -08:00
Zach Fox
811b01816b CR round 3 2018-11-08 10:41:31 -08:00
Roxanne Skelly
04a3d6f098 Merge branch 'master' of https://github.com/highfidelity/hifi into SetupLogging 2018-11-08 10:35:07 -08:00
Gabriel Calero
79a71d26b3 Fix webview in android 2018-11-08 15:33:49 -03:00
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
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