Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 00:03:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4723 commits 76 branches 59 tags 1.2 GiB
Commit graph

4723 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Eric Johnston
e5fcd0b274 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-17 14:50:51 -07:00
ZappoMan
b1435fba44 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-07-17 14:46:20 -07:00
ZappoMan
677e2580e1 make send only changed bits work better 2013-07-17 14:42:20 -07:00
Jeffrey Ventrella
202fb95102 turned off setShowingEmitter 2013-07-17 13:51:00 -07:00
Philip Rosedale
0550bc643b Merge pull request #699 from ZappoMan/voxel_animation 
Fix crashing bug in voxel-server related to animation
 2013-07-17 13:48:26 -07:00
Jeffrey Ventrella
5a0fcb7f6c adding more behavior to the particle system 2013-07-17 13:47:18 -07:00
Eric Johnston
46c5383d10 minor cleanup 2013-07-17 12:54:44 -07:00
Eric Johnston
f9bfc8af82 Merge branch 'master' of https://github.com/worklist/hifi into dev4 
Conflicts:
	interface/src/Hand.cpp
 2013-07-17 12:49:31 -07:00
Jeffrey Ventrella
1d18252498 Merge pull request #670 from Ventrella/particles 
Added more API to the Particle System
 2013-07-17 12:27:08 -07:00
ZappoMan
74eaf72d53 removed bogus code that related to server crash 2013-07-17 11:52:50 -07:00
ZappoMan
9e9b379d66 Fix crashing bug in voxel-server related to animation 
- added VoxelNodeDeleteHook mechanism that allows users of VoxelNode to register for delete
  notification call backs
- added call back to VoxelNodeBag to remove and nodes from bags when the nodes get deleted.
 2013-07-17 11:49:42 -07:00
Jeffrey Ventrella
1aa06116c2 change mode of HandData.h to 755 2013-07-17 10:17:12 -07:00
Jeffrey Ventrella
2147a82398 change mode of HandData.cpp to 755 2013-07-17 10:16:45 -07:00
Jeffrey Ventrella
a501659083 change mode of HandData to 644 2013-07-17 10:16:30 -07:00
Jeffrey Ventrella
c33e4fe6f7 file mode reverts 2013-07-17 10:15:42 -07:00
Jeffrey Ventrella
882257b65d ahibfasubhdf 2013-07-17 10:03:04 -07:00
Jeffrey Ventrella
98dd83dde8 ahibfasubhdf 2013-07-17 10:02:23 -07:00