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 |
|
Seth Alves
|
7c52849740
|
change how hold action works
|
2015-10-13 11:36:58 -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 |
|
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 |
|
Brad Hefta-Gaub
|
0986f86c34
|
implement StandardController and expose it to JS as Controller.Standard.*
|
2015-10-11 14:55:07 -07: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 |
|
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 |
|