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

1719 commits

Author SHA1 Message Date
Seth Alves
a0771f8ee5 use smart pointers for entity simulations 2016-05-07 09:14:33 -07:00
Andrew Meadows
778820edb4 fix broken dupe method implementation 2016-05-06 09:07:03 -07:00
Andrew Meadows
635e2e78e3 minor cleanup 2016-05-05 18:43:08 -07:00
Andrew Meadows
71b2d647e8 add locks and explicitly copy ViewFrustums 2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074 use references not pointers for ViewFrustums 
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
 2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660 getViewFrustum() provides const pointer 2016-05-05 18:28:27 -07:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
c7f58dc17c first cut at exposing recommend overlay rectangle 2016-04-14 20:47:31 -07:00
Brad Hefta-Gaub
7b5075cce5 Merge pull request #7645 from sethalves/dont-run-bullet-too-soon 
add a heuristic for deciding when it's safe to enable bullet
 2016-04-14 09:35:58 -07:00
Ryan Huffman
47c2a1722b Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu 2016-04-13 14:40:46 -07:00
Ryan Huffman
bc247ec058 Remove unused Application::crashApplication() 2016-04-13 14:01:41 -07:00
Seth Alves
e4c91e5064 add a heuristic for deciding when it's safe to enable bullet 2016-04-12 11:46:00 -07:00
Brad Davis
df8ad57185 Fix FPS counter 2016-04-11 00:25:16 -07:00
Brad Hefta-Gaub
157dd96303 Merge pull request #7612 from ZappoMan/mirrorReturnsToLastView 
when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror
 2016-04-07 14:56:53 -07:00
Brad Hefta-Gaub
81bb5ff07d when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror 2016-04-07 13:13:19 -07:00
Brad Hefta-Gaub
bd1eb5842a fix crash related to menu vs watchdog create order 2016-04-07 12:45:24 -07:00
Brad Hefta-Gaub
47aed9c8bd fix redraw issue when logging in to or out of a domain 2016-04-06 14:56:20 -07:00
Anthony J. Thibault
07ff687bfe Application: change keyboard input focus when using ui overlay. 
call focusOutEvent on keyboard input plugin when an offscreen ui has activeFocus.
 2016-04-05 18:12:02 -07:00
Triplelexx
a4775983a2 Merge branch 'master' into 20769 
# Conflicts:
# interface/src/Application.cpp

conflicting line 2528 wheelEvent is now const
 2016-04-04 19:19:55 +01:00
Thijs Wenker
142f37da1c fix accidentally violated style rule 3.1.2.1 2016-04-04 17:33:47 +02:00
Thijs Wenker
b2058376ba used "ReSharper C++" to fix some style and spelling in Application.(h|cpp) 2016-04-04 17:03:05 +02:00
Triplelexx
fb242be50f resolved merge conflict 
got to stick to command line, this should have been added with add
command at merge....
 2016-04-03 22:59:48 +01:00
Seth Alves
5fa9f662fc Merge pull request #7542 from birarda/refresh-on-asset-connect 
refresh/close the asset browser dialog on domain switch
 2016-04-01 18:08:59 -07:00
Stephen Birarda
ee7bee95f8 use nodeActivated to trigger refresh of Asset Browser 2016-04-01 11:35:33 -07:00
Anthony J. Thibault
3d43f73a88 Application: don't call Model::simulate on network thread. 
This can cause a crash.

On startup the Application::processOctreeStats method on the network thread will call into entities entity->isReadyToComputeShape() (without a tree lock) and trigger Model::simulate.  Model is NOT thread safe.  This was leading to a single model to be initialized on two threads simultaneously.

This might be somewhat rare, I only caught it because I was running a debug build.
 2016-03-31 17:57:20 -07:00
Brad Hefta-Gaub
d99dcf5450 Merge pull request #7487 from hyperlogic/tony/animated-culling 
Improved render bounding boxes for animated models
 2016-03-30 09:27:43 -07:00
howard-stearns
4ebf816166 cleanup 2016-03-29 16:17:19 -07:00
Anthony J. Thibault
115fd607a0 Address performance issues introduced with this PR. 
* Prevent clusterMatrices from being invalidated and re-computed in each updateItem lambda.
  We do this by not setting _model->_needsUpdateClusterMatrices = true;
* Prevent redundant work if Model::enqueueLocationChange is called multiple times per frame.
  We do this by introducing a preRenderLambdas map in the Application class.
  Instead of adding work directly to the scene PendingChanges queue Model::enqueueLocationChange
  adds a lambda to the Application preRenderLambdas map.  The Application ensures that only one lambda will
  be invoked for each model per frame.
 2016-03-28 19:47:30 -07:00
Brad Davis
520cccb219 Make display plugin switching atomic from other threads 2016-03-24 15:19:46 -07:00
Brad Hefta-Gaub
2b0670718f Merge pull request #7449 from howard-stearns/report-previous-session-data 
Report previous session data
 2016-03-23 20:58:51 -07:00
howard-stearns
c435ca212a Report previous session time. 2016-03-23 16:59:17 -07:00
howard-stearns
550738776c Pass whether or not previous session crashed to the UserActivityLogger. 2016-03-23 15:56:29 -07:00
Zach Pomerantz
9c11474dd7 Expose qApp->updateHeartbeat 2016-03-22 17:17:36 -07:00
Anthony J. Thibault
ce47f83288 Prevent deadlock if idle is called during rendering 
This extraordinary event can occur if a MessageBox is popped up by the opengl driver.

* removed AvatarData::avatarLock
* removed AvatarUpdate

This code was left over from an earlier avatar threading experiment.

Removed AvatarData avatarLock and AvatarUpdate class
 2016-03-21 15:11:15 -07:00
Brad Hefta-Gaub
edcf642410 Merge pull request #7374 from jherico/plugin_switch_crash 
Reduce crashes on switching display plugins
 2016-03-17 15:51:39 -07:00
Anthony J. Thibault
a8bc8a7843 Application: prevent crash on startup when "Interface Crashed" dialog is shown. 
If the application "Interface Crashed" dialog is shown at startup, it can cause Application to receive events before it has been fully constructed.
In this case the QMainWindow _window pointer is uninitialized, causing Menu::getInstance() to de-reference an invalid pointer.

The fix for this is three fold.

1. Construct the QMainWindow before calling setupEssentials (which in turn spawns the "Interface Crashed" dialog).
2. Change Menu::getInstance() from a static_cast to a dynamic_cast.  This will cause it to return a nullptr if [QMainWindow::menuBar()](http://doc.qt.io/qt-4.8/qmainwindow.html#menuBar) returns an instance of QMenuBar and not a ui::Menu instance.
3. In Application::event return false if Menu::getInstance() returns a nullptr.  This should prevent any code that relies on having a valid ui::Menu instance from running.
 2016-03-17 12:13:01 -07:00
Bradley Austin Davis
7045680bc7 Reduce crashes on switching display plugins 2016-03-17 10:13:52 -07:00
Atlante45
4a90ec303c Fix drag&drop 2016-03-15 11:22:42 -07:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
Anthony J. Thibault
807d31743c Removed Hand, HandData & PalmData 
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.

The hand controller debug drawing is slightly different, but still works.
 2016-03-10 19:33:31 -08:00
Stephen Birarda
57ea51d244 Merge pull request #84 from Atlante45/feat/atp 
Replace old drag&drop with new UI
 2016-03-09 14:26:49 -08:00
Stephen Birarda
9a2b2b4c16 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-09 12:16:46 -08:00
Atlante45
5a0beec1f5 Replace old drag&drop with new UI 2016-03-09 11:47:31 -08:00
Brad Davis
95f5d82d37 Add a watchdog thread to trigger a crash on detecting a deadlock 2016-03-09 00:32:46 -08:00
Atlante45
ded449072f Rename window 2016-03-08 13:13:45 -08:00
Atlante45
784f669998 First draft Assets Manager 2016-03-08 13:13:45 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
Stephen Birarda
f44cf3903c re-instate verified domain ownership for full automatic networking 
This reverts commit 34408c8144.
 2016-03-01 13:04:37 -08:00
Stephen Birarda
b0c11e6562 Merge pull request #7217 from huffman/udt-random-seq 
Randomize initial send sequence number in UDT
 2016-03-01 12:59:10 -08:00
Atlante45
4944d0a8d0 Handle threading inside AssetServer 2016-03-01 12:00:43 -08:00
Ryan Huffman
cc9c87d281 Fix packet version mismatch not showing for domain packets 2016-03-01 11:36:49 -08:00
Brad Hefta-Gaub
2c3fdc995f Away improvements 2016-02-29 20:23:06 -08:00
Zach Pomerantz
3c53078178 Merge pull request #7194 from ZappoMan/toggleOverlay 
add toggleOverlays menu item and action
 2016-02-26 10:17:24 -08:00
Anthony J. Thibault
1fdae13de1 Application: don't simulate until we are ready to render. 2016-02-25 17:48:55 -08:00
Brad Hefta-Gaub
b0c286bc3b Merge branch 'master' of https://github.com/highfidelity/hifi into toggleOverlay 
Conflicts:
	interface/src/Application.cpp
 2016-02-25 16:21:38 -08:00
Clément Brisset
2e7c7eace5 Merge pull request #7179 from birarda/domain-security 
verified domain ownership for full automatic networking
 2016-02-25 15:24:09 -08:00
Brad Hefta-Gaub
366aa39be8 handle startup overlay visibility correctly 2016-02-25 14:46:08 -08:00
Brad Hefta-Gaub
5828c32041 add toggleOverlays menu item and action 2016-02-25 08:31:11 -08:00
Zach Pomerantz
7ae9752272 Remove Render > Ambient Light menu 2016-02-23 16:24:43 -08:00
Stephen Birarda
42582e5d0f remove old voxel cost model from application 2016-02-23 14:53:35 -08:00
Stephen Birarda
6cab831ea0 re-gen the interface keypair while being denied from domain 2016-02-23 14:52:12 -08:00
Brad Davis
160a107bbd Auto-unhide the desktop when showing or raising a window 2016-02-22 19:36:00 -08:00
Triplelexx
949eab62ec Merge remote-tracking branch 'refs/remotes/highfidelity/master' into 20769 
# Conflicts:
#	libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp

removed deviceID
 2016-02-21 22:04:14 +00:00
Brad Hefta-Gaub
3e6cddede3 CR feedback 2016-02-21 10:03:51 -08:00
Brad Hefta-Gaub
32a7179c62 CR feedback 2016-02-21 09:59:19 -08:00
Brad Hefta-Gaub
1a4591db58 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-21 09:30:41 -08:00
Howard Stearns
13c602e2a3 Remove mumbleUnsynchronizedFPS, which is obsolete now that the update/render rate is not in power-of-two lockstep with present rate, and which had users other than the LOD PID. 2016-02-19 15:12:44 -08:00
Brad Hefta-Gaub
7219a925d2 remove getTrueMouse() 2016-02-19 14:17:28 -08:00
Triplelexx
087e2e7f66 revise touchscreen camera control manipulation 
Touchscreen camera control is now via a touchscreen device. Input must
be enabled with the menu option. Currently supports dragging and
gesturing to control avatar camera. Gesturing is handled by integration
of the Qt implementation.
 2016-02-19 13:47:28 +00:00
Triplelexx
9d03f0eb66 Revert "integrate touch screen camera manipulation controls" 
This reverts commit 4855511512d6df09691d7d54d48a341512d92392.
 2016-02-19 13:38:34 +00:00
Triplelexx
fde01e094e integrate touch screen camera manipulation controls 
Set Avatar _driveKeys via touch manipulation
 2016-02-19 13:38:19 +00:00
Brad Hefta-Gaub
8b8b99c7e0 HMD mouse checkpoint 2016-02-17 21:19:01 -08:00
Brad Hefta-Gaub
a25581c656 clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor) 2016-02-16 12:11:58 -08:00
samcake
0c0089f736 REnamed Octree.h/cpp to SpatialTree and fixing some coding guidelines 2016-02-15 11:08:12 -08:00
Brad Davis
908e153c36 Don't drop to half the vsync rate when we can't keep up 2016-02-12 15:57:27 -08:00
Brad Hefta-Gaub
839ce50bde Merge pull request #7018 from jherico/qml 
QML fixes
 2016-02-03 11:59:27 -08:00
Stephen Birarda
93530fca72 fix the last of the current override warnings for OS X 2016-02-03 11:08:41 -08:00
Bradley Austin Davis
f24f2749e1 Make users.js show QML window for edit friends 2016-02-02 15:19:12 -08:00
Brad Hefta-Gaub
6779bc4073 Merge pull request #7000 from jherico/qml 
Snapshot UI in QML
 2016-02-01 14:00:25 -08:00
Brad Davis
27c38599a9 Snapshot dialogs 2016-02-01 11:07:48 -08:00
howard-stearns
9601b65269 Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible 2016-01-29 11:40:13 -08:00
Brad Davis
aa03241dd9 Make all load script dialogs QML and respect previous script location 2016-01-28 15:53:04 -08:00
howard-stearns
1225e50581 One round of billboard shredding. Server/wire/AvatarData have not been 
touched.
 2016-01-27 16:15:43 -08:00
Brad Davis
b8109af196 Ignite the atmosphere 2016-01-21 15:15:15 -08:00
Leonardo Murillo
098b7a4ff3 Merge pull request #6870 from birarda/console 
Your Stack Manager is now a Server Console
 2016-01-21 14:31:34 -06:00
Stephen Birarda
8bc063e758 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-19 16:21:19 -08:00
Brad Hefta-Gaub
bcdff7ba4a fix premature octree query before preferences are loaded 2016-01-19 13:11:11 -08:00
Brad Hefta-Gaub
d10e1cc39d CR feedback, dead code cleanup 2016-01-18 12:09:21 -08:00
Stephen Birarda
275fa1c5c7 fix for override warnings with clang on OS X 2016-01-15 15:41:34 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Brad Davis
dcc6739bce Final functionality for running scripts 2016-01-12 12:40:46 -08:00
Brad Davis
21534cbde0 Layout for running scripts 2016-01-12 12:40:42 -08:00
Brad Davis
d1d178787c PR comments 2016-01-11 12:55:23 -08:00
Brad Davis
d28f80aa07 Moving running scripts functionality to scripting library 2016-01-11 12:44:03 -08:00
Stephen Birarda
404fb2f781 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-07 16:02:32 -08:00
Brad Hefta-Gaub
1508a637ab Menu restructuring 2016-01-07 12:09:02 -08:00
Anthony J. Thibault
bac6570655 Interface support for avatar attachments from Marketplace 
Drag and drop support of ava.json files is also supported and
at the moment the only way to test.

To test:

1. Create a cowboyhat.ava.json file on your hard-drive, with the following contents:
    {
        "version": "0.1",
        "name": "Cowboy Hat",
        "modelUrl": "https://s3.amazonaws.com/hifi-public/tony/cowboy-hat.fbx",
        "jointName": "Head",
        "transform": {
            "rotation": {"x": 0, "y": 0, "z": 0, "w": 1},
            "translation": {"x": 0, "y": 0, "z": 0},
            "scale": {"x": 1, "y": 1, "z": 1}
        },
        "isSoft": false
    }
2. Create a leatherjacket.ava.json file, with the following contents:
    {
        "version": "0.1",
        "name": "Leather Jacket",
        "modelUrl": "https://hifi-content.s3.amazonaws.com/ozan/dev/clothes/coat/coat_rig.fbx",
        "isSoft": true
    }
3. Run interface
4. Drag-and-Drop cowboyhat.ava.json onto the main Interface window.
5. You should be prompted wear the 'Cowboy Hat' attachment.
6. If you select 'Yes', the cowboy hat should appear on the avatar.
7. Do the same with leatherjacket.ava.json file.
 2016-01-04 17:50:45 -08:00
Stephen Birarda
6b4db2707e Merge branch 'console' into console-dev 2015-12-29 17:55:22 -08:00
Stephen Birarda
5887867ccf use a QLocalServer to handle multiple instance launches 2015-12-29 11:10:40 -08:00
Brad Davis
6ef77bc46a Support the marketplace in QML 2015-12-21 11:34:03 -08:00
Brad Hefta-Gaub
aa53900fa3 CR feedback 2015-12-15 15:40:50 -08:00
Brad Hefta-Gaub
3dcdfbc0f1 first cut at simulating mouse/reticle behavior with input contorllers 2015-12-15 13:59:22 -08:00
Seth Alves
d10221f53a merge from upstream 2015-12-10 11:21:36 -08:00
Brad Hefta-Gaub
589adde41e Merge pull request #6541 from howard-stearns/correct-target-frame-rate 
Don't limit avatar rendering when not vsync'd
 2015-12-10 11:17:23 -08:00
James B. Pollack
d21e4ff5e1 Merge pull request #6592 from huffman/script-engine-fixes 
Fix concurrency issues for bools in ScriptEngine
 2015-12-10 10:48:54 -08:00
Seth Alves
a59af2c1b2 Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready 2015-12-10 09:03:57 -08:00
Seth Alves
d09f70239c make entity-tree a global. change how network-requests to load model geometry are triggered 2015-12-10 09:03:53 -08:00
Howard Stearns
dd2d040253 Merge branch 'fix-sync-period-calc' into correct-target-frame-rate 2015-12-09 15:43:43 -08:00
Howard Stearns
d964032572 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc 2015-12-09 15:23:00 -08:00
Ryan Huffman
fc6a78d9ef Update scriptFinished signal to be a DirectConnection 2015-12-09 14:49:05 -08:00
Ryan Huffman
4bfce768ca Add locks around read/writes of _scriptEnginesHash 2015-12-09 14:48:33 -08:00
howard-stearns
1d65cbce88 Remove unneeded getTargetFramePeriod and isVSynchronized. 2015-12-08 18:08:57 -08:00
howard-stearns
9ae22800fe Merge branch 'fix-sync-period-calc' into correct-target-frame-rate 2015-12-08 17:32:53 -08:00
howard-stearns
32e4967ee0 cleanup 2015-12-08 16:38:05 -08:00
Seth Alves
164439b303 don't enable physics until an entire scene has been received from the entity server and until nearby (to MyAvatar) entities are ready 2015-12-08 13:53:39 -08:00
howard-stearns
9512c3f73d Debugging. 
Please enter the commit message for your changes. Lines starting
 2015-12-07 16:58:59 -08:00
Ryan Huffman
34138f07bd Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-07 08:58:47 -08:00
Howard Stearns
fa0ad1fe4d Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate 2015-12-04 16:12:22 -08:00
Ryan Huffman
89c412c324 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-04 11:38:28 -08:00
Brad Davis
60aa93c38c Fixing menu items in display plugins 2015-12-04 10:28:19 -08:00
Brad Davis
b9ace94ff1 Prototyping threaded present 2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents 
Parents
 2015-12-04 10:26:57 -08:00
Howard Stearns
d51785a259 Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate 2015-12-03 17:28:32 -08:00
Howard Stearns
375211e13b Use isVSynchronized in controller. 2015-12-03 11:29:13 -08:00
Howard Stearns
53bfcd17e2 Use plugins data for Application frame rate/period. 2015-12-02 16:41:16 -08:00
Brad Davis
0023c034c4 Fixing naming of GL classes 2015-11-30 18:27:03 -08:00
Seth Alves
5c327edd5a keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts 2015-11-30 14:08:07 -08:00
Ryan Huffman
99dd9646bc Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-30 10:20:13 -08:00
Seth Alves
cf39cac7fc attempt to make SpatiallyNestable data access thread-safe 2015-11-29 12:50:33 -08:00
Howard Stearns
f1e0742aeb Add getTargetFrameRate(). 2015-11-23 10:20:59 -08:00
howard-stearns
1ddcc62db9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2 2015-11-20 14:05:40 -08:00
howard-stearns
6c784256cb final(?) cleanup 2015-11-20 13:51:12 -08:00
howard-stearns
a366598598 snapshot. It works. 2015-11-20 11:48:44 -08:00
Howard Stearns
431a8c9584 cleanup 2015-11-19 17:12:50 -08:00
Ryan Huffman
2a416ebc61 Merge branch 'master' of https://github.com/highfidelity/hifi into received-message 2015-11-18 16:52:23 -08:00
Stephen Birarda
0e3d3451d7 make keep alive pings the responsibility of NL 2015-11-18 10:24:10 -08:00
Howard Stearns
fee13d4375 Rebuild on a new branch after original stopped building. 2015-11-17 20:06:25 -08:00
Anthony J. Thibault
50370479e4 Application.h: coding standard fixes 2015-11-05 11:03:32 -08:00
Anthony J. Thibault
69f1cfbcb9 Fixes for Mac build and crash on startup 
For some reason the qt code gen is getting confused by the #if 0
in 3DConnextionClient.h, so I added a stub implementation.

In Application.cpp the change of moving idle into paintGL had a sideeffect
of calling OffscreenGlCanvas before it was initialized.  To work around this
I added a guard to prevent calling idle before all the gl windows/widgets have
been initialized.
 2015-11-04 12:04:34 -08:00
Anthony J. Thibault
31f361d49c Moved fps timing to beginning of paintGL 
This should improve accuracy.

However the fps displayed can still sometimes be slightly greater then the
vsync, this is either due to timer accuracy problems or QTimer delay within
OpenGLDisplayPlugin.
 2015-11-03 15:51:18 -08:00
Anthony J. Thibault
c139b62217 fps calculation now based on moving average 
fps stat is now calcualted the same way as simRate and avatarRate are calculated,
based on a moving average that is sampled once a second.
Also, Removed unused constants and renamed Application::checkFPS to Application::ping
 2015-11-03 11:19:49 -08:00
Brad Hefta-Gaub
05dea847be add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu 2015-10-31 15:47:40 -07:00
Brad Davis
c4e82a85d9 Remove DeviceProxy in favor of InputDevice 2015-10-29 09:32:56 -07:00
samcake
fc15c7cd98 Adding the ApplicationStateDevice to the APplication class and add one entry ythere 2015-10-28 12:15:14 -07:00
Brad Hefta-Gaub
5a42991e0c first pass at cleaning up MyAvatars use of PalmData 2015-10-27 13:51:42 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:20:28 -07:00
Brad Davis
57be59935d Move controller test to app 2015-10-17 19:13:38 -07:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Brad Davis
0063f9ae1d Merging old and new controller interfaces 2015-10-14 15:16:54 -07:00
Howard Stearns
93e908a592 Don't reload/recenter some avatar data on startup, when we don't necessarilly have all the required data initialized. 2015-10-13 12:15:13 -07:00
Atlante45
eea89ba010 CR - Rename method 2015-10-12 14:26:28 -07:00
Atlante45
7b41efcf86 All file types eligible for upload to asset server 2015-10-12 13:35:21 -07:00
Atlante45
2229f942df Spawn fbx dropped in front of avatar 2015-10-09 12:23:19 -07:00
Atlante45
b666acdb26 Add fbx upload on drop 2015-10-09 12:23:19 -07:00
Atlante45
327154b0c0 Make _acceptedExtensions static const 2015-10-09 12:23:19 -07:00
Brad Hefta-Gaub
bfd014203e fix a bunch of warnings 2015-10-07 14:48:42 -07:00
Atlante45
7b25c9d417 More header cleanup 2015-10-06 13:57:50 -07:00
Atlante45
b63df98b8b More unused 2015-10-06 13:57:49 -07:00
Atlante45
17edd38cb9 Remove unused variables 2015-10-06 13:57:48 -07:00
Atlante45
e9b7125894 Misc cleanup 2015-10-06 13:56:26 -07:00
Atlante45
5e9425d9eb Fix view frustum preference 2015-10-06 13:56:25 -07:00
Atlante45
60ebd3a544 Remove unused members (Mostly mouse stuff) 2015-10-06 13:56:25 -07:00
Atlante45
35e2f8cd89 Removed _myAvatar from Application 2015-10-06 13:56:25 -07:00
Atlante45
2fc80e58b6 Fix warning 2015-10-06 13:56:24 -07:00
Atlante45
9c7a480fda Remove shadowMatrices/Distances 2015-10-06 13:56:23 -07:00
Atlante45
8c653c70fb Remove fps throttle from Application 2015-10-06 13:56:23 -07:00
Atlante45
4ccc2bbcd0 Enclose entire functions in ifdef 2015-10-06 13:56:23 -07:00
Atlante45
dde11c5cd1 More unused 2015-10-06 13:56:23 -07:00
Atlante45
34bba28775 More header cleanup 2015-10-06 13:56:22 -07:00
Atlante45
f55f146d1b More code cleanup 2015-10-06 13:56:22 -07:00
Atlante45
38f23ef79e Remove Application friend 2015-10-06 13:56:22 -07:00
Atlante45
311edabe51 More header cleanup 2015-10-06 13:56:21 -07:00
Atlante45
765608d0ff More unused 2015-10-06 13:56:21 -07:00
Atlante45
7da55747f5 Simplify friends window 2015-10-06 13:56:21 -07:00
Atlante45
77a7814854 Move sendPingPackets 2015-10-06 13:56:20 -07:00
Atlante45
e74df484cc Remove unused methods 2015-10-06 13:56:20 -07:00
Atlante45
a5f31dba5f Fix startup timer 2015-10-06 13:56:20 -07:00
Atlante45
0aab013a0e Remove unused members 2015-10-06 13:56:20 -07:00
Atlante45
92e974929c Move tray icon to MainWindow 2015-10-06 13:56:19 -07:00
Atlante45
0f18db886c Remove 4 Application static methods 
- Replace by lambda
- Cleaned up global scope
 2015-10-06 13:56:19 -07:00
Atlante45
cf3b33a96b Replace Application::getInstance() with qApp 2015-10-06 13:56:19 -07:00
Brad Hefta-Gaub
d14820d3ef Merge pull request #5880 from thoys/20668 
Worklist job #20668 - JS: Add option to listen audio from camera
 2015-09-23 20:40:32 -07:00
Thijs Wenker
f38bb77d0a less calls to QHash 2015-09-22 18:48:46 +02:00
Thijs Wenker
90b89cbb45 Merge branch 'master' of https://github.com/worklist/hifi into 20655 2015-09-22 18:44:25 +02:00
Thijs Wenker
617f048883 Added JS interface to change audio listening position / orientation in Interface 
- MyAvatar.audioListenerMode  change using:   MyAvatar.FROM_HEAD    , MyAvatar.FROM_CAMERA , MyAvatar.CUSTOM
- MyAvatar.customListenPosition   and  MyAvatar.customListenOrientation are for manual listening positions
 2015-09-22 13:40:33 +02:00
Brad Hefta-Gaub
0ba1e8c945 remove renderingInWorldInterface signals 2015-09-18 09:49:57 -07:00
Thijs Wenker
9992f4b5c5 Made stopping scripts by hash (path/url) more tolerable and fixed stopping script functionality in ScriptDiscoveryService: 
made stopScript(string) to stop script by url or path and stopScriptName(string) to stop by filename
 2015-09-16 01:16:58 +02:00
Anthony J. Thibault
90f46ba2c8 Added hand state machines to AnimGraph. 
* Application: Forward trigger values to the MyAvatar's PalmData
* SkeletonModel: Pass PalmData to Rig via updateRigFromHandData() this is more explicit then
  the Rig::inverseKinematics methods.
* AnimNodeLoader & AnimOverlay: add support for LeftHand and RightHand bone sets
* Rig::updateRigFromHandData() read the triggers and set stateMachine trigger vars
* avatar.json - udpated with new hand state machine with temporary animations
 2015-09-14 18:54:12 -07:00
Seth Alves
e65ef93663 Merge pull request #5778 from jherico/homer 
Fixing some entity race condition crashes
 2015-09-11 17:54:53 -07:00
Andrew Meadows
9c6060160a Merge pull request #5784 from howard-stearns/rationalize-rig-settings 
Rationalize rig settings
 2015-09-11 16:56:44 -07:00
Brad Davis
9b81842850 Merge branch 'master' into homer 
Conflicts:
	assignment-client/src/octree/OctreeSendThread.cpp
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/EntityTreeElement.h
	libraries/entities/src/EntityTreeHeadlessViewer.cpp
	libraries/entities/src/RecurseOctreeToMapOperator.cpp
	libraries/octree/src/Octree.h
	libraries/physics/src/EntityMotionState.cpp
 2015-09-11 16:31:18 -07:00
Brad Davis
e458eb7ae9 Merge pull request #5734 from sethalves/octree-shared-pointers 
octree uses shared pointers
 2015-09-11 16:00:04 -07:00
Howard Stearns
67ce0966d1 Rationalize the rig state setters. 2015-09-11 11:52:20 -07:00
Brad Davis
aa989c3687 Fixing some entity race condition crashes 2015-09-10 20:53:17 -07:00
Howard Stearns
24f1387579 Consistently use brace initialization in class headers. 2015-09-09 10:34:08 -07:00
Seth Alves
9c4fdfd653 merge from upstream 2015-09-08 18:01:07 -07:00
Howard Stearns
eb67254e54 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 16:54:14 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Howard Stearns
0065c64b31 Snapshot of no-judder, before cleanup. 2015-09-07 09:57:05 -07:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Howard Stearns
c0fec44f32 Menu item to switch between threaded and not (without restart!). 2015-09-03 19:34:25 -07:00
Howard Stearns
32eb51d0fa Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-03 13:55:57 -07:00
Brad Davis
1f83d04423 Fix oculus crash on switching display plugin to something else 2015-09-02 18:28:43 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Howard Stearns
b3a919a5ca Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-27 13:46:12 -07:00
Brad Hefta-Gaub
79a9694d4a Merge pull request #5648 from ctrlaltdavid/20663 
Clean Interface.ini after a crash
 2015-08-27 10:52:25 -07:00
Brad Davis
270f2f7a3b Fixing framerate limit, moving vsync to 2d plugin 2015-08-26 15:47:45 -07:00
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Howard Stearns
828509e8eb Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-24 15:01:46 -07:00
David Rowe
07c9a0e2bb Add Developer > Crash Interface menu item 2015-08-24 10:48:58 -07:00
Brad Davis
d3135dcfa6 Stereo rendering work 2015-08-22 16:15:10 -07:00
Howard Stearns
ae3e052e72 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-21 08:13:44 -07:00
ZappoMan
6a7f367e5f fix throttled rendering for the 2D display plugin 2015-08-19 21:11:48 -07:00
Howard Stearns
dc75b238a8 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 
And update with current code.
 2015-08-18 15:35:37 -07:00
Stephen Birarda
0f77ab8611 resolve conflicts on merge with upstream/master 2015-08-18 11:45:55 -07:00
Seth Alves
e29bb9183b minimize diff 2015-08-18 02:08:21 -07:00
Seth Alves
8435550fe9 only update simRate once per second 2015-08-18 02:05:50 -07:00
Seth Alves
551f0aaba3 show how many times per second Application::idle is called 2015-08-18 01:41:17 -07:00
Howard Stearns
9ed418f7b6 Simple frequencey decoupling. Still same thread. 2015-08-17 19:19:11 -07:00
ZappoMan
b7d9dc444b more work on clicking focus 2015-08-17 13:06:32 -07:00
Brad Davis
208e41efd1 WebEntity keyboard input with mouse hover 2015-08-14 16:18:38 -07:00
David Rowe
3e8d0ad712 Fix to use new HMD methods 2015-08-11 13:40:08 -07:00
David Rowe
e6473fc8b9 Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.h
	tests/ui/src/main.cpp
 2015-08-11 12:34:28 -07:00
Bradley Austin Davis
7694c1c0a6 Cleaning up HMD tools 2015-08-10 21:39:36 -07:00
Brad Davis
5515b9d8ee Decouple Application and plugin definitions, cleanup container usage 2015-08-08 17:51:16 -07:00
Brad Davis
caf93d1aff Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.h
 2015-08-08 13:18:13 -07:00
David Rowe
051a398fa2 Merge branch 'master' into 20639 2015-08-07 18:26:56 -07:00
ZappoMan
87f609b9af remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows 2015-08-07 11:26:07 -07:00
Bradley Austin Davis
7e60aee1bf Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
 2015-08-06 11:03:37 -07:00
Stephen Birarda
052978898e resolve conflicts on merge with upstream master 2015-08-05 11:16:20 -07:00
David Rowe
c771574578 Add 5 point eye tracker calibration option 2015-08-04 18:02:34 -07:00
David Rowe
fefddb631f Add 1 and 3 point eye tracker calibration 2015-08-04 14:46:03 -07:00
David Rowe
b71ad31812 Merge branch 'master' into 20639 2015-08-03 20:53:12 -07:00
Zander Otavka
c77a91eb63 Expose address bar toggling to scripts. 2015-07-31 11:26:04 -07:00
Bradley Austin Davis
ac0ec0a458 Ensure the app moves back to a non-rift screen if the saved geometry is bad 2015-07-30 17:09:08 -07:00
Brad Davis
5878a4661c Restoring HMD tools dialog, phase 1 2015-07-30 11:35:55 -07:00
Brad Davis
382ef057b0 Revert to using QGLWidget 2015-07-30 10:59:05 -07:00
Brad Davis
8202862750 Working on display plugins stability 2015-07-28 16:22:22 -07:00
Brad Davis
2bb7a20578 Working on fullscreen targeting 2015-07-28 11:30:35 -07:00
David Rowe
e0ca6eb5ed Add eye tracker class and menu item 2015-07-27 15:33:15 -07:00
Bradley Austin Davis
7edf138843 Attempting to fix offscreen UI event handling 2015-07-25 19:26:38 -04:00
Stephen Birarda
82def6e15f resolve conflicts on merge with upstream/master 2015-07-24 15:40:35 -07:00
Bradley Austin Davis
975c95eded Merge remote-tracking branch 'tony/ajt/overlay-fade' into plugins 2015-07-24 13:59:11 -04:00
Bradley Austin Davis
a60e669d3d Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
samcake
52ac5b3ef6 On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize 2015-07-24 03:38:21 -07:00
Anthony J. Thibault
1d93abf90c Overlay can be shown and hidden and has better behavior in Standing HMD Mode. 
Added OverlayConductor class that "orchestrates" Overlays, ApplicationCompositor & AppliationOverlay instances
so that the overlay can be smoothly animated on and off, mouse/key events are blocked when overlay is disabled.
 2015-07-23 17:17:03 -07:00
Sam Gateau
a561874ce3 Render the rear view mirror in a separate target and then display it during overlay pass 2015-07-23 14:56:14 -07:00
Stephen Birarda
9e7fb9ae16 shuffle Packet headers, use static enum for PacketType 2015-07-23 13:56:47 -07:00
Bradley Austin Davis
4ad72be0c7 Merge remote-tracking branch 'sam2/sam/input-plugins' into plugins 2015-07-23 15:40:22 -04:00
Bradley Austin Davis
96a52c4f02 Working on mac oculus functionality 2015-07-23 15:38:23 -04:00
Sam Gondelman
4c6783a791 Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins 2015-07-23 11:46:07 -07:00
Bradley Austin Davis
40485948f9 Fixing merge boo-boos 2015-07-23 13:49:17 -04:00
Bradley Austin Davis
1db4162371 Merge branch 'master' into plugins 2015-07-23 13:42:03 -04:00
SamGondelman
e27ba86f75 fixing merge issues with plugins 2015-07-22 14:57:59 -07:00
SamGondelman
505ef4c5cc set up sixense/vive menu items with correct event forwarding 2015-07-22 11:36:31 -07:00
Sam Gateau
f70553ec95 Fixing merge 2015-07-22 11:31:46 -07:00
Sam Gateau
7ac2030862 Preparing for first pr 2015-07-22 10:43:50 -07:00
Bradley Austin Davis
408bb082d7 Merge fixes, OSX compile fixes 2015-07-22 13:24:47 -04:00
Bradley Austin Davis
114ab9e47f Merge branch 'master' into plugins 2015-07-22 11:47:56 -04:00
SamGondelman
e3bc4b3b89 working on plugin menu manipulation 2015-07-21 13:45:33 -07:00
Sam Gateau
7b35048e52 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-21 11:18:15 -07:00
Sam Gateau
93afdf79a3 Removing the gl driver version report intiialization code out of applciation 2015-07-21 11:17:41 -07:00
Bradley Austin Davis
fda1cb6f7b Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 08:59:29 -07:00
Brad Davis
9016f437a8 Merge pull request #5371 from Atlante45/smart_pointers 
Smart pointers fixes
 2015-07-21 08:52:29 -07:00
Brad Davis
5744200f64 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/MyAvatar.h
 2015-07-20 19:21:02 -07:00
Brad Davis
c3a2b72c13 Breaking framebuffer ops out of texture cache 2015-07-20 17:26:26 -07:00
Sam Gateau
9d9142c274 cleaning commented code supposedly dead now 2015-07-20 16:50:24 -07:00
Sam Gateau
b5090883a0 merge with latest network pr 2015-07-20 15:49:10 -07:00
Sam Gateau
59666f664a merging my changes to remove cruff from application to AUstin;s latest 2015-07-20 15:37:17 -07:00
Anthony J. Thibault
80dea6831c Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 
Conflicts:
	interface/src/Application.cpp
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
 2015-07-20 15:18:23 -07:00
Atlante45
8d6ff2d9f9 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 14:50:44 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -07:00
Brad Davis
359abd6474 Merge branch 'master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/GLCanvas.cpp
	interface/src/GLCanvas.h
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
	libraries/render-utils/src/OffscreenGlCanvas.cpp
	libraries/render-utils/src/OffscreenGlCanvas.h
	libraries/render-utils/src/text/EffectType.h
 2015-07-20 13:33:24 -07:00
Stephen Birarda
0177513285 resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
Sam Gateau
1a9f6e12a5 something not compiling but just before merge with upstream 2015-07-20 12:20:04 -07:00
Brad Hefta-Gaub
c41e20b90f Merge pull request #5366 from jherico/marge 
Naked GL removal work
 2015-07-20 12:12:22 -07:00
Atlante45
fc2956342e Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 10:39:16 -07:00
Stephen Birarda
6b11495a20 resolve conflicts on merge with upstream master 2015-07-20 08:51:48 -07:00
Philip Rosedale
61c2b172d4 Merge pull request #5357 from ctrlaltdavid/scriptable-muting 
Mute / un-mute face tracking when menu item is changed from script
 2015-07-18 15:45:01 -07:00
David Rowe
d0489bf2a0 Add menu item, Developer > Render > Throttle FPS If Not Focus 2015-07-18 14:18:06 -07:00
Brad Davis
b7fdfd8663 Working on lighting 2015-07-18 10:55:53 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Anthony J. Thibault
01c740f415 cleaning up plugin architecture, fixed hand controllers 2015-07-17 17:19:49 -07:00
ZappoMan
26e8090ec1 Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL 2015-07-17 16:48:42 -07:00
Stephen Birarda
1fd4a1f0c3 resolve conflicts on merge with upstream master 2015-07-17 16:07:45 -07:00
Stephen Birarda
54edc6f993 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-07-17 16:04:45 -07:00
David Rowe
550e9224c5 Mute / un-mute face tracking when menu item is changed from script 2015-07-17 11:45:15 -07:00
Stephen Birarda
e5722098f6 resolve conflicts on merge with upstream/master 2015-07-17 11:06:01 -07:00
Stephen Birarda
7d60b86f52 kill the PacketLister (AKA Huffman 1 : PacketListener 0) 2015-07-17 09:07:39 -07:00
Brad Davis
7f6bb552a3 Working on cleaning up diff 2015-07-16 20:51:37 -07:00
Anthony J. Thibault
e8da4b9586 merge with plugins, needs testing 2015-07-16 18:47:39 -07:00
Anthony J. Thibault
060f6c19a6 almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly 2015-07-16 18:16:59 -07:00
Brad Davis
ae882c8347 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationCompositor.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-07-16 16:37:55 -07:00
ZappoMan
398075e45a hacking on more naked GL 2015-07-16 16:26:28 -07:00
Anthony J. Thibault
56e7af081e input plugin architecture, fixed sixense 2015-07-15 18:50:44 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
Atlante45
aa517adb73 Fix Application inheritance formatting 2015-07-15 13:09:34 -07:00
bwent
70e3e7caa4 Merge branch 'master' into audioStatsDialog 2015-07-15 12:29:33 -07:00
bwent
5b0b7229ba Added a dialog box to display audio network statistics 2015-07-15 11:10:39 -07:00