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

46121 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
7c5b8cb75d send faux joints to the avatar-mixer 2016-08-25 15:21:29 -07:00
Seth Alves
948b4b7a15 in search, consider distance from grab-point rather than from avatar-hand when selecting the closest entity 2016-08-25 13:46:52 -07:00
Seth Alves
0783629cde grab-point sphere is a child of controller joint, so it doesn't jitter 2016-08-25 13:31:07 -07:00
Seth Alves
39f52b3682 start on faux avatar joint that represent hand controllers 2016-08-25 10:58:23 -07:00
Seth Alves
7b1db2c8a9 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-25 10:41:53 -07:00
Seth Alves
3750488b8d Merge branch 'grab-point-sphere' of github.com:sethalves/hifi into joints-for-controllers 2016-08-25 10:41:41 -07:00
Anthony Thibault
8d5a896ccf Merge pull request #8524 from AndrewMeadows/fix-default-scripts 
fix typo
 2016-08-25 10:28:27 -07:00
Andrew Meadows
da387a958a fix typo 2016-08-25 10:26:05 -07:00
Seth Alves
cab30651d0 cleanups 2016-08-25 09:47:14 -07:00
Brad Hefta-Gaub
b5adf1cf4c Merge pull request #8515 from AndrewMeadows/include-default-scripts 
include default scripts instead of loading them
 2016-08-25 09:41:32 -07:00
Andrew Meadows
a0911d2b9d add local scope wrappers to new default scripts 2016-08-25 09:04:06 -07:00
Andrew Meadows
fefe5e30ec don't use globals and remove double definitions 2016-08-25 08:57:06 -07:00
Andrew Meadows
6f6a7bcc44 wrap default scripts with local scope 2016-08-25 08:57:06 -07:00
Andrew Meadows
3690b38c65 fix warnings found by eslint in defaultScripts.js 2016-08-25 08:56:22 -07:00
Andrew Meadows
13a12a2a13 Script.include() default scripts not Script.load() 2016-08-25 08:56:22 -07:00
Brad Davis
479d90a462 Merge remote-tracking branch 'upstream/stable' 2016-08-24 19:31:11 -07:00
Chris Collins
2c5a672c2a Merge pull request #8521 from jherico/hotfix_fade_fix 
Make sure we start fade in once an item becomes ready
 2016-08-24 19:29:02 -07:00
James B. Pollack
f7697c88ae Merge pull request #8476 from zzmp/fix/vive-ati 
fix vive crash in AMD driver
 2016-08-24 18:06:18 -07:00
Brad Davis
5cdb30357f Add checking for failed downloads in the textures 2016-08-24 18:03:56 -07:00
Anthony Thibault
f971b4b041 Merge pull request #8457 from hyperlogic/feature/handheld-marketplace 
Handheld Marketplace Tablet
 2016-08-24 17:59:39 -07:00
Anthony J. Thibault
c234f1b65d marketplace.js: merge fix for WebTablet.js path 2016-08-24 16:26:53 -07:00
Seth Alves
3e18eb79c0 Merge branch 'feature/handheld-marketplace' of github.com:hyperlogic/hifi into joints-for-controllers 2016-08-24 16:10:48 -07:00
Anthony J. Thibault
c2af948e25 Merge branch 'master' into feature/handheld-marketplace 2016-08-24 16:07:04 -07:00
Brad Davis
c5628b615c Make sure we start fade in once an item becomes ready 2016-08-24 16:05:22 -07:00
Brad Hefta-Gaub
99ea180f09 Merge pull request #8495 from AndrewMeadows/faster-spherical-harmonics 
speed up spherical harmonics calculation with minimal error
 2016-08-24 15:57:42 -07:00
James B. Pollack
d9ebad7976 Merge pull request #8372 from elisa-lj11/zip_project 
Added Clara.io to the marketplace
 2016-08-24 15:53:58 -07:00
Ryan Huffman
4897d721c3 Merge pull request #8505 from imgntn/json_editor 
New Editor for UserData JSON
 2016-08-24 15:49:32 -07:00
Anthony J. Thibault
fce207ba5d eslint fix 2016-08-24 15:31:13 -07:00
James B. Pollack
af2fb5d7ed beautify more html 2016-08-24 14:54:00 -07:00
James B. Pollack
5305ec7feb html beautify 2016-08-24 14:51:15 -07:00
James B. Pollack
384c3dd543 cleanup and handle a bug when changing from normal text userdata to another field 2016-08-24 14:49:41 -07:00
James B. Pollack
45e3f926a1 removed unused prints and cleanup 2016-08-24 14:19:27 -07:00
Seth Alves
82122c7183 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-24 14:15:48 -07:00
Seth Alves
b8603134ad Merge branch 'feature/handheld-marketplace' of github.com:hyperlogic/hifi into joints-for-controllers 2016-08-24 12:54:30 -07:00
Brad Davis
211fb3f3df Merge pull request #8520 from highfidelity/stable 
Stable to Master
 2016-08-24 12:20:29 -07:00
Chris Collins
2514587899 Merge pull request #8508 from highfidelity/RC-19 
Beta Release 19 - Includes up to Developer Release 5298
 2016-08-24 11:40:41 -07:00
Zach Pomerantz
6c99a33009 detect unset skybox 2016-08-24 11:03:07 -07:00
Chris Collins
8163fc785a Merge pull request #8516 from zzmp/fix/default-skybox 
fix default skybox behavior
 2016-08-24 10:32:57 -07:00
Anthony J. Thibault
1939c6915a Bug-fixes for marketplace toggling 2016-08-24 10:05:27 -07:00
James B. Pollack
48bab49210 in the right place... thanks howard! 2016-08-23 21:09:44 -07:00
James B. Pollack
c4c6b30440 center after teleport 2016-08-23 21:09:17 -07:00
James B. Pollack
2f4617cd5e quiet some prints 2016-08-23 18:20:33 -07:00
James B. Pollack
a5054487ba save on no selections, select another entity, etc 2016-08-23 18:18:43 -07:00
Seth Alves
18852137b5 cleanups, avoid pop when grabbing 2016-08-23 17:06:53 -07:00
Seth Alves
dbe65df90b merge from upstream 2016-08-23 16:42:02 -07:00
James B. Pollack
3abbc98857 save when focus on inputs 2016-08-23 15:48:04 -07:00
Zach Pomerantz
c740b263a8 detect unset skybox 2016-08-23 15:16:26 -07:00
James B. Pollack
477ed88284 remove autosave, disable save button until change 2016-08-23 14:34:28 -07:00
Howard Stearns
89b00883dd Merge pull request #8428 from highfidelity/discovery 
Snapshot of Snapshot-Discovery to master
 2016-08-23 14:32:10 -07:00
Ryan Downe Karpf
82041e4baa Merge pull request #8514 from imgntn/center_hud 
Center HMD Hud after teleport
 2016-08-23 13:34:29 -07:00