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

5643 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
0e4d54d5b0 voxel mode actions group cannot be exclusive 2013-08-15 12:48:48 -07:00
Stephen Birarda
4903122432 fix hooks to voxel stats dialog 2013-08-15 12:38:26 -07:00
Stephen Birarda
d1bc2058bc fix hook to open bandwidth details 2013-08-15 12:30:29 -07:00
Stephen Birarda
d257b70103 fixes for new Menu class after merge with upstream/master 2013-08-15 12:29:04 -07:00
Stephen Birarda
443203201e Merge remote-tracking branch 'upstream/master' into menu 2013-08-15 12:22:37 -07:00
ZappoMan
2ae5a56b6e Merge pull request #854 from ey6es/glow 
Three other glow techniques, with menu option to cycle between them.
 2013-08-15 12:21:11 -07:00
Stephen Birarda
811fc87294 move avatar size changes to Avatar slots 2013-08-15 12:18:19 -07:00
Andrzej Kapolka
ace9da5b85 Merge pull request #852 from ZappoMan/voxel_sending_helper 
Improvements to Voxel Edit in the client
 2013-08-15 12:10:12 -07:00
ZappoMan
74100ad043 make threads sleep 2013-08-15 12:01:50 -07:00
Stephen Birarda
92b6459e4b hooks for cycle of voxel mode and face mode 2013-08-15 11:54:56 -07:00
Stephen Birarda
3a42bda0f2 repairs after merge with upstream master 2013-08-15 11:42:30 -07:00
ZappoMan
4f16157e51 CR feedback 2013-08-15 11:39:00 -07:00
Stephen Birarda
a2ed48ed1d Merge remote-tracking branch 'upstream/master' into menu 2013-08-15 11:38:33 -07:00
Stephen Birarda
bbe239694e move Avatar goHome to Avatar slot 2013-08-15 11:36:12 -07:00
Stephen Birarda
ce3afbcb32 fix hooks for webcam mode cycle and texture 2013-08-15 11:31:25 -07:00
Stephen Birarda
f5079374f3 fix hooks for skeleton tracking and collisions 2013-08-15 11:29:10 -07:00
Stephen Birarda
9e4e1f3edc fix hook to Webcam toggle from Menu 2013-08-15 11:19:45 -07:00
Stephen Birarda
c6baa56022 update Q_OS_MAC ifdefs for Qt 5 2013-08-15 11:12:17 -07:00
Stephen Birarda
10109fff10 inlined spacing cleanup in Head, remove noise 2013-08-15 11:04:18 -07:00
Stephen Birarda
eb7714f6c4 change signature of Menu helper for cleaner code in ctor 2013-08-15 10:56:37 -07:00
ZappoMan
8e07bd42ea removed app from SendVoxelsOperationArgs since its available as singleton 2013-08-15 10:51:56 -07:00
ZappoMan
8b867df762 style fix 2013-08-15 10:47:59 -07:00
Stephen Birarda
46b064b7d6 initial decoupling of menu from Application 2013-08-15 10:46:51 -07:00
ZappoMan
90fcfca561 style fix 2013-08-15 10:45:53 -07:00
Andrzej Kapolka
94e5c8d4a1 Missed a spot in the merge. 2013-08-15 10:10:14 -07:00
Andrzej Kapolka
3ad0b8b99d Merge branch 'master' of https://github.com/worklist/hifi into ssao 
Conflicts:
	interface/src/Application.h
 2013-08-15 10:06:22 -07:00
ZappoMan
ced61e94d8 added more doxygen comments 2013-08-15 08:48:21 -07:00
ZappoMan
beec5f60d8 renamed class to be more appropriate, added doxygen comments 2013-08-15 08:36:06 -07:00
Andrzej Kapolka
95fee434a7 Don't make the avatars glow; that was just for testing. 2013-08-14 17:37:50 -07:00
Andrzej Kapolka
ab9d414340 Doxygen comment fix. 2013-08-14 17:22:43 -07:00
Andrzej Kapolka
690e2c1965 Blur/add should be the default. 2013-08-14 16:58:04 -07:00
Andrzej Kapolka
7cd1360ba7 Doxygen-style comments. 2013-08-14 16:48:00 -07:00
Andrzej Kapolka
621d32b506 Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-14 16:41:30 -07:00
Andrzej Kapolka
8238d0d380 Merge pull request #851 from birarda/master 
intial rev of Doxyfile
 2013-08-14 16:41:22 -07:00
Andrzej Kapolka
a9ccca3f72 Diffuse/add glow mode. 2013-08-14 16:13:30 -07:00
Stephen Birarda
23152abce7 suppress warnings for glm headers that pop up in Xcode 5 2013-08-14 15:34:57 -07:00
Stephen Birarda
c7b784aa1f signed UNKNOWN_NODE_ID should be 0 2013-08-14 15:31:23 -07:00
ZappoMan
266d57264b fix build buster 2013-08-14 14:57:23 -07:00
ZappoMan
1730f7f2f6 fix build buster 2013-08-14 14:48:16 -07:00
ZappoMan
18e5d49d75 move move constructors and assignments into IFDEFS for now to fix build buster 2013-08-14 14:46:40 -07:00
Andrzej Kapolka
e2513901ef Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-14 14:38:21 -07:00
ZappoMan
21f521f3a5 fix build buster 2013-08-14 14:33:47 -07:00
ZappoMan
d19e2d7490 merge repair 2013-08-14 14:23:13 -07:00
ZappoMan
153f444c32 merge repair 2013-08-14 14:22:50 -07:00
ZappoMan
4227d75942 merge repair 2013-08-14 14:21:25 -07:00
Stephen Birarda
bedd98cdfd initial rev of Doxyfile to generate HTML documentation for our classes 2013-08-14 14:20:47 -07:00
ZappoMan
4305ad552d fix issue with JurisdictionMap being passed across wire 2013-08-14 14:19:06 -07:00
Andrzej Kapolka
15f129f32d Added simple additive/blur-with-persist glow modes, means to cycle through 
modes.
 2013-08-14 14:14:47 -07:00
ZappoMan
a43615e9dc repair bad merge 2013-08-14 13:20:22 -07:00
ZappoMan
4477289501 repair bad merge 2013-08-14 13:18:41 -07:00