Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 09:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36759 commits 71 branches 56 tags 1.2 GiB
Commit graph

36759 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
c17e8a6d9e Merge pull request #6753 from jherico/sdl_fix 
Fix SDL breakage due to missing init
 2016-01-03 10:11:19 -10:00
Brad Hefta-Gaub
02835fc960 Merge pull request #6702 from hyperlogic/tony/soft-attachments 
Soft Attachment Support
 2016-01-03 08:46:16 -10:00
Seth Alves
b190b2757e Merge pull request #6751 from hyperlogic/tony/model-entity-item-animation-fix 
ModelEntityItem: Fix for missing pre-rotations for animated models.
 2016-01-01 07:08:24 -08:00
Philip Rosedale
60bc023d6e Merge pull request #6754 from PhilipRosedale/master 
Show hand-sphere search line and point just with hand direction again
 2015-12-31 13:53:21 -08:00
Philip Rosedale
85a0dfa21a remove debug line 2015-12-31 13:49:24 -08:00
Philip Rosedale
f4389c3b1f Add head-to-hand mixing ratio, default to zero (hands only) 2015-12-31 13:36:24 -08:00
Philip Rosedale
c18a2fc264 blend 50/50 between head and hands for search 2015-12-31 11:56:37 -08:00
Philip Rosedale
0d4ac4387a Show hand-sphere search line and point just with hand direction again 2015-12-31 11:46:35 -08:00
Brad Davis
7d71a187d8 Fix SDL breakage due to missing init 2015-12-31 08:47:27 -08:00
Eric Levin
9276c78368 Merge pull request #6741 from PhilipRosedale/master 
Improved hand controller grab and mouse movement
 2015-12-30 11:10:37 -08:00
Anthony J. Thibault
8f71a5fda5 ModelEntityItem: Fix for missing pre-rotations for animated models. 
This should fix the issue with the Kaya and Claire models, while
also not breaking the windmill model in demo.
 2015-12-30 10:17:18 -08:00
Andrew Meadows
a5c19c04e5 Merge pull request #6672 from ctrlaltdavid/fix-nodelist-shutdown 
Don't send a domain-server check in when shutting down
 2015-12-30 08:43:19 -08:00
Andrew Meadows
b83987331b Merge pull request #6725 from huffman/fix-avatar-get-myavatar 
Fix crash when getting MyAvatar.sessionUUID from AvatarManager
 2015-12-30 08:41:52 -08:00
Brad Davis
76eba89f7d Merge pull request #6745 from hyperlogic/tony/neuron-plugin 
Support for Perception Neuron
 2015-12-30 11:39:32 -05:00
Andrew Meadows
ec27c75332 Merge pull request #6660 from hyperlogic/tony/anim-expressions 
AnimExpression: boolean expression parser and evaluator
 2015-12-30 08:36:44 -08:00
Brad Davis
65862bfd02 Merge pull request #6747 from hyperlogic/tony/glmhelpers-tests 
Added tests for GLMHelpers::safeEulerAngles.
 2015-12-30 11:35:17 -05:00
Philip Rosedale
118f919c8b fix merge conflicts 2015-12-30 00:42:14 -08:00
Philip Rosedale
e995b29712 can target without grabbing 2015-12-30 00:36:11 -08:00
Philip Rosedale
6d857296f9 show search sphere instead of beams, start at center of view 2015-12-29 23:37:10 -08:00
Philip Rosedale
54edd94dd2 Merge pull request #6743 from zzmp/fix/skymap-tex-load 
Guard against unloaded skymap tex
 2015-12-29 21:34:48 -08:00
Philip Rosedale
a44a64d9c0 Merge pull request #6748 from ericrius1/gunFix 
Fixing issue with muzzle flash and hit sparks being out of sync for pi…
 2015-12-29 21:31:40 -08:00
James B. Pollack
5caa6cbdbf Update pistol.js 
leading zeroes
 2015-12-29 18:38:57 -08:00
ericrius1
4cc94b44ba muzzle is in sync 2015-12-29 18:30:07 -08:00
ericrius1
1a84b5c0f0 Fixing issue with muzzle flash and hit point being out of sync for pistol 2015-12-29 18:13:34 -08:00
Anthony J. Thibault
f4f4bd44cb SoftAttachmentModel: added a descriptive comment. 2015-12-29 13:28:04 -08:00
Anthony J. Thibault
c2dd00375d Merge branch 'master' into tony/soft-attachments 2015-12-29 13:21:37 -08:00
Eric Levin
f71a4807f7 Merge pull request #6667 from imgntn/light_mod 
Entity Sliders for Changing Spotlight Properties
 2015-12-29 10:58:47 -08:00
Zach Pomerantz
12fa223004 Render SKY_DOME when SKY_MAP tex is loading 2015-12-29 10:58:23 -08:00
Anthony J. Thibault
5d596bcbc4 Added tests for GLMHelpers::safeEulerAngles. 
To verify that converting to and from quats and eulers will use the same angle order.

Also I fixed some naming inconsistencies in GeometryUtilTests.
 2015-12-29 10:07:38 -08:00
Anthony J. Thibault
e10cecd310 Build fix for linux #2? 2015-12-29 09:23:03 -08:00
Anthony J. Thibault
c35995b8e3 Build fix for linux? 2015-12-29 08:51:44 -08:00
Anthony J. Thibault
7e514d2f4d Mac build fix 2015-12-28 18:42:03 -08:00
Anthony J. Thibault
4661152aa7 NeuronAvatar.js: Now aligns the head with the HMD if active 2015-12-28 17:57:24 -08:00
Eric Levin
034b28e1b3 Merge pull request #6742 from zzmp/fix/empty-poly-line 
Guard against empty polyline index out of range
 2015-12-28 17:30:27 -08:00
James B. Pollack
2ec712a5db disable near grabbing on sliders 2015-12-28 15:27:17 -08:00
James B. Pollack
c266a093e0 clear sliders at cleanup 2015-12-28 15:17:00 -08:00
James B. Pollack
9f342ba8ce readme 2015-12-28 15:14:59 -08:00
James B. Pollack
5786789a66 cleanup cleanup 2015-12-28 15:12:29 -08:00
Zach Pomerantz
bea18e91aa Guard against empty polyline index out of range 2015-12-28 15:09:49 -08:00
Philip Rosedale
36beea17fa Improved hand controller reticle movement 2015-12-28 14:59:43 -08:00
James B. Pollack
f0a12e0251 switch 2015-12-28 14:50:35 -08:00
James B. Pollack
d4fd59edc0 send blacklist messages 2015-12-28 13:49:00 -08:00
Eric Levin
890b39f04b Merge pull request #6740 from imgntn/blacklist_grab 
Add Raypick Blacklisting to handControllerGrab.js
 2015-12-28 13:39:23 -08:00
James B. Pollack
7d7d0d4c07 mege 2015-12-28 13:21:00 -08:00
James B. Pollack
8eeae5ddf0 Merge pull request #6736 from ericrius1/handGrabCalcs 
Hand grab calcs
 2015-12-28 10:49:55 -08:00
James B. Pollack
e237f957a6 Merge branch 'master' into blacklist_grab 2015-12-28 10:24:27 -08:00
James B. Pollack
4b50a030e0 Update masterReset.js 2015-12-28 10:23:08 -08:00
James B. Pollack
4f80753d7b Update masterReset.js 2015-12-28 10:22:34 -08:00
James B. Pollack
679070ff6e Update hiddenEntityReset.js 2015-12-28 10:22:02 -08:00
James B. Pollack
c4d7b7b9bb Update utils.js 2015-12-28 10:21:23 -08:00