Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 23:29:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54172 commits 76 branches 59 tags 1.2 GiB
Commit graph

17387 commits

Author SHA1 Message Date
Vladyslav Stelmakhovskyi
368334e07e Merge branch 'master' into audio-source-sync 2017-04-28 23:04:17 +02:00
Vladyslav Stelmakhovskyi
d18ac6dd49 Reimplemented Tablet Audio screen using C++ model 2017-04-28 23:02:28 +02:00
Seth Alves
2a0fc5b34c Merge pull request #10273 from hyperlogic/feature/hips-ik-target 
Avatar IK system now supports manipulating the hips.
 2017-04-28 09:17:33 -07:00
Anthony J. Thibault
b80270400f Merge branch 'master' into feature/hips-ik-target 2017-04-27 18:15:12 -07:00
Zach Fox
3ce81844da Snapshot JS interface for better Settings handling 2017-04-27 14:01:08 -07:00
Zach Fox
6711e8cbc2 Remove duplicate setting; Make settings page open; button state 2017-04-27 14:01:07 -07:00
Zach Fox
3221214283 New Snap FTUE flow 2017-04-27 14:01:07 -07:00
Zach Fox
eaa699bbfd Wow, it's really coming together! 2017-04-27 14:01:06 -07:00
Zach Fox
880bcf3b1e Checkpoint 2017-04-27 14:01:06 -07:00
Zach Fox
16b4af8a9d Rearchitecture 2017-04-27 14:01:06 -07:00
Howard Stearns
88c3b4d9d3 Merge pull request #10258 from howard-stearns/watch-for-announcements 
watch for announcements
 2017-04-27 14:00:39 -07:00
David Kelly
63468cc9e1 Thread safety for sending location 2017-04-27 12:20:56 -07:00
Philip Rosedale
f555291d92 Merge pull request #10296 from Triplelexx/21296 
21296 - Move two menu items
 2017-04-27 11:37:07 -07:00
Triplelexx
a154879001 change menu item text Audio Noise Reduction to Noise Reduction 2017-04-27 03:25:24 +01:00
Triplelexx
f9c6cb27f4 change menu item for avatar collisions to "Collide with world" 2017-04-27 03:16:04 +01:00
ZappoMan
c0df82ff69 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 18:49:24 -07:00
ZappoMan
834a447d62 remove debugging code 2017-04-26 18:36:44 -07:00
Triplelexx
f795027ab7 change menu item locations 
AudioNoiseReduction moved under Audio.  Avatar Collision under Avatar.
 2017-04-27 01:09:04 +01:00
anshuman64
d146431e9b Merge pull request #10268 from druiz17/input-recorder 
Input recorder/ input playback system  for all input actions
 2017-04-26 16:20:20 -07:00
humbletim
f8bbd9174c Merge remote-tracking branch 'upstream/master' into 21281 2017-04-26 18:26:15 -04:00
anshuman64
5bd9b2e631 Merge pull request #10130 from ctrlaltdavid/21249 
New avatar record and playback script
 2017-04-26 15:18:30 -07:00
Ryan Huffman
8ba56a96df Merge pull request #10240 from zzmp/fix/hmd-tutorial 
Condition tutorial on active HMD
 2017-04-26 14:00:02 -07:00
Andrew Meadows
fd874429c1 remove unused cruft 2017-04-26 12:51:16 -07:00
Andrew Meadows
ac751029c0 remove identity cache code 2017-04-26 12:51:16 -07:00
Andrew Meadows
4511156d7b cache avatar identity info forever 2017-04-26 12:50:48 -07:00
ZappoMan
5dd6daaad7 send identity on nodeActivated not nodeAdded 2017-04-26 11:42:38 -07:00
Dante Ruiz
d8e6e8e7d0 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-26 16:53:02 +01:00
David Rowe
1b635d8c5e Replace FIXMEs with proper code 2017-04-26 13:29:51 +12:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249 
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
 2017-04-26 13:24:18 +12:00
ZappoMan
65801cbb4d Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 18:21:17 -07:00
ZappoMan
5164aa4056 hacking 2017-04-25 18:21:09 -07:00
ZappoMan
90cdeb9582 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 16:09:59 -07:00
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -07:00
Dante Ruiz
5a9cf554e7 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-25 23:57:48 +01:00
Atlante45
62b7855e1f Add pending to stats 2017-04-25 15:56:23 -07:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
Atlante45
a450f52427 Start to setup image library 2017-04-25 15:56:22 -07:00
David Rowe
7c2e1aa846 Tidy FIXME 2017-04-26 10:16:35 +12:00
Brad Hefta-Gaub
1962a49f3b Merge pull request #10225 from sethalves/bullet-constraints-1 
Bullet constraints + far-grab bootstrap fix
 2017-04-25 13:36:47 -07:00
Zach Pomerantz
d2bfcce3f7 Merge pull request #10242 from zzmp/fix/display-log 
Send changed_display_mode after it changes
 2017-04-25 16:36:12 -04:00
David Rowe
d682924b00 Temporary fix for recording audio 2017-04-25 21:08:10 +12:00
ZappoMan
382645ddd0 more cleanup 2017-04-24 18:01:54 -07:00
ZappoMan
aa955ee360 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-24 17:36:30 -07:00
ZappoMan
c9aad6b762 new approach to the tpose fix, as well as other improvements 2017-04-24 17:36:05 -07:00
Anthony J. Thibault
937f308ba8 code cleanup 2017-04-24 17:04:16 -07:00
humbletim
3641ca3816 add support for jointRotations/jointTranslations to ModelOverlay 2017-04-24 19:24:54 -04:00
humbletim
28b3eef7aa add getJointTranslations() methods 2017-04-24 19:22:02 -04:00
Anthony J. Thibault
dc3803a225 Re-enable IK _hipsOffset computation when no hips IK target is present. 2017-04-24 13:59:02 -07:00
David Rowe
d52125e2f5 Merge branch 'master' into 21249 2017-04-25 07:19:56 +12:00
Dante Ruiz
f69691afd5 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-24 19:57:48 +01:00