Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-02 03:58:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5532 commits 70 branches 56 tags 1.2 GiB
Commit graph

865 commits

Author SHA1 Message Date
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
Andrzej Kapolka
11664f9446 Have the particle system default to off. 2013-08-02 10:12:21 -07:00
Philip Rosedale
1b5c79aa8a Merge branch 'master' of https://github.com/worklist/hifi into Remove-body 2013-08-02 09:37:08 -07:00
ZappoMan
983db5f70d Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-01 20:50:24 -07:00
Philip Rosedale
8f95534644 Fix jittering in view from body slowly following head 2013-08-01 16:04:38 -07:00
Andrzej Kapolka
0052221c33 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-01 15:52:58 -07:00
atlante45
fdd01a6551 merge 2013-08-01 15:48:57 -07:00
ZappoMan
0a4fcdccb5 Merge branch 'master' of https://github.com/worklist/hifi into tile_import 
Conflicts:
	interface/src/Application.cpp
 2013-08-01 15:44:28 -07:00
ZappoMan
a0ba788679 implement grid landscape import 2013-08-01 15:40:39 -07:00
Andrzej Kapolka
12f42358d5 Allow cycling between video send modes. 2013-08-01 15:39:53 -07:00
Philip Rosedale
9defa6255a disable mouse wheel voxel scale change 2013-08-01 15:31:09 -07:00
atlante45
b6049c9a10 Merge branch 'master' of https://github.com/worklist/hifi into pie_menu 2013-08-01 15:28:35 -07:00
Mark Peng
6a6c51f80e Add skeleton tracking toggle in options menu in interface. 2013-08-01 15:04:58 -07:00
Philip Rosedale
ef8daffa4d Merge branch 'master' of https://github.com/worklist/hifi 2013-08-01 15:00:27 -07:00
Philip Rosedale
fcf20a7ebc Sound on click, but not on hover 2013-08-01 15:00:08 -07:00
Mark Peng
9ba0e3bb0c Add reference lines to mouse voxel when adding/deleting voxels. 2013-08-01 13:03:17 -07:00
Philip Rosedale
bc1ac6b455 turn down collision sounds 2013-08-01 12:49:10 -07:00
Philip Rosedale
ba2c98a3eb Merge branch 'master' of https://github.com/worklist/hifi 2013-08-01 10:12:13 -07:00
Stephen Birarda
71ab8ae4f8 some necessary changes for AvatarData transmission 2013-08-01 10:07:10 -07:00
Jeffrey Ventrella
6c1cc911d5 Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 15:12:54 -07:00
Jeffrey Ventrella
89f36a7eb7 cleanup 2013-07-31 12:38:40 -07:00
Stephen Birarda
9e63b78a69 Merge branch 'master' of github.com:worklist/hifi into qt5 2013-07-31 11:35:24 -07:00
Philip Rosedale
98ec2efc01 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-30 14:55:33 -07:00
ZappoMan
c7e3fe5ef6 Added false colorization by voxel server source 
- switched readBitstreamToTree() to take params struct for future expansion
- switched readNodeData() to take params for future expansion
- added sourceID to VoxelNode
- fixed false colorize routines to correctly redraw by marking tree as dirty
 2013-07-30 11:08:48 -07:00
ZappoMan
620fe12358 support for multiple voxel servers in ping stats 2013-07-29 16:31:14 -07:00
ZappoMan
c5ab321bd9 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-07-29 15:54:52 -07:00
Jeffrey Ventrella
a1eba53678 cleanup 2013-07-29 15:09:38 -07:00
Jeffrey Ventrella
f8392c0843 Merge remote-tracking branch 'upstream/master' into particles 2013-07-29 15:07:56 -07:00
ZappoMan
86bf268eef first cut at multiple voxel servers 2013-07-29 14:56:33 -07:00
Mark Peng
bfd7f3a6c9 Remove rendering of your own avatar's lookatVectors. This fixes the 
behavior where if you are moving and jumping, you will occasionally see
your own lookatVectors on your screen.
 2013-07-29 12:25:01 -07:00
Mark Peng
bd663a8c22 Merge remote-tracking branch 'upstream/master' 2013-07-29 12:09:27 -07:00
Andrzej Kapolka
20360ad3e9 Make particle system update/render toggleable, fix GCC compile warnings. 2013-07-29 10:41:45 -07:00
Mark Peng
dd2655825a Fix first person camera positioning to correspond to eyelevel. 
This makes sure the lookatVectors don't seem to point upwards when
looking at you.
 2013-07-26 16:08:17 -07:00
Jeffrey Ventrella
937574a6b5 cleanup 2013-07-26 15:25:13 -07:00
Jeffrey Ventrella
05e0bf3e84 added collision plane 2013-07-26 15:21:10 -07:00
Jeffrey Ventrella
8cecd67731 cleanup 2013-07-26 12:46:27 -07:00
Jeffrey Ventrella
ad00747c29 cleanup 2013-07-26 12:44:17 -07:00
Jeffrey Ventrella
9890cf72ce added keyboard mode switching for rave glove effects 2013-07-26 12:37:37 -07:00
atlante45
f3c87b81ec Avatar can follow but don't look at the same point for the moment 2013-07-25 16:14:47 -07:00
Stephen Birarda
08b94d731f merge branch qt5 with upstream/master 2013-07-25 10:23:22 -07:00
Jeffrey Ventrella
5e2dcfee53 cleaned up some magic numbers 2013-07-24 16:52:37 -07:00
Jeffrey Ventrella
aee29a0ab1 cleaning up the particle system more 2013-07-24 16:37:13 -07:00
atlante45
68194f2037 Slot calling when pie menu on avatar. 2013-07-24 13:50:00 -07:00
Jeffrey Ventrella
288a218ae2 Merge remote-tracking branch 'upstream/master' into particles 2013-07-24 12:41:32 -07:00
atlante45
d165891fe6 New design for pie menus 2013-07-24 12:38:35 -07:00
Stephen Birarda
f27eb5e1d8 small code changes for qt5 compatibility 2013-07-24 12:06:55 -07:00
atlante45
177471e83b First step toward follow mode 2013-07-24 11:24:28 -07:00
atlante45
fec25d374f merge 2013-07-24 10:35:57 -07:00
ZappoMan
31a1e3e7b5 Merge pull request #720 from LionTurtle/master 
Fix eyePosition so that lookatVectors point directly to eyes,
 2013-07-24 01:19:49 -07:00
Mark Peng
7177b71bc7 Replace var in renderLookatIndicator with const IDENTITY_UP 2013-07-24 00:19:25 -07:00
Jeffrey Ventrella
f85690c1c4 Merge remote-tracking branch 'upstream/master' into particles 2013-07-23 20:46:34 -07:00
ZappoMan
e7fb392f38 Merge branch 'master' of https://github.com/worklist/hifi into audio_select 2013-07-23 20:20:49 -07:00
ZappoMan
eb8c565350 dry up code 2013-07-23 20:08:57 -07:00
ZappoMan
a162643e1e more removing of SourceID from classes 2013-07-23 19:21:43 -07:00
ZappoMan
c969570e8c working on selected audio 2013-07-22 23:05:42 -07:00
Mark Peng
4e641eed2f LookatIndicator now scales with the avatar's scale. 2013-07-22 17:11:11 -07:00
Mark Peng
0f1ac2b226 Fix eyePosition so that lookatVectors point directly to eyes, 
even when looking at someone from above.
 2013-07-22 16:46:06 -07:00
ZappoMan
c301b799c5 first cut at selecting audio sources 2013-07-22 13:54:47 -07:00
Jeffrey Ventrella
8a55db53ce merge 2013-07-22 10:42:18 -07:00
atlante45
13952a6f24 Merge with pie_menu 2013-07-21 15:22:43 -07:00
ZappoMan
c3fa37019e replaced old voxel stats with new voxel stats 2013-07-21 05:18:35 -07:00
ZappoMan
86ad0da09f Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-20 11:35:10 -07:00
ZappoMan
e0f115298d additional stats items 2013-07-20 11:28:12 -07:00
Jeffrey Ventrella
ad0ca748bb added extra mode and improved particle system 2013-07-20 09:48:55 -07:00
Eric Johnston
0cdad1a313 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-19 19:48:52 -07:00
Jeffrey Ventrella
05039b4e3e adding rave glove modes and changing API of particle system to accommodate 2013-07-19 18:02:48 -07:00
ZappoMan
83290bc8b7 first cut at real voxel stats dialog box 2013-07-19 17:28:37 -07:00
atlante45
72774a5e20 First step toward pie menus 2013-07-19 17:01:38 -07:00
Jeffrey Ventrella
6e84481931 Merge remote-tracking branch 'upstream/master' into particles 2013-07-19 16:08:43 -07:00
Jeffrey Ventrella
7f3750f1f0 clean up 2013-07-19 16:08:19 -07:00
ZappoMan
2cc42f6773 support piggybacking voxel and voxel stats messages into single packet 2013-07-19 15:59:47 -07:00
Andrzej Kapolka
353f16b2d0 Style fixes. 2013-07-19 15:56:04 -07:00
Jeffrey Ventrella
d2d8019e73 Merge remote-tracking branch 'upstream/master' into particles 2013-07-19 15:51:14 -07:00
Jeffrey Ventrella
87d9aae328 improvements to particle system 2013-07-19 15:50:40 -07:00
Andrzej Kapolka
f70b4dcab2 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-19 15:49:07 -07:00
ZappoMan
d9c8a59929 send voxel scene stats from server to client 2013-07-19 15:09:38 -07:00
Eric Johnston
262851346c Rave Glove Demo: Leap Rework (simplification and elimination of redundant data passing) 
This version matches fingers based on Leap serialized ID's, avoiding finger-replacement-crosstalk.
 2013-07-19 09:31:45 -07:00
Mark Peng
ceb743a65d Remove unncessary import math.h (for reals). 2013-07-19 00:56:12 -07:00
Mark Peng
fc22240525 Remove unnecessary import math.h. 2013-07-19 00:55:31 -07:00
Mark Peng
a84c1c9e21 Merge remote-tracking branch 'upstream/master' 2013-07-19 00:46:52 -07:00
Mark Peng
927aea8bb4 Bug fix on lookatVectors (fixed scale in head.cpp). Added bool 
isLookingAtOtherAvatar. Basic halo indicator in Application.cpp.
 2013-07-19 00:44:23 -07:00
Mark Peng
cfcb31172c Merge remote-tracking branch 'upstream/master' 2013-07-18 21:08:08 -07:00
Andrzej Kapolka
b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/Application.h
	interface/src/Audio.h
	interface/src/Webcam.cpp
 2013-07-18 18:09:57 -07:00
Stephen Birarda
ef7dc4a39a if the hostname field is left blank reset to DEFAULT_DOMAIN_HOSTNAME 2013-07-18 17:42:25 -07:00
Stephen Birarda
01e6891fd3 save custom domain server hostname to QSettings 2013-07-18 17:23:52 -07:00
Philip Rosedale
c74287160f merged 2013-07-18 16:52:56 -07:00
Philip Rosedale
4af92d46f3 Set lookAt to hovered voxel 2013-07-18 16:50:37 -07:00
Stephen Birarda
a00b95666a don't listen to VS packets not from current VS 2013-07-18 15:49:07 -07:00
Stephen Birarda
45d82dc97c correct reference to new hostname for Qt temp variable changes 2013-07-18 15:20:05 -07:00
Stephen Birarda
4dd6afc08f fix grabbing of domain server hostname from QString 2013-07-18 14:59:11 -07:00
Stephen Birarda
04a2dd3b86 clear environment data on domain server switch 2013-07-18 14:36:55 -07:00
Mark Peng
fe01067473 Merge remote-tracking branch 'upstream/master' 2013-07-18 14:35:41 -07:00
Mark Peng
7ee0d8da2e Render circle in 3D space for lookatIndicator. Still not normal to the screen. 2013-07-18 14:34:51 -07:00
Philip Rosedale
0b10169915 More audio collision on hover experiments 2013-07-18 11:13:16 -07:00
Philip Rosedale
e6cd90fa37 Merge pull request #704 from Ventrella/particles 
more code cleanup
 2013-07-18 11:08:18 -07:00
Stephen Birarda
2ad99f3129 point to stars file on non-SSL for easier RV redirect 2013-07-18 10:26:08 -07:00
Jeffrey Ventrella
f89b1fcd4c more clean up of particle system 2013-07-17 18:10:30 -07:00
Andrzej Kapolka
8863645dc9 Working on transmitting and receiving the face video. 2013-07-17 18:02:27 -07:00
Mark Peng
6006b8e96b Merge remote-tracking branch 'upstream/master' 2013-07-17 17:28:12 -07:00
Mark Peng
125bcc46f4 Circle drawn with camera orientation as its normal for lookatIndicator. 2013-07-17 17:27:15 -07:00
Philip Rosedale
3111303c32 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-17 17:15:25 -07:00
Philip Rosedale
5f51464230 Start clicking on voxels makes sound 2013-07-17 17:15:19 -07:00
Jeffrey Ventrella
9c2ea6e7e4 more clean up 2013-07-17 17:07:53 -07:00
Jeffrey Ventrella
ea7e16660c Merge remote-tracking branch 'upstream/master' into particles 2013-07-17 16:43:57 -07:00
Jeffrey Ventrella
be5612711b clean up of particle system 2013-07-17 16:43:34 -07:00
Eric Johnston
57c2f16894 Merge branch 'master' of https://github.com/worklist/hifi into dev4 
Conflicts:
	interface/src/Hand.cpp
 2013-07-17 16:42:11 -07:00
Jeffrey Ventrella
1f1259cec5 added particle life stages 2013-07-17 16:03:10 -07:00
Jeffrey Ventrella
d0dffb464b added emitter particle 2013-07-17 14:51:11 -07:00
Mark Peng
0bbea078b5 Merge remote-tracking branch 'upstream/master' 2013-07-17 13:52:46 -07:00
Mark Peng
5ffe3fa4b4 Rendering of indicator circle in 3D space. Spacing edits in util. 2013-07-17 13:52:05 -07:00
Jeffrey Ventrella
202fb95102 turned off setShowingEmitter 2013-07-17 13:51:00 -07:00
Jeffrey Ventrella
5a0fcb7f6c adding more behavior to the particle system 2013-07-17 13:47:18 -07:00
Jeffrey Ventrella
98dd83dde8 ahibfasubhdf 2013-07-17 10:02:23 -07:00
Jeffrey Ventrella
0be15231b9 ahibfasubhdf 2013-07-17 10:01:23 -07:00
Eric Johnston
39130aef58 Rave Glove demo: activation mode and stage (dark backdrop) drawing. 2013-07-16 18:10:54 -07:00
Stephen Birarda
7cec2f5ffd use fprintf instead of printf and flush for qDebug 2013-07-16 15:27:14 -07:00
Stephen Birarda
1e0f3e4d1c Merge pull request #686 from Atlante45/few_avatar_resizing_correction 
Few avatar resizing correction
 2013-07-16 14:31:27 -07:00
Stephen Birarda
8464a013fe fix format string warnings in Application 2013-07-16 13:39:24 -07:00
Stephen Birarda
c78759da16 cleanup printLogs reintroduce on merge with upstream master 2013-07-16 13:37:16 -07:00
Stephen Birarda
9d62e7f187 Merge remote-tracking branch 'upstream/master' into qdebug 2013-07-16 13:34:42 -07:00
Stephen Birarda
ce0c9e2e1a flush stdout in case non new-line output is received 2013-07-16 12:58:16 -07:00
Stephen Birarda
16d603e203 clean up extra new lines and LogDisplay line break 2013-07-16 12:53:43 -07:00
Andrzej Kapolka
fd1671a44f Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-16 12:48:24 -07:00
Stephen Birarda
1b48d4f0fc revert removal of extraneous newlines 2013-07-16 12:46:32 -07:00
atlante45
13762da7d8 Changed shortcuts to ALT+ +/- 2013-07-16 12:03:07 -07:00
Stephen Birarda
51d1e6ae80 add a message handler to send messages over to LogDisplay 2013-07-16 11:50:40 -07:00
Stephen Birarda
89d3cfdb6f remove now extraneous newlines after switch to QDebug 2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
Stephen Birarda
3f9865759c Merge pull request #682 from ZappoMan/bug_fixes 
Import Voxels and Paste Bug fixes
 2013-07-16 10:11:11 -07:00
ZappoMan
440352c584 white space 2013-07-16 10:02:27 -07:00
ZappoMan
42e5440b7b CR feedback 2013-07-16 10:00:55 -07:00
Eric Johnston
802abade4f Fixed problem in idle(), causing events to stack up. 
The problem was that idle() was set on a zero-ms timer (using idleTimer->start(0)), and the time is then self-regulated by returning early if it's not time yet.
Because of this, Qt stays perpetually in the timer servicing, instead of processing events. This causes keys and menu items to be delayed if the user drags the mouse before activating them, especially at low frame rates. It also causes very-delayed multitouch response.

The fix I've applied is to reset the idle timer after servicing the idle. I've set it to 2ms because I noticed that 1ms didn't always clear out all of the events. We can tune it to whatever we need, or even calculate it based on the time it took us to service the idle.
 2013-07-15 18:16:50 -07:00
ZappoMan
e4b7ba7428 Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-15 17:58:45 -07:00
Jeffrey Ventrella
b765de6990 Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 17:58:38 -07:00
Jeffrey Ventrella
0481a81ca7 moved finger particles over to hand.cpp 2013-07-15 17:58:17 -07:00
ZappoMan
a3009981d0 added Import Voxels to Clipboard 2013-07-15 17:54:50 -07:00
Stephen Birarda
9f9d8e59bd don't accept voxel packet if rendering is turned off, correct boolean for kill 2013-07-15 17:12:44 -07:00
Stephen Birarda
38d8041bfb kill local voxels when voxel rendering is turned off 2013-07-15 17:12:24 -07:00
ZappoMan
01b7f3868b Merge pull request #672 from birarda/domain-switch 
add an option in preferences to dynamically switch domain servers
 2013-07-15 17:10:18 -07:00
ZappoMan
31875abcab Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-15 17:05:10 -07:00
Andrzej Kapolka
d8d9f5e315 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-15 16:54:29 -07:00
Stephen Birarda
c27cd7ae42 couple of type squishes in NodeList 2013-07-15 16:49:36 -07:00
ZappoMan
1fb1622beb added sleep to sendVoxelOperation() to keep from overwhelming server 2013-07-15 16:27:23 -07:00
Andrzej Kapolka
d5abb3e6eb Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-15 16:15:12 -07:00
Andrzej Kapolka
fdeb63c121 More work on face points. 2013-07-15 16:09:49 -07:00
atlante45
bf328c8532 Improved import system copying to clipboard 2013-07-15 16:07:50 -07:00
Stephen Birarda
9fe1c7c63d lock the voxel server when receiving data to avoid race crash 2013-07-15 15:59:31 -07:00
Stephen Birarda
6c2682833e lock on the solo voxelServer before deleting local voxels 2013-07-15 15:53:25 -07:00
Stephen Birarda
6b83f95f9e conditionally set a new hostname on preferences save 2013-07-15 15:46:04 -07:00
Jeffrey Ventrella
56d0c7d7e4 added array of finger emitters for particle system 2013-07-15 15:45:31 -07:00
Stephen Birarda
d389dc6e3a add method to NodeList to set domain IP to local, move mutex lock to node 2013-07-15 15:17:10 -07:00
Jeffrey Ventrella
c0f319f077 merge 2013-07-15 14:36:11 -07:00
Jeffrey Ventrella
f75ce72aca Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 14:30:19 -07:00
Jeffrey Ventrella
7d5ade33a3 Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 13:58:12 -07:00
Jeffrey Ventrella
84b6adf5b0 more work on particle emitter API 2013-07-15 13:57:39 -07:00
Eric Johnston
86faa33f83 Added fake Leap finger generation so that Ryan and Jeffrey can work on Leap glove-code without needing a Leap sensor at all times. 2013-07-15 13:56:37 -07:00
atlante45
423a0eaac8 Fixed typo 2013-07-15 12:28:22 -07:00
atlante45
bf3c4fa1f8 Avatar resizing final commit 2013-07-15 12:04:24 -07:00
Jeffrey Ventrella
ae99ca5ec8 added more API for the particle system 2013-07-12 18:55:42 -07:00
atlante45
280afed7f0 added scale in avatar packets eand slots to change it from the menu 2013-07-12 17:51:47 -07:00
Jeffrey Ventrella
3649c89c12 more developing on the API for the particle system 2013-07-12 16:19:31 -07:00
atlante45
35c00c739c resizing avatar now handle the camera 2013-07-12 14:53:51 -07:00
Jeffrey Ventrella
e6b751e538 more work on particle system 2013-07-12 14:32:14 -07:00
atlante45
16647e3591 Resolve conflict 2013-07-12 13:27:46 -07:00
Jeffrey Ventrella
c348c5ec35 Merge remote-tracking branch 'upstream/master' into particles 2013-07-12 12:12:25 -07:00
Jeffrey Ventrella
106d7c225a turned on particle system viewing for pull request 2013-07-12 12:11:51 -07:00
Philip Rosedale
4e9530f946 Body slowly turns to follow touch look 2013-07-11 22:31:31 -07:00
Philip Rosedale
4e89c679b9 Oculus will work with touch look (hopefully) 2013-07-11 21:51:13 -07:00
Philip Rosedale
6609a850eb Gyros and touch look now work at same time 2013-07-11 21:34:42 -07:00
ZappoMan
c26e39764a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 13:50:33 -07:00
ZappoMan
57ce20d3ce add support for Low Res sending while moving 2013-07-11 12:43:43 -07:00
Stephen Birarda
b201d13e31 refactor ping packet sending to push past version byte 2013-07-11 12:42:45 -07:00
Stephen Birarda
64887f2a36 Merge branch 'master' of github.com:worklist/hifi into packet-versions 2013-07-11 11:02:49 -07:00
Stephen Birarda
fcb8865d2e resolve conflicts on merge with upstream master 2013-07-11 10:58:45 -07:00
Mark Peng
9749e5edd6 Add const var to represent magic num in eyecontact code when gyros 
are on.
 2013-07-11 10:53:38 -07:00
Mark Peng
24d32bcdc8 Fix style mistakes according to code review for eyecontact code. 2013-07-11 10:40:57 -07:00
ZappoMan
9aed3d3cc6 enable delta sending by default 2013-07-11 10:37:28 -07:00
Mark Peng
083e0e9d06 Merge remote-tracking branch 'upstream/master' 2013-07-11 10:20:41 -07:00
Mark Peng
f145a1eac4 Add condition to updateAvatar() where if another avatar's head is at 
the center of the screen, the lookAtPosition is set to the eye level
of that avatar.
 2013-07-11 10:17:45 -07:00
Stephen Birarda
211204e878 Merge remote-tracking branch 'upstream/master' into timestamps 2013-07-11 09:23:16 -07:00
Philip Rosedale
cf665e10b3 Merge pull request #644 from ZappoMan/occlusion_culling 
Latest Revision of Occlusion Culling & Delta Sending Work - now it's always better and never worse
 2013-07-11 09:05:03 -07:00
Philip Rosedale
8ea2b46264 Merge pull request #641 from ZappoMan/bug_fixes 
Two small bug fixes
 2013-07-11 07:46:57 -07:00
ZappoMan
dc70675c22 removed obsolete ResIn mode 2013-07-10 19:04:28 -07:00
Jeffrey Ventrella
6c3644a2fc merge 2013-07-10 18:32:59 -07:00
Jeffrey Ventrella
420ecddafb Merge remote-tracking branch 'upstream/master' into particles 2013-07-10 18:32:42 -07:00
ZappoMan
3d3eca9afa Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 17:45:04 -07:00
Andrzej Kapolka
d59b9ce955 Flip x when in mirror mode, rather than special-casing all the head rotations. 
Also fixed sideways leaning (was correct in mirror mode, incorrect in world).
 2013-07-10 17:31:21 -07:00