Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25522 commits 29 branches 0 tags 1.1 GiB
Commit graph

155 commits

Author SHA1 Message Date
Brad Davis
e20d2ffb15 Merge typo 2015-05-13 21:39:04 -07:00
Brad Davis
c94b8b6e30 Merge branch 'master' into dk1 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-05-13 21:25:56 -07:00
Brad Davis
41d587bd2e Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"" 
This reverts commit 6e8c067bcb.

Conflicts:
	interface/src/Camera.h
 2015-05-12 14:47:44 -07:00
samcake
6e8c067bcb Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff" 2015-05-12 14:34:43 -07:00
Brad Davis
666caf0d59 Working on fixing DK1 and santizing the transform stuff 2015-05-12 00:44:30 -07:00
Bradley Austin Davis
03bd17ed49 Rebasing onto scale changes 2015-05-08 15:09:46 -07:00
Bradley Austin Davis
c31d36be59 Fixing scale resolution issues 2015-05-07 12:01:56 -07:00
Bradley Austin Davis
fc73676b4d Merge branch 'master' into plugins_pt1 2015-05-06 11:43:25 -07:00
Philip Rosedale
e9476029fb Merge pull request #4724 from jherico/menu_polish 
Menu polish
 2015-05-04 23:44:06 -07:00
Bradley Austin Davis
098a9bd70e Fixing sixense and restoring lookat 2015-05-04 13:10:16 -07:00
Atlante45
fc1519c078 Quiet compiler 2015-05-04 16:49:33 +02:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
Brad Davis
1e2106e831 Whitespace removal 2015-05-01 10:36:03 -07:00
Brad Davis
ce6b7e7aec Merge branch 'master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-16 14:02:40 -07:00
Sam Gateau
5ebbdaca05 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-15 09:00:50 -07:00
Sam Gateau
1046356abb FIx the include that was using the wrong \ in the path... 2015-04-15 09:00:20 -07:00
Brad Hefta-Gaub
a105f579ce Merge pull request #4621 from jherico/oculus_crash 
Attempt to stop the crashing on exit caused by the Oculus SDK
 2015-04-15 08:52:17 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
Sam Gateau
fec52f6b10 Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly 2015-04-14 18:27:24 -07:00
Brad Davis
f496175fb9 Attempt to stop the crashing on exit caused by the Oculus SDK 2015-04-09 09:17:23 -07:00
Seth Alves
30a8b61df3 quiet compiler 2015-04-08 15:39:21 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
fc5b442e12 interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging 2015-04-07 09:15:11 -07:00
Seth Alves
fb607e2b26 logging groups for library/shared and interface 2015-04-06 18:45:06 -07:00
Bradley Austin Davis
44c9d4a742 Working on removing some of the warnings in the xcode build 2015-04-02 16:12:44 -07:00
Bradley Austin Davis
58908f44ef Fixing crash on exit when using (or used) VR mode 2015-04-01 16:05:46 -07:00
Bradley Austin Davis
fd47d4f3a5 Working on putting some more timing measurement into the code 2015-04-01 15:47:51 -07:00
Bradley Austin Davis
a7dc1d26e6 Working on SDK vs client distortion performance differences 2015-04-01 13:23:55 -07:00
Bradley Austin Davis
eb816f7f6a Adding support for eye per frame mode and offscreen render scaling 2015-03-31 18:24:58 -07:00
Bradley Austin Davis
6757dfcc0c Working on 0.5.0.1 port and addressing the direct HMD/v-sync conflict 2015-03-31 14:52:21 -07:00
Bradley Austin Davis
c4c6cf82a2 Working on migration to SDK 0.5.0.1 2015-03-31 13:27:11 -07:00
Brad Davis
5aa4277d9b Removing a superfluous clear from Application.cpp. It's only required in client distortion mode 2015-03-16 12:22:35 -07:00
Brad Davis
76ce31d4c3 Limiting app pollution with Oculus headers, ensuring client distortion mode builds 2015-03-09 14:47:33 -07:00
Brad Davis
c1c97fc8b6 Updating cmake files after merging from master 2015-03-04 23:32:27 -08:00
Brad Davis
d838b78df9 Merging from upstream 2015-03-04 21:53:31 -08:00
Brad Davis
7f29a70157 Switchable between SDK/client distortion 2015-02-26 00:06:59 -08:00
ZappoMan
a89691fc66 switch GLCanvas back to being owned by Application 2015-02-25 12:11:35 -08:00
Brad Davis
670a566763 Porting oculus rendering to 0.4.4 SDK 2015-02-23 22:15:59 -08:00
Brad Davis
06b9b9cc88 Getting SDK based rendering and Direct HMD mode working 2015-02-21 00:15:12 -08:00
Brad Davis
16feaceab5 Working on oculus build 2015-02-20 09:32:25 -08:00
Brad Davis
58ca2e4148 Merge branch 'master' into oculus 2015-02-17 18:36:48 -08:00
Thijs Wenker
e3ca1efe6b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-07 00:34:38 +01:00
Brad Davis
a921f7ae74 Updating API usage to Oculus 0.4.4 2015-01-31 19:44:23 -08:00
Atlante45
647a935eaa Remove app->getAvatar 2015-01-29 15:16:40 -08:00
Thijs Wenker
9e51bece63 More accurate HMD-cursor on virtual keyboard, thanks Simon and @ctrlaltdavid for the help on this! 2015-01-21 15:07:32 +01:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
Atlante45
7d39b45f16 Hopefully fixes the windows compile error 2015-01-12 17:34:07 -08:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
ZappoMan
046564ec47 oops double 2014-12-19 12:35:47 -08:00
ZappoMan
d585f8c707 replace gluOrtho2D() with glOrtho() 2014-12-19 12:10:40 -08:00