Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 01:36:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27283 commits 25 branches 0 tags 1.1 GiB
Commit graph

12681 commits

Author SHA1 Message Date
Sam Gondelman
0333adb95b moved controllers to input-plugins, they work now 2015-07-01 18:46:57 -07:00
Sam Gondelman
e54060d6bb more working on poses, LEFT_ and RIGHT_HAND input actions 2015-07-01 14:36:12 -07:00
Sam Gondelman
a154c809c0 working on using UserInputMapper::Pose, merging 2015-06-30 17:34:34 -07:00
Sam Gondelman
1ea8e85fe8 Merge remote-tracking branch 'jherico/input-plugins' into sam/vive-hand-controllers 2015-06-30 17:30:37 -07:00
Brad Davis
b2b571b5a1 Fixing app includes 2015-06-30 15:52:55 -07:00
Brad Davis
db1094418d Restoring from plugins 2015-06-30 15:41:47 -07:00
Sam Gondelman
aaf84b47f3 Merge remote-tracking branch 'upstream/plugins' into sam/vive-hand-controllers 2015-06-30 10:37:06 -07:00
Brad Davis
e421141ec5 experimenting with input plugins 2015-06-30 09:52:54 -07:00
Sam Gondelman
a27196dfee initial testing of hand controller tracking 2015-06-29 17:13:33 -07:00
Brad Davis
cdb6620703 Merge remote-tracking branch 'upstream/master' into plugins 2015-06-29 10:55:39 -07:00
Brad Davis
196a92c1b4 A little bit of display plugin API cleanup 2015-06-29 10:55:13 -07:00
Brad Davis
5cfa22396c Merge pull request #5219 from venkatn93/master 
Changing tooltip reticle
 2015-06-29 10:51:16 -07:00
Brad Davis
a923c044a3 Merge remote-tracking branch 'upstream/master' into plugins 2015-06-28 22:51:46 -07:00
Brad Davis
dcdf47dd66 Fix mouse interaction with overlays in HMDs 2015-06-28 22:51:26 -07:00
David Rowe
386b3d8ae3 Fix text overlay font rendering 
Use the same font size as used in TextRenderer to avoid scaling issues.
 2015-06-27 14:02:49 -07:00
Seth Alves
97cd5b8b99 Merge pull request #5223 from SamGondelman/cameraMode 
misc. key binding/camera fixes
 2015-06-27 10:55:34 -07:00
Brad Davis
7ca63a4ace Fixing overlay rendering in plugins 2015-06-27 00:43:38 -07:00
Brad Davis
267d339ecc Put the 2D plugin first for default usage, enable oculus, disable interleaved 2015-06-27 00:31:29 -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
Sam Gondelman
2f0fcba1eb key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode 2015-06-26 17:28:02 -07:00
Brad Davis
d8dad5b86f Fixing bad merge 2015-06-26 17:17:56 -07:00
Brad Davis
5ce79d6800 Merge remote-tracking branch 'upstream/master' into plugins 2015-06-26 17:14:45 -07:00
Brad Davis
4417c00ae4 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.h
	interface/src/Menu.h
 2015-06-26 17:02:16 -07:00
Niraj Venkat
9101b4ad70 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-26 16:28:01 -07:00
Niraj Venkat
fe8d539cf5 changing link icon 2015-06-26 16:27:04 -07:00
Stephen Birarda
ff33922716 handle conflicts on merge with upstream master 2015-06-26 15:33:35 -07:00
Stephen Birarda
5b660e8c91 Merge pull request #5214 from venkatn93/master 
Changing formatting of tooltip
 2015-06-26 18:27:59 -04:00
Niraj Venkat
87fce44271 Changing formatting of tooltip 2015-06-26 14:41:38 -07:00
Stephen Birarda
9b84eabd18 Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo 2015-06-26 14:40:01 -07:00
Stephen Birarda
7e19a540fd add the new placeholder image 2015-06-26 14:13:23 -07:00
Stephen Birarda
18e2b62ecc initial image replacement for hyperlink preview 2015-06-26 14:12:26 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-06-26 13:05:51 -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
Brad Davis
8dcd91fdab Merge pull request #5192 from venkatn93/master 
Hyperlink tooltip and address bar remodel
 2015-06-26 10:28:52 -07:00
Niraj Venkat
b1c361b324 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-26 09:45:39 -07:00
Seth Alves
a0d77c061c lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does 2015-06-26 07:00:28 -07:00
Brad Hefta-Gaub
63812f28ad Merge pull request #5206 from SamGondelman/cameraMode 
fix bug that was preventing camera mode switches
 2015-06-25 18:55:13 -07:00
Niraj Venkat
23f4f7d824 Place name is underlined 2015-06-25 15:56:40 -07:00
Niraj Venkat
8ea01b45ae Word wrap implementation 2015-06-25 15:46:43 -07:00
Niraj Venkat
6b14a64c8c Formatting changes and teleport on click 2015-06-25 15:15:44 -07:00
Niraj Venkat
de26dc9c49 Further changes to tooltip 2015-06-25 14:15:06 -07:00
Niraj Venkat
210a1205a7 More layout changes 2015-06-25 14:07:03 -07:00
Sam Gondelman
56944afd39 avatar doesn't move in independent mode, alphabetized menu options 2015-06-25 12:36:36 -07:00
Niraj Venkat
1a6acdc5b7 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-25 09:39:13 -07:00
David Rowe
d38a5a1771 Back out saccade speed limit 2015-06-25 07:38:06 -07:00
Brad Hefta-Gaub
6c4a4866d3 Merge pull request #5202 from Atlante45/overlay 
Overlay have correct bounds
 2015-06-24 19:00:55 -07:00
Brad Hefta-Gaub
77bbb23a1e Merge pull request #5175 from hyperlogic/ajt/first-person-avatar 
Render a different model when in first person view.
 2015-06-24 18:54:47 -07:00