Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 15:46:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34009 commits 25 branches 0 tags 1.1 GiB
Commit graph

34009 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Howard Stearns
574a51e831 Use cleaner interface. 2015-10-20 17:02:16 -07:00
Howard Stearns
3d2f00c609 Cleaner intgerface, including cleanup. 2015-10-20 17:01:45 -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
Howard Stearns
4c6867bb9c Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-20 12:17:00 -07:00
James B. Pollack
b0ae55ee63 update cat purr header 2015-10-20 11:28:04 -07:00
James B. Pollack
771e5a4f9d add toybox ac scripts, write headers for them, organize 2015-10-20 11:21:09 -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
Howard Stearns
2213a4bb02 Do not set (just rightHand) anim var if a script has done so. 2015-10-19 20:09:48 -07:00
Brad Davis
380b10ab8d Fixing a bug in the gitattributes file 2015-10-19 19:32:27 -07:00
Brad Hefta-Gaub
e3ea7fb97f Merge pull request #6117 from ZappoMan/fixControllerWarnings 
fix several warnings
 2015-10-19 19:28:18 -07:00
samcake
8701d73ee9 DOing the groundwork to pass along the pose 
still not working
 2015-10-19 19:05:37 -07:00
Clément Brisset
62923beef1 Merge pull request #6118 from ZappoMan/fixWarningsInMaster 
fix warning in master
 2015-10-19 18:23:30 -07:00
Atlante45
1c46f2aa75 Fix autoresizing log spam 2015-10-19 18:22:44 -07:00
Brad Hefta-Gaub
9f17f10d6a fix warning in master 2015-10-19 17:56:38 -07:00
Seth Alves
4feb9dc8c6 prepare for possible future coding standard 2015-10-19 17:46:34 -07:00
Brad Hefta-Gaub
9acff9497c fix several warnings 2015-10-19 17:34:59 -07:00
Brad Hefta-Gaub
0068af4cb6 fix several warnings 2015-10-19 17:31:42 -07:00
Brad Hefta-Gaub
7669f9ed2c fix several warnings 2015-10-19 17:26:57 -07:00
Seth Alves
41f7ef1e2e cleanups 2015-10-19 16:53:27 -07:00
Brad Hefta-Gaub
56f625d376 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-19 16:53:25 -07:00
Brad Davis
5a0bb4c31b Fixing line endings 2015-10-19 16:51:31 -07:00
samcake
b977a094d3 Merge pull request #6115 from ZappoMan/fixLOD 
fix model LOD behavior
 2015-10-19 16:16:48 -07:00
Seth Alves
bddbe89c86 don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action 2015-10-19 16:13:53 -07:00
Seth Alves
2b24ef2c83 Merge pull request #6114 from Atlante45/vhacd_fix 
Fix vhacd for models with quads
 2015-10-19 16:11:28 -07:00