Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 04:10:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33173 commits 76 branches 59 tags 1.2 GiB
Commit graph

33173 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
f860ca923e revert small hack 2015-10-12 16:01:26 -07:00
Ryan Huffman
ebeb87ba62 test 2015-10-12 11:21:40 -07:00
Brad Davis
f77878ee79 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-12 11:05:28 -07:00
samcake
b89121a7ad Merge pull request #6057 from jherico/controllers 
Working on refactoring the xbox hardware access and wiring up test code
 2015-10-12 10:50:30 -07:00
Brad Davis
14f511350d Working on refactoring the xbox hardware access and wiring up test code 2015-10-12 10:47:23 -07:00
Brad Hefta-Gaub
f8956a853b Merge pull request #6051 from jherico/marge 
Cleanup CMake files
 2015-10-11 16:22:56 -07:00
Brad Davis
d29c7ef267 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-11 16:12:51 -07:00
Brad Davis
8024d9f017 Merge pull request #6055 from ZappoMan/newControllerInterface 
implement StandardController and expose it to JS as Controller.Standard.*
 2015-10-11 16:10:42 -07:00
Brad Hefta-Gaub
21a473035e more CR feedback 2015-10-11 15:37:17 -07:00
Brad Davis
8f2ed2ca5c Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-11 15:32:29 -07:00
Brad Hefta-Gaub
312bbf6167 CR feedback 2015-10-11 15:15:20 -07:00
Brad Hefta-Gaub
9667a103aa actually add new files 2015-10-11 15:02:11 -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
61ab1a1935 Merge pull request #6054 from ZappoMan/fixEdit 
temp fix to get editing working again
 2015-10-11 14:03:04 -07:00
Brad Hefta-Gaub
e09fe30f05 damn you visual studio 2015-10-11 14:02:33 -07:00
Brad Hefta-Gaub
b5b4c2153a temp fix to get editing working again 2015-10-11 14:00:35 -07:00
Brad Hefta-Gaub
b880855998 Merge pull request #6029 from jherico/homer 
Low level support for URL overrides when loading content
 2015-10-11 11:34:07 -07:00
Brad Davis
cd1b758534 PR comments 2015-10-11 00:32:31 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Brad Davis
e5fc2e5525 Low level support for URL overrides when loading content 2015-10-10 23:00:15 -07:00
Brad Davis
14f33258ae Working on test code, new controller interface 2015-10-10 16:08:44 -07:00
Brad Davis
80c95cd8eb Fixing access to second based timestamp 2015-10-10 16:07:26 -07:00
Brad Davis
52c65b917f Merge remote-tracking branch 'upstream/master' into controllers 2015-10-10 12:48:49 -07:00
Brad Davis
700c11563c Merge pull request #6050 from ZappoMan/newControllerInterface 
Expose Controller.Hardware.* constants to JavaScript
 2015-10-10 12:43:43 -07:00
Brad Hefta-Gaub
83bf8c8742 Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface 2015-10-10 09:43:07 -07:00
Brad Hefta-Gaub
b7b2c30eaa Merge pull request #6049 from sethalves/less-picky 
grab script picks less
 2015-10-10 09:41:49 -07:00
Seth Alves
5c95306e8e merge from upstream 2015-10-10 09:34:13 -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
69d6e5d298 Merge pull request #6046 from sethalves/flip-you-for-real 
add a userdata flag to toggle ignoreForCollisions while holding an entity
 2015-10-10 09:25:57 -07:00
Brad Davis
9e4a7a6226 Working on controller refactoring 2015-10-10 03:05:42 -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
e48206f1b5 Merge pull request #6047 from howard-stearns/log-hydra-disconnect 
Log when hydra is disconnected.
 2015-10-09 20:41:27 -07:00
Seth Alves
7824d03e11 grab script picks 5x per second rather than 60x 2015-10-09 17:56:32 -07:00
Brad Davis
c2da6600f5 Fixing includes 2015-10-09 17:49:24 -07:00
Brad Davis
a801aeea50 Merge pull request #6048 from samcake/controllers 
Controllers Branch: adding example mapping files
 2015-10-09 17:48:35 -07:00
samcake
3d607f406f revert change to the slf file 2015-10-09 17:40:36 -07:00
samcake
297c3c9ed0 Fixing json issues 2015-10-09 17:37:51 -07:00
samcake
502cb90e02 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-09 17:32:14 -07:00
samcake
f80e59e6b9 Merge branch 'controllers' of https://github.com/samcake/hifi into controllers 2015-10-09 17:32:00 -07:00
Brad Davis
78624679ed Adding more parsing functions 2015-10-09 17:30:46 -07:00
samcake
c02d33c17c Adding example mapping files 2015-10-09 17:27:50 -07:00
samcake
01a3539a2a Merge branch 'controllers' of https://github.com/samcake/hifi into controllers 2015-10-09 17:25:45 -07:00
Brad Davis
c3775623aa Splitting files, adding test skeleton 2015-10-09 17:23:52 -07:00
samcake
0587c23b67 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-09 16:22:24 -07:00
Brad Davis
184e9a2209 Prototyping controllers 2015-10-09 16:20:55 -07:00
Howard Stearns
7ba149fbbd Log when hydra is disconnected. 2015-10-09 16:19:14 -07:00