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

47926 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
427c8008c6 Merge branch 'master' into 21089 2016-11-03 09:18:25 +13:00
David Rowe
0c47960553 Don't raise keyboard for non-text HTML input fields 2016-11-03 09:01:28 +13:00
David Rowe
de5e02310b Provide keyboard in marketplaces window 2016-11-03 09:00:40 +13:00
Ryan Downe Karpf
8f7b8504fd Merge pull request #8983 from druiz17/oldIcon 
Update Dialog - changed old interface icon with new interface  icon
 2016-11-02 12:21:07 -07:00
Clément Brisset
e85d81da3c Merge pull request #8982 from Atlante45/installer 
Launch Interface after Sandbox content loaded
 2016-11-02 11:30:50 -07:00
Clément Brisset
9d555270d1 Merge pull request #8985 from huffman/fix/tutorial-went-to-trigger 
Fix tutorial tracking wentToEntry if you haven't finished the tutorial
 2016-11-02 11:26:41 -07:00
Ryan Huffman
54496c2eff Fix tutorial tracking wentToEntry if you haven't finished the tutorial 2016-11-02 09:02:39 -07:00
Dante Ruiz
a948e03ed8 changed old icon to new icon 2016-11-02 08:23:10 -07:00
David Rowe
8ccf645d1c Make script event bridge available to OverlayWindow 2016-11-02 21:41:06 +13:00
Brad Hefta-Gaub
56b3ac8c89 Merge pull request #8972 from sethalves/fix-for-2159 
lock around audio-client quit flag to avoid shutdown race
 2016-11-02 00:14:33 -07:00
David Rowe
c578cd4b6d Inject keyboard raising and lowering script into marketplaces window 2016-11-02 17:06:40 +13:00
David Rowe
41c7f714e2 Add keyboard control to marketplaces window 2016-11-02 16:49:45 +13:00
Atlante45
46102d93c6 Launch interface on install after content loading 2016-11-01 18:15:27 -07:00
Atlante45
e78d907db0 Add clo to launch interface after content loads 2016-11-01 18:15:27 -07:00
Howard Stearns
486cf01a55 Merge pull request #8975 from zfox23/AddSnapshotText 
Add "Snapshot" text to snapshot cards in Address Bar Dialog
 2016-11-01 15:33:53 -07:00
Anthony Thibault
a9c88f2383 Merge pull request #8957 from AndrewMeadows/dont-mirror-eyes 
fix broken eyes in mirrored animations
 2016-11-01 15:28:48 -07:00
Zach Fox
b98c6cb50f Change 'Snapshot' to 'snapshot' and use smaller font 2016-11-01 14:49:18 -07:00
David Rowe
10490a9fad Default collision shap to hull per submesh instead of static 2016-11-02 10:45:00 +13:00
Zach Fox
c4b59eafbb Add 'Snapshot' text. My very first commit! 2016-11-01 14:09:25 -07:00
Seth Alves
137730dc50 coding standard 2016-11-01 11:59:28 -07:00
Chris Collins
3625f329d9 Merge pull request #8971 from hyperlogic/bug-fix/deterministic-plugin-load-order 
Load plugins in alphabetical order.
 2016-11-01 11:30:04 -07:00
Seth Alves
ae17135a07 lock around quit flag to avoid shutdown race 2016-11-01 11:14:16 -07:00
Anthony J. Thibault
09511111cf Load plugins in alphabetical order. 2016-11-01 10:23:54 -07:00
David Rowe
0c6ed67e3b Tidying 2016-11-02 00:05:30 +13:00
David Rowe
35448b6c09 Update Clara.io instructions 2016-11-02 00:05:10 +13:00
David Rowe
667a777695 Use Clara.io API for FBX downloads 2016-11-01 23:43:15 +13:00
David Rowe
93beaa81c0 Code tidying 2016-11-01 13:27:05 +13:00
David Rowe
cee8b66ce9 Handle duplicate Clara download asset names 2016-11-01 13:26:05 +13:00
David Rowe
3ca2c19075 Delete temporary directory after content has been used 2016-11-01 12:31:35 +13:00
Chris Collins
a49669a975 Merge pull request #8955 from sethalves/fix-obj-textures 
fix obj textures
 2016-10-31 11:52:25 -07:00
Chris Collins
0520aa9ad5 Merge pull request #8948 from samcake/blue 
Avoid messaging for render targets generating mip maps
 2016-10-31 11:09:06 -07:00
Chris Collins
6698b1617b Merge pull request #8945 from thoys/patch-8 
Fix Oculus hand controllers to only work in HMD
 2016-10-31 11:02:40 -07:00
Chris Collins
dc8d0bf31c Merge pull request #8935 from zzmp/log/silence-udt-socket 
group udt::Socket errors as debug logs
 2016-10-31 10:31:10 -07:00
Chris Collins
3b6faefe05 Merge pull request #8931 from sethalves/possible-fix-for-2068 
Possible fix for 2069
 2016-10-31 10:21:01 -07:00
David Rowe
8ab56fe871 Automatically download Clara model to ATP and add to world 2016-10-31 16:02:20 +13:00
Brad Hefta-Gaub
a79541a83a Merge pull request #8962 from ZappoMan/removeFaceMute 
remove mute icons
 2016-10-30 13:12:23 -07:00
Brad Hefta-Gaub
8fbac58091 remove mute icons 2016-10-30 09:33:02 -07:00
David Rowe
098200a5dd Hide brief flash of browser window used for download 2016-10-30 15:50:41 +13:00
David Rowe
e0ef24a460 Set auto adding for Clara downloads 2016-10-30 15:35:20 +13:00
David Rowe
12747d26e0 Add parameter that enables automatically adding download model to world 2016-10-30 13:58:17 +13:00
David Rowe
97407e1cd5 Canonical default browser URL 2016-10-29 21:31:44 +13:00
David Rowe
5e82410371 Make Clara.io download more robust 2016-10-29 21:31:27 +13:00
Andrew Meadows
c8d4146351 don't mirror eye animations 2016-10-28 17:08:43 -07:00
Seth Alves
3ad748cfe2 Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 16:41:39 -07:00
Clément Brisset
95c175ae74 Merge pull request #8950 from huffman/tutorial/gotoentrystep 
Add tutorial tracking for going through the welcome portal
 2016-10-28 16:26:40 -07:00
Ryan Huffman
4148abe28f Add comment to tutorial.js generateUUID usage 2016-10-28 16:17:54 -07:00
Chris Collins
1ba5a5d5d7 Merge pull request #8947 from huffman/fix/script-include-race 
Fix race condition in BatchLoader
 2016-10-28 16:17:46 -07:00
David Kelly
a8832fafeb Merge pull request #8934 from howard-stearns/more-reliable-crowds 
More reliable crowds
 2016-10-28 16:17:35 -07:00
Ryan Huffman
214d8ebc33 Merge pull request #8954 from Atlante45/sandbox 
Exit Sandbox instead of asking to quit
 2016-10-28 16:09:03 -07:00
Ryan Huffman
8fe6278831 Update wentToEntry tutorial step to #9 2016-10-28 16:01:52 -07:00