Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 11:22:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71808 commits 71 branches 56 tags 1.2 GiB
Commit graph

4928 commits

Author SHA1 Message Date
David Rowe
4927ffece3 Misc fixes 2018-09-25 10:33:49 +12:00
David Rowe
991ceb643c Fix teleport not working after script reload in HMD mode 2018-09-25 10:18:52 +12:00
David Rowe
858abaf6fc Fix sensor overlays not displaying after re-enter HMD mode 2018-09-25 09:49:11 +12:00
David Rowe
5ff2c36917 Get play area displaying and working again 2018-09-24 15:53:47 +12:00
David Rowe
e29b403abc Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/raypick/PointerScriptingInterface.cpp
#	interface/src/raypick/PointerScriptingInterface.h
#	interface/src/raypick/StylusPointer.h
#	libraries/pointers/src/Pointer.h
#	scripts/system/controllers/controllerModules/teleport.js
 2018-09-24 11:44:28 +12:00
John Conklin II
ea7bc26ad8
Merge pull request #14038 from wayne-chen/fixInterstitialButton 
Fix Interstitial GoTo button stretch
 2018-09-21 11:44:48 -07:00
Ryan Huffman
1ee655c8f8 Fix sorting of entity list not working as expected 2018-09-20 13:51:00 -07:00
Wayne Chen
8bd698b143 leaving button in natural dims 2018-09-20 11:13:27 -07:00
Zach Fox
d487914656 Prevent text notification from appearing when not necessary 2018-09-18 11:28:59 -07:00
Zach Fox
c453594eb7 Overhaul notification logic for PAL 2018-09-17 14:41:18 -07:00
Zach Fox
143a059b16 Small changes to AppUI and PAL 2018-09-17 11:11:36 -07:00
Zach Fox
23fab0985b Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-17 11:11:21 -07:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip 
Safe Teleport Target
 2018-09-14 15:11:18 -07:00
Zach Fox
9c5544af39 Merge in big work from appui_notifications branch 2018-09-14 14:37:04 -07:00
Zach Fox
9e50904376 Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-14 14:36:22 -07:00
luiscuenca
04e6225a95 Threshold back 2018-09-14 11:22:47 -07:00
luiscuenca
8c9173b639 Safe landing for discrepancies 2018-09-14 11:06:30 -07:00
David Back
86972cf4fb
Merge pull request #13992 from dback2/entityListSearchCase 
Fix entity list search case-sensitivity and allow id search
 2018-09-14 10:58:44 -07:00
Howard Stearns
4378f5bf1c
Merge pull request #13996 from howard-stearns/text-tuning-for-wallet-setup-cta 
Text tuning for wallet setup call to action
 2018-09-14 10:17:22 -07:00
David Back
296e2ba488 lowercase search term at start 2018-09-14 09:57:27 -07:00
howard-stearns
685b2978ce Text tuning for wallet setup call to action 2018-09-14 08:26:25 -07:00
unknown
f9480c24a5 store search term lower 2018-09-13 20:07:49 -07:00
unknown
ae2005b8c4 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase 2018-09-13 19:37:16 -07:00
luiscuenca
fb37e13aae fix hat stand fail 2018-09-13 18:21:22 -07:00
David Back
b65bd6736f also allow search using entity id 2018-09-13 18:20:11 -07:00
Wayne Chen
53582bddcd pushing more changes 2018-09-13 17:26:08 -07:00
Wayne Chen
bf7dd94db7 button was clipped; adding higher res img 2018-09-13 17:25:33 -07:00
Wayne Chen
2b8aebdb6b Revert "Merge branch 'master' into fixGoToButtonInterstitial" 
This reverts commit b4b0c519f3, reversing
changes made to aef3ed3e01.
 2018-09-13 17:21:29 -07:00
Wayne Chen
40451a1fc1 Revert "Revert "Merge branch 'master' into fixGoToButtonInterstitial"" 
This reverts commit c5468fd8e9.
 2018-09-13 17:21:07 -07:00
Wayne Chen
c5468fd8e9 Revert "Merge branch 'master' into fixGoToButtonInterstitial" 
This reverts commit b4b0c519f3, reversing
changes made to 77d5ebf34f.
 2018-09-13 17:18:49 -07:00
Wayne Chen
b4b0c519f3
Merge branch 'master' into fixGoToButtonInterstitial 2018-09-13 17:11:34 -07:00
Wayne Chen
77d5ebf34f
changing button URL - typo 2018-09-13 15:47:25 -07:00
Wayne Chen
db1acb87b8 button was clipped; adding higher res img 2018-09-13 15:38:24 -07:00
David Back
4bc046187a fix searching case-sensitivity 2018-09-13 15:06:14 -07:00
luiscuenca
b517808bc2 Fix smaller size avatar capsule and land on detailed mesh 2018-09-12 21:24:19 -07:00
David Back
7768e08510 rename func 2018-09-12 16:06:14 -07:00
Zach Fox
5a1d074e2f Goto now uses AppUi; lint 2018-09-12 16:04:37 -07:00
David Back
06504ade88 Merge branch 'master' of https://github.com/highfidelity/hifi into centerScaleCubeHMD 2018-09-12 16:04:22 -07:00
David Back
1b8e9ed906 get controller position from avatar frame 2018-09-12 16:02:43 -07:00
Zach Fox
01073ca18d Lots of changes; marketplaces.js working now 2018-09-12 15:46:17 -07:00
David Back
55a4c55f78 remove unused and rename var 2018-09-12 14:48:27 -07:00
David Back
3da442a8f9 allow highlights in hmd, fix center scale hmd math 2018-09-12 14:44:04 -07:00
John Conklin II
e243792cac
Merge pull request #13623 from wayne-chen/fixGrabWebSurface-case-16192 
MS16192: Fix Near Grabbing After Using Web Entity
 2018-09-12 12:50:44 -07:00
David Back
cf1c1296a7 fix center scale cube in hmd 2018-09-12 11:44:26 -07:00
Wayne Chen
521361293a
moving comment locations inside conditionals 2018-09-12 11:03:00 -07:00
Wayne Chen
acf34dcfdf
one more unused variable 2018-09-12 10:58:05 -07:00
Wayne Chen
8bef0d0de4
removing unused variables 2018-09-12 10:55:40 -07:00
Wayne Chen
a96e78c72d
removing debug 2018-09-12 10:54:38 -07:00
Wayne Chen
b9f0af63e1 changing check for near grabbing modules - fixes grabbing for dynamic 2018-09-12 10:38:21 -07:00
Zach Fox
de2548d926 Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-12 09:30:00 -07:00