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

33500 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
4b4907c9ef Allow multiple scripts to register, and allow them to specify the specific anim vars they are interested in. 2015-10-26 10:04:55 -07:00
Howard Stearns
900b07fdee dead code 2015-10-26 10:00:07 -07:00
Howard Stearns
e11b0add9a Update safety trampoline with correct arguments. 2015-10-24 15:29:49 -07:00
Howard Stearns
23e7274ac4 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-24 09:37:08 -07:00
Brad Hefta-Gaub
5cf936f132 Merge pull request #6163 from imgntn/move_files 
[Scripts] Move scripts no longer in toybox to better locations
 2015-10-23 12:26:38 -07:00
James B. Pollack
6392b7080b move scripts no longer in toybox to better locations 2015-10-23 10:36:32 -07:00
Howard Stearns
84cfeaec13 Linux QT wants .h-less headers. 2015-10-22 17:01:06 -07:00
howard-stearns
92ddedd44b Make msvc happy. 2015-10-22 16:44:15 -07:00
howard-stearns
7638a58ce9 Merge branch 'expose-anim-vars' of https://github.com/howard-stearns/hifi into expose-anim-vars 2015-10-22 16:29:14 -07:00
Howard Stearns
773e4014ca Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-22 16:26:59 -07:00
Howard Stearns
2b7ceffd64 Get rid of globalObject().property("MyAvatar").property("animationStateHandlerResult"). 2015-10-22 16:23:09 -07:00
Howard Stearns
913842ac30 Thread check, for consistency. 2015-10-22 15:31:17 -07:00
Howard Stearns
f0a4e25e89 Name change per comments. 2015-10-22 15:25:14 -07:00
Howard Stearns
ecc920199d Return id suitable for use with remover, per comments. 2015-10-22 15:24:24 -07:00
Howard Stearns
1d0464ede5 Name change and thread checks per comments. 2015-10-22 15:15:10 -07:00
Howard Stearns
759e652506 Thread test per comments. 2015-10-22 15:13:14 -07:00
James B. Pollack
cd2559f1cc Merge pull request #6153 from ZappoMan/addKeyholeRadiusToEntityViewer 
Add Ability to set keyhole radius on EntityViewer
 2015-10-22 14:06:07 -07:00
Howard Stearns
dbf5072814 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-22 13:35:30 -07:00
Brad Hefta-Gaub
ea917f85f4 added ability to set keyhole radius on EntityViewer 2015-10-22 12:56:45 -07:00
Brad Hefta-Gaub
4a7f5751f4 Merge pull request #6151 from samcake/color 
Fix the dark diffuse color for material without texture
 2015-10-22 12:23:41 -07:00
samcake
b2461a8e4e Merge branch 'master' of https://github.com/highfidelity/hifi into color 2015-10-22 12:06:20 -07:00
Brad Davis
0755ba8ba4 Merge pull request #6150 from birarda/qt-5.5 
final fixes required for successful Qt 5.5.1 build
 2015-10-22 11:51:15 -07:00
Howard Stearns
30429e8138 Don't use late-breaking results that got reported after the handler was removed. 2015-10-22 11:43:22 -07:00
Howard Stearns
b5ccd49959 Make ubuntu happy. 2015-10-22 11:42:50 -07:00
samcake
a44ac4cbfd Fiing the dark colors for surfaces without texture 2015-10-22 11:40:56 -07:00
Stephen Birarda
a8d591166e Merge branch 'master' of https://github.com/highfidelity/hifi into qt-5.5 2015-10-22 11:13:28 -07:00
Stephen Birarda
695f0a75b0 fixes for builds with qt 5.5 2015-10-22 11:12:51 -07:00
howard-stearns
86c1483862 Merge branch 'expose-anim-vars' of https://github.com/howard-stearns/hifi into expose-anim-vars 2015-10-22 10:52:45 -07:00
howard-stearns
ba948dd5ea Merge branch 'master' into expose-anim-vars 2015-10-22 10:49:36 -07:00
Howard Stearns
a58539be82 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-22 10:39:54 -07:00
Howard Stearns
9fd61907f5 Call back to Javascript asynchronously, so that we don't block and the script's engine doesn't have thread conflicts. 2015-10-21 20:50:07 -07:00
samcake
613b509ba1 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-10-21 16:40:18 -07:00
Andrew Meadows
27c6624f0c Merge pull request #6142 from ZappoMan/fixEntityItemDependency 
fix EntityItemID dependency
 2015-10-21 14:57:07 -07:00
Brad Hefta-Gaub
856af8c764 fix EntityItemID dependency 2015-10-21 14:33:12 -07:00
James B. Pollack
03d740914d Merge pull request #6136 from imgntn/cleanup_toybox 
[Scripts] Toybox Cleanup & Organization
 2015-10-21 13:59:13 -07:00
Brad Hefta-Gaub
8f90cdf98c Merge pull request #6137 from sethalves/fix-kinematic-grab 
Fix kinematic hold-action transmission
 2015-10-21 12:44:05 -07:00
Seth Alves
47d48d8cd1 Merge branch 'master' of github.com:highfidelity/hifi into fix-kinematic-grab 2015-10-21 12:29:35 -07:00
Seth Alves
c0eccca6d3 relay 'kinematic' mode of a hold to other interfaces 2015-10-21 12:29:26 -07:00
James B. Pollack
b302244a08 Merge pull request #6134 from ZappoMan/improveFindEntities 
implement improvement in sphere test
 2015-10-21 12:11:20 -07:00
James B. Pollack
384a6a8154 rename /toys to /toybox, remove non toybox scripts, update master refs 2015-10-21 11:36:49 -07:00
Eric Levin
970d189262 Merge pull request #6125 from imgntn/toybox_ac 
[Scripts] Add Toybox AC Scripts, cleanup their headers, organize
 2015-10-21 11:24:59 -07:00
James B. Pollack
f3181054c9 Merge pull request #6133 from ericrius1/grabFixes 
Added wantsTrigger to userData for a couple toys to avoid breakage …
 2015-10-21 11:16:35 -07:00
James B. Pollack
0b06cf1dfb cleanup 2015-10-21 10:53:32 -07:00
James B. Pollack
68d43dc576 reduce number of toybox sound scripts 2015-10-21 10:50:37 -07:00
Brad Hefta-Gaub
246e46b69a implement improvement in sphere test 2015-10-21 10:46:50 -07:00
ericrius1
1c5dc0374a Added wantsTrigger to user data for a couple items to avoid breakage with new grab script changes 2015-10-21 10:16:31 -07:00
James B. Pollack
80fb12b1a4 Merge branch 'master' into toybox_ac 2015-10-21 09:58:49 -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