Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33176 commits 71 branches 56 tags 1.2 GiB
Commit graph

33176 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
c63ef10c67 got rid of query string 2015-10-14 11:50:35 -07:00
ericrius1
0991be3255 got rid of printing statements 2015-10-14 11:44:47 -07:00
ericrius1
22615dae07 Don't delete board on script close 2015-10-14 11:43:05 -07:00
ericrius1
6cd9bf407f Reverted handControllerGrab 2015-10-14 11:40:06 -07:00
ericrius1
7fb6b7e272 Reverted hand controller 2015-10-14 11:31:09 -07:00
ericrius1
d072a2efd3 laser pointer now showing up all the time 2015-10-14 11:26:38 -07:00
ericrius1
1a9c1110c0 Fixed gap between strokes 2015-10-14 11:17:54 -07:00
ericrius1
20d1a2440c Ignoring unknown types in collision 2015-10-14 11:15:49 -07:00
ericrius1
caacbcbe78 Adjust erase box position 2015-10-14 10:40:55 -07:00
ericrius1
8e21999e44 erasing board 2015-10-13 16:54:37 -07:00
ericrius1
e42bbbc10d Adding erase board feature to whiteboard 2015-10-13 16:41:05 -07:00
ericrius1
2c8b85bb5c Displaying overlay laser pointer, user must past threshold to paint 2015-10-13 16:13:24 -07:00
ericrius1
4c877e8204 Changing color when grabbing colored boxes 2015-10-13 15:46:10 -07:00
ericrius1
b54b488b9e Adding in color selecting 2015-10-13 15:23:02 -07:00
ericrius1
a3f948acf8 Adding entity script to each color box 2015-10-13 15:00:38 -07:00
ericrius1
ad61b89abd setting up colors, adding some functions to utils.js 2015-10-13 14:16:28 -07:00
ericrius1
b490f9e2c1 Drawing line width based on trigger squeeze 2015-10-13 13:33:24 -07:00
ericrius1
470c8f7ef8 Painting on whiteboard with no judder 2015-10-13 11:31:56 -07:00
ericrius1
47c3df7587 Cleaned up spacing 2015-10-12 17:38:52 -07:00
ericrius1
2f620e654b Fixed styling 2015-10-12 17:37:51 -07:00
ericrius1
04f0d792bb Reverted grab back to 5 hz 2015-10-12 17:36:53 -07:00
ericrius1
33ff21f376 Got rid of debug message in handControllerGrab script 2015-10-12 17:36:07 -07:00
ericrius1
fb040426eb added explanatory comment 2015-10-12 17:34:50 -07:00
ericrius1
f93b1d3325 Correctly whitelisting entities for ray picking 2015-10-12 17:05:34 -07:00
ericrius1
8d39f9c760 Syntax fixes 2015-10-12 15:02:03 -07:00
ericrius1
d01dda9c81 Adding in functionality to include only specified Ids in ray picking 2015-10-12 14:40:11 -07:00
ericrius1
8dddf0e17a Added findRayIntersection, and confirmed judder grew a lot worse 2015-10-12 11:15:04 -07:00
ericrius1
96fd634138 Pre- ray cast 2015-10-12 11:02:47 -07:00
ericrius1
56a2aa101c baseline judder test for whiteboard painting- pre entity ray test 2015-10-12 10:44:18 -07:00
ericrius1
fb4aad1f32 adding whiteboard 2015-10-12 10:11:46 -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
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 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
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