Brad Davis
|
57be59935d
|
Move controller test to app
|
2015-10-17 19:13:38 -07:00 |
|
Brad Davis
|
f4380da857
|
Merge pull request #6105 from ZappoMan/controllers
[Controllers Branch] - various updates
|
2015-10-17 14:28:34 -07:00 |
|
Brad Hefta-Gaub
|
8578b40236
|
get JS source functions working across threads
|
2015-10-17 14:14:45 -07:00 |
|
Brad Hefta-Gaub
|
7956d737ab
|
fix thread safety issue on JS based fliters
|
2015-10-17 14:08:21 -07:00 |
|
Brad Hefta-Gaub
|
7d48fe9187
|
don't include Standard device in Controllers.Hardware
|
2015-10-17 13:00:43 -07:00 |
|
Brad Hefta-Gaub
|
251a55b1fb
|
rename hardware controllers to not have device ID in the name
|
2015-10-17 12:52:37 -07:00 |
|
Brad Hefta-Gaub
|
293b7c12e1
|
change join to makeAxis, fix some warnings
|
2015-10-17 12:46:05 -07:00 |
|
Brad Hefta-Gaub
|
e888391e7e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
|
2015-10-17 12:35:48 -07:00 |
|
Brad Hefta-Gaub
|
f90f0ed1f3
|
apply Huffman's feedback to Sam's PR
|
2015-10-17 12:34:32 -07:00 |
|
Brad Hefta-Gaub
|
fd5a5bb104
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-17 12:22:39 -07:00 |
|
Brad Hefta-Gaub
|
23839d7b45
|
Merge pull request #6103 from samcake/controllers
Controllers : Adding support for load mapping from json URL
|
2015-10-17 12:22:22 -07:00 |
|
Brad Hefta-Gaub
|
4289d54bd9
|
Merge pull request #6102 from Atlante45/master
Fix particle bug by having lifetimes increase
|
2015-10-17 12:21:47 -07:00 |
|
Brad Hefta-Gaub
|
75c59fad99
|
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
|
2015-10-17 12:18:14 -07:00 |
|
Ryan Huffman
|
29a29d997d
|
Merge pull request #6100 from imgntn/edit_better
[Scripts] Edit.js - Add color bars below XYZ inputs to indicate world axis
|
2015-10-16 22:17:37 -07:00 |
|
Atlante45
|
1da68e0214
|
Fix particle bug by having lifetimes increase
|
2015-10-16 18:11:22 -07:00 |
|
samcake
|
941f95c7d4
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-16 18:07:25 -07:00 |
|
samcake
|
20416455db
|
Adding the loadMapping feature
|
2015-10-16 18:06:58 -07:00 |
|
samcake
|
f675035fd1
|
Merge pull request #6101 from jherico/controllers
Hydra controller updates and test code
|
2015-10-16 17:43:44 -07:00 |
|
Brad Davis
|
5bac1aae2d
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2015-10-16 17:23:30 -07:00 |
|
Brad Davis
|
db0fa6b8ed
|
Update hydra mappings and test code
|
2015-10-16 17:23:09 -07:00 |
|
Brad Davis
|
1dcf03d61e
|
Put standard 'makeinput' functions on the base class
|
2015-10-16 17:20:52 -07:00 |
|
Eric Levin
|
6738455a5a
|
Merge pull request #6099 from ctrlaltdavid/20709
QA for 20709 - Fix reading of QVector<float> from models files - polyline strokeWidths
|
2015-10-16 17:12:18 -07:00 |
|
James B. Pollack
|
31cc451fd4
|
css cleanup
|
2015-10-16 16:42:29 -07:00 |
|
James B. Pollack
|
c6fcaf158b
|
add color to more props
|
2015-10-16 16:15:20 -07:00 |
|
James B. Pollack
|
aa6aaf912e
|
add color bars below position inputs
|
2015-10-16 16:07:20 -07:00 |
|
David Rowe
|
8c22db17cc
|
Fix reading of QVector<float> from models files - polyline strokeWidths
|
2015-10-16 15:43:23 -07:00 |
|
samcake
|
974d2e20ff
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-16 15:25:06 -07:00 |
|
samcake
|
6d3d29b6b7
|
Adding a new mapping
|
2015-10-16 15:24:44 -07:00 |
|
Brad Davis
|
94ff1893d4
|
Merge pull request #6098 from samcake/controllers
Controllers : Wiring the Endpoint to actions and actually replace the legacy system
|
2015-10-16 15:19:44 -07:00 |
|
samcake
|
0fc04ab297
|
Fixing the review comments and setting the StandardDevice of USerINputMapper in the registeredDevices just like any other, only the ID is special
|
2015-10-16 14:45:38 -07:00 |
|
samcake
|
f0034844e7
|
Actions working from the Controller layer
|
2015-10-16 12:24:12 -07:00 |
|
Eric Levin
|
9a87f5c574
|
Merge pull request #6096 from imgntn/resetter_acs
[Scripts] - Move resetting basketballs and targets to an AC script
|
2015-10-16 12:18:15 -07:00 |
|
James B. Pollack
|
4b21bdf308
|
testing
|
2015-10-16 11:50:13 -07:00 |
|
Brad Hefta-Gaub
|
88a66d3c52
|
Merge pull request #6088 from hyperlogic/tony/regen-english-translation-strings
Updated english translation file
|
2015-10-16 10:59:26 -07:00 |
|
Seth Alves
|
8338491c3b
|
Merge pull request #6095 from Atlante45/master
Fix export bug
|
2015-10-16 07:32:56 -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 |
|
Atlante45
|
a84fdecec9
|
Fix export bug
|
2015-10-15 18:43:32 -07:00 |
|
samcake
|
43d7fe491e
|
wiring the actions
|
2015-10-15 17:53:53 -07:00 |
|
Brad Hefta-Gaub
|
26f82e899e
|
Merge pull request #6079 from ericrius1/whiteboard
Entity whitelist for raypicking and whiteboard painting example
|
2015-10-15 17:50:35 -07:00 |
|
Brad Hefta-Gaub
|
c3ee419ad7
|
Merge pull request #6086 from imgntn/flashlight_life
[Scripts] Add lifetime to lights created by flashlight
|
2015-10-15 17:42:57 -07:00 |
|
ericrius1
|
97fe0170cb
|
glowing box for black color
|
2015-10-15 17:09:41 -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 |
|
Brad Hefta-Gaub
|
3718149157
|
include inbound queue PPS stats in server stats page
|
2015-10-15 15:49:12 -07:00 |
|
samcake
|
d44beca29f
|
Merge pull request #6092 from jherico/controllers
Controllers Branch - Fix hardware access from JS...
|
2015-10-15 15:41:36 -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 |
|
Brad Hefta-Gaub
|
e1570e3197
|
include inbound queue PPS stats in server stats page
|
2015-10-15 15:31:52 -07:00 |
|
Brad Hefta-Gaub
|
82a211174b
|
added packet recieved,lost,recovered stats to detailed server stats page
|
2015-10-15 15:23:12 -07:00 |
|
Brad Hefta-Gaub
|
1f6a2f3c21
|
Merge pull request #6081 from samcake/controllers
Controllers mapping created from JSON, first draft
|
2015-10-15 15:19:42 -07:00 |
|
James B. Pollack
|
aee11d4c06
|
cleanup merge
|
2015-10-15 15:05:34 -07:00 |
|
samcake
|
63ad9ae198
|
Fixing the include file names...
|
2015-10-15 15:02:55 -07:00 |
|