Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-19 13:12:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
33459 commits 76 branches 59 tags 1.2 GiB
Commit graph

33459 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
5a0bb4c31b Fixing line endings 2015-10-19 16:51:31 -07:00
Brad Davis
052ad1236c Merge pull request #6111 from samcake/controllers 
Avoid to create a route when the source is not defined
 2015-10-19 13:15:24 -07:00
samcake
3d8b7f9d10 Avoid to create a route when the source is not defined 2015-10-19 12:56:06 -07:00
samcake
9ae1da371e Merge pull request #6108 from jherico/controllers 
Controllers Branch - Breaking up UserInputMapper, restoring some mappings
 2015-10-19 11:16:13 -07:00
Brad Davis
22602fb6f6 Fixing line endings 2015-10-19 10:00:16 -07:00
Brad Davis
edd2ce27f8 Merge remote-tracking branch 'upstream/controllers' into controllers 2015-10-19 09:59:37 -07:00
Brad Davis
1de811c754 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-19 09:59:03 -07:00
Brad Hefta-Gaub
c04cdc4964 Merge pull request #6109 from jherico/marge 
Fixing line endings and adding git attribute files
 2015-10-19 08:33:02 -07:00
Brad Davis
282cdadf63 Fixing line endings 2015-10-18 22:55:14 -07:00
Brad Davis
82c041d06a Adding git attributes file 2015-10-18 22:54:04 -07:00
Brad Davis
a8e707ced2 Correcting update order to fix mouse 2015-10-18 22:46:14 -07:00
Brad Davis
184303d3c9 Using JS mappings for joystick, updating test code 2015-10-18 20:44:32 -07:00
Brad Davis
734a39f962 Breaking up UserInputMapper, restoring some mappings 2015-10-18 18:58:03 -07:00
Brad Hefta-Gaub
a75316f27b Merge pull request #6107 from jherico/controllers 
Move controller test to app
 2015-10-18 14:42:32 -07:00
Brad Davis
57be59935d Move controller test to app 2015-10-17 19:13:38 -07:00
Brad Hefta-Gaub
12583533d4 Merge pull request #6106 from ZappoMan/controllers 
remove dead code
 2015-10-17 14:53:53 -07:00
Brad Hefta-Gaub
fda8292fa6 remove dead code 2015-10-17 14:53:23 -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