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

1329 commits

Author SHA1 Message Date
Brad Davis
9bef5f011b Reverting mirror functionality 2015-06-19 00:03:46 -07:00
Brad Davis
0fa6ac175f Merge branch 'master' into overlay 2015-06-18 21:56:11 -07:00
Brad Hefta-Gaub
a7a53d8be7 Merge pull request #5148 from SamGondelman/rotationModes 
center player in view mode
 2015-06-18 18:02:47 -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
4762e1a00c Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
 2015-06-16 21:01:00 -07:00
Brad Davis
ba13b7820c Working on overlay refactor 2015-06-16 09:58:03 -07:00
Sam Gondelman
22961fcc9d added camera mode to keep player in center of view 2015-06-15 15:44:56 -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
a26373bd3a Fixing merge problem 2015-06-12 17:28:38 -07:00
Brad Davis
7955eeda28 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
 2015-06-12 15:49:35 -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
Brad Davis
7f6a49688a Merge branch 'master' into plugins 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Environment.cpp
	interface/src/Environment.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationOverlay.h
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-06-10 14:21:48 -07:00
Leonardo Murillo
8f72763f17 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-10 13:18:20 -06: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
c360dde71a Merge branch 'master' into render_cursor 
Conflicts:
	interface/src/Application.cpp
 2015-06-08 20:18:32 -07:00
ZappoMan
8fa31ec521 dead code removal machine 2015-06-08 14:30:31 -07:00
Brad Davis
b3534210e4 Always use GL rendered cursor 2015-06-08 11:51:35 -07:00
Brad Davis
1b7efe9a02 Working on display plugins 2015-06-05 00:00:57 -07:00
Sam Gondelman
984d449bf9 exposed input key bindings to js to enable key remapping 2015-06-04 16:29:58 -07:00
Leonardo Murillo
cefdbc3126 Checkpoint auto updater 2015-06-02 19:32:03 -06:00
Brad Davis
f22682fe39 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2015-06-01 22:59:10 -07:00
Sam Gateau
cd7914ad9d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-06-01 17:31:39 -07:00
Sam Gateau
bd7c22e715 Trying to transfer the rnedering from displaySide to RenderDeferredTask 2015-06-01 17:31:00 -07:00
ZappoMan
d4af454834 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-01 14:42:35 -07:00
Brad Davis
23d6725a6a Consolidating GL display plugins 2015-05-31 00:24:19 -07:00
Brad Davis
912c003d58 Making (most) plugins into a library 2015-05-29 16:49:11 -07:00
Sam Gondelman
4c83c6918d fixed avatar billboards not displaying 2015-05-29 16:44:16 -07:00
Ryan Huffman
3f5b115c67 Move _overlays after scene in Application so it destructs first 2015-05-29 14:55:32 -07:00
Brad Hefta-Gaub
bcc24c9762 Merge pull request #4975 from huffman/scene-avatar 
Team Teaching - Move avatar rendering to Scene pipeline
 2015-05-27 17:13:10 -07:00
Ryan Huffman
f972e84d6c Move avatar renedering to Scene 2015-05-27 12:40:26 -07:00
ZappoMan
2516066e1d some hacking 2015-05-27 10:40:07 -07:00
Brad Davis
b5e6b737c4 Working on display plugins 2015-05-26 17:32:41 -07:00
Sam Gateau
f0ab6d96f5 merge with upstream team-teaching 2015-05-24 19:45:37 -07:00
Sam Gateau
35b8d45bee Insert a first scene and the engine in the Application and render a first Item 2015-05-24 17:03:43 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
Ryan Huffman
4a4c9c75fc Add gpu::context to RenderArgs and start using RenderArgs in place of the flags 2015-05-22 09:50:51 -07:00
Brad Davis
ac93d2c721 Working on display plugins 2015-05-21 18:50:11 -07:00
Brad Davis
c0d84cfc54 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
 2015-05-21 11:04:06 -07:00
Brad Davis
7f2552c690 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
 2015-05-16 22:38:15 -07:00
David Rowe
ff7b2016b4 Add option to auto mute microphone after lose face tracking 2015-05-14 08:50:43 -07:00
Brad Hefta-Gaub
77019eafa7 Merge pull request #4831 from jherico/plugins_pt2 
Display plugins part 2
 2015-05-13 20:40:33 -07:00
Bradley Austin Davis
a0097bcff8 Fixing offscreen rendering on retina display, even without a proxy window 2015-05-13 12:26:46 -07:00
Brad Davis
abab54aed8 Working on display plugins 2015-05-11 13:08:53 -07:00
Seth Alves
ead200b77a remove unneeded code 2015-05-11 12:03:10 -07:00
Seth Alves
de9e74a725 put max-octree-pps in Application rather than in the Octree 2015-05-11 12:01:13 -07:00
Seth Alves
83748096ef max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree 2015-05-11 11:37:53 -07:00
Brad Hefta-Gaub
bfb2b278ee Merge pull request #4791 from jherico/scale 
Fixing scale resolution issues
 2015-05-08 15:54:24 -07:00
Bradley Austin Davis
0751443a01 Merge branch 'master' into scale 2015-05-08 15:03:24 -07:00
Bradley Austin Davis
9974eb0357 Merge branch 'master' into plugins 2015-05-08 10:49:28 -07:00
Bradley Austin Davis
5e821b4447 Updating plugins 2015-05-07 22:32:28 -07:00
Bradley Austin Davis
efa88ba122 Merge branch 'scale' into plugins 2015-05-07 12:52:13 -07:00
Bradley Austin Davis
c31d36be59 Fixing scale resolution issues 2015-05-07 12:01:56 -07:00
Bradley Austin Davis
b73ce81a2d Working on plugin architecture 2015-05-06 22:28:34 -07:00
Bradley Austin Davis
0d509ceeea Working on merging 2015-05-06 15:07:31 -07:00
Seth Alves
fe06ce2931 pull from upstream 2015-05-06 14:31:22 -07:00
Bradley Austin Davis
77a9f7fa2a Merge branch 'plugins_pt1' into plugins 2015-05-06 14:22:13 -07:00
Bradley Austin Davis
fc73676b4d Merge branch 'master' into plugins_pt1 2015-05-06 11:43:25 -07:00
Seth Alves
238a41f2b9 pull from upstream 2015-05-06 11:22:18 -07:00
David Rowe
1c21874f00 Make face tracker mute action start / stop face tracker 2015-05-05 16:51:31 -07:00
David Rowe
35dbb9491c Merge branch 'master' into 20518 2015-05-05 13:13:49 -07:00
Seth Alves
8aafce6382 Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1 2015-05-05 12:53:28 -07:00
Andrew Meadows
aa5a59c3dc merge upstream/master into andrew/nova 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/PhysicsEngine.cpp
 2015-05-05 10:24:17 -07:00
ZappoMan
77232e35f8 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones 2015-05-04 17:16:33 -07:00
ZappoMan
4561c59203 wire up zone to environment atmosphere rendering 2015-05-04 13:49:43 -07:00
Bradley Austin Davis
8119e3d629 Merging back from part 1 2015-05-04 11:35:28 -07:00
Sam Gateau
c7153bcc14 fixing commetns from review 2015-05-04 10:40:11 -07:00
Sam Gateau
c9b296693c bringing the UserInputMapper to the application 2015-05-03 15:45:19 -07:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
Andrew Meadows
0a102575ee fix simulation ownership infection 2015-05-01 16:56:00 -07:00
Brad Davis
d8415ce79b Working on display plugins 2015-05-01 15:14:50 -07:00
David Rowe
528f73897c Make double click face tracking toggle button reset tracking 2015-04-30 23:14:23 -07:00
David Rowe
d053379831 Add "Mute Face Tracking" menu item 2015-04-30 23:14:21 -07:00
Brad Davis
ba4ae3762d Working on merging in master 2015-04-30 22:01:03 -07:00
Brad Davis
031b294ae5 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Camera.cpp
	interface/src/Camera.h
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/ApplicationOverlay.h
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/GlowEffect.h
	libraries/render-utils/src/TextureCache.cpp
 2015-04-30 12:14:07 -07:00
Andrew Meadows
087d0a027d merge upstream/master into andrew/nova 2015-04-28 10:07:49 -07:00
Andrew Meadows
34974272af proposal for PhysicsEngine API in Application 2015-04-28 10:06:05 -07:00
Brad Davis
f49f37ac89 Merge pull request #4670 from thoys/fix-run_one_interface_per_user 
Multiple instances of interface on Windows (one per user)
 2015-04-28 01:22:21 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Brad Davis
c4d2bd2cda More coding standard fixes 2015-04-22 19:18:09 -07:00
Brad Davis
7a33474245 Merge remote-tracking branch 'upstream/master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-21 13:02:38 -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
David Rowe
6b085ca668 Move method out of Menu class 2015-04-17 10:53:04 -07:00
Brad Davis
ce6b7e7aec Merge branch 'master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-16 14:02:40 -07:00
Clément Brisset
d6ee1c708d Merge pull request #4642 from ZappoMan/avatarUI 
New Avatar UI
 2015-04-15 19:13:23 +02:00
Brad Davis
1563b05278 Merge branch 'master' into offscreen 2015-04-15 10:01:15 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
ZappoMan
ae16bab7c2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2015-04-14 13:13:15 -07:00
Brad Davis
9f0d410387 Working on decoupling rendering 2015-04-13 23:15:51 -07:00
David Rowe
3b6a35c38f Merge branch 'master' into 20447 2015-04-13 17:22:34 -07:00
Atlante45
a3f8076641 Quit VRMode before aboutToQuit runs 2015-04-06 17:55:48 +02:00
David Rowe
00f5469fa8 Add menu item that resets DDE tracking 2015-04-04 17:31:32 -07:00
ZappoMan
1a463a0256 more work on improved avatar UI adding model names and backward compatible support 2015-04-03 17:03:22 -07:00
ZappoMan
aaf191b6dc first cut at new avatar preferences UI 2015-04-03 14:31:43 -07:00
David Rowe
49de54de48 Use improved WebWindowClass for friends window 2015-04-01 18:58:59 -07:00
David Rowe
96e888864a Merge branch 'master' into 20422 2015-04-01 14:56:48 -07:00
David Rowe
e519928320 Move friends window to own class 2015-04-01 11:38:32 -07:00
David Rowe
e06f28b7c5 Merge branch 'master' into 20422 
Conflicts:
	examples/users.js
	interface/src/Application.cpp
 2015-03-31 21:01:54 -07:00
ZappoMan
d68143675a first simple pass at using marketplace windows in preferences 2015-03-31 16:24:27 -07:00
Seth Alves
186cb1ec7a merge from upstream 2015-03-30 11:28:47 -07:00
David Rowe
be69c0b58f Add add/remove friends menu item 
This must display the dialog whether or not users.js is running. Both
C++ and JavaScript need to open or restore the same dialog, hence a new
dialog rather than using WebWindow with its JavaScript baggage.
 2015-03-28 13:05:23 -07:00
David Rowe
90c1da2094 Merge branch 'master' into 20416 
Conflicts:
	examples/notifications.js
 2015-03-27 12:13:29 -07:00
Seth Alves
7da87d6e15 set up a way to request ResourceCache downloads from a non-networking thread. 2015-03-26 18:37:55 -07:00
Brad Hefta-Gaub
918154e407 Merge pull request #4491 from huffman/export-json 
Update export entities to export as JSON
 2015-03-25 16:49:23 -07:00
Ryan Huffman
3f986229d1 Rename edit-entities-commands.html to edit-commands.html 2015-03-24 13:43:10 -07:00
Ryan Huffman
6d932508ff Add support for .svo.json extension 2015-03-24 10:27:53 -07:00
David Rowe
cb6abfb2e6 Display notification if domain connection refused 2015-03-23 12:05:56 -07:00
ZappoMan
c5314aceac more DRYing up of code 2015-03-19 11:57:57 -07:00
ZappoMan
3c41ecd091 cleanup accepted files implementation 2015-03-19 11:29:41 -07:00
ZappoMan
8e0141b8e9 first cut at fst drag/drop support 2015-03-19 08:48:13 -07:00
ZappoMan
a2e012f7a9 Merge branch 'master' of https://github.com/highfidelity/hifi into runJSFiles 2015-03-18 11:53:19 -07:00
Brad Davis
e616308911 Adding runtime check to ensure that the correct frustum is fetched during rendering 2015-03-17 16:28:44 -07:00
Brad Davis
895a0d7b85 Correcting frustum usage by the avatar renderer that was causing aspect ratio problem 2015-03-17 16:14:35 -07:00
ZappoMan
749bc1ee9b support for loading of JS files by drag, web page urls, and openfile events 2015-03-17 08:38:39 -07:00
Ryan Huffman
aca509d5cc Add Application::improtSVOFromURL 2015-03-13 17:35:06 -07:00
Stephen Birarda
7bfc747748 Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"" 
This reverts commit 9269b2a0b2.
 2015-03-12 12:13:32 -07:00
Stephen Birarda
9269b2a0b2 Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList" 2015-03-12 11:28:07 -07:00
Stephen Birarda
4da9186045 Merge pull request #4429 from birarda/master 
NOT MERGEABLE: graceful cleanup on Application dtor for NodeList
 2015-03-12 11:26:56 -07:00
Atlante45
d858956ad8 Merge branch 'master' of https://github.com/highfidelity/hifi into package_models 2015-03-12 16:31:03 +01:00
Stephen Birarda
5d9a3811ca more graceful cleanup for Application NodeList and DatagramProcessor 2015-03-11 17:14:20 -07:00
Ryan Huffman
c3c2a75f48 Handle .svo drop events and emit svoImportRequested 2015-03-11 15:38:15 -07:00
Atlante45
9b80c01357 Remove ModelUploader from the menu 2015-03-11 16:21:36 +01:00
Brad Hefta-Gaub
04837d5302 Merge pull request #4390 from ctrlaltdavid/20287 
CR for 20287 - Don't show the application menu bar when in full screen
 2015-03-10 16:36:11 -07:00
ZappoMan
feddea821a cleanup import from file vs url 2015-03-10 12:35:12 -07:00
David Rowe
2df3eed31e Merge branch 'master' into 20287 
Conflicts:
	interface/src/Application.h
 2015-03-10 09:31:15 -07:00
Stephen Birarda
0658b54263 move location update to DiscoverabilityManager 2015-03-09 16:48:39 -07:00
Brad Hefta-Gaub
e2a367607a Merge pull request #4384 from ctrlaltdavid/20369 
CR for Job #20369 - Uploaded avatars without skeletons crash Interface
 2015-03-08 11:42:07 -07:00
David Rowe
22d9ff2788 Show/hide menu bar in non-VR fullscreen 2015-03-06 14:36:08 -08:00
Ryan Huffman
6848025504 Add exporting by entity ID to Application 2015-03-05 13:36:16 -08:00
Ryan Huffman
71768ef275 Return entity IDs on paste 2015-03-05 12:36:45 -08:00
Ryan Huffman
a922619ebc Add Clipboard.exportEntities that takes a list of entity IDs 2015-03-05 12:36:10 -08:00
David Rowe
aad3f1dfd9 Automatically switch to default model if avatar model is skeletonless 2015-03-03 22:34:07 -08:00
samcake
6b1f42df83 Merge pull request #4366 from ZappoMan/removeMetavoxels 
remove metavoxels
 2015-03-03 15:50:53 -08:00
Stephen Birarda
5a601f3676 resolve conflicts on merge with upstream/master 2015-03-03 10:01:24 -08:00
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Stephen Birarda
fc2f6d47bb remove references to PrioVR in interface code 2015-02-26 17:28:00 -08:00
Atlante45
f560f97c6b Only update active FaceTracker 2015-02-26 19:18:05 +01:00
ZappoMan
a89691fc66 switch GLCanvas back to being owned by Application 2015-02-25 12:11:35 -08:00
Andrew Meadows
0455ccf7be Merge pull request #4313 from ctrlaltdavid/20355 
CR for 20355 - Initial Integration with DDE
 2015-02-23 09:47:19 -08:00
Clément Brisset
d2ed782626 Merge pull request #4308 from Triplelexx/20315 
CR for Job #20315 - Update contents of the "welcome to Interface" dialog
 2015-02-19 10:27:27 -08:00
David Rowe
c446e72226 Add Face Tracking menu item to select the face tracker to use 
Includes new DDE Face Regression option.
 2015-02-18 12:39:51 -08:00
Kai Ludwig
d659ac573a now all application timers should get stopped correctly on exit 2015-02-18 19:53:45 +01:00
Triplelexx
81d4af86a7 Merge remote-tracking branch 'upstream/master' into 20315 2015-02-13 23:23:19 +00:00
Triplelexx
a968c0dcf9 Code revision & integration 
Change C++ source to use new HTML file. Old file deleted.
HTML formatting revised, some incorrect code pulled.
 2015-02-13 00:07:56 +00:00
Stephen Birarda
6c25205856 fix audio cleanup and close action in Application 2015-02-12 13:35:22 -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
Brad Hefta-Gaub
a4541758cf Merge pull request #4245 from ctrlaltdavid/20301 
CR for Job #20301 - Windows: If I'm running Interface go to a place via hifi://, don't start another instance of the app
 2015-02-06 14:19:10 -08:00
David Rowe
ec590791df Merge branch 'master' into 20301 2015-02-06 13:23:59 -08:00
Stephen Birarda
219e78425b resolve conflicts on merge with upstream master 2015-02-06 09:49:46 -08:00
David Rowe
ab758648c7 Show and focus on the other Interface instance 2015-02-05 16:44:26 -08:00
Thijs Wenker
de3afa0637 keep a boolean for cursorHidden state, so we know when to hide the VR-mode-cursor while the normal cursor is hidden 2015-02-05 00:19:45 +01:00
Thijs Wenker
9dbcefed2a Fix for making cursor invisible over the glwidget and js-interface to cursorVisible boolean 2015-02-04 23:23:27 +01:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Brad Hefta-Gaub
de58c4a007 Merge pull request #4217 from Atlante45/master 
Fix for fps bug/field of view
 2015-02-03 19:13:52 -08:00
Atlante45
875507aaaa Missing return 2015-02-03 15:58:24 -08:00
David Rowe
d9e353e498 Merge branch 'master' into 20280 
Conflicts:
	libraries/networking/src/LimitedNodeList.h
 2015-02-03 14:46:27 -08:00
Atlante45
aacf61609f Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-03 10:53:44 -08:00
Stephen Birarda
e07ce23825 resolve conflicts on merge with upstream master 2015-02-03 10:25:17 -08:00
Atlante45
cc58cb0f03 Update domain-server and Application setting handles 2015-02-02 20:06:13 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
Seth Alves
4377105410 formatting and cleanups 2015-02-02 12:13:54 -08:00
Seth Alves
c0a219678c use DependencyManager to keep track of BandwidthRecorder 2015-02-02 08:55:55 -08:00
Seth Alves
fc07ecf83d use BandwidthRecorder rather than recompute Mbps and pps in Application 2015-01-31 20:40:18 -08:00
David Rowe
3c7cdc16ce Merge branch 'master' into 20280 
Conflicts:
	interface/src/Application.h
 2015-01-30 18:44:14 -08:00
Seth Alves
eda7785d3b minor edit to make diff nicer 2015-01-30 14:41:03 -08:00
Seth Alves
620efb2bbe change display style of bandwidth detail dialog, include a totals line 2015-01-30 13:43:28 -08:00
Seth Alves
f0edba9a6b Start on refactoring of bandwidth metrics 2015-01-30 11:11:17 -08:00
Atlante45
2d973e5288 Move updateMyAvatar to AvatarManager 2015-01-29 16:55:32 -08:00
Atlante45
647a935eaa Remove app->getAvatar 2015-01-29 15:16:40 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
 2015-01-28 13:13:32 -08:00
Atlante45
c25ae9d506 Merge branch 'android' of git://github.com/birarda/hifi into android 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityCollisionSystem.cpp
	libraries/entities/src/EntityCollisionSystem.h
 2015-01-27 15:04:17 -08:00
Stephen Birarda
54660dd1a2 resolve conflicts on merge with upstream master 2015-01-27 14:24:48 -08:00
David Rowe
44083dd343 Add user warning if domain has mismatched packet versions 2015-01-27 13:10:11 -08:00
Atlante45
20358a87d6 Moved some headers around 2015-01-27 01:43:01 -08:00
Atlante45
dbdb87a1a2 Moved Menu dependency out of audio 2015-01-27 01:21:59 -08:00
Atlante45
71b565c33c Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 
Conflicts:
	interface/src/Application.cpp
 2015-01-27 01:21:33 -08:00
Atlante45
4fce5113dd Use DM to access AvatarHashMap/Manager 2015-01-23 11:50:27 -08:00
Andrew Meadows
1b7074e52a purge EntityCollisionSystem 2015-01-21 14:16:34 -08:00
Stephen Birarda
d2af9a2911 have Application pass audio pos/orientation to AudioClient 2015-01-21 12:03:11 -08:00
Stephen Birarda
e28ca27ccd add a position and orientation getter for AudioClient 2015-01-21 11:55:12 -08:00
Andrew Meadows
86583f3f3f physics collisions emit script collision events 2015-01-21 11:27:32 -08:00
Atlante45
77bab2a8c2 Setup Thread and timer for settings 2015-01-20 17:11:46 -08:00
Atlante45
2b3f12a7c4 More settings hooks 2015-01-20 16:52:42 -08:00
Atlante45
d15d8e0ad6 ScriptsLocation uses new settings 2015-01-19 16:45:10 -08:00
Atlante45
c1e195d17b Remove load/saveSettings from Menu/Application 
Tweaked scanMenuBar too
 2015-01-19 16:24:58 -08:00
Atlante45
43597ea29d Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
 2015-01-19 14:18:22 -08:00
Atlante45
967028e5cf Removed more QSettings references 2015-01-18 19:29:27 -08:00
Atlante45
c2b7ff1b54 Totally removed Application's setting memember 2015-01-18 19:10:30 -08:00
Atlante45
6bda5de5e5 Move (re)storeSizeAndGeometry out of Application 
Moved to MainWindow
 2015-01-18 18:24:44 -08:00
Atlante45
5266ae5397 firstRun uses new Settings 2015-01-18 18:24:28 -08:00
Atlante45
1f31828e08 Moved last methog out of Menu 
Also did a bit of Header cleanup
 2015-01-18 07:14:52 -08:00
Atlante45
e7a2b0296b Removed Menu::bumpSettings() 2015-01-18 06:57:59 -08:00
Atlante45
8933da7bc7 Moved SpeechRecognizer out of Menu 
Added it in the DM
 2015-01-18 06:50:34 -08:00
Atlante45
fdce0baee9 Removed vsync slot from menu 2015-01-18 05:39:53 -08:00
Atlante45
e8a396b08b Moved Octree max pps out of Menu 
Moved it to OctreeQuery
 2015-01-17 23:31:38 -08:00
Atlante45
8996bf8e0d Use qApp 
Reuse qApp global variable following Qt's pattern
 2015-01-16 15:26:42 -08:00
Andrew Meadows
d5119b3532 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/EntityMotionState.h
	libraries/physics/src/ObjectMotionState.cpp
	libraries/physics/src/PhysicsEngine.cpp
	libraries/physics/src/PhysicsEngine.h
 2015-01-16 14:36:27 -08:00
Philip Rosedale
1ff90bec5d Merge pull request #4124 from AndrewMeadows/inertia 
support for simple kinematic motion
 2015-01-16 13:33:44 -08:00
Sam Gateau
d1fb071208 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:38:53 -08:00
Andrew Meadows
250fd98fee support for simple kinematic motion 2015-01-15 17:51:01 -08:00
Philip Rosedale
048d190350 Merge pull request #4108 from ctrlaltdavid/20263 
CR for Job #20263 - Create a "Bookmarks" capability
 2015-01-15 10:30:41 -08:00
Andrew Meadows
ff171a5782 Bullet is now required dependency 2015-01-15 10:27:43 -08:00
David Rowe
95efe9857b Merge branch 'master' into 20263 2015-01-15 09:52:19 -08:00
Ryan Huffman
00487fb175 Fix issue with avatar data being sent too often 2015-01-15 09:45:51 -08:00
David Rowe
fa6faa771a Add bookmarks with Bookmark Location menu item 
The menu of bookmarks is kept sorted.
 2015-01-13 22:39:16 -08:00
Atlante45
36db547c0f Setup DependencyManager before any member of Application 2015-01-13 20:35:45 -08:00
ZappoMan
873403a333 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Audio.h
	interface/src/Menu.cpp
	interface/src/Menu.h
 2015-01-06 12:27:16 -08:00
ZappoMan
0e943ae240 remove render view frustum mode 2015-01-05 17:23:10 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
Stephen Birarda
dfb02aea0c resolve conflicts on merge, add cstring inc 2015-01-05 09:25:30 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
ZappoMan
95bb125e48 more voxelEctomy 2014-12-30 20:13:57 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
ZappoMan
e1d8022409 working on removing voxels 2014-12-30 14:11:31 -08:00
Stephen Birarda
c7a5f3c86c resolve conflicts and merge with upstream master 2014-12-29 10:59:42 -07:00
Andrew Meadows
9b7e50858a merge upstream/master into andrew/inertia 
Conflicts:
	libraries/avatars/CMakeLists.txt
	libraries/entities/CMakeLists.txt
 2014-12-29 09:15:49 -08:00
Atlante45
da636ca918 ModelUploader only has static methods accessible 2014-12-23 14:00:23 -08:00
Atlante45
879c3e2fd0 Add entity model upload 2014-12-23 12:30:00 -08:00
Stephen Birarda
1ab66c2bfe split port and hostname for cleaner domain changes 2014-12-18 16:17:03 -08:00
Andrew Meadows
85fd1fc14f merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.cpp
 2014-12-18 13:46:06 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -08:00
Andrew Meadows
6ea766b48d merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTypes.cpp
 2014-12-17 13:21:00 -08:00
ZappoMan
1a9cf126e4 Merge branch 'master' of https://github.com/highfidelity/hifi into librarization 
Conflicts:
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
 2014-12-17 13:16:11 -08:00
ZappoMan
9f9b8bcb68 move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00
ZappoMan
5d636e21c6 more Application dependency cleanup 2014-12-17 11:10:45 -08:00
ZappoMan
3dfded89b8 remove menu dependency from EntityTreeRenderer, some Application cleanup 2014-12-16 16:28:09 -08:00
Atlante45
11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/entities/EntityTreeRenderer.h
	interface/src/ui/ApplicationOverlay.cpp
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/Model.cpp
 2014-12-16 15:02:37 -08:00
Atlante45
2039895898 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/renderer/GlowEffect.cpp
	interface/src/renderer/TextureCache.cpp
 2014-12-16 14:27:50 -08:00
ZappoMan
efa8a752f2 remove dependency on Menu from Model 2014-12-16 13:14:57 -08:00
ZappoMan
16c1e597f1 remove Application dependency from Model 2014-12-16 12:53:22 -08:00
Stephen Birarda
6fd55e6f42 make Audio class use DependencyManager 2014-12-16 12:31:01 -08:00
ZappoMan
fc1e1ecfc0 move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled 2014-12-16 11:27:44 -08:00
ZappoMan
4d79a08533 remove Application dependencies from AmbientOcclusion and DeferredLightingEffect 2014-12-16 10:32:03 -08:00
ZappoMan
660bf2720e convert AnimationCache to DependencyManager 2014-12-15 19:48:15 -08:00
ZappoMan
e53833b306 make GlowEffect support DependencyManager 2014-12-15 17:29:48 -08:00
Atlante45
e5e2eb4e8a Moved GLCanvas in DM and DM to QSharedPointers 2014-12-15 16:20:52 -08:00
ZappoMan
bfcc78c57d replaced Application::resourcesPath() with PathUtils::resourcesPath() 2014-12-15 15:20:18 -08:00
Andrew Meadows
67c3a25475 Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.h
 2014-12-15 14:46:46 -08:00
ZappoMan
49cacd85bd move GeometryCache to library 2014-12-15 14:00:41 -08:00
ZappoMan
7b973453b4 move TextureCache to library 2014-12-15 13:14:16 -08:00
Atlante45
68430e1346 Moved GLCanvas to DependencyManager 2014-12-15 11:54:33 -08:00
Atlante45
25df784f43 Headers cleanup 2014-12-15 10:56:42 -08:00
ZappoMan
6b39783de7 revert out the InterfaceConfig.h changes 2014-12-15 10:12:04 -08:00
ZappoMan
7d1081473e remove _textureCache 2014-12-15 09:42:35 -08:00
ZappoMan
3de3540ebe move back into interface for now 2014-12-15 08:37:33 -08:00
ZappoMan
4ac673fe63 more render util cleanup 2014-12-15 08:16:42 -08:00
ZappoMan
2df4c017f1 move GeometryCache out of application and remove dependency on Model 2014-12-15 08:15:55 -08:00
ZappoMan
e253b8afa4 move TextureCache out of interface and Application 2014-12-15 08:14:53 -08:00
Atlante45
738f23f326 Moved visage and dde over to DependencyManager 2014-12-14 22:30:13 -08:00