Commit graph

758 commits

Author SHA1 Message Date
Stephen Birarda
b1c151b165 remove dead code in main.cpp 2016-01-21 11:04:39 -08:00
Ryan Huffman
fe4c161cb6 Fix sending URL to second interface instance 2016-01-14 12:47:36 -08:00
Ryan Huffman
471c555bca Add shared memory back into main.cpp 2016-01-04 11:58:56 -08:00
Stephen Birarda
a8896de140 remove dead code, use stop index 2015-12-30 09:45:23 -08:00
Stephen Birarda
5887867ccf use a QLocalServer to handle multiple instance launches 2015-12-29 11:10:40 -08:00
Ryan Huffman
14e71778a8 Remove unused captures from lambdas in main() 2015-12-22 16:30:02 -08:00
Ryan Huffman
c396caee5e Update interface to support --url on all platforms 2015-12-22 16:27:33 -08:00
Lars Christensen
110ba131a6 moved translation efforts into subdir 2015-08-25 01:36:19 +02:00
Brad Davis
d65e5882aa Working on 64 bit builds 2015-06-18 21:44:12 -07:00
Stephen Birarda
ddb52348bc don't force use of Settings to all QCoreApplication 2015-05-08 16:24:39 -07:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
Thijs Wenker
85e9a794a3 ability to run multiple interfaces on single Windows machine by switching user accounts (or using run as) 2015-04-21 03:58:39 +02: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
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
Brad Davis
7f29a70157 Switchable between SDK/client distortion 2015-02-26 00:06:59 -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
David Rowe
45c0d0e6a9 Fix Windows --url command line parameter handling 2015-02-09 23:50:43 -08:00
David Rowe
4fa2b3a6e9 Fix maximized Windows window unintentionally changing to windowed
This stops a maximized Windows window changing to being windowed when
you click on a menu item.
2015-02-09 22:07:12 -08:00
Stephen Birarda
41d2da8712 remove doubled Q_INIT_RESOURCE calls 2015-02-06 15:28:36 -08:00
Stephen Birarda
6a58d8b0a3 resolve conflicts on merge with upstream master 2015-02-06 14:21:07 -08:00
Stephen Birarda
9a98e07b2d call Q_INIT_RESOURCE from mains to handle static link 2015-02-06 12:39:14 -08:00
David Rowe
9e34b36839 Send hifi command line url to other instance 2015-02-05 17:17:31 -08:00
David Rowe
ab758648c7 Show and focus on the other Interface instance 2015-02-05 16:44:26 -08:00
David Rowe
1fa50fa54d Run only one instance of Windows Interface at a time
OSX automatically does this.
2015-02-05 13:09:06 -08:00
Atlante45
967028e5cf Removed more QSettings references 2015-01-18 19:29:27 -08:00
Atlante45
8b4a910040 Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
Atlante45
3eeb3a539d Fixed lack of resolution in usecTimestampNow() 2014-04-22 11:48:43 -07:00
Atlante45
f7f30e118c More gettimeofday cleanup 2014-04-21 15:17:11 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Dimitar Dobrev
9eb217794c Added time stamps to the chat. Enabled translations. 2014-03-12 01:24:30 +02:00
Stephen Birarda
5f130872af repair usage of INI file for QSettings 2014-02-19 14:09:18 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
ZappoMan
5b36953e81 cleanup clockSkew debug options and remove some chatty logs 2013-12-18 19:33:52 -08:00
ZappoMan
6b0d7c30f0 added debugging option for forced clock skew 2013-12-18 16:58:49 -08:00
Leonardo Murillo
939a9bf5c4 We can let qt find things on its own, which will let us add frameworks/plugins inside the bundle 2013-12-12 12:59:34 -08:00
Andrzej Kapolka
8f633f87e9 Fix for seg fault on Linux exit. 2013-12-09 13:32:02 -08:00
Stephen Birarda
4d9075f21c optionally check /usr/local/lib for plugins 2013-08-16 13:58:22 -07:00
Stephen Birarda
1b48d4f0fc revert removal of extraneous newlines 2013-07-16 12:46:32 -07:00
Stephen Birarda
89d3cfdb6f remove now extraneous newlines after switch to QDebug 2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
Stephen Birarda
36c6912de8 your agents are now nodes 2013-07-03 10:35:09 -07:00
Stephen Birarda
222a596754 remove unnecessary OctalCode include in main 2013-06-07 10:59:40 -07:00
ZappoMan
46c6f2f9b5 latest copy paste 2013-05-29 15:02:28 -07:00
ZappoMan
377fb1e936 latest copy and paste 2013-05-29 12:06:58 -07:00
Geenz
fb553fce80 Refactor startup timing a little by getting the current time the moment the application enters its main function, then passing that to Application's constructor. Also fix the titlebar bug by setting the title bar at the end of initializeGL() instead of at the end of the first frame (which would actually further the inaccuracy of the startup time). 2013-05-22 10:53:35 -04:00
Jeffrey Ventrella
a0e8c0da74 more work on avatar lookat 2013-05-14 18:15:54 -07:00
Jeffrey Ventrella
a5e696b696 Merge remote-tracking branch 'upstream/master' 2013-05-14 17:31:03 -07:00
Jeffrey Ventrella
f53b49c496 working on lookat (eye contact) 2013-05-14 17:30:41 -07:00
Jeffrey Ventrella
7117e4a76c Merge remote-tracking branch 'upstream/master' 2013-05-14 11:44:34 -07:00
Jeffrey Ventrella
acda87502e more work on camera shifting between modes 2013-05-14 11:43:51 -07:00
ZappoMan
63510aa30b Merge pull request #301 from PhilipRosedale/master
Improved stability of invensense for drift
2013-05-14 11:27:01 -07:00
Andrzej Kapolka
1e99389a4b Various fixes, removed the bulk of main.cpp. 2013-05-13 23:15:45 -07:00
Andrzej Kapolka
75eee4bcbd Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
2013-05-13 21:23:00 -07:00
Andrzej Kapolka
e0388515a4 Massive migration from GLUT/globals to Qt/class members. Mostly there. 2013-05-13 21:11:54 -07:00
Philip Rosedale
6b85d93aee Simplified serial port init to not use baud. 2013-05-13 18:52:43 -07:00
Philip Rosedale
87dfbf9f4f Improved Invensense stability by adding average of first few samples to better eliminate DC bias/drift 2013-05-13 18:04:21 -07:00
Jeffrey Ventrella
6e3ab12411 Merge remote-tracking branch 'upstream/master' 2013-05-13 16:54:41 -07:00
Jeffrey Ventrella
54010d36c4 created transitions between camera modes 2013-05-13 16:53:45 -07:00
ZappoMan
b196227385 Added wantResIn and wantColor feature between client and server
- Updated Voxel Server to support non-res-in version of voxel distribution
- Updated agent data to allow client to send desired res-in and color state
- added menu items to client debug menu to toggle wantResIn and wantColor
2013-05-13 15:02:46 -07:00
Jeffrey Ventrella
6f1000447b Merge remote-tracking branch 'upstream/master' 2013-05-13 14:01:32 -07:00
Jeffrey Ventrella
3ab0fa4e8c added code to detect mouse hovering over avatar joints for various touch effects 2013-05-13 14:00:25 -07:00
Andrzej Kapolka
57af5b11dd Start out with voxel editing disabled; let the add/delete/color buttons toggle
the mode.
2013-05-13 11:27:55 -07:00
Andrzej Kapolka
4bbd3e2e07 Better way of coming up with a contrasting color. 2013-05-13 09:41:50 -07:00
Andrzej Kapolka
eb77f5ff83 Removed debug code, more tests for staged-for-deletion. 2013-05-12 20:36:10 -07:00
Andrzej Kapolka
4289921b7e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-11 15:39:18 -07:00
Andrzej Kapolka
9802403749 Let's do some locking to prevent simultaneous access from different threads. 2013-05-11 15:38:49 -07:00
Jeffrey Ventrella
442632f467 fixed merge conflict 2013-05-11 11:50:19 -07:00
Jeffrey Ventrella
5c10ca5677 Merge remote-tracking branch 'upstream/master' 2013-05-11 11:48:34 -07:00
Jeffrey Ventrella
08aba4decb fixed problem of camera shifting when application starts (made camera jump to ideal position/rotation when initialized) 2013-05-11 11:48:00 -07:00
Philip Rosedale
f115f2a991 fixes to repair merge 2013-05-11 10:55:20 -07:00
Philip Rosedale
dec7e5921c Merge remote-tracking branch 'upstream/master' 2013-05-11 10:49:23 -07:00
Philip Rosedale
a89b011ddf Spacing fixes 2013-05-11 10:47:02 -07:00
Philip Rosedale
a1e9235db5 fixed per review 2013-05-11 10:41:34 -07:00
Philip Rosedale
59a681ee44 Fixes per review. 2013-05-11 10:19:57 -07:00
Jeffrey Ventrella
ab9fa0a556 cleaned up some code 2013-05-10 22:31:51 -07:00
Jeffrey Ventrella
1e4305d277 Merge remote-tracking branch 'upstream/master' 2013-05-10 21:58:52 -07:00
Jeffrey Ventrella
e4c84e7b74 added mouse view shift behaviors 2013-05-10 21:58:11 -07:00
Andrzej Kapolka
750843e867 More editing progress. Now there are threading issues. Joy! 2013-05-10 21:02:08 -07:00
Philip Rosedale
4a4184b327 Head in first person follows head mouse at edges of screen 2013-05-10 17:41:16 -07:00
Stephen Birarda
82ed4a4ae8 remove old style walking sounds 2013-05-10 17:21:58 -07:00
Stephen Birarda
7abe5024d9 some space removals in Interface main.cpp 2013-05-10 17:20:07 -07:00
Philip Rosedale
6b75fe6e21 Merge remote-tracking branch 'upstream/master' 2013-05-10 16:49:28 -07:00
Philip Rosedale
5e21cb48ba First person added to render mode and 'p' key 2013-05-10 16:48:21 -07:00
Stephen Birarda
9ee3f889ab Merge remote-tracking branch 'upstream/master' into oculus 2013-05-10 14:00:10 -07:00
Stephen Birarda
e5fce7d83e remove a useless comment 2013-05-10 13:55:26 -07:00
Stephen Birarda
f447abe03b zero the yaw on oculus connect, set head yaw instead of body 2013-05-10 13:52:54 -07:00
Andrzej Kapolka
66a8e40712 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-10 12:09:25 -07:00
Andrzej Kapolka
8d0fdcac06 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-10 12:08:50 -07:00
ZappoMan
0888a6605f CR fixes 2013-05-10 12:08:43 -07:00
ZappoMan
bfa7c91a7a fixed menu behavior 2013-05-10 12:08:03 -07:00
Andrzej Kapolka
5a113fd546 Added a stub for a Qt application class that creates a menu (which, since it's
unparented, will only appear on OS X) with a test item connected to a slot.
2013-05-10 12:07:47 -07:00
ZappoMan
e84d2696f9 fixed menu behavior 2013-05-10 12:04:52 -07:00
Philip Rosedale
7d69eb09c2 Merge remote-tracking branch 'upstream/master' 2013-05-10 10:55:39 -07:00
Stephen Birarda
2f9c16f495 have the oculus drive the body yaw, head pitch, and head roll 2013-05-10 10:55:26 -07:00
Philip Rosedale
f8701e6c0c Re-added Head Mouse working correctly with invensense 2013-05-10 10:55:05 -07:00
Stephen Birarda
cc38e4c5c4 Merge remote-tracking branch 'upstream/master' into oculus 2013-05-10 10:18:36 -07:00
Stephen Birarda
04447dfcbd drive body yaw and render pitch with oculus when connected 2013-05-10 10:17:21 -07:00
Andrzej Kapolka
beadb6a93d Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	interface/src/main.cpp
2013-05-10 10:03:05 -07:00