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

62080 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
b8f7ba9aa6 Fix month display in commerce... 2017-12-01 10:45:36 -08:00
Zach Fox
52ca9a6c76
Merge pull request #11911 from zfox23/commerce_fixMonthLol 
Fix month display in commerce...
 2017-12-01 10:44:19 -08:00
Alexander Ivash
48b50e33dd 9461 Keyboard for create appear then disappears immediately (HMD) 2017-12-01 20:29:35 +03:00
Zach Fox
ebb2e50d01 Fix month display in commerce... 2017-12-01 09:29:19 -08:00
David Rowe
fd76c7a88b Fix erroneous 2D overlay unhandled property messages for bounds property 2017-12-01 17:40:34 +13:00
ZappoMan
d1017d81bd fix issues in model import sizing caused by recent refactor 2017-11-30 18:08:32 -08:00
ZappoMan
750d505f9b fix issues in model import sizing caused by recent refactor 2017-11-30 17:51:59 -08:00
luiscuenca
83e370d9de add shared pointer 2017-11-30 17:40:49 -07:00
Zach Fox
24e5994f20 The nuclear option is a bad option. 2017-11-30 15:55:09 -08:00
luiscuenca
5d1f2a04c1 restate deleted lines 2017-11-30 16:43:38 -07:00
Zach Fox
009d3a18a3 Call reset() on Ledger and Wallet before creating new wallet 2017-11-30 15:40:20 -08:00
luiscuenca
98e8361690 Fix and rebuild 2017-11-30 16:07:43 -07:00
Dante Ruiz
eaa049863d Merge branch 'RC60' of github.com:highfidelity/hifi into fix-equipping 2017-11-30 14:49:24 -08:00
Dante Ruiz
db374b8c6d fixing adjusting equipped entities 2017-11-30 14:49:06 -08:00
luiscuenca
9cd2dc921a back to for loop 2017-11-30 15:31:29 -07:00
luiscuenca
0729579266 fix for loop 2017-11-30 15:21:43 -07:00
luiscuenca
58e829dbda Delete leftover line 2017-11-30 15:11:38 -07:00
luiscuenca
e02e810399 Audio Handler fix 2017-11-30 15:06:02 -07:00
Dante Ruiz
785eedfb1c
Merge pull request #11896 from druiz17/fix-hud-hmd-rc60 
fix laser interaction on HUD in HMD mode
 2017-11-30 11:48:39 -08:00
Bradley Austin Davis
59aea9c401
Merge pull request #11862 from jherico/android_nov 
Make buildable APK from Gradle
 2017-11-30 11:23:29 -08:00
Zach Fox
b0dda3de33 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sameInfoDontRefresh 2017-11-30 10:49:20 -08:00
vladest
a3d406d8d1 Merge branch 'master' into fix_tablet_scrollbars 2017-11-30 11:40:50 +01:00
vladest
dfeefe53b8 Make scroll bar handle centered on shaft. Width chaned on par with entities list html view 2017-11-30 11:40:02 +01:00
luiscuenca
b890a29b3a Clean console log 2017-11-29 19:05:01 -07:00
Howard Stearns
be083664fb
Merge pull request #11901 from howard-stearns/merge-ECDSA-to-rc60 
Merge pull request #11882 from howard-stearns/the-lost-ECDSA
 2017-11-29 17:45:05 -08:00
luiscuenca
b817143e2e Fixes on web and QML audio sync 2017-11-29 18:16:21 -07:00
Zach Fox
39afb4ab6a Merge pull request #11882 from howard-stearns/the-lost-ECDSA 
The lost ecdsa
 2017-11-29 15:53:52 -08:00
Zach Fox
7490744fb7
Merge pull request #11882 from howard-stearns/the-lost-ECDSA 
The lost ecdsa
 2017-11-29 15:46:22 -08:00
howard-stearns
57ec73bb13 spacing 2017-11-29 14:37:20 -08:00
howard-stearns
115bc27557 back to stable, rather than staging 2017-11-29 13:39:58 -08:00
Dante Ruiz
82fb58ed96 remove debug statement 2017-11-29 10:58:10 -08:00
Dante Ruiz
eba8a6e17b Merge branch 'master' of github.com:highfidelity/hifi into fix-vive-head-pose 2017-11-29 10:50:37 -08:00
Dante Ruiz
982fad5050 fix laser interaction on HUD in HMD mode 2017-11-29 10:42:35 -08:00
howard-stearns
fb038c17ee for now, point this PR at staging so that it can be tested as built by 
jenkins
 2017-11-29 09:54:34 -08:00
howard-stearns
55589312f1 new padding/initialization that matters on linux server 2017-11-29 09:53:48 -08:00
Brad Davis
101d6763cc PR feedback 2017-11-29 09:11:52 -08:00
Zach Fox
3c892920e3 Prevent seeding text from flashing 2017-11-28 17:00:15 -08:00
howard-stearns
281b4cfd88 Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA 2017-11-28 16:59:44 -08:00
Anthony Thibault
8eb8cb0994
Merge pull request #11889 from hyperlogic/bug-fix/vive-no-head-rc60 
RC60: Head tracking bug fix for vive HMD users
 2017-11-28 16:31:27 -08:00
Anthony Thibault
16ca1a9ec6
Merge pull request #11888 from hyperlogic/bug-fix/vive-no-head 
Head tracking bug fix for vive HMD users
 2017-11-28 16:30:26 -08:00
SamGondelman
c5ebb8a279 expose Window.getDeviceSize() 2017-11-28 16:16:30 -08:00
Zach Fox
5dc8715879 Bugfix 2017-11-28 16:14:17 -08:00
Zach Fox
489d11d5fd Remove logging 2017-11-28 16:01:58 -08:00
Zach Fox
3e5a2addd2 Use same logic for Recent Activity 2017-11-28 16:00:46 -08:00
Zach Fox
e769d2fbc3 Don't refresh Inventory or Recent Activity if data hasn't changed 2017-11-28 15:44:42 -08:00
Bradley Austin Davis
e4220aa44e Fixing warnings in android build 2017-11-28 14:32:30 -08:00
David Back
1904daf623
Merge pull request #11869 from dback2/mirrorissues 
prevent spectator cam from updating secondary cam aspect ratio when it's in use by mirrors
 2017-11-28 14:05:47 -08:00
David Rowe
b9ad15b19e Add missing line3d overlay property getters 2017-11-29 11:03:16 +13:00
Bradley Austin Davis
5febbc32f5 CMake header cleanup 2017-11-28 13:54:46 -08:00
Bradley Austin Davis
a30395e945 Tweaking android cmake 2017-11-28 13:46:01 -08:00