Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 18:48:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30517 commits 25 branches 0 tags 1.1 GiB
Commit graph

77 commits

Author SHA1 Message Date
ZappoMan
29a7584ee6 remove dead code 2015-07-03 11:29:59 -07:00
Brad Davis
2a1776303d Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-07-03 06:17:35 -07:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Seth Alves
5e2f7204b4 responses to code review 2015-07-01 10:29:42 -07:00
Brad Davis
a923c044a3 Merge remote-tracking branch 'upstream/master' into plugins 2015-06-28 22:51:46 -07:00
Seth Alves
567d98dfab Merge branch 'cursor_fix' of github.com:jherico/hifi into actions-over-wire 2015-06-27 10:45:34 -07:00
Seth Alves
5ecc39b811 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-26 20:06:10 -07:00
Brad Davis
e6fade8c13 Prevent tooltips from appearing with stale data 2015-06-26 18:16:56 -07:00
Brad Davis
3b987c1e73 Fixing always-on link cursor 2015-06-26 18:14:31 -07:00
Brad Davis
69fa18c6c0 Working on overlay in plugins 2015-06-26 18:08:10 -07:00
Stephen Birarda
18e2b62ecc initial image replacement for hyperlink preview 2015-06-26 14:12:26 -07:00
Stephen Birarda
522b715628 remove comment, styling cleanup 2015-06-26 11:41:34 -07:00
Stephen Birarda
c6df573933 fix some OS X warnings, add description to tooltip 2015-06-26 10:50:31 -07:00
Seth Alves
7c26641560 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-25 17:40:27 -07:00
Brad Davis
fb2fb06371 Fixing misplaced UI on scale resolution, PC edition 2015-06-23 15:42:32 -07:00
Seth Alves
cc3854be8a quiet compiler 2015-06-22 19:55:43 -07:00
Brad Hefta-Gaub
ee85ad8bf8 Merge pull request #5185 from jherico/mouse_flicker 
Removing flickering mouse cursor in HMD
 2015-06-22 17:23:40 -07:00
Brad Davis
8c9deb9d16 Removing flickering mouse cursor in HMD 2015-06-22 12:04:55 -07:00
Brad Davis
4cd1c52987 Fixing HMD position offset bug in picking & stereo rendering in HMD 2015-06-22 11:20:48 -07:00
Brad Davis
99c217184b Fixing the mic/camera buttons and the mirror UI buttons 2015-06-19 14:46:39 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-18 18:17:59 -07:00
Brad Davis
edfb25bfe2 Removing debug define for VR overlay 2015-06-18 15:05:32 -07:00
Brad Davis
a83a4fb0a1 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-17 19:53:31 -07:00
Brad Davis
8a1b519071 Working on overlays 2015-06-17 16:06:06 -07:00
Brad Davis
659fa2387c Working on overlays / stats 2015-06-16 21:00:13 -07:00
Brad Davis
ba13b7820c Working on overlay refactor 2015-06-16 09:58:03 -07:00
Brad Davis
00d8fe75ab Breaking up overlay into rendering and compositing classes 2015-06-13 17:36:08 -07:00