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

76880 commits

This branch
This branch
All branches
Author SHA1 Message Date
r3tk0n
ec0cf3ee3a Fix typo. 2019-03-11 09:58:20 -07:00
Wayne Chen
1b628bc8e5
Merge pull request #19 from wayne-chen/pushToTalk 
fixing initialization in switch statement
 2019-03-10 19:46:50 -07:00
Wayne Chen
7b51061b5f fixing initialization in switch statement 2019-03-10 19:46:01 -07:00
Wayne Chen
a794da83da
Merge pull request #18 from wayne-chen/pushToTalk 
connecting pushingToTalkChanged with handlePushedToTalk
 2019-03-10 19:41:13 -07:00
Wayne Chen
20487b2ad1 connecting pushingToTalkChanged with handlePushedToTalk 2019-03-10 19:39:45 -07:00
Wayne Chen
584342e4ed
Merge pull request #17 from wayne-chen/pushToTalk 
fixing error in master + getting ptt to show up
 2019-03-10 19:01:23 -07:00
Wayne Chen
cf3694e8e3 fixing error in master + getting ptt to show up 2019-03-10 19:00:41 -07:00
Wayne Chen
15eb90f634
Merge pull request #16 from wayne-chen/pttSwitchToItem 
fixng ptt checkbox
 2019-03-10 17:18:47 -07:00
Wayne Chen
54973375a4 fixng ptt checkbox 2019-03-10 17:18:18 -07:00
Wayne Chen
3dcc53a945
Merge branch 'master' into ptt 2019-03-10 17:14:54 -07:00
Wayne Chen
118ada2888
Merge pull request #15 from wayne-chen/pttSwitchToItem 
switch from column layout to item
 2019-03-10 17:07:53 -07:00
Wayne Chen
2eaa1e63d3 switch from column layout to item 2019-03-10 17:07:02 -07:00
r3tk0n
04c6c42512 Fix build error from merge. 2019-03-10 14:28:31 -07:00
Bradley Austin Davis
0e46007d84
Merge pull request #15116 from jherico/fix/oculus_sdk_update 
Case 21595: Oculus SDK Update
 2019-03-08 23:53:06 -08:00
Anthony Thibault
c36d752b6b
Merge pull request #15141 from luiscuenca/flowAPIExtra 
add getFlowData method to MyAvatar
 2019-03-08 17:45:11 -08:00
Wayne Chen
cad00c21ac
Merge pull request #14 from wayne-chen/pushToTalk 
fixing compile error
 2019-03-08 16:39:46 -08:00
Wayne Chen
e0fe11056e fixing compile error 2019-03-08 16:37:41 -08:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified 
Case 21562: Audio settings screen
 2019-03-08 16:22:52 -08:00
Wayne Chen
b3d704fa61
Merge pull request #13 from wayne-chen/pushToTalk 
rebase with master
 2019-03-08 16:10:35 -08:00
Wayne Chen
d46074d43f
Merge branch 'ptt' into pushToTalk 2019-03-08 16:09:58 -08:00
Wayne Chen
48d1ec850c removing debug statement 2019-03-08 16:07:48 -08:00
Wayne Chen
18b86d550d adding PushToTalk action 2019-03-08 16:07:48 -08:00
r3tk0n
5f48a6d104 Fix typo. 2019-03-08 16:07:47 -08:00
r3tk0n
24d6646e8d Fix activation / deactivation criteria for PTT controller module. 2019-03-08 16:07:47 -08:00
Wayne Chen
88d8163b04 updating compile failure + icons/settings update 2019-03-08 16:07:46 -08:00
Wayne Chen
39db3979b9 changing text display 2019-03-08 16:07:09 -08:00
Wayne Chen
f4db9fefd0 Push to talk changes + rebased with master (#7) 
Push to talk changes + rebased with master
 2019-03-08 16:06:46 -08:00
Wayne Chen
cb0fdd2ef2 laying groundwork for audio app + fixing deadlocks 2019-03-08 16:06:45 -08:00
r3tk0n
88a125aff0 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:05:24 -08:00
r3tk0n
3b274c2b6e Enable pushToTalk.js controller module. 2019-03-08 16:02:16 -08:00
r3tk0n
f6add9cafd Add pushToTalk.js controllerModule. 2019-03-08 16:02:15 -08:00
Wayne Chen
b7d44403e1 updating compile failure + icons/settings update 2019-03-08 16:02:15 -08:00
Wayne Chen
a688c0a92b exposing setting pushingToTalk 2019-03-08 16:02:15 -08:00
Wayne Chen
8a5924077a changing text display 2019-03-08 16:02:15 -08:00
Wayne Chen
60b98d2c70 Push to talk changes + rebased with master (#7) 
Push to talk changes + rebased with master
 2019-03-08 16:02:15 -08:00
Wayne Chen
7cb17b2d6e laying groundwork for audio app + fixing deadlocks 2019-03-08 16:02:14 -08:00
r3tk0n
15d49fd9a9 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:02:14 -08:00
luiscuenca
80150565f6 Fix bug on group settings 2019-03-08 16:30:28 -07:00
Shannon Romano
c3b8f6ed93
Merge pull request #15145 from roxanneskelly/StandaloneTags 
Case 21642 - verification dialog when user hits return in goto search
 2019-03-08 15:29:34 -08:00
Howard Stearns
1d52ed1524
Merge pull request #15146 from howard-stearns/do-not-scroll-under-letterbox 
do not scroll inventory items underneath modal dialog
 2019-03-08 15:27:44 -08:00
Howard Stearns
fac162c2bc
Merge pull request #15144 from howard-stearns/about-blockchain 
Change "about" blockchain from Elements to EOS
 2019-03-08 15:17:31 -08:00
John Conklin II
e69eda8e84
Merge pull request #15137 from thoys/fix/unityAvatarExporter/allowOptimizedRigs 
Case 21069: Avatar Exporter v0.3.3 - temporary de-optimize game objects during the export process
 2019-03-08 15:05:59 -08:00
luiscuenca
df32b61eaf remove unused variable 2019-03-08 16:01:18 -07:00
Shannon Romano
a8f6e74ca4
Merge pull request #15135 from SamGondelman/text81 
Case 21628: Fix text rendering on AMD/Mac
 2019-03-08 14:59:37 -08:00
luiscuenca
bfcb1a8391 Make methods thread safe 2019-03-08 15:57:25 -07:00
Shannon Romano
cc154be12d
Merge pull request #15090 from danteruiz/oculus-tracking-controllers 
Case 21167: When using Oculus HMD, continue to track hand position and movement when focus is off High Fidelity
 2019-03-08 14:56:56 -08:00
Thijs Wenker
ded58b96f0
Merge pull request #15139 from huffman/feat/tga-textures 
Case 21220: Add more complete support for .tga files
 2019-03-08 23:53:21 +01:00
Thijs Wenker
60d46998ec
Merge pull request #15035 from thoys/feat/avatarTools/avatarDoctorMoreWarnings 
Case 21449: [AvatarPackager/AvatarDoctor] Warnings update
 2019-03-08 23:51:58 +01:00
Anthony Thibault
aa3b27d89e
Merge pull request #15143 from amantley/bugShadowNames2 
loading jointRotationOffset2 from FST and deal with the shadow joints
 2019-03-08 14:37:30 -08:00
Roxanne Skelly
b3f5d76d0f CR Fix 2019-03-08 14:37:15 -08:00