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

17006 commits

Author SHA1 Message Date
Brad Hefta-Gaub
7da29daf9d Merge pull request #8036 from ctrlaltdavid/20955 
Fix image2d overlay color property
 2016-06-13 19:21:59 -07:00
Chris Collins
b14f9cd312 Merge pull request #8041 from sethalves/fix-avatar-entity-locking 
Fix avatar entity locking
 2016-06-13 13:10:32 -07:00
Brad Hefta-Gaub
92909af52c Merge pull request #8044 from ctrlaltdavid/20957 
fix model export
 2016-06-12 19:43:51 -07:00
Seth Alves
4c45d081cd merge from upstream 2016-06-10 19:57:46 -07:00
Chris Collins
006eb8fe64 Merge pull request #8031 from birarda/api-recheck-on-fail 
re-instate domain API connection info refresh during failure, fix localhost connection after downgrade
 2016-06-10 15:26:42 -07:00
Stephen Birarda
3c4f336e72 re-instate NodeList reset on limit of check ins reached 2016-06-10 09:11:25 -07:00
Brad Hefta-Gaub
426d67f5bf Merge pull request #8038 from jherico/pure_virtual 
Attempt to get better logging from pure virtual call crashes
 2016-06-10 08:25:10 -07:00
Stephen Birarda
e4ebafa0d8 add a menu option to force the wrong DS connect version 2016-06-09 15:53:19 -07:00
Stephen Birarda
12e5851ba4 fix connection denial message, put version back 2016-06-09 15:53:19 -07:00
Stephen Birarda
4b5a554122 remove check in version downgrading from NodeList 2016-06-09 15:53:19 -07:00
Seth Alves
441b5a20d8 merge from upstream 2016-06-09 13:23:41 -07:00
Brad Davis
cd7c6be590 Fix formatting 2016-06-09 12:25:21 -07:00
Brad Hefta-Gaub
3c5af56421 Merge pull request #8010 from hyperlogic/feature/hmd-lean-recenter-property 
Added MyAvatar.hmdLeanRecenterEnabled property
 2016-06-09 12:17:51 -07:00
Brad Davis
eee1ba0906 trying to get buildability 2016-06-09 10:19:38 -07:00
Seth Alves
203ea5ddc7 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-09 09:53:33 -07:00
Anthony J. Thibault
1aae22f5a5 Optimized MyAvatar.getCharacterControllerEnabled() 
Instead of doing a blocking queued invokeMethod, it just calls into CharacterController.isEnabled() which is now thread-safe.
 2016-06-09 09:35:19 -07:00
Brad Davis
ff8d4883b1 Attempt to get better logging from pure virtual call crashes 2016-06-08 22:35:39 -07:00
David Rowe
5352bd4b76 Fix height of Load Defaults button 2016-06-09 17:15:17 +12:00
David Rowe
cf6945b403 Fix selecting directory directly from dropdown 2016-06-09 17:11:00 +12:00
David Rowe
4176940e24 Don't highlight first drive in table when choose "This PC" from dropdown 2016-06-09 17:02:43 +12:00
David Rowe
d346d4c731 When choosing a directory make the dropdown update the path value 2016-06-09 16:41:51 +12:00
David Rowe
b4543cc579 Unhighlight directory in table when type filename to save 2016-06-09 16:29:15 +12:00
David Rowe
3780b18cc0 Fix a QML error 2016-06-09 15:15:32 +12:00
David Rowe
0ef13e6c01 Fix action button label to be "Save" when saving a file 2016-06-09 15:15:31 +12:00
David Rowe
4ae018400d Give table focus after using dropdown 2016-06-09 15:15:30 +12:00
David Rowe
358355cfbf Clear file selection and disabled Open button when change directory 2016-06-09 15:15:29 +12:00
Brad Hefta-Gaub
fc5214c938 Merge pull request #8033 from SamGondelman/xboxFix 
Game pads work after falling asleep and being reactivated
 2016-06-08 16:27:26 -07:00
Seth Alves
2e940e1055 Merge branch 'master' of github.com:highfidelity/hifi into fix-avatar-entity-locking 2016-06-08 15:54:12 -07:00
Seth Alves
f070708b4a _avatarEntityData is accessed by more than one thread. 2016-06-08 15:53:54 -07:00
Brad Hefta-Gaub
69ae33ad9a Merge pull request #7997 from SamGondelman/touchFixes 
Corrected Oculus Touch coordinate system so that hands track properly
 2016-06-08 15:39:17 -07:00
Seth Alves
1977efae4f Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-08 10:36:52 -07:00
Brad Hefta-Gaub
d0e946c907 Merge pull request #8034 from ctrlaltdavid/20953 
fix colors of buttons in Asset Browser dialog
 2016-06-08 07:47:34 -07:00
David Rowe
f9d6a7ba8d Fix image2d overlay color property 2016-06-08 14:04:02 +12:00
Brad Hefta-Gaub
80100b1d34 Merge pull request #8000 from Atlante45/feat/plugins 
Select/Disable plugins via command line args
 2016-06-07 18:17:29 -07:00
SamGondelman
2c1d20bd1a removed _deviceCounts, cache joystick available inputs, added deadzone to gamepad thumbsticks 2016-06-07 17:12:24 -07:00
Brad Hefta-Gaub
9a0076d4f1 Merge pull request #8028 from ctrlaltdavid/20949 
add "Load Defaults" button to Running Scripts dialog
 2016-06-07 17:09:29 -07:00
Brad Hefta-Gaub
6603289de9 Merge pull request #8029 from SamGondelman/constantTurn 
Fixed constant turn of 22.5 degrees in comfort mode
 2016-06-07 17:09:07 -07:00
Anthony J. Thibault
30d8ae36e8 Added MyAvatar.characterControllerEnabled property 2016-06-07 16:55:32 -07:00
Seth Alves
b2f63a2132 hook up can-rez-tmp and can-write-to-asset-server 2016-06-07 16:17:58 -07:00
David Rowe
a87483dfff Fix colors of buttons in Asset Browser dialog 2016-06-08 10:55:14 +12:00
Howard Stearns
38d0d28603 Merge pull request #8021 from AndrewMeadows/walk-follows-camera 
camera steers avatar when walking
 2016-06-07 10:43:01 -07:00
SamGondelman
509f889c0d fixed constant turn of 22.5 degrees 2016-06-06 18:40:12 -07:00
David Rowe
b6af46cac9 Add "Load Defaults" button to Running Scripts dialog 
And rename "Stop All" to "Remove All".
 2016-06-07 11:30:07 +12:00
Atlante45
399517fcbd Activate Inputs after menus are setup 2016-06-06 13:28:36 -07:00
Atlante45
26acc6fd8b Typo 2016-06-06 13:28:36 -07:00
Atlante45
24bbb8db3f Remove input plugin menu dependency 2016-06-06 13:28:36 -07:00
Atlante45
6f75fab298 Revert header changes 2016-06-06 13:28:36 -07:00
Atlante45
ee62a211ac Remove "Input Devices" menu 2016-06-06 13:28:36 -07:00
Atlante45
992fa63932 Allow ordered list of preferred plugins 2016-06-06 13:28:36 -07:00
Atlante45
932838b1e3 Setup preferred display plugin 2016-06-06 13:28:36 -07:00