atlante45
ddf1b06bf9
Add option to turn collisions on and off
2013-08-06 11:33:59 -07:00
ZappoMan
07a61a3c8e
Merge pull request #782 from Atlante45/master
...
few fixes on rescaling and following
2013-08-05 15:44:15 -07:00
atlante45
55e34558cb
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-05 15:26:43 -07:00
Andrzej Kapolka
36ae7dbd48
Normalize when we render the ground. This shouldn't be necessary, but it
...
looks like various parts of the code rely on RESCALE_NORMAL, which is set but
not unset in avatar/Head/Hand. We'll have to look at that more closely later
on.
2013-08-05 15:24:21 -07:00
atlante45
29062c51b2
- changed according to review comments
...
- added reset scale option
2013-08-05 15:23:40 -07:00
ZappoMan
7ccab1a32c
Merge pull request #783 from LionTurtle/master
...
Render other avatar's lookat to point at my camera if the other avatar is looking at my head.
2013-08-05 14:53:27 -07:00
Mark Peng
1790b0595c
Render other avatar's lookat to point at my camera if the other avatar
...
is looking at my head.
2013-08-05 14:26:39 -07:00
atlante45
6c0ea0cf9c
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-05 14:11:14 -07:00
atlante45
3d853f5b90
- Smooth rescaling
...
- stop following when leading avatar disconnect
- set max far clip for no more crash with really big avatars
2013-08-05 14:05:58 -07:00
ZappoMan
fe877b0ec8
Merge pull request #779 from birarda/rave-audio
...
fix resetting of song mix menu item after import is done
2013-08-05 12:27:47 -07:00
Stephen Birarda
25537f78a1
reset the song mix menu item after clip is done
2013-08-05 12:18:59 -07:00
Andrzej Kapolka
e8365c6b04
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-08-05 11:42:17 -07:00
Andrzej Kapolka
03de2f3ea7
Render a green plane with fog, per Grayson's request.
2013-08-05 11:41:42 -07:00
Stephen Birarda
035f1c81b9
Merge pull request #770 from ZappoMan/tile_import
...
made import work better when tile locations not included in file name
2013-08-05 10:56:53 -07:00
atlante45
1ee870be38
Fix pie menu appearing in selection mode
2013-08-05 10:35:10 -07:00
ZappoMan
cc9e4eaf45
CR feedback
2013-08-05 10:24:52 -07:00
ZappoMan
abc8bc332c
made import work better when tile locations not included in file name
2013-08-02 20:12:13 -07:00
ZappoMan
ce937247d1
added back getUprightEyeLevelPosition()
2013-08-02 18:47:21 -07:00
Mark Peng
5ef965018c
Fix bug where the lookatIndicator would draw and no longer update.
2013-08-02 18:13:49 -07:00
Mark Peng
da31cd441e
Merge remote-tracking branch 'upstream/master'
2013-08-02 18:08:28 -07:00
Mark Peng
26d6e826c5
Merge remote-tracking branch 'upstream/master'
2013-08-02 18:03:34 -07:00
Mark Peng
71a919f226
Switch back to avatar.getEyePosition() rather than
...
avatar.getHead().getEyePosition() because of mysterious lag.
2013-08-02 18:02:37 -07:00
atlante45
ff27ee1c53
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
2013-08-02 18:00:42 -07:00
Stephen Birarda
8704964a0f
resolve conflicts on merge with upstream master
2013-08-02 17:56:19 -07:00
Stephen Birarda
d259180778
add option to audio menu to stop the mixed audio
2013-08-02 17:46:23 -07:00
atlante45
84eae284ea
Changed shifted and meta variable name
2013-08-02 17:44:21 -07:00
Mark Peng
ff67367221
Remove extra parenthesis.
2013-08-02 17:42:12 -07:00
Mark Peng
e0b7773521
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/Head.cpp
2013-08-02 17:35:29 -07:00
Stephen Birarda
d56b715432
add menu option to mix RAW audio with microphone audio
2013-08-02 17:30:49 -07:00
Mark Peng
d7cd88a9a7
Fix camera positioning so that it is in between avatar's eyes. Plus
...
some code clean up.
2013-08-02 17:30:26 -07:00
atlante45
d765b58551
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
2013-08-02 17:17:35 -07:00
atlante45
e9a53ed9b4
Changed avatar resizing shortcuts to plus and minus.
2013-08-02 17:14:57 -07:00
Stephen Birarda
447e332b6f
Merge pull request #760 from Atlante45/fix_key_press_event
...
Fix key press event
2013-08-02 16:45:25 -07:00
Philip Rosedale
936209fd31
When no hovered voxel, lookAt vectors point to distant horizon
2013-08-02 16:37:49 -07:00
atlante45
8c112cbec3
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
2013-08-02 16:37:18 -07:00
atlante45
1b4cdc003d
Fix shortcuts : done
2013-08-02 16:36:53 -07:00
Philip Rosedale
639b6be01a
Merge branch 'master' of https://github.com/worklist/hifi into Remove-body
2013-08-02 16:08:16 -07:00
Philip Rosedale
8aa8b5dbfe
Marker lines all the way out to 128Meters
2013-08-02 16:03:34 -07:00
Philip Rosedale
b9a8d6080e
Render world box goes out to edge of world.
2013-08-02 15:43:37 -07:00
atlante45
eb2a1ecedd
merge
2013-08-02 15:41:32 -07:00
atlante45
2e150b97de
Fixed shortcuts issues on mac
2013-08-02 15:24:09 -07:00
ZappoMan
db55160f9a
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-08-02 14:40:39 -07:00
atlante45
f441295eb1
Merge branch 'pie_menu' of https://github.com/Atlante45/hifi into stalking_option
2013-08-02 14:15:07 -07:00
atlante45
1cae9fc6c7
merge
2013-08-02 14:14:21 -07:00
ZappoMan
55f7028726
Merge pull request #744 from PhilipRosedale/master
...
Smoother movement, rotation, less distracting collision noises. Play sound on click voxel
2013-08-02 14:03:51 -07:00
Jeffrey Ventrella
28dd38c013
Merge remote-tracking branch 'upstream/master' into particles
2013-08-02 13:36:01 -07:00
ZappoMan
4c15964cdc
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-08-02 11:44:09 -07:00
Jeffrey Ventrella
6ebe33bb0b
Merge remote-tracking branch 'upstream/master' into particles
2013-08-02 11:00:10 -07:00
Mark Peng
6cf42674d5
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
interface/src/Application.cpp
interface/src/Webcam.cpp
interface/src/Webcam.h
2013-08-02 11:00:05 -07:00
Jeffrey Ventrella
8fc800acff
some work on hands
2013-08-02 10:59:04 -07:00
