David Rowe
1fc3d9229c
Fix initial drive change and go-up not working properly on first screen
2016-05-17 10:51:42 +12:00
David Rowe
14c733cd6e
Make columns sortable
2016-05-14 17:19:18 +12:00
David Rowe
c21087ad87
Add icon to title
2016-05-14 13:04:18 +12:00
David Rowe
88130ee5c8
Merge branch 'master' into 20917
2016-05-14 12:13:39 +12:00
Brad Hefta-Gaub
c443138dd2
Merge pull request #7869 from zzmp/fix/fbx-access
...
Check vector access in fbx reader
2016-05-13 15:29:24 -07:00
Brad Hefta-Gaub
987b3483a8
Merge pull request #7876 from sethalves/fix-grab-fixes
...
fix grab-fixes
2016-05-13 15:26:31 -07:00
Seth Alves
5247ca5c22
Merge pull request #7896 from ZappoMan/possibleFixToFUESnafu
...
move firstRun.set() to correct place
2016-05-13 14:15:58 -07:00
Brad Hefta-Gaub
65aae42714
move firstRun.set() to correct place
2016-05-13 13:28:02 -07:00
David Rowe
3b34b908d7
Tweak level-up and home buttons
2016-05-13 17:39:15 +12:00
Brad Davis
85272a87ba
Merge pull request #7859 from samcake/lemon
...
Introduce the "Unlit" shading model support and apply it to Web Enitities
2016-05-12 15:09:50 -07:00
samcake
670826effc
appeasing linux gods ?
2016-05-12 14:50:41 -07:00
samcake
c6aeaf308b
appeasing linux gods ?
2016-05-12 14:36:45 -07:00
samcake
a436c54817
make scribe spit out bigger chunks of litteral strings
2016-05-12 14:14:05 -07:00
James B. Pollack
e92b4029b2
Merge pull request #7866 from imgntn/firePit
...
[Home] Updates to content
2016-05-12 13:48:40 -07:00
Seth Alves
009c288745
revert a change from previous fixes -- non-dynamic things should have to opt-into being grabbable. dynamic things have to opt-out
2016-05-12 13:29:40 -07:00
David Rowe
8f214a6b14
Merge branch 'master' into 99997
2016-05-12 17:50:34 +12:00
David Rowe
7be33a8584
Don't show header or dates and sizes when choosing a directory
2016-05-12 17:25:44 +12:00
David Rowe
d798e562fc
Update scrollbar in tree view to match table scrollbar
...
Used in Running Scripts and Asset Browser dialogs.
2016-05-12 17:18:30 +12:00
David Rowe
b6fcb77d6f
Update Running Scripts list to use updated QML table control
2016-05-12 17:16:56 +12:00
David Rowe
c29b82e24d
Restyle file selection dialog
...
First pass
2016-05-12 17:08:28 +12:00
Anthony Thibault
8fecb51dde
Merge pull request #7846 from hyperlogic/tony/improved-avatar-debug-draw
...
Eye tracking bug fix and debug rendering improvements
2016-05-11 17:41:49 -07:00
Zach Pomerantz
8db1f296de
Check vector access in fbx reader
2016-05-11 15:17:59 -07:00
Brad Hefta-Gaub
d656f61c64
Merge pull request #7759 from jherico/app_plugin_type
...
Don't expose raw pointer to the display plugin
2016-05-11 14:49:22 -07:00
Brad Davis
ba357721bf
Merge pull request #7864 from hyperlogic/tony/vive-controller-improvements
...
Fix for vive controllers sometimes not working
2016-05-11 14:32:33 -07:00
David Rowe
57fae3fc51
Add FiraSans-Regular font
2016-05-12 09:28:25 +12:00
Anthony J. Thibault
95ef543f25
viveTouchpadTest.js: don't throw if there is no Vive controller attached.
2016-05-11 13:35:17 -07:00
samcake
80c80091e4
Cleaning up code
2016-05-11 11:12:39 -07:00
Brad Hefta-Gaub
e01681eb52
Merge pull request #7856 from ZappoMan/NUEtweaks
...
don't show help or login on first run
2016-05-11 10:53:09 -07:00
samcake
99dcfef5a8
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-05-11 10:47:38 -07:00
samcake
1ec9ef560e
Fixing the srgb color format conversion for web entities
2016-05-11 10:46:54 -07:00
Anthony J. Thibault
c91455a291
Added mapping from Vive LSTouch and RSTouch to Standard.
2016-05-11 10:36:55 -07:00
James B. Pollack
8cac61081d
change cuckoo and whiteboard positions
2016-05-11 10:33:06 -07:00
James B. Pollack
46c6999dd4
add fire sound
2016-05-11 09:59:50 -07:00
Anthony J. Thibault
09a4e0eaa8
Fix for vive controllers sometimes not working
...
* Fixed bug with input devices that where added, removed then re-added.
The default mappings were being ignored on the second add.
* Fixed potential crash when hardware inputPlugin device poses were polled from the JavaScript thread
by taking the UserInputManager lock during pluginUpdate.
* Renamed Controller.Hardware.Vive.LB & RB to LeftGrip and RightGrip, to better match Oculus touch.
* Updated resource/controller/vive.json to reflect this new mapping.
* Exposed touch pad capacitive touch events to JavaScript as
Controller.Hardware.Vive.LSTouch and RSTouch.
* Added viveTouchpadTest.js script to test LSTouch and RSTouch events.
2016-05-10 19:32:08 -07:00
samcake
e40a795a27
Trying to clean up for pr
2016-05-10 19:25:22 -07:00
James B. Pollack
af8a827c83
add fire remove plant
2016-05-10 17:18:21 -07:00
Brad Hefta-Gaub
757eea16a6
Merge pull request #7809 from howard-stearns/hand-controller-pointer
...
Hand controller pointer
2016-05-10 16:37:26 -07:00
Brad Hefta-Gaub
af6be7f5f3
Merge pull request #7845 from jherico/script_debug
...
Enable script debugging
2016-05-10 15:56:38 -07:00
Brad Hefta-Gaub
62b3c12d0f
fix comment
2016-05-10 15:53:10 -07:00
Brad Hefta-Gaub
a17acc6f6b
rename functions
2016-05-10 15:52:07 -07:00
Brad Hefta-Gaub
0eb2388f69
fix unix build buster
2016-05-10 15:00:50 -07:00
Anthony J. Thibault
80a349c65b
Merge branch 'master' into tony/improved-avatar-debug-draw
2016-05-10 14:50:13 -07:00
David Rowe
51d6d99c73
Fix up files list data and basic layout
2016-05-11 09:17:11 +12:00
Brad Davis
b117a4b8d7
Debugging menu destruction
2016-05-10 12:21:19 -07:00
Brad Hefta-Gaub
7958020f4e
only expect the 5 essential servers
2016-05-10 12:07:21 -07:00
Brad Hefta-Gaub
350743454b
Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1
...
use smart pointers for entity simulations
2016-05-10 11:35:57 -07:00
Brad Hefta-Gaub
963dda1b48
Merge pull request #7855 from hyperlogic/tony/updated-idle-animations
...
Updated default idle and turn animations.
2016-05-10 11:35:21 -07:00
Brad Hefta-Gaub
df34b49b41
fix white space
2016-05-10 11:34:11 -07:00
Brad Hefta-Gaub
33c5cb519a
cleanup firstRun with a common setting
2016-05-10 11:32:29 -07:00
Clément Brisset
c3ce463b6c
Merge pull request #7854 from zzmp/refactor/delayLoad
...
Clean up resource cache's encapsulation of asynchronous loading
2016-05-10 10:47:23 -07:00
