Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-21 12:20:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 72 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
vladest
748ef8bb87 Enable edit in combobox 2017-09-03 18:10:53 +02:00
beholder
c62f9007e9 7196 Mouse pointer no longer visible in HMD mode 
The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.

The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
 2017-09-03 15:20:59 +03:00
Brad Davis
9c03fa0369 Cleanup CMake 2017-09-02 16:15:14 -07:00
David Rowe
44b365df6d Merge branch 'master' into vr-edit-a 2017-09-03 10:57:32 +12:00
beholder
b5faa8ac56 7382 Create Menu does not Work on Tablet 2017-09-02 18:20:00 +03:00
David Rowe
1cbc807016 Further haptic and audio tweaks 2017-09-02 21:23:30 +12:00
David Rowe
c93acbecaa Move hover haptic pulses to dominant hand 2017-09-02 21:23:13 +12:00
David Rowe
039ceed74c Modify equip and create sounds 2017-09-02 21:01:37 +12:00
David Rowe
5408daea73 Increase drop tool haptic pulse and decress hover haptic pulses 2017-09-02 20:49:50 +12:00
David Rowe
c7461a9646 Fix hover colors of menu buttons and header "back" icon 2017-09-02 20:36:22 +12:00
David Rowe
939b2ef11a Fix laser enabling / disabling while inside an entity 2017-09-02 19:39:37 +12:00
David Rowe
d3819cfee3 Better names for overlay methods 2017-09-02 19:24:37 +12:00
David Rowe
9f9a0b0c58 Hide UI if hand is inside entity that camera is outside of 2017-09-02 19:09:36 +12:00
David Rowe
296d270098 Enable entities inside an entity to be manipulated 2017-09-02 19:06:43 +12:00
David Kelly
8723ff2df2 Merge pull request #11294 from zfox23/commerce_walletPassphraseModal 
Commerce: Wallet Passphrase Input Modal
 2017-09-01 17:46:09 -07:00
Clément Brisset
7d4f17506e Merge branch 'feat/auto-bake' into feat/bake-meta-errors 2017-09-01 17:33:25 -07:00
Seth Alves
91ee22e5a7 Merge pull request #11297 from sethalves/fix-protocol-for-pr-11290 
PR-11290 didn't actually bump protocol version
 2017-09-01 17:27:28 -07:00
Seth Alves
0855dfc1c6 PR-11290 didn't actually bump protocol version 2017-09-01 17:26:32 -07:00
Dante Ruiz
3b357ad61e finshed handControllerGrab refactoring 2017-09-01 17:07:26 -07:00
Stephen Birarda
55d44a8c8f Merge pull request #11285 from Atlante45/feat/baking-enabled 
Wire "Use baked" checkbox
 2017-09-01 16:25:49 -07:00
Stephen Birarda
b67f741ce9 Merge pull request #11284 from Atlante45/feat/auto-bake 
Hide .baked folder in the Asset Browser
 2017-09-01 15:43:10 -07:00
Seth Alves
8ccacf34f4 Merge pull request #11290 from Menithal/21484 
WL21484 - Add an additional parameter for entity animations to "allow translation"
 2017-09-01 15:34:07 -07:00
David Kelly
47cd47f819 log when no passphrase was set before trying to decrypt 2017-09-01 14:50:45 -07:00
Atlante45
28402be37c Fix status glyphs 2017-09-01 14:17:28 -07:00
David Kelly
feaa8d3120 Someday, a real rain will come and wash Wallet.cpp 
Till then, this little change will have to do.
 2017-09-01 14:06:43 -07:00
David Kelly
90316e275a Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal 2017-09-01 13:33:23 -07:00
Liv
7eab80e494 change message when permissions to replace domain content are not present 2017-09-01 13:17:37 -07:00
David Kelly
9fe6ce0337 working change passphrase. some cleanup to come 2017-09-01 13:11:56 -07:00
Ryan Huffman
eb2e87a798 Change it++ to ++it 2017-09-01 13:02:25 -07:00
Zach Fox
3cf0df518f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal 2017-09-01 11:53:47 -07:00
Zach Fox
51699c9a6a Minor changes to fonts and colors 2017-09-01 11:44:46 -07:00
David Kelly
d8bb3c7915 Merge pull request #11289 from davidkelly/dk/penniesAndStuff 
Display hfc in "pennies"
 2017-09-01 11:39:30 -07:00
Anthony J. Thibault
26e9e6e580 Fixes for stylus ranges and grab radii 2017-09-01 11:19:51 -07:00
Ryan Huffman
c67fcc1384 Add RedirectFail to ResourceRequest::getResultString() 2017-09-01 10:41:31 -07:00
Ryan Huffman
5ee33085a5 Add handling of failedLastBake error in getAssetStatus 2017-09-01 10:37:28 -07:00
MandatoryMania
8c6bbb4968 Merge pull request #11295 from MandatoryMania/walletImgSwitch 
Wallet img switch
 2017-09-01 10:27:04 -07:00
David Kelly
655dc61ff2 doh 2017-09-01 10:16:45 -07:00
Dante Ruiz
9bd368c0a9 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-01 08:27:09 -07:00
vladest
681fc529dc Merge branch 'master' into modal_dialogs_async 2017-09-01 13:31:15 +02:00
druiz17
2948061904 code cleanup 2017-08-31 22:30:30 -07:00
Menithal
5506520226 Fixed missing semi colon 2017-09-01 08:20:54 +03:00
David Rowe
269f1769be Merge branch 'master' into vr-edit-a 2017-09-01 14:45:59 +12:00
David Rowe
110413b025 Fix action after color picker failure 2017-09-01 14:36:44 +12:00
Liv
8d21b286b4 string fix 2017-08-31 19:34:01 -07:00
David Rowe
734ce66df3 Add audio and haptic feedback 2017-09-01 14:30:22 +12:00
Hisham Qayum
ff6217069b reverting some unneeded code changes 2017-08-31 17:30:24 -08:00
Anthony J. Thibault
6618ba12e9 Merge branch 'master' into feature/ant-man 2017-08-31 18:10:39 -07:00
Dante Ruiz
7cf27c18d3 code cleanup and fix broken features 2017-08-31 18:06:55 -07:00
Anthony J. Thibault
a1b94fd9d2 Bug fixes for laser offset and avatar hold action 2017-08-31 17:26:00 -07:00
David Kelly
451936214d initial stab at changing passphrase 2017-08-31 17:05:55 -07:00