Mark Peng
57efea40ee
Add untested renderHalfCylinder function to GeometryCache/
2013-08-05 19:52:02 -07:00
Philip Rosedale
d7dc07502c
Merge pull request #787 from machinelevel/dev4
...
Rave glove demo: network-glove fixes
2013-08-05 18:58:04 -07:00
Eric Johnston
d85ce81313
Rave glove demo: network-glove fixes
...
After this change, people can see each other's rave glove performances.
1. Moved hand->simulate call into avatar->simulate so that it gets called on all avatars, not just mine.
2. Hide the rave stage, so it's out of the way while we figure out the best way to darken the world, if that's still desired.
2013-08-05 17:27:42 -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
7021d3c6a5
Merge pull request #777 from Ventrella/particles
...
Added BendyLine
2013-08-05 14:55:26 -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
Jeffrey Ventrella
96b443ec5d
Merge pull request #781 from machinelevel/dev4
...
Rave glove demo: Network rave data
2013-08-05 14:07:57 -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
Eric Johnston
a3a5c3d6d4
Rave glove demo: Network rave data
...
Sending glove modes over the network, and fixed ghost-fingers-left-behind issue.
Issues addressed:
https://basecamp.com/2151194/projects/2058851-avatar/todos/54607028-bug-phantom-leap
https://basecamp.com/2151194/projects/2058851-avatar/todos/54633674-demo-make
2013-08-05 13:25:05 -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
Jeffrey Ventrella
405cb516f6
removed 3 magic numbers in particle system
2013-08-05 12:05:15 -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
Jeffrey Ventrella
e2ba8e22d5
added BendyLine
2013-08-05 11:35:02 -07:00
Jeffrey Ventrella
7693165578
merge
2013-08-05 11:28:59 -07:00
Jeffrey Ventrella
6e69c4fbbb
improved particle rainbow color cycle mode
2013-08-05 11:28:10 -07:00
ZappoMan
92f6fe6bd8
CR feedback
2013-08-05 11:14:30 -07:00
ZappoMan
bdabe709af
added more color groups for false colorization from source
2013-08-05 11:11:10 -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
ZappoMan
1c45845842
Merge pull request #772 from birarda/assignee
...
initial stub of assignment work
2013-08-05 10:56:31 -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
Stephen Birarda
fdd0e25a60
Merge pull request #771 from ZappoMan/bugfixes
...
fixed disappearing voxel bug
2013-08-05 10:15:56 -07:00
Stephen Birarda
8f876b91ae
changes for stub pull request of assignee work
2013-08-05 10:06:50 -07:00
Stephen Birarda
a4ea0f035a
resolve conflicts on merge with upstream master
2013-08-05 09:56:07 -07:00
ZappoMan
edfd5cd543
fixed disappearing voxel bug
2013-08-05 09:45:00 -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
ZappoMan
fd81053e33
fixed compiler warnings
2013-08-02 18:33:41 -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
atlante45
be83bf5635
Fixed fucked up merge
2013-08-02 17:57:53 -07:00
Stephen Birarda
8704964a0f
resolve conflicts on merge with upstream master
2013-08-02 17:56:19 -07:00
Stephen Birarda
222a46189f
some comments and _songFileBytes reset
2013-08-02 17:50:08 -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
atlante45
466d50ea4b
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
2013-08-02 17:30:59 -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
