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

2579 commits

Author SHA1 Message Date
Faye Li
067faad9cd Fix careless math mistake 2017-03-24 10:22:08 -07:00
Zach Fox
056d6fbe4f Actually merge from master 2017-03-24 10:10:17 -07:00
Zach Fox
915ace0087 Revert "Merge from Master" 
This reverts commit e48123b5bb.
 2017-03-24 10:04:51 -07:00
ZappoMan
52335e20a2 fix typo 2017-03-24 09:59:55 -07:00
ZappoMan
84836d9331 fix typo that broke gun 2017-03-24 09:58:56 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
Zach Fox
665b21f2f7 Checkpoint 2017-03-23 17:08:32 -07:00
Dante Ruiz
a078121c46 saving work 2017-03-24 00:23:13 +01:00
Anthony J. Thibault
bab9890fea Added inputMode property to Web3DOverlay. 
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
 2017-03-23 13:54:18 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00
David Kelly
0edcdde746 better key mapping 2017-03-23 10:40:34 -07:00
David Kelly
a08346719c one bit of defensive code, plus some temporary logging 2017-03-23 10:29:45 -07:00
Zach Fox
e48123b5bb Merge from Master 2017-03-23 09:54:14 -07:00
Seth Alves
ff3fc244d1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:50:53 -07:00
Dante Ruiz
dfa6174069 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help 2017-03-23 17:34:50 +01:00
Seth Alves
62f10204d9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:25:48 -07:00
David Kelly
aa085e577d more vis work 2017-03-23 09:19:04 -07:00
David Kelly
a0c19d6b59 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-22 17:02:03 -07:00
David Kelly
7b52afb58b vis changes to fade. Still needs more work 2017-03-22 17:01:42 -07:00
Zach Fox
692ef369c7 Attempted Stale PAL fix - hard to test! 2017-03-22 15:14:11 -07:00
Triplelexx
6a17e328e8 fix myVisibility typo 2017-03-22 22:13:39 +00:00
David Kelly
675612c1e9 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-22 14:56:23 -07:00
David Kelly
020dcca78d end handshake when successful, stop handshake sound if other guy pulls out 2017-03-22 14:55:57 -07:00
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
 2017-03-22 14:25:23 -07:00
Zach Fox
bf191eabb7 Some new stale PAL behavior 2017-03-22 13:35:48 -07:00
David Kelly
34a89e4b9a added sounds, new haptics, and some cleanup 2017-03-22 13:26:51 -07:00
Triplelexx
c7b9492620 revert removing rightUnitVec 
.....
 2017-03-22 19:14:20 +00:00
Triplelexx
d1db04f93a fix lost forwardOffset declaration 2017-03-22 18:57:00 +00:00
Dante Ruiz
3a89654111 saving work 2017-03-22 19:14:53 +01:00
Anthony J. Thibault
2c38d7ff89 Tablet spawn orientation now takes hand orientation into account. 
Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.
 2017-03-22 11:03:03 -07:00
Triplelexx
2fc8dd48de change testFront to testForward 2017-03-22 17:13:45 +00:00
David Kelly
a594419688 friend->connection which I should have done long ago 2017-03-22 10:09:48 -07:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00
Seth Alves
bd32104bc1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-22 08:41:59 -08:00
Ryan Huffman
1285f2a9eb Merge pull request #9937 from thoys/boppo 
El Boppo the Clown punching bag game
 2017-03-22 09:30:54 -07:00
David Kelly
59b02261e5 minor cleanup, remove waiting visualization completely 2017-03-21 16:08:25 -07:00
Triplelexx
6e740a5fbb change Mat4 getFront to getForward 2017-03-21 22:33:37 +00:00
Triplelexx
66d697873f change mat4test back to getFront 
premature, including in seperate commit
 2017-03-21 22:31:06 +00:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Dante Ruiz
d2c139ce6e fix error from using a misspelled function 2017-03-21 22:25:45 +01:00
kunalgosar
f09ee92fe1 spacing issues 2017-03-21 14:16:49 -07:00
kunalgosar
30d2ea0ea5 spacing issues 2017-03-21 14:15:56 -07:00
kunalgosar
a4af973ae4 fixed back button on marketplace 2017-03-21 14:12:54 -07:00
David Kelly
5bcd7ca97f visuals update. Will do some cleaning shortly 2017-03-21 13:27:00 -07:00
Seth Alves
14027d4acb Merge pull request #9968 from druiz17/tablet-xbox 
Fixed the third eye for the xbox controller
 2017-03-21 11:03:53 -08:00
Seth Alves
04a334fd07 unmangle merge 2017-03-21 11:02:18 -08:00
Dante Ruiz
bf3c5dbf0e Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-xbox 2017-03-21 19:47:16 +01:00
Dante Ruiz
1811a2edc7 fixed third eye laser 2017-03-21 19:45:00 +01:00
Seth Alves
1da6349505 merge from upstream 2017-03-21 10:26:02 -07:00
Ryan Huffman
13222468e3 Merge pull request #9712 from huffman/feat/edit-particle-icon 
Add particle system overlay in edit.js
 2017-03-21 10:02:52 -07:00
Seth Alves
cc4ddd1387 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-21 08:43:35 -08:00
Brad Hefta-Gaub
b7f48644af Merge pull request #9955 from druiz17/tablet-edit-selecting 
Fix edit.js from deselecting an object when trying to delete it
 2017-03-21 09:27:30 -07:00
Zach Fox
29e97381eb PAL open, user leaves, gray out row 2017-03-20 17:20:28 -07:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Seth Alves
bc90e9081b Merge pull request #9957 from hyperlogic/bug-fix/tablet-scale 
Tablet scale settings now take effect soon after they are changed.
 2017-03-20 15:05:47 -08:00
Zach Fox
d16acc5a7f Stale PAL Notification 2017-03-20 15:24:49 -07:00
Anthony J. Thibault
f5c3d41f2c Tablet scale settings now take effect soon after they are changed. 2017-03-20 14:51:47 -07:00
Dante Ruiz
de24023a21 Fix edit.js from deselecting an object when trying to delete it 2017-03-20 20:43:32 +01:00
Seth Alves
8988110c3b Merge pull request #9953 from fayeli/edit-export-entities 
Adding Export Entities Functionality in Tablet Edit
 2017-03-20 11:35:18 -08:00
David Kelly
81cb63df6b new particle effect, first pass 2017-03-20 11:42:58 -07:00
Faye Li
f57905fbb3 remove code for jump to selection 2017-03-20 10:23:55 -07:00
Seth Alves
2e29ff3114 Merge pull request #9934 from fayeli/edit-import-entities 
Adding Import Entities button on the Create tab of Edit
 2017-03-20 09:13:08 -08:00
Brad Hefta-Gaub
af790d8474 Merge pull request #9875 from birarda/bug/spin-strafe 
fix double snap turn strafing
 2017-03-20 10:08:05 -07:00
Ryan Huffman
df644edde4 Fix hand controller not able to select light/particle icons 2017-03-20 09:45:50 -07:00
Chris Collins
308c134119 Merge pull request #9686 from humbletim/21114-part3 
CR 21114 -- Implement modules/require support into hifi
 2017-03-20 06:22:35 -07:00
Seth Alves
424af2255b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-19 21:17:30 -08:00
Thijs Wenker
a8740614e2 CR Fixes 2017-03-18 01:22:06 +01:00
Atlante45
eab2c314d8 Preload sitting animation 2017-03-17 17:17:05 -07:00
Atlante45
893a5b1b18 Only override inAir and flying animation roles 2017-03-17 17:16:58 -07:00
samcake
e1a0984fed Merge pull request #9906 from samcake/red 
Expose rendering in wireframe mode
 2017-03-17 17:09:44 -07:00
Faye Li
197a06c423 changes in TWO entityList.js to register the export event 2017-03-17 16:17:21 -07:00
Atlante45
1ce4dcc6e5 Fix attempt for avatar stuck in geometry. 2017-03-17 16:11:47 -07:00
Atlante45
eccc9ff47c Prevent 2 avatars from staying seated in the same chair 2017-03-17 16:11:17 -07:00
Atlante45
4c75680877 Set teleport target to Cancel if seat in use 2017-03-17 16:10:15 -07:00
Faye Li
1a46f18aa3 adding export button + hiding jump to selection 2017-03-17 15:56:55 -07:00
David Kelly
c425c32b8f hack somewhat different visualization in. If this is ok, will cleanup 2017-03-17 14:56:47 -07:00
Thijs Wenker
febe25511b teleport.js - ignore entity support (for boxing gloves) 2017-03-17 21:10:06 +01:00
Faye Li
6531efffbc hook up qml button to edit.js 2017-03-17 11:22:07 -07:00
Atlante45
c1466c2dec Fix a couple sitting bugs 2017-03-17 10:45:13 -07:00
David Kelly
58ac34b336 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-17 08:46:04 -07:00
David Kelly
2758e740bf hacked in a particle effect (as entity) plus popped sphere into existence 2017-03-17 08:45:24 -07:00
Seth Alves
df84ff27e9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-17 07:52:22 -07:00
Atlante45
698791295a Expose DriveKeys enum to JS 2017-03-16 20:03:27 -07:00
Seth Alves
a5d19439f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-16 16:32:07 -07:00
Atlante45
42316e713d CR drive keys 2017-03-16 16:24:52 -07:00
Atlante45
3e9474e878 CR 2017-03-16 16:24:36 -07:00
Atlante45
35dd45ddf9 Capture drive keys while avatar is seated 2017-03-16 15:44:18 -07:00
Clément Brisset
21c5e7b0b2 Merge pull request #9880 from Atlante45/feat/sit 
Fix avatars stuck in the sitting position after a domain disconnect
 2017-03-16 15:42:29 -07:00
Zach Fox
fc2a501474 Cleanup JS<->QML messaging 2017-03-16 15:38:39 -07:00
David Kelly
60000becce more careful stopping of intervals, edge case stuff 2017-03-16 13:19:17 -07:00
humbletim
758c07c7d4 Merge branch 'master' into 21114-part3 2017-03-16 14:29:17 -04:00
samcake
4ef7fc61f0 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2017-03-16 10:43:07 -07:00
David Kelly
f0fad5981a Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into dk/newMessageStuff 2017-03-16 09:01:13 -07:00
Seth Alves
31e0cfe296 Merge pull request #9825 from thoys/record-fixes 
Avatar Recorder and Playback Fixes
 2017-03-16 07:27:42 -08:00
humbletim
52a571558c * changes per CR feedback 
* revert JSON content-type workaround
* add specific error check / advice for unanchored module ids
* update unit tests
 2017-03-16 01:23:23 -04:00
David Kelly
4f6123ee29 more messaging rework - dealing with edges 2017-03-15 16:41:07 -07:00
howard-stearns
84fd17bd88 use location.metaverseServerUrl instead of hardcoded value. 2017-03-15 16:33:23 -07:00
samcake
ea2f1359bc Expose rendering in wireframe mode 2017-03-15 12:23:44 -07:00
Dante Ruiz
a5f1fb9e9a fixed notification spelling error 2017-03-15 19:45:30 +01:00
Dante Ruiz
dac16af1df Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-notifcation 2017-03-15 19:27:11 +01:00
Dante Ruiz
4bc050e583 added tablet notification 2017-03-15 19:26:50 +01:00
David Kelly
d8719ac3a9 cleanup, switch to overlays with texture swapping, move overlay to between hands 2017-03-15 11:15:58 -07:00
Stephen Birarda
d13752a7c6 use the correct property name for useAdvancedMovementControls 2017-03-15 10:34:43 -07:00
Stephen Birarda
bfc51d8222 use property not function for advanced movement controls 2017-03-15 10:25:06 -07:00
Seth Alves
96a3e2a6d3 Merge pull request #9898 from ctrlaltdavid/21214 
Load controller scripts in their own script engine
 2017-03-15 08:42:20 -08:00
Seth Alves
b5919d89a5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 08:26:10 -08:00
howard-stearns
6c88bc98b4 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-15 09:24:30 -07:00
Triplelexx
5883bd39dc rename color to component 2017-03-15 11:17:27 +00:00
Triplelexx
41041c711f use utils.js 2017-03-15 11:09:13 +00:00
Triplelexx
9e0091ebe0 use utils.js, move easing function, use mixes 
some cleanup
 2017-03-15 11:08:54 +00:00
Triplelexx
84d157ab18 handle overlay lifetime during update, remove color conv 2017-03-15 10:31:09 +00:00
David Rowe
cb4bd58381 Load controller scripts in their own script engine 2017-03-15 14:31:13 +13:00
Stephen Birarda
7ddb5ff770 use correct boolean when changing AMC 2017-03-14 18:09:17 -07:00
Stephen Birarda
188530590a add missing curly brace to script 2017-03-14 17:16:49 -07:00
Stephen Birarda
490cb83489 move advanced movement control changes to MyAvatar 2017-03-14 15:03:01 -07:00
David Kelly
0a35fa34f9 some reworking, cleaning, bug fixing... 2017-03-14 14:22:44 -07:00
Zach Fox
5da0dfc4ac Merging from Pal_v2_Zach 2017-03-14 14:05:50 -07:00
Atlante45
b14a4faf61 Guard against script loading before avatar 2017-03-14 10:54:22 -08:00
Triplelexx
6971aeb081 additional reference information 2017-03-14 17:18:11 +00:00
David Kelly
f821ccc8c3 fix typo - doh! 2017-03-14 10:00:19 -07:00
Triplelexx
8a39ce16bd add simple easing function 
dodgy add push
 2017-03-14 16:57:45 +00:00
Triplelexx
4dd9a7c37f add simple easing function 2017-03-14 16:51:43 +00:00
David Kelly
246d2f4017 fix comments at top 2017-03-14 08:58:14 -07:00
Triplelexx
30c16984c0 change offsetPosition to use Camera.position 2017-03-14 06:07:22 +00:00
Triplelexx
c729ceccb5 change color lerp to use HSV color 2017-03-14 03:59:24 +00:00
Atlante45
9e6312ba0e Make sit script more stable. 2017-03-13 18:06:32 -08:00
Atlante45
f0d971fc6f Put avatar in front of chair on situp to avoid infinite collisions 2017-03-13 18:06:32 -08:00
Atlante45
1a375432e0 Only grab primary clicks 2017-03-13 18:06:32 -08:00
Atlante45
34889d38c9 Override all roles instead of just fly 2017-03-13 18:06:32 -08:00
David Kelly
7765daf382 handle cleanup, race, etc..., more to come 2017-03-13 18:57:01 -07:00
David Kelly
fa7283a6e2 initial new messaging - working but needs cleanup 2017-03-13 18:33:36 -07:00
Triplelexx
2e0cac4676 add extra safeguards 2017-03-14 01:25:39 +00:00
Triplelexx
8bd155cb86 change offsetPosition to use Camera.orientation 2017-03-14 01:23:04 +00:00
Ryan Huffman
8246dbafab Update particle explorer to work outside of entity list 2017-03-13 15:15:36 -07:00
Stephen Birarda
0926b2df2a add LX snap turn to standard mapping 2017-03-13 15:14:20 -07:00
Ryan Huffman
9880d40cfb Update edit.js light icons to now use the name entityIcon 2017-03-13 14:38:56 -07:00
Brad Davis
3bef5ad528 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-13 14:30:25 -07:00
David Kelly
515e6fd34e map Controller.Standard.RB so xbox controller works. whee. 2017-03-13 13:10:05 -07:00
howard-stearns
db06c2650f Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-13 11:53:48 -07:00
Triplelexx
95fcb1df7a fix spelling mistake 2017-03-13 18:32:53 +00:00
Ryan Huffman
d4ade8278c Fix js linting errors in entityIconOverlayManager.js 2017-03-13 11:27:12 -07:00
Ryan Huffman
b7783dcffe Update edit.js light/particle overlays to be clickable when behind something 2017-03-13 11:26:34 -07:00
David Kelly
e2e7573e93 handle stopping handshake part-way through 2017-03-13 11:04:51 -07:00
Zach Fox
beb848373b Update from zfox23/PALv2 branch 2017-03-13 10:15:06 -07:00
Ryan Huffman
c2564800dc Add edit.js particle + light icons 2017-03-13 10:10:53 -07:00
Ryan Huffman
dbcd7fd9e9 Fix light icon overlay not updating to represent light type 2017-03-13 10:10:53 -07:00
Ryan Huffman
42d518fafb Remove debug log in entityIconOverlayManager 2017-03-13 10:10:53 -07:00
Ryan Huffman
86116aaad7 Update light/particel icons to be shown by default in edit mode 2017-03-13 10:10:53 -07:00