Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 09:54:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
27282 commits 71 branches 56 tags 1.2 GiB
Commit graph

27282 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gondelman
e54060d6bb more working on poses, LEFT_ and RIGHT_HAND input actions 2015-07-01 14:36:12 -07:00
Sam Gondelman
ab50e58cac more working on integrating hand poses 2015-07-01 10:32:18 -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
1dd62b2726 general improvements, need to resolve dependency issues 2015-06-29 18:22:31 -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
Brad Hefta-Gaub
62b3ca936f Merge pull request #5231 from ctrlaltdavid/fix-textoverlay-font 
Fix text overlay font rendering
 2015-06-28 09:06:12 -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
Seth Alves
b7da7374ba Merge pull request #5227 from jherico/cursor_fix 
Fixing always-on link cursor
 2015-06-27 10:47:51 -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
a8f8c45755 Use correct size for the offscreen framebuffer for vive 2015-06-27 00:30:33 -07:00
Brad Davis
e7f31ec811 Move to latest Oculus SDK 2015-06-27 00:27:22 -07:00
Brad Hefta-Gaub
9b42221123 Merge pull request #5216 from ctrlaltdavid/comment-update 
Improve entity properties list code comment
 2015-06-26 22:21:39 -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
Clément Brisset
252286bdc1 Merge pull request #5226 from Atlante45/html 
Restore jquery
 2015-06-26 18:00:04 -07:00
Atlante45
7aae36d73e Restore jquery 2015-06-26 17:58:53 -07:00
Brad Hefta-Gaub
fbf2f51ded Merge pull request #5224 from sethalves/fix-nan-in-vec3 
don't try to convert a vec3 containing NaN to a script value
 2015-06-26 17:55:38 -07:00
Seth Alves
0f3ac976c3 don't try to convert a vec3 containing NaN to a script value 2015-06-26 17:53:28 -07:00
Brad Hefta-Gaub
8ee0bd24fe Merge pull request #5222 from birarda/ac-failover 
add a forced failover for hanging STUN dns lookup
 2015-06-26 17:40:11 -07:00
Stephen Birarda
8fd309027f add a forced failover for hanging STUN dns lookup 2015-06-26 17:35:14 -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
84505c49c4 Merge pull request #5213 from birarda/hyperlink-photo 
add photo replacement for hyperlinked places
 2015-06-26 17:05:33 -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
Seth Alves
8a6ab68eda Merge pull request #5217 from ZappoMan/fixDeadlock 
Fix for deadlock
 2015-06-26 16:27:30 -07:00
Niraj Venkat
fe8d539cf5 changing link icon 2015-06-26 16:27:04 -07:00
ZappoMan
f61581d29d possible fix for deadlock 2015-06-26 15:42:04 -07:00
David Rowe
8d83e23bab Improve entity properties list code comment 2015-06-26 15:37:16 -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
Seth Alves
50c0ee1f7e Merge pull request #5215 from ZappoMan/repairBadFormat 
repair bad ordering of PROP_SCRIPT_TIMESTAMP
 2015-06-26 15:03:40 -07:00
ZappoMan
ccbc048f64 repair bad ordering of PROP_SCRIPT_TIMESTAMP 2015-06-26 14:59:40 -07: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
a0df52e860 add note for UI link 2015-06-26 14:17:54 -07:00