Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 01:00:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
74312 commits 76 branches 59 tags 1.2 GiB
Commit graph

74312 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
87c863584d Just to remove conflict. 2018-11-29 17:43:19 -08:00
Clement
c53c52c7a0 Fix various Agent bugs 2018-11-29 17:42:04 -08:00
Wayne Chen
707339dd2a allowing clicking any mousearea back to the textfield/disable movement ctrls 2018-11-29 17:18:40 -08:00
Wayne Chen
e033492472 enable mouse capture upon resume 2018-11-29 15:40:00 -08:00
Wayne Chen
62848700f3 disable mouse capture in login state 2018-11-29 15:37:35 -08:00
Wayne Chen
a80017c8c3 fixing typo 2018-11-29 15:04:34 -08:00
Sam Gateau
1dcddb9541
Merge pull request #14440 from NissimHadar/19942-MacInstall 
19942 Mac installation procedure
 2018-11-29 14:38:07 -08:00
Wayne Chen
ba62cbf45c making lasers appear on the tip of the mallets 2018-11-29 14:17:39 -08:00
Ryan Huffman
59b7cdf318 Fix empty rgb field in Create going black 2018-11-29 14:10:22 -08:00
David Rowe
dc05cdee5a Merge branch 'master' into M17406 
# Conflicts:
#	scripts/system/controllers/controllerModules/nearParentGrabEntity.js
 2018-11-30 09:44:09 +13:00
Jeff Clinton
be0a1ed2f8
Merge pull request #14498 from kencooke/audio-options-pitch-bugfix 
Fix the audio injector "pitch" property
 2018-11-29 10:07:07 -08:00
Wayne Chen
5fb183285e Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-11-29 09:25:23 -08:00
Seth Alves
87e4c17194
Merge pull request #14429 from danteruiz/disable-highlighting 
Remove entity highlighting
 2018-11-29 09:04:56 -08:00
Ken Cooke
88d935a28e Fix the audio injector "pitch" property 2018-11-29 08:12:14 -08:00
Sam Gateau
54fa4365b8 FIxing build issue doh... 2018-11-28 22:21:58 -08:00
Sam Gateau
aa749b0980 adressing review comments 2018-11-28 21:46:13 -08:00
Sam Gateau
9353745054 MErge with master 2018-11-28 21:40:24 -08:00
Wayne Chen
295d40724a adding difference in text shown between tablet/other mode 2018-11-28 19:24:47 -08:00
Wayne Chen
34fb7159e2 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-11-28 19:24:20 -08:00
Wayne Chen
b0fb7778cf fixing some text, turning off lasers until they intersect login overlay 2018-11-28 19:17:30 -08:00
Wayne Chen
9deb15b9f6
Merge branch 'master' into loginInitiative2 2018-11-28 19:10:20 -08:00
Clement
181f2b4263 Fix Agent crash on shutdown 2018-11-28 18:40:52 -08:00
Shannon Romano
f4535e6784
Merge pull request #14493 from kencooke/audio-asan-warnings2 
Fix UBSAN warning
 2018-11-28 18:09:36 -08:00
Ken Cooke
11252a8f56 Fix UBSAN warning (left-shift of negative integer) when peak limiter is called with implausibly large (or NaN) audio values 2018-11-28 16:48:34 -08:00
Clement
c29f6346d8 Clear mixing structures when we stop mixing for node 2018-11-28 16:09:04 -08:00
Wayne Chen
527f8a2b59 UI feedback + new overlay position update 2018-11-28 15:38:37 -08:00
Jeff Clinton
f98f070c8b
Merge pull request #14445 from danteruiz/fix-stylus-dimensions 
fixing keyboard mallets dimensions
 2018-11-28 14:19:53 -08:00
David Rowe
1683179fe5 Remove unused constant 2018-11-29 09:14:10 +13:00
Seth Alves
0de011dd71
Merge pull request #14478 from danteruiz/ScriptEngine-Crashes 
Fix script engine crashes when reloading scripts.
 2018-11-28 12:04:52 -08:00
Shannon Romano
ff934a8f87
Merge pull request #14394 from sabrina-shanman/hfm_serializer 
(case 20005) Create HFMSerializer interface for model loaders
 2018-11-28 11:10:27 -08:00
Dante Ruiz
8be775c2b7 don't save joint information for avatar entities 2018-11-28 10:54:39 -08:00
Zach Fox
022fea107f
Merge pull request #14476 from zfox23/payIn1 
Pay-In API Frontend, Part One
 2018-11-28 10:32:01 -08:00
NissimHadar
59a030a16f Correct message to user. 2018-11-27 17:41:00 -08:00
NissimHadar
4effd365ed Change "Autotester" to "nitpick". 2018-11-27 17:34:17 -08:00
NissimHadar
57ba50fa96 Merge branch '19991-MacAppData' of https://github.com/NissimHadar/hifi into 19991-MacAppData 2018-11-27 17:17:50 -08:00
Seth Alves
fac27553d7 suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient. 2018-11-27 17:02:48 -08:00
Wayne Chen
d8a1c4e956 reverting header in qml 2018-11-27 14:34:58 -08:00
Zach Fox
a4175b0428 Error handling in checkout 2018-11-27 14:17:28 -08:00
Jeff Clinton
fd87aad3c2
Merge pull request #14465 from sethalves/fix-up-disable-qml 
make cmake -DDISABLE_QML=1 work again
 2018-11-27 14:16:25 -08:00
Wayne Chen
d5e16ae920 removing login state sound 2018-11-27 13:31:41 -08:00
Seth Alves
8f21ade0c7 make cmake -DDISABLE_QML=1 work again 2018-11-27 12:41:40 -08:00
Shannon Romano
d6c7027fea
Merge pull request #14437 from sethalves/fix-asan-shared-lib-problem 
fix linux + clang build when memory debugging is enabled
 2018-11-27 12:25:13 -08:00
Dante Ruiz
29028386c8 Keyboard menu option in general settings 2018-11-27 11:56:07 -08:00
Sam Gateau
87730884ab
Merge pull request #14340 from Nex-Pro/patch-5 
Change to English spelling of 'declination'
 2018-11-27 10:53:28 -08:00
Dante Ruiz
9cc896c4a8 fixing keyboard mallets dimensions 2018-11-27 10:34:34 -08:00
Zach Fox
67dfccafec Show item name when sending item 2018-11-27 10:19:14 -08:00
Dante Ruiz
c4a9ca3445 fix interface crashing when reloading scripts 2018-11-27 09:32:37 -08:00
Wayne Chen
94789d0170 standardizing font of text fields 2018-11-26 21:06:42 -08:00
Wayne Chen
1258676d56 fixing text height/toolbar coming back 2018-11-26 21:01:34 -08:00
NissimHadar
d6a4f89a08 Merge branch 'master' of https://github.com/highfidelity/hifi into 19991-MacAppData 2018-11-26 19:36:01 -08:00