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

74681 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thijs Wenker
d25b5f054b
Merge branch 'master' into fix/create/missingStartMiddleFinishTooltips 2018-12-06 20:48:42 +01:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
Wayne Chen
4f0e23ed69 changing link steam flow/height of error message 2018-12-06 11:26:33 -08:00
Sam Gondelman
a7c083e97a
Merge branch 'master' into NOverlays2 2018-12-06 11:24:27 -08:00
Jeff Clinton
43f84a9577
Merge pull request #14426 from ElderOrb/FB19400 
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
 2018-12-06 11:18:39 -08:00
Adam Smith
08d6e35d4d
Merge pull request #14372 from SamGondelman/decals 
Case 19798: 3D projected Material Entities and materialRepeat option
 2018-12-06 11:13:46 -08:00
Zach Fox
a2af50a9d0 Show pre-auth'd transactions in Recent Activity before redemption 2018-12-06 11:07:26 -08:00
Wayne Chen
9f894ae977 fixing case with KB pw prop./bolding error msg 2018-12-06 10:52:10 -08:00
David Back
1171821fc9 unity avatar exporter plugin 2018-12-06 10:22:18 -08:00
NissimHadar
4a50baddc2 Reverted debug code. 2018-12-06 09:55:48 -08:00
Wayne Chen
30f1016f1c Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-06 09:55:00 -08:00
NissimHadar
0cca388971 Merge branch 'master' of https://github.com/highfidelity/hifi into 20116_nitpick_v1.2 2018-12-06 09:52:48 -08:00
NissimHadar
a665e728e6 Improved contents of the HTML results. 2018-12-06 09:52:21 -08:00
Ryan Huffman
13c3b410d8
Merge pull request #14495 from dback2/draggableNumberFixes76-master 
Draggable numbers - RC76 fixes to master
 2018-12-06 09:47:38 -08:00
Jeff Clinton
b9156d68e5
Merge pull request #14508 from amantley/restingHandsBug 
removed the code that turns off inactive hands in MyAvatar.cpp
 2018-12-06 09:42:34 -08:00
Jeff Clinton
e65e8d29a1
Merge pull request #14442 from hyperlogic/bug-fix/hand-grasp-during-desktop-handshake 
Ensure that hand is in grasp pose during desktop handshake animation
 2018-12-06 09:41:29 -08:00
Ryan Huffman
3160339551 Improve Create properties for particles + materials 
Sizing of input fields is now flexible.
Material scale field labels are no longer obscured.
Material tooltips are corrected.
 2018-12-06 09:41:10 -08:00
Jeff Clinton
e8c1c4a27b
Merge pull request #14536 from danteruiz/fix-audio-switching 
Respect changed audio settings when switch displays (Master)
 2018-12-06 09:13:47 -08:00
Jeff Clinton
7f242b8c0e
Merge pull request #14522 from thoys/fix/create/ignoreTextareaShortcuts-master 
[RC77] MS20114 [CreateApp] ignore createApp shortcut keys while TEXTAREA elements are in focus
 2018-12-06 09:11:49 -08:00
Wayne Chen
89a216a5ec Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-06 09:05:07 -08:00
Wayne Chen
ce65e557bc cleaning up commented code 2018-12-06 09:04:57 -08:00
NissimHadar
8938afd350 Updated for v1.2 2018-12-06 08:42:38 -08:00
Wayne Chen
f8a55a9196 25% opacity from PM req/fixing error message in profile body 2018-12-05 19:42:44 -08:00
Wayne Chen
a3a575acd1 updating background img binaries 2018-12-05 19:12:21 -08:00
Wayne Chen
f7265378bd updating background img 2018-12-05 19:11:58 -08:00
David Rowe
aa952e9142 Fix mini tablet visibility angle calculations 2018-12-06 15:24:03 +13:00
Wayne Chen
037abd9b5e don't allow PC keyboard in HMD login/fix sign up password 2018-12-05 18:14:59 -08:00
Simon Walton
e03104cad5 Merge remote-tracking branch 'upstream/master' into avatar-mixer-downloads-fst 
Remove the code that was fixed in the conflicting PR - it's
now fixed in the new location.
 2018-12-05 17:58:38 -08:00
NissimHadar
079a623b30 Added text results to HTML. 2018-12-05 17:25:03 -08:00
Simon Walton
16144b6630 Move the previously deleted FST reader down to the ScriptableAvatar class 2018-12-05 17:14:40 -08:00
David Rowe
363e3ca32d Merge branch 'master' into mini-tablet-tuning 2018-12-06 13:55:24 +13:00
Adam Smith
653974ca30
Merge pull request #14293 from SamGondelman/branching 
Case 19473: Reduce branching in our shaders
 2018-12-05 16:42:42 -08:00
Zach Fox
235b27a198 Merge branch 'master' of github.com:highfidelity/hifi into payOut1 2018-12-05 16:35:07 -08:00
Zach Fox
02307d2308 Secret to Coupon ID 2018-12-05 16:34:53 -08:00
Clement
7723261cb9 Remove deferred script loading logic 2018-12-05 14:08:30 -08:00
Alexander Ivash
090bc4fc0d FB19355 - When I have avatar entities as children of my avatar, the Avatar app is not consistent in displaying wearables 2018-12-05 23:33:34 +03:00
NissimHadar
e3402328c8 Use same name for all text results in zipped folder. 2018-12-05 12:10:28 -08:00
NissimHadar
f5a19efa8c Saves text results in zip file. 2018-12-05 11:36:55 -08:00
Wayne Chen
11c40666e4 removing trailing tests 2018-12-05 11:29:58 -08:00
Wayne Chen
27e4e1c245 pitch updates login pos/fix signup errors 2018-12-05 11:24:27 -08:00
SamGondelman
287878ff98 merge with master 2018-12-05 10:35:08 -08:00
Dante Ruiz
3123bb37e4 fix audio switching issue 2018-12-05 10:34:47 -08:00
Antonina Savinova
2dcfea5f7c
Merge pull request #14487 from SimonWalton-HiFi/avatar-mixer-memory-leak 
Fix minor avatar-mixer memory leaks
 2018-12-05 10:29:29 -08:00
Wayne Chen
eb51a5b7b6 changing opacity to 0.5 2018-12-05 10:16:48 -08:00
Wayne Chen
37beab3ab3 fixing the desktop tablet problem again 2018-12-05 09:36:56 -08:00
Wayne Chen
40053ef13a make sure android still functions as expected 2018-12-05 09:10:17 -08:00
Wayne Chen
328e1ebc27 autotester param fully functional 2018-12-05 08:51:13 -08:00
Wayne Chen
3d99ffc459 outing oculus login 2018-12-05 08:25:01 -08:00
Wayne Chen
a2a4d2ff89 removing trailing debug 2018-12-05 08:21:11 -08:00
Wayne Chen
a30f4ed0b3 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-05 08:17:06 -08:00