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

58558 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Collins
2a77bb06c7 Merge pull request #11367 from highfidelity/RC-54-HOTFIX 
Build 54.1 Hotfix Fix for polyline crash
 2017-09-15 09:35:59 -07:00
Brad Davis
d3ac7a388c Fix polyline rendering using default texture 2017-09-14 15:50:09 -07:00
Brad Davis
4c4df97c42 Fix transform of polylines with high update rates 2017-09-14 15:50:02 -07:00
Brad Davis
c0fb9dcf2e Fix polyline crash and flicker 2017-09-14 15:49:54 -07:00
Chris Collins
1b608a7d35 Merge pull request #11315 from highfidelity/RC-54 
Beta Release 54 - Includes up to Developer Release 7078
 2017-09-13 10:36:28 -07:00
Chris Collins
bb26cf2179 Merge pull request #11342 from Atlante45/RC-54 
Fix RC-54 conflict with stable
 2017-09-12 11:48:13 -07:00
Atlante45
c170cc2eb1 Merge branch 'stable' of https://github.com/highfidelity/hifi into RC-54 2017-09-12 10:53:04 -07:00
Bradley Austin Davis
45a2c3d5d9 Modifying SDL initialization due to crash on OSX 2017-09-11 17:17:16 -07:00
Bradley Austin Davis
0f465da92f Various Mac fixes 2017-09-11 17:17:07 -07:00
Bradley Austin Davis
3a75dcf84d Fix crashes in entity rendering on OSX 2017-09-11 17:17:00 -07:00
Zach Fox
9bbcf3e1ae Merge pull request #11232 from zfox23/SelectionScriptingInterface 
Selection Scripting Interface
 2017-08-31 08:57:24 -07:00
Zach Fox
913618ded5 Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-30 16:13:50 -07:00
David Kelly
84e13c84ae Merge pull request #11273 from howard-stearns/reset-wallet 
reset wallet
 2017-08-30 16:10:26 -07:00
David Kelly
962d1fc81d Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet 2017-08-30 15:30:29 -07:00
Zach Fox
dbb7023fc1 Fix warnings 2017-08-30 15:26:25 -07:00
David Kelly
988ee8c8d1 fix image provider, couple other things 2017-08-30 15:23:54 -07:00
Zach Fox
3f0d44990a Hook up bounding box rendering to Selection Scripting Interface 2017-08-30 14:54:23 -07:00
Zach Fox
fdcc149c34 Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-30 13:27:18 -07:00
Zach Fox
500427010d Merge pull request #11276 from zfox23/commerce_polishTxnHistory 
Polish transaction history and prepare for whatever new design
 2017-08-30 13:25:55 -07:00
Zach Fox
17d999e721 Fixes 2017-08-30 13:25:34 -07:00
Zach Fox
580865fa5a Add skeleton for infinite scroll 2017-08-30 12:54:26 -07:00
Zach Fox
7a7d7f95d7 Polish transaction history and prepare for whatever new design 2017-08-30 12:45:13 -07:00
Zach Fox
6f6edf460e Merge pull request #11274 from zfox23/commerce_zachsPunchlist3 
Remove most dependencies on 'onVisibleChanged'
 2017-08-30 12:30:09 -07:00
Zach Fox
fb4b0f60fa Remove most dependencies on 'onVisibleChanged' 2017-08-30 11:55:29 -07:00
howard-stearns
b8da08ca42 reset wallet 2017-08-30 11:29:43 -07:00
Zach Fox
a73d548ffc Merge pull request #11272 from zfox23/commerce_zachsPunchlist2 
Commerce: Login; punctuationMode; new images
 2017-08-30 11:12:38 -07:00
Zach Fox
e0878e7a3f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_zachsPunchlist2 2017-08-30 11:07:24 -07:00
Zach Fox
f366743be7 Login; punctuationMode; new images 2017-08-30 11:07:03 -07:00
Zach Fox
271fcbf8b4 Merge pull request #11271 from davidkelly/dk/securityImageIssue 
security image shows up in every qml engine now
 2017-08-30 10:52:48 -07:00
Zach Fox
1b48319a3f Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 
Commerce: Zachs Punchlist 01
 2017-08-30 10:10:56 -07:00
Chris Collins
f0e699aecb Merge pull request #11263 from highfidelity/RC-53 
Beta Release 53 - Includes up to Developer Release 7053
 2017-08-30 09:48:00 -07:00
Chris Collins
47a2e57e26 Merge pull request #10625 from humbletim/21180-C++ 
CR 21180-C++ Camera app -- core changes
 2017-08-30 07:20:00 -07:00
David Kelly
72b15b4223 fix comment 2017-08-29 20:28:57 -07:00
Zach Fox
6ee634b90a Lock overlay on top of security image 2017-08-29 17:19:34 -07:00
druiz17
2a97257698 Merge pull request #11140 from ElderOrb/case6788 
6788: You can deselect your current view mode
 2017-08-29 17:15:51 -07:00
David Kelly
a2b1cfc7ac security image shows up in every qml engine now 2017-08-29 17:06:57 -07:00
Zach Fox
c0d9c06067 Merge pull request #11268 from howard-stearns/fix-wallet-login 
fix wallet login (and share code with snapshot login)
 2017-08-29 16:26:51 -07:00
Zach Fox
5d1170c5d6 Only make message appear after inventory received 2017-08-29 16:17:59 -07:00
Liv
492d053016 Create home path for new content sets loaded in 2017-08-29 16:11:16 -07:00
howard-stearns
5b264a867a fix wallet login (and share code with snapshot login) 2017-08-29 16:05:01 -07:00
Zach Fox
a9c99854f9 Haven't purchased anything yet UI 2017-08-29 15:39:07 -07:00
Zach Fox
c7ad875485 Virtual keyboard and logic 2017-08-29 15:27:53 -07:00
Zach Fox
50241078ae Buncha punchlist items checked off 2017-08-29 14:30:00 -07:00
beholder
a0a43ebf26 show checkbox or radiobutton dependently on exclusiveGroup presence 2017-08-29 23:23:16 +03:00
Zach Fox
91f4e59f61 Misc fixes. Get started. 2017-08-29 12:33:44 -07:00
Chris Collins
b9d8b325bc Merge pull request #11265 from sethalves/RC-53-x 
Rc 53 x
 2017-08-29 09:59:49 -07:00
Seth Alves
a6aa71f8fd unmangle merge 2017-08-29 09:51:08 -07:00
Seth Alves
b8795c3ea9 remove unneeded bind-by-ref thing from lambdas 2017-08-29 09:49:06 -07:00
Seth Alves
35459a7b93 cherry-pick 2017-08-29 09:49:04 -07:00
SamGondelman
10eaed71f9 crash on shutdown 2017-08-29 09:10:12 -07:00