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
ZappoMan
f1b85aefa9
more dead code removal: NodeBounds
2015-07-14 17:59:20 -07:00
Atlante45
fbb6a94579
Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol
2015-07-14 16:36:28 -07:00
Stephen Birarda
23548a99bc
move NACK packet disabling to EntityEditPacketSender
2015-07-14 14:43:01 -07:00
Stephen Birarda
d617b71232
remove SharedNodePointer from some packet callbacks
2015-07-14 14:27:26 -07:00
Stephen Birarda
0637f589b5
add PacketListener to help unregister for packets
2015-07-14 13:52:38 -07:00
Atlante45
7bf45308b6
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-14 12:31:37 -07:00
Atlante45
c80df94b06
Update includes for moved files
2015-07-13 15:28:55 -07:00
Stephen Birarda
d990420565
repairs to octree packet receiving in interface
2015-07-13 13:10:57 -07:00
Anthony J. Thibault
d07a02cef3
Refactor of MyAvatar and Application HMD sensor
...
MyAvatar now uses a cached copy of the HMDSensor location,
instead of calling into Application for every access.
This allows us to simplify application to always return the
most recent pose, instead of a different one pre and post physics.
Added accessors to HMD Sensor in MyAvatar, besides being helpful,
it also an optimization to avoid extracting quaternions from the
HMD matrix on every access.
2015-07-13 12:56:33 -07:00
Stephen Birarda
3d62162812
cleanup octree networking code to use new API
2015-07-13 09:40:26 -07:00
Stephen Birarda
9ee62a8a38
fix for connection denied packet in Application
2015-07-10 17:52:51 -07:00
Howard Stearns
51be245159
Remove old octreeFade code that wasn't working anyway.
2015-07-10 16:55:45 -07:00
Atlante45
ec7e1df8c0
Move and rename menu item
2015-07-10 15:47:46 -07:00
Ryan Huffman
99aaefbd03
Fix and update signature of Application::handleDomainConnectionDeniedPacket
2015-07-10 15:00:29 -07:00
Ryan Huffman
8da50d342c
Remove DatagramProcessor.h from Application
2015-07-09 15:31:01 -07:00
Atlante45
ed296850e2
Rename to clear cache and restart
2015-07-08 12:24:45 -07:00
Atlante45
39cb5100a3
Clear cache and restart first draft
2015-07-08 12:23:22 -07:00
Ryan Huffman
0b0446e527
Add handleComainConnectionDeniedPacket to Application
2015-07-08 11:54:22 -07:00
Stephen Birarda
6c6143f21e
remove NetworkPacket and replace with NodePacketPair
2015-07-07 16:56:05 -07:00
Anthony J. Thibault
d75353eeb2
added left/right hand click actions, vive controller should be able to emulate mouse events
2015-07-07 14:35:55 -07:00
Anthony J. Thibault
5293effc2e
more work in progress vive room tracking
...
Found and disabled torso twist
use an old copy of the hmd pose before physics, and the most up to date
one after physics.
2015-07-07 00:12:48 -07:00
Sam Gondelman
f69b755166
merge with hifi/plugins
2015-07-06 17:41:45 -07:00
Brad Davis
2a1776303d
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/SkeletonModel.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
2015-07-03 06:17:35 -07:00
Stephen Birarda
a9420d4212
replace controlled broadcast to nodes in Application
2015-07-02 17:55:26 -07:00
Stephen Birarda
0d64e82fe2
replace PacketType declarations with PacketType::Value
2015-07-02 16:38:52 -07:00
Sam Gondelman
81efd99ae4
merge with hifi/plugins
2015-07-02 10:13:28 -07:00
Atlante45
ee13407066
Fix smart pointer casts
2015-07-01 19:22:40 -07:00
Sam Gondelman
e54060d6bb
more working on poses, LEFT_ and RIGHT_HAND input actions
2015-07-01 14:36:12 -07:00
Clément Brisset
eb3bddfe4c
Merge pull request #5209 from ctrlaltdavid/20589
...
QA for #20589 - Vertical field of view preference change should be applied immediately
2015-07-01 13:53:25 -07:00
Brad Davis
040f7c86ea
Working on plugin menu items
2015-07-01 09:05:26 -07:00
Brad Davis
b2b571b5a1
Fixing app includes
2015-06-30 15:52:55 -07:00
Brad Davis
e421141ec5
experimenting with input plugins
2015-06-30 09:52:54 -07:00
Brad Davis
4417c00ae4
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.h
interface/src/Menu.h
2015-06-26 17:02:16 -07:00
David Rowe
1898c6bd55
Merge branch 'master' into 20547
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-06-26 13:05:51 -07:00
David Rowe
377979e380
Make field of view preference change be applied immediately
2015-06-25 15:41:10 -07:00
Sam Gondelman
19ec080e2b
Merge with master
2015-06-24 15:04:03 -07:00
Sam Gondelman
824c219fa0
started fixing camera mode issue
2015-06-23 09:26:38 -07:00
Brad Davis
967fc62da7
Working on syncing with master
2015-06-22 13:46:03 -07:00
Brad Davis
9f98547390
Merge branch 'master' into plugins
2015-06-22 13:35:40 -07:00
Brad Davis
99c217184b
Fixing the mic/camera buttons and the mirror UI buttons
2015-06-19 14:46:39 -07:00
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
