Dante Ruiz
2d3eb7ba07
Merge branch 'master' of github.com:highfidelity/hifi into config-pucks
2017-05-09 00:28:09 +01:00
humbletim
ef0e32643d
update refactored logic to match previous application behavior
2017-05-08 18:53:47 -04:00
Anthony J. Thibault
712fcbe27a
Removed cruft/debug code & comments
2017-05-08 15:06:30 -07:00
Anthony J. Thibault
7af93f9fea
Hooked up IK constraint rendering
2017-05-08 15:06:29 -07:00
Anthony J. Thibault
e992d6703a
WIP: debug render joint constraints.
2017-05-08 15:06:28 -07:00
Anthony J. Thibault
a260163aee
WIP commit, first pass at generating limit center joints + debug draw
2017-05-08 15:06:27 -07:00
Andrew Meadows
afe0447322
remove unnecessary virtual keyword
2017-05-08 14:27:39 -07:00
Andrew Meadows
138a987a8f
_rotationChanged is a timestamp
2017-05-08 14:27:18 -07:00
David Rowe
116175cf9f
Fix going back from Twitter password recovery page
2017-05-09 09:03:48 +12:00
David Rowe
c8328e9b9f
Merge branch 'master' into 21319
2017-05-09 08:04:27 +12:00
Vladyslav Stelmakhovskyi
fa9a4053ca
Save selected device in settings to make sure it will not be changed back in Menu
2017-05-08 21:24:46 +02:00
Vladyslav Stelmakhovskyi
d0111ac0bb
Merge branch 'master' into audio-source-sync
2017-05-08 20:09:34 +02:00
Seth Alves
c8cdad5b4e
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-08 11:02:42 -07:00
Chris Collins
4bfb23b5d2
Merge pull request #10388 from humbletim/21308
...
CR #21308 Fix Script.print
2017-05-08 10:46:49 -07:00
Chris Collins
0351ac1575
Merge pull request #10401 from jherico/fix_benny_hill_animations
...
Fix sped up animations
2017-05-08 09:11:23 -07:00
Sam Cake
d3724116d9
Using the items to pick the key light!
2017-05-08 00:20:20 -07:00
Brad Davis
b63015eaea
Fix sped up animations
2017-05-06 14:34:28 -07:00
Seth Alves
5d539bcc17
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-06 07:49:02 -07:00
Seth Alves
9e0845f17e
Merge pull request #10387 from vladest/tablet-performance
...
Decrease CPU usage in tabletUI periodical updates
2017-05-06 07:07:29 -07:00
Chris Collins
820ed5049b
Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire
...
Fix -- dont send non-entity edits to entity-server
2017-05-05 16:37:27 -07:00
samcake
bc1e5101ac
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-05 16:13:51 -07:00
David Rowe
1b26ba22cb
Fix browser history in goto "i" pages on tablet
2017-05-06 11:13:13 +12:00
Seth Alves
b2ccc33a79
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-05 14:52:07 -07:00
Zach Fox
6b00688289
Merge pull request #10392 from zfox23/AvailabilityLanguageChanges
...
"Set Availability" UI changes
2017-05-05 14:03:39 -07:00
Zach Fox
a10606b994
OMG language changed again
2017-05-05 11:44:59 -07:00
Zach Fox
905f36976f
New language
2017-05-05 11:28:49 -07:00
howard-stearns
2ecc71a990
Annoncement Card visual tweeks.
2017-05-05 10:49:09 -07:00
Zach Fox
b41fb952ae
UI changes - Thanks Alan!
2017-05-05 10:29:46 -07:00
Zach Pomerantz
ca7cd61c64
Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join
2017-05-05 13:04:01 -04:00
Chris Collins
fd836dcd68
Merge pull request #10366 from Atlante45/feat/normal-map-compression
...
Feat/normal map compression
2017-05-05 10:03:01 -07:00
Chris Collins
8d49540f3a
Merge pull request #10380 from vladest/rightclick-fix
...
Rightclick fix
2017-05-05 10:01:11 -07:00
Andrew Meadows
63042eea3a
fix flawed fix of bad rebase
2017-05-05 09:37:00 -07:00
Andrew Meadows
41ad25ade1
fix bad rebase of changed menu option
2017-05-05 09:37:00 -07:00
Andrew Meadows
fe401c7488
improved management of collisionless avatar state
2017-05-05 09:37:00 -07:00
Andrew Meadows
d34b667e82
remove kinematic character controller implemention
2017-05-05 09:35:49 -07:00
Andrew Meadows
0aa579225c
even more correct API: MyAvatar.collisionsEnabled
2017-05-05 09:35:49 -07:00
Andrew Meadows
559f5836c5
restore MyAvatar.setCharacterControllerEnabled()
2017-05-05 09:35:49 -07:00
Andrew Meadows
94ee6d6838
fix driving motion of collisionless avatars
2017-05-05 09:35:49 -07:00
Andrew Meadows
c47e26174c
support collisionless avatar when playing recording
2017-05-05 09:35:49 -07:00
Andrew Meadows
e21bd7a67a
help avatar walk up steps
2017-05-05 09:35:49 -07:00
samcake
327dac8a19
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-05 09:31:03 -07:00
Andrew Meadows
f809afae2f
Merge pull request #10363 from jherico/qmlspam
...
Removing logspam on toggling scripts window
2017-05-05 08:29:12 -07:00
humbletim
25807a5258
fix warning color
2017-05-05 09:48:24 -04:00
David Rowe
88dc6b5f61
Fix tablet Web view "back" button not greying out when disabled
2017-05-05 17:24:36 +12:00
Vladyslav Stelmakhovskyi
e395a51c60
Merge with master
2017-05-05 07:05:16 +02:00
Seth Alves
92966377fb
Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 19:05:57 -07:00
Seth Alves
0406cc41e0
if model-overlay has no name, use its url
2017-05-04 18:37:04 -07:00
Seth Alves
c04c0c5b13
if model-overlay has no name, use its url
2017-05-04 18:36:51 -07:00
samcake
df2c5b8c23
adding the notification for keyLight changes modifying the KeyLIghtPayoad
2017-05-04 18:28:12 -07:00
Seth Alves
960bab6e4e
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 16:42:57 -07:00
Howard Stearns
fc9e9e1d28
Merge pull request #10374 from howard-stearns/notification-circumstances
...
Notification circumstances
2017-05-04 16:18:58 -07:00
Atlante45
ecda313223
Add runtime access to compression settings
2017-05-04 15:07:59 -07:00
howard-stearns
9954380ce3
don't filter out the place you're at anymore
2017-05-04 14:44:48 -07:00
humbletim
6cb95b2393
add and connect handlers for scriptWarningMessage and scriptInfoMessage signals
2017-05-04 17:43:00 -04:00
Brad Davis
9def788956
Merge pull request #10314 from jherico/avatars-renderer
...
Migrate Avatar rendering code to library
2017-05-04 14:23:49 -07:00
Brad Davis
2d0bbf70ae
Migrate core avatar rendering functionality to library
2017-05-04 14:08:59 -07:00
Anthony Thibault
7006fa6da4
Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update
...
grab is driven by timer rather than update, load tablet model with high priority
2017-05-04 14:07:21 -07:00
Vladyslav Stelmakhovskyi
ba5a371da1
Decrease CPU usage in tabletUI periodical updates
2017-05-04 22:54:41 +02:00
humbletim
fe36e6a793
fix JSConsole script message handlers and about: filename
2017-05-04 16:45:12 -04:00
Vladyslav Stelmakhovskyi
d522864141
Remove debug prints
2017-05-04 21:16:58 +02:00
Vladyslav Stelmakhovskyi
c8a9b02c7a
Block only secondary button
2017-05-04 20:26:02 +02:00
Andrew Meadows
7cb2bff4c5
Merge pull request #10350 from sethalves/fix-vr-2d-vr-tablet-crash
...
Fix vr 2d vr tablet crash
2017-05-04 10:08:55 -07:00
Seth Alves
9ab2a61a4b
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 10:04:18 -07:00
Dante Ruiz
3894c7c2ff
Merge branch 'master' of github.com:highfidelity/hifi into config-pucks
2017-05-04 16:54:00 +01:00
Vladyslav Stelmakhovskyi
4cefa0379c
Merge branch 'master' into rightclick-fix
2017-05-04 16:13:07 +02:00
Vladyslav Stelmakhovskyi
99ed2556f2
Do not send non primary button events to Tablet window
2017-05-04 16:11:07 +02:00
David Rowe
30604ab901
Fix some typos noticed in passing
2017-05-04 16:56:18 +12:00
David Rowe
9d92ed2b9b
Fix keyboard not appearing in social media snapshot sharing dialogs
2017-05-04 16:55:10 +12:00
Seth Alves
69944cc76d
add a way to get a SpatiallyNestable's name without knowing what its type is
2017-05-03 21:32:49 -07:00
David Rowe
8ae3d4e8a0
Merge branch 'master' into 21314
...
# Conflicts:
# interface/resources/qml/controls/TabletWebView.qml
2017-05-04 13:10:09 +12:00
Zach Fox
affc7fc654
Merge pull request #10369 from druiz17/url-fix
...
Fix tablet webview showing incorrect url.
2017-05-03 16:58:06 -07:00
Zach Fox
d28d89e8ff
Merge pull request #10368 from zfox23/palWebViewtoTabletWebView
...
PAL WebView is now a TabletWebView
2017-05-03 16:51:32 -07:00
anshuman64
a924a33428
Merge pull request #10361 from ctrlaltdavid/21315
...
Fix numeric keys not displaying in social media sharing dialogs
2017-05-03 16:41:43 -07:00
Seth Alves
a259d00b63
Merge pull request #10332 from sethalves/bullet-constraints-5
...
Bullet constraints
2017-05-03 16:30:34 -07:00
Zach Fox
4d49ae5b09
Remove the +1s
2017-05-03 15:43:57 -07:00
Zach Fox
07d3e482cf
ARG
2017-05-03 15:40:39 -07:00
Dante Ruiz
5390a29859
tabletwebview-url-fix
2017-05-03 23:05:05 +01:00
Zach Fox
eaf819d11d
Remove FIXME
2017-05-03 14:59:07 -07:00
Zach Fox
066b2db73f
Make the change
2017-05-03 14:57:31 -07:00
trent
d7ed727faf
Adjustments based on PR feedback, though it looks like this snap-turn-snafu-story is not yet complete.
2017-05-03 16:56:18 -04:00
trent
ca4b563768
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-03 16:34:34 -04:00
Dante Ruiz
31f6038e45
limbs tracking pucks
2017-05-03 20:08:42 +01:00
Zach Pomerantz
4a8f5e380f
Merge pull request #10358 from zzmp/fix/minimize-deadlock
...
Fix deadlock from minimizing
2017-05-03 15:06:27 -04:00
Zach Fox
ae72b9b73d
Merge pull request #10357 from zfox23/newSnapshotReview_Improvements2
...
Lots of Snapshot app improvements, Round Two
2017-05-03 11:44:40 -07:00
Brad Davis
8e12c1959d
Removing logspam on toggling scripts window
2017-05-03 09:53:32 -07:00
trent
fc3cce6b73
Fixed the silly and stupid subtle issue that was causing the bug in inconsistencies.
2017-05-03 12:35:35 -04:00
trent
24f2678cdd
Adjusted the smooth time for the snap-turn remote view. Fixed tab issue.
2017-05-03 12:05:21 -04:00
David Rowe
7fdcb9b1f0
Fix numeric keys not displaying in social media sharing dialogs
2017-05-03 14:59:41 +12:00
David Rowe
7b387c52c3
Fix reliability of keyboard enabling in tablet Web pages
2017-05-03 14:42:06 +12:00
trent
786838d092
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-02 20:21:35 -04:00
Zach Pomerantz
ad8d3e5490
continue idling while minimized
2017-05-02 20:05:55 -04:00
trent
557a8fffd7
Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D
2017-05-02 19:56:47 -04:00
Trent Polack
0a5dfbb9af
Changed l to interp.
...
In my defense, if anyone ever looked at it and thought the 'l' was a '1', they should never be programming unless they used a special language where you could reassign numbers.
2017-05-02 19:10:33 -04:00
Sam Gateau
a7eecdfb26
Merge pull request #10265 from samcake/ambient
...
Making the render engine Job/Task system configurable and reusable
2017-05-02 14:55:53 -07:00
Zach Fox
d1dff7606c
Lint cleanup; Immediate share button visibility;
2017-05-02 14:10:24 -07:00
Zach Fox
5302110e7b
Merge pull request #10346 from zfox23/newSnapshotReview_Improvements
...
Lots of Snapshot app improvements, Round One
2017-05-02 13:00:08 -07:00
Vladyslav Stelmakhovskyi
e789b69a8e
Merge branch 'master' into audio-source-sync
2017-05-02 20:57:01 +02:00
trent
f79e032841
Silly online git merge tool. You are silly. Errors fixed.
2017-05-02 14:48:27 -04:00
Zach Fox
c9e0679b70
Subscribe to changes to snapshotsLocation setter for better UX
2017-05-02 10:55:57 -07:00
trent
6d1fb8a6f8
Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270
2017-05-02 13:55:39 -04:00
trent
49881b5ea2
Actually the full set of changes. Kids: don't forget to pop your stash.
2017-05-02 13:55:32 -04:00
samcake
df54ad2339
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-02 10:50:39 -07:00
Trent Polack
8f93a9a074
Merge branch 'master' into feature/snap-turn-smoothing-21270
2017-05-02 13:43:32 -04:00
trent
8f34ec4c7f
Iteration on the snap-turn smoothing based on feedback from Andrew. Also additional cleanup.
2017-05-02 13:41:34 -04:00
Brad Davis
425405f72d
Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
...
more cleanup in preparation for moving Avatar class to lib
2017-05-02 10:37:22 -07:00
Seth Alves
dc569051f9
Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update
2017-05-02 09:50:13 -07:00
Seth Alves
6b2caf8081
Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash
2017-05-02 09:41:47 -07:00
trent
6317857e3d
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-02 12:11:39 -04:00
druiz17
18368cc073
Merge pull request #10343 from druiz17/tabletwebview-fix-links
...
fix Tablet webview issues of not loading correct url.
2017-05-02 08:09:22 -07:00
Seth Alves
71deac49c6
reset tablet to homescreen when going from 2d to vr
2017-05-01 17:06:15 -07:00
samcake
4514da2a09
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-01 16:49:35 -07:00
Howard Stearns
73c24a5240
Merge pull request #10344 from howard-stearns/announcement-styling
...
goto announcement card styling
2017-05-01 16:41:39 -07:00
howard-stearns
ca5318f121
remove debugging code
2017-05-01 15:57:22 -07:00
howard-stearns
545fd1355f
cleanup
2017-05-01 15:45:26 -07:00
howard-stearns
61b738e3cd
announcment styling
2017-05-01 15:35:17 -07:00
Seth Alves
45a50f9a46
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-5
2017-05-01 15:32:29 -07:00
Dante Ruiz
a08b55d5f5
minimize diff
2017-05-01 23:08:25 +01:00
druiz17
67daa4b0a9
Merge pull request #10335 from druiz17/webview-js
...
Implemented of a web app to bring up the tablet webView
2017-05-01 15:03:55 -07:00
Dante Ruiz
b00d7d763a
Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links
2017-05-01 22:45:42 +01:00
Dante Ruiz
64b8237bd6
fix twitter and facebook links
2017-05-01 22:45:13 +01:00
Dante Ruiz
62870d85d3
Merge branch 'webview-js' of github.com:druiz17/hifi into tabletwebview-fix-links
2017-05-01 21:58:09 +01:00
Dante Ruiz
bb9eb98625
prevent mouse events from propagating to far
2017-05-01 21:49:57 +01:00
Dante Ruiz
c205bf0980
working on cleaner navigation
2017-05-01 21:23:38 +01:00
Seth Alves
a75544a9fb
Merge pull request #10319 from hyperlogic/feature/head-standard-action
...
Head, Hips and Chest IK can now be controlled from Controller inputs
2017-05-01 13:03:23 -07:00
Seth Alves
2b13d4d257
Merge pull request #10331 from ctrlaltdavid/21306
...
Fix keyboard not raising for Facebook username field
2017-05-01 13:02:19 -07:00
trent
4d7eeed343
Marking MyAvatar's rotation as dirty if smoothing is going down.
2017-05-01 15:21:25 -04:00
Brad Davis
40e4e2f307
Merge pull request #10327 from jherico/face_tracker_refactor
...
Remove Faceshift
2017-05-01 12:14:55 -07:00
Howard Stearns
9fab66b66a
Merge pull request #10328 from howard-stearns/tablet-discovery-events
...
fix announcement suggestions
2017-05-01 11:28:45 -07:00
trent
773563850c
Merge hifi/master with my branch, fixed merge issue.
2017-05-01 13:23:02 -04:00
Dante Ruiz
763feccbe1
removed tabs
2017-05-01 18:07:42 +01:00
Dante Ruiz
9f33af479d
saving work
2017-05-01 18:04:22 +01:00
Vladyslav Stelmakhovskyi
dde363ef3d
Merge branch 'master' into audio-source-sync
2017-05-01 18:42:53 +02:00
Vladyslav Stelmakhovskyi
28447cde0b
Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items
2017-05-01 18:41:38 +02:00
Anthony J. Thibault
0c09823f67
clang warning fixes, unused variables...
2017-05-01 09:10:31 -07:00
Seth Alves
7f69bdecb2
first try at angular-velocity setting action
2017-05-01 07:06:21 -07:00
druiz17
f60deb0cfc
fixed the twitter link
2017-04-30 22:55:44 -07:00
druiz17
2bf7b12c7d
open webview from tabletwebscreen
2017-04-30 15:27:34 -07:00
druiz17
b1abbbe472
Merge branch 'master' of github.com:highfidelity/hifi into webview-js
2017-04-30 13:17:28 -07:00
Seth Alves
7ce0ef2ec4
fix spring action so that it can be linear or rotational or both
2017-04-30 10:04:07 -07:00
David Rowe
819f02a988
Fix keyboard not raising for Facebook username field
2017-04-30 11:40:28 +12:00
Seth Alves
4c4e0dffcc
bullet cone-twist constraint
2017-04-29 12:30:12 -07:00
Seth Alves
6623028d71
ball-and-socket constraint
2017-04-29 08:35:55 -07:00
Seth Alves
9e7ef83bd1
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4
2017-04-29 07:01:44 -07:00
Brad Davis
2b43a1989f
Moving face and eye trackers out of interface
2017-04-28 23:28:17 -07:00
Howard Stearns
b6ae0a5bde
add nextTick, and cleanup
2017-04-28 20:06:13 -07:00
howard-stearns
f9debf1388
checkpoint
2017-04-28 16:53:08 -07:00
Brad Davis
5e1bc0d908
Remove faceshift
2017-04-28 16:34:54 -07:00
Dante Ruiz
59f84a60c5
saving work
2017-04-29 00:31:09 +01:00
Stephen Birarda
c518aa55be
Merge pull request #10312 from birarda/upload-new-models-to-entity
...
add an entity file replacement via domain-server content page
2017-04-28 16:06:05 -07:00
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
Anthony J. Thibault
108cd80bb5
Merge branch 'master' into feature/head-standard-action
2017-04-28 10:41:29 -07:00
Andrew Meadows
994eed7b83
safer delete of AvatarMotionStates
2017-04-28 10:18:19 -07:00
Stephen Birarda
9bc0609b1e
address code review comments
2017-04-28 10:17:48 -07: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
Howard Stearns
a2721d21ef
Merge pull request #10278 from zfox23/newSnapshotReview
...
New Snapshot Review Dialog
2017-04-28 07:25:47 -07:00
Howard Stearns
0ad8f4d985
remove debugging
2017-04-28 07:15:22 -07:00
Anthony J. Thibault
b80270400f
Merge branch 'master' into feature/hips-ik-target
2017-04-27 18:15:12 -07:00
Anthony J. Thibault
2120e63e3a
Merge branch 'master' into feature/head-standard-action
2017-04-27 17:51:13 -07:00
Stephen Birarda
038ac745c8
clear domain octree details if ES killed
2017-04-27 17:47:18 -07:00
Anthony J. Thibault
764f6c69ea
Head input action will override the HMD for IK.
2017-04-27 17:39:25 -07:00
howard-stearns
aed762e986
ux
2017-04-27 17:16:03 -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
Howard Stearns
5d6e24b495
Merge pull request #10253 from howard-stearns/new-address-bar
...
New address bar
2017-04-27 14:00:24 -07:00
Andrew Meadows
5cf233db3a
less labyrinth
2017-04-27 13:16:50 -07:00
Andrew Meadows
aa90a6bd02
use static methods for setting avatar debug options
2017-04-27 13:16:50 -07:00
Andrew Meadows
75b563d598
restore rendering of avatar receive stats
2017-04-27 13:16:50 -07:00
Andrew Meadows
442080dec7
remove unused RenderArgs::_cameraMode hack
2017-04-27 13:16:50 -07:00
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
trent
53f47c132f
Avatar snap-turn rotation smoothing (sent out from the local client outward).
2017-04-27 16:12:25 -04: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
Seth Alves
b0c12dd84a
warn rather than crash if we get unexpected action data
2017-04-27 13:04:47 -07:00
howard-stearns
e4f259e630
back to non-fake data
2017-04-27 13:01:33 -07:00
howard-stearns
56196c03a3
pr review
2017-04-27 12:56:32 -07:00
Seth Alves
203a14f2a0
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux
2017-04-27 12:56:11 -07:00
David Kelly
63468cc9e1
Thread safety for sending location
2017-04-27 12:20:56 -07:00
howard-stearns
97777a416d
Merge branch 'master' of https://github.com/highfidelity/hifi into new-address-bar
2017-04-27 12:02:02 -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
Seth Alves
93f9716557
merge from upstream
2017-04-27 10:17:00 -07:00
Seth Alves
15661987be
load tablet overlay models with higher priority
2017-04-27 10:16:08 -07:00
Seth Alves
68b59e4601
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux
2017-04-27 07:56:49 -07:00
Seth Alves
b196dd082b
expose bullet slider constraint to javascript
2017-04-27 07:56:35 -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
