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

5600 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
436f70ab5d removed dead code 2013-08-20 11:12:22 -07:00
ZappoMan
f581b58fbc spacing fix 2013-08-20 11:11:28 -07:00
ZappoMan
0f7ea55e82 make animation-server work with jurisdictions 2013-08-20 11:08:20 -07:00
ZappoMan
5e7e6fc9d7 First cut at JurisdictionListener and PACKET_TYPE_VOXEL_JURISDICTION_REQUEST 2013-08-19 20:15:46 -07:00
ZappoMan
55a025a0ed removed debug 2013-08-19 11:16:22 -07:00
ZappoMan
2be85d439b Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	interface/src/Application.cpp
	interface/src/VoxelPacketProcessor.cpp
	libraries/voxels/src/VoxelEditPacketSender.cpp
 2013-08-19 11:13:38 -07:00
ZappoMan
e64664c0d1 first cut at JurisdictionSender and related changes 2013-08-19 11:05:29 -07:00
Andrzej Kapolka
a391e6fa19 Merge pull request #864 from ey6es/master 
Added back the glow mode cycle command that got removed in the menu resh...
 2013-08-19 11:03:02 -07:00
Andrzej Kapolka
fe2484ba68 Added back the glow mode cycle command that got removed in the menu reshuffle. 2013-08-19 11:01:57 -07:00
Andrzej Kapolka
c738d52b98 Merge pull request #863 from ey6es/master 
We must set the window menu bar in order for it to show up on Linux/Wind...
 2013-08-19 10:53:03 -07:00
Andrzej Kapolka
60b410cecd We must set the window menu bar in order for it to show up on Linux/Windows. 2013-08-19 10:51:41 -07:00
ZappoMan
5a96f51602 first cut at JurisdictionSender and related changes 2013-08-19 10:30:22 -07:00
ZappoMan
94952fe8fb Merge pull request #855 from birarda/menu 
initial de-coupling of menu from Application
 2013-08-16 16:08:44 -07:00
Stephen Birarda
98b144d675 Merge remote-tracking branch 'upstream/master' into menu 2013-08-16 15:59:09 -07:00
ZappoMan
6c1601c4eb Merge pull request #862 from birarda/master 
changes for UCSF installer build
 2013-08-16 15:58:38 -07:00
ZappoMan
4555165749 Merge pull request #861 from LionTurtle/master 
Render lookatIndicator for cursor select even when gyros are on for more consistent behavior.
 2013-08-16 15:57:39 -07:00
Stephen Birarda
ed48f8d982 add a DISABLE_OPENNI option for release builds without OpenNI 2013-08-16 14:28:22 -07:00
Stephen Birarda
4d9075f21c optionally check /usr/local/lib for plugins 2013-08-16 13:58:22 -07:00
LionTurtle
c579f70611 Render lookatIndicator for cursor select even when gyros are on for 
more consistent behavior.
 2013-08-16 11:44:23 -07:00
Leonardo Murillo
e1e451b4f2 Merge pull request #860 from birarda/master 
repair docs job in groovy for jenkins
 2013-08-16 10:44:47 -07:00
Stephen Birarda
1802ccdc7f use shell command for doxygen instead of plugin 2013-08-16 10:42:58 -07:00
Stephen Birarda
2cd83ee9a8 remove selective listening on git push 2013-08-16 10:36:01 -07:00
ZappoMan
68845da901 added doxygen comments and cleanup for VoxelSceneStats class 2013-08-16 10:10:17 -07:00
Stephen Birarda
bbcf5b4d8d Merge pull request #859 from birarda/master 
comment out addition of docs from seed job for now
 2013-08-15 17:48:57 -07:00
Stephen Birarda
ab7c5eb1e6 comment out docs in seed for now 2013-08-15 17:48:27 -07:00
Stephen Birarda
d7423c2c0a Merge pull request #858 from birarda/master 
add missing option for doxygen job
 2013-08-15 17:18:12 -07:00
Stephen Birarda
d4be99ae2b add missing folderWhereYouRunDoxygen option 2013-08-15 17:17:30 -07:00
Stephen Birarda
b02208a20f Merge pull request #857 from birarda/master 
add missing queue for doxygen job
 2013-08-15 17:07:36 -07:00
Stephen Birarda
3f5cf8f714 add missing queue for doxygen job 2013-08-15 17:07:12 -07:00
Leonardo Murillo
a0dc4305a5 Merge pull request #856 from birarda/master 
add doxygen job for jenkins to groovy
 2013-08-15 17:04:17 -07:00
Stephen Birarda
6dd4aaf177 add docs job to groovy 2013-08-15 16:58:37 -07:00
Stephen Birarda
5b02125d5f remove an extra g 2013-08-15 16:10:34 -07:00
Stephen Birarda
d4951b0223 fix getter for Hand and Head 2013-08-15 16:09:44 -07:00
Stephen Birarda
9816e1d9a8 some spacing cleanup in Head 2013-08-15 16:09:00 -07:00
Stephen Birarda
50e062edf2 some spacing cleanup in AvatarData 2013-08-15 16:06:48 -07:00
Stephen Birarda
6cbe0ca3d0 some spacing cleanup in Avatar header 2013-08-15 16:04:42 -07:00
Stephen Birarda
4a13f3b75a move swatch reset to Menu 2013-08-15 15:52:47 -07:00
Stephen Birarda
0ec2b761e9 remove some extra methods after menu cleanup 2013-08-15 15:44:03 -07:00
Stephen Birarda
e2ae85176f make settings methods slots in Menu so they are accessible 2013-08-15 15:41:25 -07:00
Stephen Birarda
0667190d00 hook settings options in menu 2013-08-15 15:40:17 -07:00
Stephen Birarda
e18be2cb36 hook audio listening modes and complete cleanup for debug 2013-08-15 15:37:09 -07:00
Stephen Birarda
154c6b4f32 fix disabling of occlusion culling from menu 2013-08-15 15:32:44 -07:00
Stephen Birarda
b288cc43a2 fix disabling of delta sending and low res while moving 2013-08-15 15:29:05 -07:00
Stephen Birarda
c930d058b1 fix monochrome option menu hook 2013-08-15 15:23:26 -07:00
Stephen Birarda
b4da77028b fix true colorization of voxels 2013-08-15 15:16:58 -07:00
Stephen Birarda
80967e6941 fix by source false colorization 2013-08-15 15:16:13 -07:00
Stephen Birarda
2742e723e0 fix V2 occlusion false coloring 2013-08-15 15:15:43 -07:00
Stephen Birarda
e77aae157b fix in view and occluded false colorization 2013-08-15 15:15:19 -07:00
Stephen Birarda
c7be2e13cd repair false coloring by distance 2013-08-15 15:12:05 -07:00
Stephen Birarda
cf5c53281b repair first couple of false colorize methods 2013-08-15 15:07:49 -07:00