Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 03:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4742 commits 25 branches 0 tags 1.1 GiB
Commit graph

4742 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ZappoMan
e6c50e3d80 Merge pull request #713 from birarda/ds-switch 
smarter domain-server hostname switching
 2013-07-18 22:15:33 -07:00
Mark Peng
cfcb31172c Merge remote-tracking branch 'upstream/master' 2013-07-18 21:08:08 -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
ZappoMan
30be3f9a4e Merge pull request #712 from birarda/master 
fix VS packet receipt on domain server switch
 2013-07-18 15:53:29 -07:00
Stephen Birarda
902e300347 Merge pull request #711 from ZappoMan/bug_fixes 
adjust server sleep time to allow 60fps
 2013-07-18 15:49:55 -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
ZappoMan
4f36a0cda1 adjust server sleep time to allow 60fps 
(cherry picked from commit 4d1ae43085)
 2013-07-18 15:15:57 -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
ZappoMan
12c519cbac Merge pull request #710 from birarda/master 
don't not kill NODE_TYPE_VOXEL_SERVER
 2013-07-18 14:11:08 -07:00
Stephen Birarda
67e5a6409e don't not kill NODE_TYPE_VOXEL_SERVER in removeSilentNodes 2013-07-18 14:07:08 -07:00
Stephen Birarda
402ec86bd1 Merge pull request #709 from PhilipRosedale/gyroTweaks 
Gyros don't move view for small head movements
 2013-07-18 11:27:49 -07:00
ZappoMan
f781829f91 Merge pull request #708 from ZappoMan/bug_fixes 
fixed crash
 2013-07-18 11:25:36 -07:00
ZappoMan
c41f5e27ef fixed crash 2013-07-18 11:25:01 -07:00
Philip Rosedale
b3b8ef3347 Gyros don't move view for small head movements 2013-07-18 11:24:39 -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
5edcfaa38b Merge pull request #705 from ZappoMan/bug_fixes 
cleaned up some compiler warnings and constants
 2013-07-18 10:27:30 -07:00
Stephen Birarda
da25821270 Merge pull request #706 from birarda/master 
switch stars file URL to non-SSL
 2013-07-18 10:26:57 -07:00
Stephen Birarda
2ad99f3129 point to stars file on non-SSL for easier RV redirect 2013-07-18 10:26:08 -07:00
ZappoMan
1e421d222d cleaned up some compiler warnings and constants 2013-07-18 10:20:01 -07:00
Jeffrey Ventrella
f89b1fcd4c more clean up of particle system 2013-07-17 18:10:30 -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
Jeffrey Ventrella
9c2ea6e7e4 more clean up 2013-07-17 17:07:53 -07:00
Jeffrey Ventrella
1264b3ce66 removed deprecated code 2013-07-17 17:00:18 -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
Jeffrey Ventrella
7ceb549416 Merge pull request #700 from machinelevel/dev4 
Rave Glove: Start of hand/finger reorganization for Leap glove stability and trails
 2013-07-17 16:42:54 -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
Eric Johnston
aa0cab2180 Code review issues addressed. 2013-07-17 16:09:24 -07:00
Philip Rosedale
0bc0f3ca7a Merge pull request #701 from Ventrella/particles 
added life stages to particles for effects to change over time
 2013-07-17 16:07:52 -07:00
Jeffrey Ventrella
4389389f17 Merge remote-tracking branch 'upstream/master' into particles 2013-07-17 16:03:38 -07:00
Jeffrey Ventrella
1f1259cec5 added particle life stages 2013-07-17 16:03:10 -07:00
Eric Johnston
1a4a165c8b Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-17 15:55:20 -07:00
ZappoMan
380db8f960 Merge pull request #703 from PhilipRosedale/master 
No more very slight sliding/collision due to gravity
 2013-07-17 15:32:26 -07:00
Philip Rosedale
0c272b44b6 Merge pull request #702 from ZappoMan/voxel_animation 
Make "Send only changed voxels" work better
 2013-07-17 15:24:11 -07:00
Philip Rosedale
52d8ece38a remove old pre-movement of avatar in gravity 2013-07-17 15:03:56 -07:00
Philip Rosedale
c0ef05f69f Merge branch 'master' of https://github.com/worklist/hifi 2013-07-17 14:58:21 -07:00
Philip Rosedale
4272f4da57 Tiny sliding with gravity removed 2013-07-17 14:57:29 -07:00
Eric Johnston
8ebf5fbd6b Rave & Leap: cleanup and move over to new hand/finger structures 2013-07-17 14:54:18 -07:00
Jeffrey Ventrella
d572feecf9 Merge remote-tracking branch 'upstream/master' into particles 2013-07-17 14:51:46 -07:00
Jeffrey Ventrella
d0dffb464b added emitter particle 2013-07-17 14:51:11 -07:00