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

13746 commits

Author SHA1 Message Date
Andrew Meadows
341bc3666f Merge pull request #6093 from sethalves/hold-action-changes 
Hold action changes
 2015-10-20 09:19:48 -07:00
Brad Hefta-Gaub
9f17f10d6a fix warning in master 2015-10-19 17:56:38 -07:00
Seth Alves
4feb9dc8c6 prepare for possible future coding standard 2015-10-19 17:46:34 -07:00
Brad Hefta-Gaub
7669f9ed2c fix several warnings 2015-10-19 17:26:57 -07:00
Seth Alves
41f7ef1e2e cleanups 2015-10-19 16:53:27 -07:00
Brad Hefta-Gaub
56f625d376 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-19 16:53:25 -07:00
Brad Hefta-Gaub
0b2bf8bda8 remove some dead code 2015-10-19 15:23:45 -07:00
Brad Hefta-Gaub
110adc5c22 fix model LOD behavior 2015-10-19 15:21:25 -07:00
Seth Alves
46e5bf0435 take entity-server clock-skew into account when handling action expiration times 2015-10-19 11:59:03 -07:00
Brad Davis
a8e707ced2 Correcting update order to fix mouse 2015-10-18 22:46:14 -07:00
Brad Davis
734a39f962 Breaking up UserInputMapper, restoring some mappings 2015-10-18 18:58:03 -07:00
Brad Davis
57be59935d Move controller test to app 2015-10-17 19:13:38 -07:00
Brad Davis
5bac1aae2d Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-16 17:23:30 -07:00
Howard Stearns
91c2d31118 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-16 15:51:09 -07:00
Howard Stearns
770282ad88 Javascript methods to getAvatars listing and getAvatar from id. 2015-10-16 15:22:43 -07:00
samcake
f0034844e7 Actions working from the Controller layer 2015-10-16 12:24:12 -07:00
Seth Alves
fe709a9397 keep object active in kinematic mode, also 2015-10-16 10:53:33 -07:00
Howard Stearns
f25cc93936 Initial prototype of exposing anim vars to javascript. 2015-10-16 10:48:36 -07:00
Seth Alves
966499b9e5 continually activate (in the bullet sense) a held object 2015-10-16 10:17:17 -07:00
Seth Alves
d2b7e5c4eb Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-16 09:54:26 -07:00
Seth Alves
b18bb1e076 Merge pull request #6084 from AndrewMeadows/physics-cleanup 
move DIRTY_FLAGS out of EntityItem namespace
 2015-10-16 07:22:40 -07:00
Seth Alves
359a318568 fold kinematic hold into normal hold (disabled by default, an argument enables) 2015-10-15 20:23:06 -07:00
Seth Alves
0964180f2c code review 2015-10-15 17:10:47 -07:00
Stephen Birarda
e5825daa57 Merge pull request #6090 from ZappoMan/fixStat 
Add some additional stats for debugging edit lags
 2015-10-15 16:00:29 -07:00
Ryan Huffman
421e2a6c21 Merge pull request #6078 from imgntn/top_tool_tabs 
Move  Edit.js Tool Window Tabs to the Top
 2015-10-15 15:40:42 -07:00
James B. Pollack
aee11d4c06 cleanup merge 2015-10-15 15:05:34 -07:00
James B. Pollack
112007e5a9 cleanup 2015-10-15 14:58:05 -07:00
Seth Alves
462918ffcf cleanups 2015-10-15 14:55:17 -07:00
Seth Alves
487131dde1 cleanups 2015-10-15 14:52:38 -07:00
Seth Alves
36a523478f Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-15 14:21:30 -07:00
Seth Alves
4903db45b1 give other avatars an anim-skeleton 2015-10-15 14:21:06 -07:00
James B. Pollack
8b57b3c0ff fix memory leak 2015-10-15 14:13:07 -07:00
Andrew Meadows
3d17c57910 Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes 
Groundwork for hold action changes
 2015-10-15 13:30:02 -07:00
James B. Pollack
e63ed5cf84 Merge pull request #6087 from thoys/20708 
CR for Job #20708 - Script Editor Improvements
 2015-10-15 12:28:32 -07:00
Brad Davis
80c962a4cc Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-15 12:27:53 -07:00
Brad Hefta-Gaub
923e1ed208 add more processing stats 2015-10-15 12:21:36 -07:00
Seth Alves
a70ba4cd5a add some accessors 2015-10-15 11:42:53 -07:00
Seth Alves
1d8db13f41 switch to low-entity-server traffic hold 2015-10-15 10:56:47 -07:00
Seth Alves
64c5cde2d2 further unmangle branch split 2015-10-15 10:33:58 -07:00
Seth Alves
a78728c96b further unmangle branch split 2015-10-15 10:29:25 -07:00
Seth Alves
8195145dc7 further unmangle branch split 2015-10-15 10:13:00 -07:00
Seth Alves
d833fb08d7 further unmangle branch split 2015-10-15 10:03:32 -07:00
Andrew Meadows
2ae62de84e Merge pull request #6026 from birarda/qt-polling-env 
set bearer poll timeout env for wlan scan in Qt 5.5
 2015-10-15 09:58:32 -07:00
Andrew Meadows
fa17b77d70 move DIRTY_FLAGS out of EntityItem namespace 2015-10-15 09:34:09 -07:00
Seth Alves
c96f7562f2 Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes 2015-10-15 09:28:57 -07:00
Seth Alves
7ef5fc9613 remove line that leaked over from other branch 2015-10-15 09:19:47 -07:00
Seth Alves
9f40c7bf8c fix up AvatarActionHold 2015-10-15 09:13:06 -07:00
Seth Alves
5ebefadda1 remove some debugging 2015-10-15 09:07:35 -07:00
Thijs Wenker
8111432088 Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX 2015-10-15 14:50:20 +02:00
James B. Pollack
c8b6fed0e0 Update ToolWindow.cpp 2015-10-14 21:18:17 -07:00
James B. Pollack
84973c590d Update ToolWindow.h 2015-10-14 21:17:19 -07:00
James B. Pollack
c18aeef6b3 remove redundant call 2015-10-14 17:29:38 -07:00
James B. Pollack
a1e2292e62 remove title bar from docked tool widgets 2015-10-14 17:27:45 -07:00
Clément Brisset
efd106e68c Merge pull request #6075 from birarda/default-asset-server 
add a migrator to move assets to ATP
 2015-10-14 17:02:10 -07:00
Brad Davis
e39219c2b5 Fixes and PR comments 2015-10-14 16:51:52 -07:00
Brad Davis
0063f9ae1d Merging old and new controller interfaces 2015-10-14 15:16:54 -07:00
James B. Pollack
536351e9d5 move set tab position to constructor 2015-10-14 15:10:04 -07:00
Anthony J. Thibault
3e7a6fd490 Change to boom offset for 3rd person HMD camera. 
Previously the boom offset was computed in HMD sensor space instead of
world space, so it did not play well with the vive, or the oculus
if you weren't facing the camera directly.

Now it is computed in world space, and is always behind the character's
position/orientation.  This can cause the boom to swing if the character
rotation changes but now the avatar rotation in HMD uses comfort mode.
It's not that disorienting.
 2015-10-14 14:43:59 -07:00
Seth Alves
21519c6418 debugging 2015-10-14 14:13:08 -07:00
Seth Alves
5ce39b74fd debugging 2015-10-14 13:58:19 -07:00
James B. Pollack
d45f48c8cd fixbug 2015-10-14 13:55:04 -07:00
James B. Pollack
815b263954 convert tabs to spaces 2015-10-14 13:26:19 -07:00
Thijs Wenker
7df5ba01e6 JSConsole: 
executeCommand works async now
 2015-10-14 22:21:51 +02:00
Seth Alves
9937b6a3ef quiet some debugging 2015-10-14 13:12:11 -07:00
Seth Alves
d72152da87 more locking 2015-10-14 13:01:56 -07:00
Seth Alves
07a4dc3a7f more lock fixing 2015-10-14 12:49:06 -07:00
Seth Alves
fa2bf2b2d9 tighten up locking in actions 2015-10-14 11:43:03 -07:00
Thijs Wenker
96b6067d88 ScriptEditor Improvements: 
- Script restart works proper again
- Fixed on and off icon switch
- Replaced regular script output box with fully functional JSConsole!
 2015-10-14 20:37:47 +02:00
James Pollack
7a8db803eb move toolwindow tabs to the top 2015-10-14 19:35:37 +01:00
Thijs Wenker
880d34d483 JSConsole improvements 
- ability to set Script Engine
- clear function for clearing the output
- only show evaluation output for executeCommand, print() and error output is still being printed
 2015-10-14 20:35:15 +02:00
Brad Davis
f051a84dc6 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-14 10:54:32 -07:00
Seth Alves
698a4001a8 Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-14 06:18:02 -07:00
Seth Alves
742cc0f511 rename a function 2015-10-14 06:17:55 -07:00
Thijs Wenker
660bf6b3ea ScriptEditor: single quotes support and spelling fix 2015-10-14 14:47:29 +02:00
Brad Davis
0c31fb1b1b Merge pull request #6069 from ZappoMan/controllers 
Hack in NewControllers into the JS layer of interface to allow testing
 2015-10-13 19:08:26 -07:00
Anthony J. Thibault
1c1221597d Merge branch 'master' into tony/turn-hips-while-moving 2015-10-13 18:38:27 -07:00
Anthony J. Thibault
e484a904a2 Rotate the avatar to align with the HMD while moving 
MyAvatar: refactored updateFromHMDSensorMatrix() a bit by splitting it into several methods, because
it was getting quite large and becoming hard to follow.

* beginStraighteningLean() - can be called when we would like to trigger a re-centering action.
* shouldBeginStraighteningLean() - contains some of the logic to decide if we should begin a re-centering action.
  for now it encapulates the capsule check.
* processStraighteningLean() - performs the actual re-centering calculation.

New code was added to MyAvatar::updateFromHMDSensorMatrix() to trigger re-centering when the avatar speed rises
over a threshold.

Secondly the Rig::computeMotionAnimationState() state machine for animGraph added a state change hysteresis
of 100ms.  This hysteresis should help smooth over two issues.

1) When the delta position is 0, because the physics timestep was not evaluated.
2) During re-centering due to desired motion, the avatar velocity can fluctuate causing undesired animation state fluctuation.
 2015-10-13 17:36:00 -07:00
Andrew Meadows
073b019458 Merge pull request #6072 from howard-stearns/skip-some-reload-recenter-on-startup 
Don't reload/recenter some avatar data on startup
 2015-10-13 17:08:00 -07:00
Stephen Birarda
d84994d8e0 fix casing for ubuntu include failure 2015-10-13 17:04:45 -07:00
Stephen Birarda
2caa7f6d64 change getUrl to getATPUrl, use in ATPAssetMigrator 2015-10-13 16:56:20 -07:00
Stephen Birarda
574089530a make sure request is not nullptr before using it 2015-10-13 16:49:12 -07:00
Stephen Birarda
d22c602041 use categorized logging in ATPAssetMigrator 2015-10-13 16:44:13 -07:00
Stephen Birarda
cc93767077 remove some extra spaces 2015-10-13 16:38:00 -07:00
Seth Alves
4402242c3c allow an action to suppress sending of physics related edits to the entity-server 2015-10-13 16:27:40 -07:00
Brad Hefta-Gaub
8a2e23cae4 CR feedback 2015-10-13 16:20:52 -07:00
Seth Alves
2ecb7e8d29 fix bug that was making action deletes fail 2015-10-13 16:19:12 -07:00
Stephen Birarda
1450305390 fix ATP url scheme constant 2015-10-13 16:13:47 -07:00
Stephen Birarda
fc82ea8541 resolve conflicts on merge with upstream/master 2015-10-13 16:12:54 -07:00
Stephen Birarda
549043f255 add an option to bulk upload assets in ATPAssetMigrator 2015-10-13 15:20:37 -07:00
Seth Alves
4fa85441b8 tweak 2015-10-13 15:14:34 -07:00
Brad Hefta-Gaub
ad96d76921 implement comfort mode hack 2015-10-13 15:06:11 -07:00
Seth Alves
257e3845de get action type correct 2015-10-13 14:45:20 -07:00
Seth Alves
fcbb107bc0 tweak 2015-10-13 14:13:53 -07:00
Seth Alves
8b72f6e7c6 tweak 2015-10-13 13:50:43 -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
Seth Alves
7c52849740 change how hold action works 2015-10-13 11:36:58 -07:00
Stephen Birarda
65976f7891 add saving of entity file to ATPAssetMigrator 2015-10-13 10:51:57 -07:00
Stephen Birarda
cf74cfb50e add an ATPAssetMigrator for bulk ATP migration 2015-10-13 10:38:52 -07:00
James B. Pollack
8d9bcbd793 Merge pull request #6067 from hyperlogic/tony/remove-middle-mouse-overlay-toggle 
Remove overlay hiding from middle mouse button.
 2015-10-13 10:14:15 -07:00
Brad Hefta-Gaub
8e8ba15aaa Merge pull request #6065 from sethalves/reorder-sims 
grab changes
 2015-10-13 08:35:38 -07:00
Andrew Meadows
25685f97eb Merge pull request #6062 from howard-stearns/fix-startup-position-failure 
fix-startup-position-failure
 2015-10-13 08:34:33 -07:00
Ryan Huffman
9a9bdbbc44 hack in mappings to interface 2015-10-12 17:59:58 -07:00
Anthony J. Thibault
6a8ff676ed Remove overlay hiding from middle mouse button. 
Because it conflicts with edit.js camera panning.
You can still toggle the overlay via the O key.
 2015-10-12 17:33:27 -07:00
Seth Alves
ed9907ce66 do avatar simulation before physics simulation so that physics actions can update based on avatar 2015-10-12 16:23:12 -07:00
Howard Stearns
6cbeb6e7c3 Fix my bug, introduced in PR#6012, in which startup position goto got 
cancelled out.
 2015-10-12 15:40:16 -07:00
Atlante45
cfba5752ce Change checkbox text 2015-10-12 15:03:37 -07:00
Atlante45
51acf07c15 Factor couple methods in AssetUtils 2015-10-12 15:03:37 -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
Thijs Wenker
309b381bab Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX 2015-10-12 18:51:18 +02:00
Brad Hefta-Gaub
0986f86c34 implement StandardController and expose it to JS as Controller.Standard.* 2015-10-11 14:55:07 -07:00
Thijs Wenker
7d3b300037 Fix set avatar rotations from scripts (different tread) 2015-10-11 14:51:12 +02:00
Brad Hefta-Gaub
ded677e90f Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface 2015-10-10 09:33:55 -07:00
Brad Hefta-Gaub
25481e0a25 Merge pull request #6038 from Atlante45/asset-drop 
Asset file drop
 2015-10-10 09:32:58 -07:00
Brad Hefta-Gaub
63f3156a61 add Controler.Actions 2015-10-09 21:23:19 -07:00
Brad Hefta-Gaub
f55b6115d6 cleanup sanatize name function 2015-10-09 21:11:38 -07:00
Brad Hefta-Gaub
5c5ee8d699 remove debug code 2015-10-09 21:01:44 -07:00
Brad Hefta-Gaub
d3ee9b0f39 more work on exposing device inputs as JavaScript named constants 2015-10-09 20:58:23 -07:00
Brad Hefta-Gaub
37f530f97f first cut at wiring up devices and inputs to JS 2015-10-09 16:15:29 -07:00
Anthony J. Thibault
0c489e3afd MyAvatar: Rename new instance variable after merge. 2015-10-09 14:46:05 -07:00
Anthony J. Thibault
b5ba621f78 Merge branch 'master' into tony/hmd-rest-detection 2015-10-09 14:36:18 -07:00
Howard Stearns
700835a6d1 Merge branch 'master' of https://github.com/highfidelity/hifi into align-body-to-head-on-reset 2015-10-09 13:13:22 -07:00
Atlante45
ae83dfe041 Move auto-resize to update 2015-10-09 12:23:19 -07:00
Atlante45
e056743621 Check for upload rights 2015-10-09 12:23:19 -07:00
Atlante45
2229f942df Spawn fbx dropped in front of avatar 2015-10-09 12:23:19 -07:00
Atlante45
a1c154e7be Fix compile error 2015-10-09 12:23:19 -07:00
Atlante45
b666acdb26 Add fbx upload on drop 2015-10-09 12:23:19 -07:00
Atlante45
2d12b2ba9a Spacing 2015-10-09 12:23:19 -07:00
Atlante45
327154b0c0 Make _acceptedExtensions static const 2015-10-09 12:23:19 -07:00
Howard Stearns
652376db8a Kill the stuff we can't do yet. 2015-10-08 21:44:45 -07:00
Stephen Birarda
7987595dcd set the bearer poll timeout for wlan scan in Qt 5.5 2015-10-08 11:32:10 -07:00
Brad Hefta-Gaub
e1b69a1704 Merge pull request #6022 from jherico/lisa 
Fix mouse events for entity scripts
 2015-10-07 20:43:41 -07:00
Brad Davis
50592a87a6 Fix mouse events for entity scripts 2015-10-07 19:44:08 -07:00
Howard Stearns
bd0d1eaef6 Merge branch 'master' of https://github.com/highfidelity/hifi into align-body-to-head-on-reset 2015-10-07 18:35:52 -07:00
Brad Hefta-Gaub
a86e34f9f9 Merge pull request #6018 from hyperlogic/tony/avatar-mixer-stats-improvements 
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
 2015-10-07 16:04:13 -07:00
Andrew Meadows
ef58238c66 Merge pull request #6017 from ZappoMan/animationGroupSettings 
fix a bunch of warnings
 2015-10-07 15:50:20 -07:00
Brad Hefta-Gaub
ae93c020be Merge pull request #5994 from Atlante45/display_name 
Display name in terms of arc size not pixels
 2015-10-07 15:40:30 -07:00
Anthony J. Thibault
0cebeb7fe9 Separated AvatarMixer inbound and outbound bandwidth on stats overlay 
Also, small bug fix to BandwidthRecorder. It would incorrectly
calculate outbound pps if the input pps was 0.
 2015-10-07 15:32:10 -07:00
Brad Hefta-Gaub
c6d50af085 Merge pull request #5999 from AndrewMeadows/save-sixense-settings 
Save hydra calibration settings
 2015-10-07 15:27:06 -07:00
Atlante45
fb284448b5 Raise display name not to collide with heads 2015-10-07 15:21:35 -07:00
Atlante45
efeeaa7ea7 Make display names 25% smaller 2015-10-07 15:14:06 -07:00
Atlante45
14a1860670 Do not change keyhole radius 2015-10-07 14:55:18 -07:00
Atlante45
fd6f0213ef CR 2015-10-07 14:55:18 -07:00
Atlante45
79b280f733 Update getDisplayNamePosition debug 2015-10-07 14:55:18 -07:00
Atlante45
91b46203f3 Don't take keyhole into account 2015-10-07 14:55:17 -07:00
Atlante45
946d289a99 Display name have a arc size instead of pixel size 2015-10-07 14:55:17 -07:00
Brad Hefta-Gaub
bfd014203e fix a bunch of warnings 2015-10-07 14:48:42 -07:00
Andrew Meadows
0680be0422 save sixense settings and some UI cleanup 2015-10-07 14:19:15 -07:00
Andrew Meadows
039d9a6a98 Merge pull request #6010 from ZappoMan/disableHandMouseByDefault 
Disable hand mouse by default
 2015-10-07 14:15:58 -07:00
Thijs Wenker
ad5a6fac62 - applying of new qApp accessing method. 
- Some magic constant replacements with Helper "glm::vec3(matrix[3])" -> "extractTranslation(matrix)"
 2015-10-07 15:10:40 +02:00
Thijs Wenker
4ab5e0af84 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-07 14:48:06 +02:00
Brad Hefta-Gaub
05fd62ac51 Merge pull request #6009 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-07 01:43:10 -07:00
Brad Davis
eff5a4c395 Picking fixes in the HMD 2015-10-06 22:56:48 -07:00
Howard Stearns
1fc305ca6b Update HMD-derived avatar stuff during reset, update position under head, and remove unused vars. 2015-10-06 20:51:53 -07:00
Anthony J. Thibault
2dabe69341 When HMD is at rest, re-center the body under the avatar. 
This should help the case when a user avatar is stuck in an
uncomfortable pose for a long period of time.  If they stop
moving their head, the body should recenter itself and
appear more natural.

Added an AtRestDetector class.  That tracks the average and variance
of both position and rotation (quaternion logarithms), then
detects when the variance falls under a threshold.

Also, renamed variables with the straighting prefix to straightening.
 2015-10-06 20:37:51 -07:00
Brad Davis
028935f831 Removing deprecated function usage 2015-10-06 20:36:55 -07:00
Brad Hefta-Gaub
6e5847bb1c make Hand Input Mouse off by default 2015-10-06 19:58:25 -07:00
Brad Davis
bac69c73a8 Fixing bug in application compositor transform 2015-10-06 19:08:44 -07:00
Brad Davis
19fb4e92a6 Enabling programmatic access to the IPD scale 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/scripting/HMDScriptingInterface.cpp
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:08:17 -07:00
Thijs Wenker
6e52fcb857 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-07 03:11:24 +02:00
Brad Hefta-Gaub
02bb372c27 Merge pull request #6008 from AndrewMeadows/ik-targets-use-model-frame 
IK targets specified in the skeleton's model-frame
 2015-10-06 17:34:42 -07:00
Andrew Meadows
224fc55033 put IK targets in skeleton's model-frame 2015-10-06 16:49:29 -07:00
Atlante45
76e0006732 Remove forgotten cursorVisible 2015-10-06 15:58:35 -07:00
Howard Stearns
db955d894f Align avatar body to head on reset. 2015-10-06 14:52:53 -07:00
Atlante45
8a7871e15b rebase fix 2015-10-06 14:13:28 -07:00
Atlante45
ed13c02075 Fix rebase 2015-10-06 13:57:51 -07:00
Atlante45
c745050dea Fix QObject::connect warning 2015-10-06 13:57:51 -07:00
Atlante45
7b25c9d417 More header cleanup 2015-10-06 13:57:50 -07:00
Atlante45
775994f9d0 Fix for 3DConnection 2015-10-06 13:57:49 -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
39e0d0e1dc Put timers on the stack 2015-10-06 13:56:26 -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
9827c90851 Rebase fixes 2015-10-06 13:56:24 -07:00
Atlante45
ba5c20b7a6 Header cleanup 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
Thijs Wenker
4e8fc08458 made the changes as suggested by @hyperlogic 2015-10-06 20:48:51 +02:00
Thijs Wenker
3c6e9378c3 fixes merge issues 2015-10-06 20:20:37 +02:00
Thijs Wenker
953ff6caa7 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/Application.cpp
	interface/src/scripting/HMDScriptingInterface.h
	libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h
 2015-10-06 20:06:29 +02:00
Thijs Wenker
f6afb4cb02 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:56:22 +02:00