Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 06:24:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33567 commits 25 branches 0 tags 1.1 GiB
Commit graph

33567 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
21a3079a39 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-21 10:05:32 -07:00
Brad Hefta-Gaub
6465bb85dd Merge pull request #6124 from imgntn/bball_fixes 
[Scripts]  Fix Basketball Solidity in Toybox
 2015-10-21 09:11:12 -07:00
Brad Hefta-Gaub
954afe45d3 Merge pull request #6112 from ericrius1/rayPickAdditions 
Moved whitelist and raypicking code out of octree, fixed small bug with polylines
 2015-10-21 09:08:56 -07:00
Brad Hefta-Gaub
6902f5c54f Merge pull request #6130 from sethalves/grab 
grab script changes
 2015-10-21 09:02:41 -07:00
Brad Hefta-Gaub
5466fa1de8 Merge pull request #6128 from jherico/controllers 
Controllers Branch - Get conditional routes working
 2015-10-21 09:00:26 -07:00
Brad Davis
f0edc302bf Fixing filters creation 2015-10-20 22:06:08 -07:00
Brad Davis
a124d3b433 Moving to InputEndpoint, fixing build problem 2015-10-20 22:00:16 -07:00
Brad Davis
de57c3b4d6 Merge remote-tracking branch 'upstream/controllers' into controllers 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-20 21:59:00 -07:00
Andrew Meadows
a6ee1d0edb Merge pull request #6132 from ZappoMan/improveFindEntities 
improved findEntities(sphere) to check against Non-AABBox of entities
 2015-10-20 21:56:22 -07:00
Brad Davis
f71d1a6fb7 Merge pull request #6131 from samcake/controllers 
DO NOT MERGE: Controllers : Adding support for Pose
 2015-10-20 21:02:29 -07:00
Brad Hefta-Gaub
d34ad2af42 improved findEntities(sphere) to check against Non-AABBox of entities 2015-10-20 21:01:20 -07:00
Seth Alves
f85ef9267b oops 2015-10-20 18:29:27 -07:00
Seth Alves
311254c395 require user-data to have wantsTrigger in it before non-colliding calls will happen 2015-10-20 18:26:12 -07:00
samcake
da26d0dee1 Adding the hand poses channels in the controller mapping files 2015-10-20 18:19:44 -07:00
samcake
e0615309bb Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-20 17:48:38 -07:00
Brad Davis
cd940325c2 Merge remote-tracking branch 'upstream/controllers' into controllers 2015-10-20 17:48:29 -07:00
Brad Davis
0e419e3fbb Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-20 17:47:37 -07:00
samcake
6f7719e9e9 Finally getting the merge to work 2015-10-20 17:44:24 -07:00
Seth Alves
7dcbb5849a another bug 2015-10-20 17:44:12 -07:00
Seth Alves
ed480f651f missed a line 2015-10-20 17:43:31 -07:00
Seth Alves
f16b62df83 - grab script: possible fix for line disappearing 
- grab script: go from 3 pickrays back to 1
- grab script: put "sphere" test back in, but with fixed distance test
 2015-10-20 17:34:35 -07:00
Seth Alves
d0118e80a7 Merge pull request #6129 from imgntn/grab_two_hand_and_debugging 
[Scripts] handControllerGrab.js - add some logic for two-handed situations, add debugging visualization
 2015-10-20 17:04:29 -07:00
samcake
da55011c2a Trying to merge 2015-10-20 16:38:41 -07:00
Brad Davis
eacd6af032 Get conditional routes working 2015-10-20 16:32:00 -07:00
James B. Pollack
8e1c3c32d1 additions to debug and also to handle some two handed situations 2015-10-20 16:24:17 -07:00
Brad Davis
f54fe50c79 Merge pull request #6127 from AndrewMeadows/gitattributes 
gitattributes take 2
 2015-10-20 15:48:44 -07:00
James B. Pollack
fcaad60971 Merge branch 'AndrewMeadows-gitattributes' 2015-10-20 14:43:40 -07:00
Andrew Meadows
d02fe784a9 css and cfg filetypes are text in .gitattributes 2015-10-20 13:58:44 -07:00
Stephen Birarda
14aab4871d Merge pull request #6119 from Atlante45/baseball 
Fix autoresizing log spam
 2015-10-20 13:45:50 -07:00
Andrew Meadows
4ff05e8c2a fix lin endings of some JS files 2015-10-20 13:26:19 -07:00
Andrew Meadows
502fb9cca5 adding .gitattributes again 2015-10-20 13:12:16 -07:00
Brad Hefta-Gaub
9717a53b07 Merge pull request #6126 from jherico/marge 
Removing .gitattributes until we can tackle consistent line endings without impacting the team
 2015-10-20 12:48:06 -07:00
Brad Davis
630bad5433 Removing .gitattributes until we can tackle consistent line endings without impacting the team 2015-10-20 12:46:54 -07:00
James B. Pollack
af09871bed fix basketball solidity in toybox 2015-10-20 11:08:28 -07:00
Brad Hefta-Gaub
9c031b6bef Merge pull request #6121 from jherico/controllers 
Controllers Branch - End to end functionality
 2015-10-20 10:57:31 -07:00
Brad Davis
22139931f2 Warning fixes 2015-10-20 10:48:23 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:20:28 -07:00
samcake
16f96715a3 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-20 10:16:08 -07:00
Brad Davis
ef6c4f6f66 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:15:36 -07:00
samcake
07aac6b2c7 Merging with upstream 2015-10-20 10:13:47 -07:00
Brad Davis
8d0148a1ca Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-20 10:13:31 -07:00
Brad Hefta-Gaub
ea297166d8 Merge pull request #6123 from AndrewMeadows/fix-line-endings 
fix line endings in files that have mixed DOS/unix endings
 2015-10-20 10:12:10 -07:00
Andrew Meadows
7fa069cf30 fix line endings grumble gruble 2015-10-20 09:38:25 -07:00
Seth Alves
d64034c015 Merge pull request #6122 from ZappoMan/fixLaserLifetime 
fix laser lifetimes
 2015-10-20 09:33:06 -07:00
Brad Hefta-Gaub
dfe3e5b1cb fix laser lifetimes 2015-10-20 09:30:27 -07:00
ericrius1
0373a481f8 Using EntityItemIDs instead of QUuids 2015-10-20 09:22:16 -07:00
Andrew Meadows
341bc3666f Merge pull request #6093 from sethalves/hold-action-changes 
Hold action changes
 2015-10-20 09:19:48 -07:00
Philip Rosedale
282485d412 Merge pull request #6116 from AndrewMeadows/reduced-hips-shift-from-hand-targets 
hack to reduce hand influence of hips in HMD mode
 2015-10-19 22:31:50 -07:00
Brad Hefta-Gaub
f68d897104 Merge pull request #6120 from jherico/marge 
Fixing a bug in the gitattributes file
 2015-10-19 20:16:23 -07:00
Brad Davis
380b10ab8d Fixing a bug in the gitattributes file 2015-10-19 19:32:27 -07:00