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

2129 commits

Author SHA1 Message Date
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 Hefta-Gaub
750ce250fa Merge pull request #5150 from SamGondelman/mouseLook 
mouse look script
 2015-06-18 17:41:20 -07:00
Niraj Venkat
894a245318 Further changes to address bar 2015-06-18 17:35:50 -07:00
Niraj Venkat
55b6efb1e9 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-18 15:48:37 -07:00
Niraj Venkat
5645491170 Further changes to address bar 2015-06-18 15:09:13 -07:00
Niraj Venkat
1be303e3ed Address bar polish 2015-06-18 15:07:27 -07:00
Brad Davis
edfb25bfe2 Removing debug define for VR overlay 2015-06-18 15:05:32 -07:00
Sam Gondelman
53bbd519a3 two new customizable actions for use in js 2015-06-18 14:37:09 -07:00
Bradley Austin Davis
e75b1a6794 Merge branch 'temp' into overlay 2015-06-18 14:03:25 -07:00
Bradley Austin Davis
96ac5070f6 Adding some more protection to the viewport 2015-06-18 14:00:17 -07:00
Sam Gondelman
fd0efd91ff added shift action, added timers and fast mode to hmdControls.js 2015-06-18 13:59:37 -07:00
Bradley Austin Davis
7bbaf026f3 use a monospace font on all platforms 2015-06-18 13:33:37 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
Sam Gondelman
f752534f7c actionEvent signal, captureActions, began work on hmdControls.js 2015-06-18 09:52:36 -07:00
Brad Davis
acdf7c48d9 Adding more explicit error checking 2015-06-18 00:53:19 -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
Bradley Austin Davis
4633cabcec Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 17:07:43 -07:00
David Rowe
67206332e6 Make individual reload buttons reload scripts 2015-06-17 16:11:30 -07:00
David Rowe
5dab977c28 Add a reload script button after each script in list of running scripts 2015-06-17 16:11:26 -07:00
Brad Davis
8a1b519071 Working on overlays 2015-06-17 16:06:06 -07:00
Brad Davis
f2261b5ed5 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:34:50 -07:00
Brad Davis
ae1c9603b9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
Sam Gondelman
0157997126 fix findDevice 2015-06-17 14:42:11 -07:00
Niraj Venkat
225e2ebfdc Fixing build issues and finishing up address bar 2015-06-17 14:27:16 -07:00
Niraj Venkat
9b9aba48f0 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-17 13:50:30 -07:00
Niraj Venkat
1328ea6199 Calling AddressManager back and forward functions 2015-06-17 13:41:41 -07:00
Bradley Austin Davis
2172445db7 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 12:56:41 -07:00
Sam Gondelman
a37b089b33 merge with master 2015-06-17 12:17:09 -07:00
Brad Davis
4282c044ef Working on mirror and overlay 2015-06-17 12:01:39 -07:00
Andrew Meadows
61f62f96b0 Merge pull request #5129 from SamGondelman/master 
Integrating gamepads/hydras to input mapping system, zooming
 2015-06-17 11:39:38 -07:00
Brad Davis
1e90aaf9c3 Working on overlays still, mirror rendering and overlay order 2015-06-17 11:35:30 -07:00
Sam Gondelman
17322645f2 added mouselook script, reticle and icons need changes 2015-06-17 11:17:38 -07:00
Brad Davis
5ded9e7eb9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 10:50:01 -07:00
Sam Gateau
3176c8e93c polish before PR 2015-06-17 17:09:33 +02:00
samcake
d703748ec3 trying to solve the rendering of overlay3d 2015-06-17 16:44:02 +02:00
Seth Alves
02d7aa30ab don't check QtWidgets header for -Wdouble-promotion 2015-06-17 07:02:37 -07:00
Sam Gateau
5c547037f2 Migrating the overaly 3d rendering in their own job and their own shader 2015-06-17 15:54:20 +02:00
Brad Davis
2bf53b625e Working on overlays and stats 2015-06-17 02:00:13 -07:00
Sam Gateau
0653be445a Merge branch 'batch-overlay' of https://github.com/huffman/hifi into yellow 2015-06-17 10:39:45 +02:00
Brad Davis
4762e1a00c Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
 2015-06-16 21:01:00 -07:00
Brad Davis
659fa2387c Working on overlays / stats 2015-06-16 21:00:13 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Ryan Huffman
d47f5a2abb Update Rectangle, Grid, and Billboard overlays to use batches 2015-06-16 16:45:53 -07:00
Brad Davis
02d33f6086 Working on overlay rendering 2015-06-16 12:14:42 -07:00
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -07:00
Brad Davis
ba13b7820c Working on overlay refactor 2015-06-16 09:58:03 -07:00
Ryan Huffman
8241a2170b Update cube, line, and sphere overlays to use batches 2015-06-16 09:50:42 -07:00
Leonardo Murillo
c065269ba7 Merging with upstream 2015-06-15 11:58:52 -06:00
Brad Davis
00d8fe75ab Breaking up overlay into rendering and compositing classes 2015-06-13 17:36:08 -07:00
Brad Davis
e44b21ee0b Working on functional overlays 2015-06-13 10:36:52 -07:00
Brad Davis
737e418878 Revert "Revert "Merge pull request #5106 from jherico/render_cursor"" 
This reverts commit 0cdc2b53fe.
 2015-06-13 10:02:54 -07:00
ZappoMan
648f9bebdf add LOD stats to the default stats 2015-06-12 15:58:26 -07:00
Philip Rosedale
b628df45bc Merge pull request #5121 from ZappoMan/attemptRevertOverlaysBork2 
REVERT recent changes to overlays that seem to be breaking stuff
 2015-06-12 13:50:53 -07:00
ZappoMan
0cdc2b53fe Revert "Merge pull request #5106 from jherico/render_cursor" 
This reverts commit 4d18bd7cec, reversing
changes made to 24fda9a733.
 2015-06-12 12:57:24 -07:00
ZappoMan
87951ff7b3 quick hack to fix stats texture bleed through 2015-06-12 11:24:56 -07:00
Brad Davis
09cfe004a1 Combining with new cursor render code 2015-06-11 16:55:23 -07:00
Brad Davis
9148b866bb Merge branch 'render_cursor' into cursor_manager 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-11 16:19:57 -07:00
Sam Gondelman
b8b61e7c62 integrated joysticks with userinputmapper, enabling plug-in-and-play controllers and input mapping with js 2015-06-11 15:51:21 -07:00
Brad Davis
92f22bc6d5 Magic number and build errors 2015-06-11 15:40:16 -07:00
Brad Davis
d3cdbc389a Code cleanup 2015-06-11 15:05:08 -07:00
Brad Davis
b7cd1ea72a Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 15:04:56 -07:00
Brad Davis
bc206633f5 Fixing overlay rendering in HMD 2015-06-11 14:56:21 -07:00
Brad Hefta-Gaub
24fda9a733 Merge pull request #5085 from SamGondelman/master 
Exposing Input Key Binding To JavaScript
 2015-06-11 14:41:34 -07:00
Sam Gateau
7685fe2229 Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool 2015-06-11 06:40:21 -07:00
Brad Davis
ef52035300 Working on functional overlays 2015-06-11 02:20:51 -07:00
Brad Davis
ac0fc5d974 Working on oculus overlay code 2015-06-11 00:57:58 -07:00
Sam Gateau
1f62fb4b6f Adding standard vertex and pixel shaders for drawing texture in applicationOverlay 2015-06-10 15:24:29 -07:00
Leonardo Murillo
3bd0c7bd87 Code Review changes 2015-06-10 14:35:52 -06:00
Brad Davis
ca1af77763 Working on cursor manager 2015-06-10 13:24:56 -07:00
Leonardo Murillo
869461a01b Code Review changes 2015-06-10 14:14:00 -06:00
Leonardo Murillo
8f72763f17 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-10 13:18:20 -06:00
Brad Davis
7374fb84e8 Working on fixing overlays with team-teaching merge 2015-06-10 09:36:14 -07:00
Brad Davis
78ab6a03af Fixing broken cursor rendering from team-teaching merge 2015-06-09 11:47:19 -07:00
Brad Davis
78c3ba0e2c Removing dead code 2015-06-09 10:25:21 -07:00
Sam Gondelman
0769593ca8 added getters/setters for Inputs and InputChannels 2015-06-09 10:20:36 -07:00
Sam Gondelman
d3a4eec5c5 removed dead code, magic numbers 2015-06-09 09:56:40 -07:00
Leonardo Murillo
1d785c714b Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-09 09:01:50 -06:00
Brad Davis
6147844f93 Merge branch 'master' into ovr6 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.h
 2015-06-09 00:44:06 -07:00
Brad Davis
c360dde71a Merge branch 'master' into render_cursor 
Conflicts:
	interface/src/Application.cpp
 2015-06-08 20:18:32 -07:00
Leonardo Murillo
7aee293df4 Buttons are connected and execting old functions 2015-06-08 14:56:46 -06:00
Leonardo Murillo
edce36f5a1 Checkpoint - buttons in place 2015-06-08 14:29:10 -06:00
Leonardo Murillo
bd85ce1312 Auto Update checkpoint - dialog is QML and populated with real data 2015-06-08 13:55:28 -06:00
ZappoMan
5d6112d9c5 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 12:29:32 -07:00
Brad Davis
b3534210e4 Always use GL rendered cursor 2015-06-08 11:51:35 -07:00
Leonardo Murillo
83b7054138 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-08 11:55:47 -06:00
Brad Davis
5faa53d7e9 Working on OVR SDK 0.6 2015-06-08 10:17:34 -07:00
Bradley Austin Davis
5a52a389be Working on SDK 0.6 2015-06-07 23:23:21 -07:00
David Rowe
8c1ece8865 Fix #include for Unix 2015-06-07 13:57:02 -07:00
David Rowe
36312e7bb4 Remove circular login dialog variation 2015-06-07 13:57:01 -07:00
David Rowe
162395e7fe Make login password and register links work 2015-06-07 13:56:56 -07:00
David Rowe
a2f262f659 Add basic username, password, login, and error functionality and styling 2015-06-07 13:56:54 -07:00
David Rowe
511832c273 New login dialog background with circular and rectangular variations 
Developer menu item toggles between the two.
 2015-06-07 13:56:53 -07:00
Leonardo Murillo
68b419deec Syncing 2015-06-05 17:11:32 -06:00
David Rowe
7fb434613c Fix #include for Unix 2015-06-05 15:57:09 -07:00
David Rowe
c7c355c19f Remove circular login dialog variation 2015-06-05 15:37:25 -07:00
Leonardo Murillo
dea80d1757 Styling update dialog and working towards passing build details from c++ to qml 2015-06-05 16:17:54 -06:00
David Rowe
977eae9f86 Make login password and register links work 2015-06-05 08:42:33 -07:00
David Rowe
3388406984 Add basic username, password, login, and error functionality and styling 2015-06-04 18:48:21 -07:00
Sam Gondelman
984d449bf9 exposed input key bindings to js to enable key remapping 2015-06-04 16:29:58 -07:00
David Rowe
afc2f374e5 New login dialog background with circular and rectangular variations 
Developer menu item toggles between the two.
 2015-06-04 14:39:28 -07:00