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

20057 commits

Author SHA1 Message Date
Andrew Meadows
00b05ed137 connect menu options to avatar render features 2017-04-27 13:16:50 -07:00
Andrew Meadows
823f3a73c6 remove commented out cruft 2017-04-27 13:16:50 -07:00
Andrew Meadows
72f5860538 restore RecordingScriptingInterface to Application 2017-04-27 13:16:50 -07:00
Andrew Meadows
caf6a77baf repair bad merge during rebase 2017-04-27 13:16:50 -07:00
Andrew Meadows
2441536de3 remove Avatar dependency on AvatarMotionState 2017-04-27 13:16:49 -07:00
Andrew Meadows
010d1dfa22 remove Menu dependency from Avatar class 2017-04-27 13:11:57 -07:00
Andrew Meadows
6393972874 remove AvatarManager dependency from Avatar 2017-04-27 13:11:57 -07:00
Andrew Meadows
65682a914d remove cufty AvatarManager LocalLights feature 2017-04-27 13:11:57 -07:00
Andrew Meadows
4c212fb1e5 pull qApp spaghetti out of Avatar class 
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
 2017-04-27 13:11:57 -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
anshuman64
c088bd6891 Merge pull request #10271 from humbletim/21281 
CR Job #21281 -- Doppleganger Mirror
 2017-04-26 16:18:14 -07:00
Zach Fox
9ace7a7488 Merge pull request #10279 from andrewd440/21174 
21174 Make the Particle Emitter Easier to Use
 2017-04-26 15:35:29 -07:00
Andrew Lowry
d3a9114676 Uses spaces instead of tabs for Edit.qml and EditTabView.qml. 2017-04-26 18:29:38 -04: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
Chris Collins
c28a5b2342 Merge pull request #10293 from zzmp/fix/tablet-typo 
fix tablet resolve typo
 2017-04-26 15:02:23 -07:00
Dante Ruiz
95d6a451c6 fixed work mapping 2017-04-26 22:14:53 +01: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
Zach Pomerantz
532284f779 fix tablet resolve typo 2017-04-26 16:28:42 -04: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
7840377109 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 12:39:30 -07:00
ZappoMan
5dd6daaad7 send identity on nodeActivated not nodeAdded 2017-04-26 11:42:38 -07:00
Dante Ruiz
4df953d510 fixed text issue 2017-04-26 19:14:14 +01:00
Dante Ruiz
d8e6e8e7d0 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-26 16:53:02 +01:00
Dante Ruiz
79d827c6be added requested features 2017-04-26 16:52:51 +01:00
Seth Alves
c7ab4994ea Merge pull request #10282 from druiz17/tablet-webview-keyboard 
Added tabletwebview keyboard for HMD
 2017-04-25 19:30:49 -07: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
Dante Ruiz
851eece0e4 removed comments 2017-04-25 23:26:16 +01:00
Dante Ruiz
b78bae37be added keyboard for tabletWebview 2017-04-25 23:22:27 +01: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
humbletim
760113f9c9 add doppleganger example/placeholder icons 2017-04-25 16:29:34 -04:00