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

1985 commits

Author SHA1 Message Date
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
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
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
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
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
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
Thijs Wenker
a8740614e2 CR Fixes 2017-03-18 01:22:06 +01:00
Faye Li
197a06c423 changes in TWO entityList.js to register the export event 2017-03-17 16:17:21 -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
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
Seth Alves
df84ff27e9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-17 07:52:22 -07:00
Seth Alves
a5d19439f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-16 16:32:07 -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
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
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
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
Triplelexx
6971aeb081 additional reference information 2017-03-14 17:18:11 +00: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
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
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
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
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
Ryan Huffman
ce5ee42961 Update LightOverlayManager to work with particles 2017-03-13 10:10:53 -07:00
Seth Alves
524e4bdfbc Merge pull request #9853 from sethalves/tablet-ui-fix-edit-props-race 
Tablet ui fix edit props race
 2017-03-13 08:56:56 -08:00
Triplelexx
873a9aa39e change color swapping to be more concise 2017-03-11 07:40:32 +00:00
Brad Hefta-Gaub
23e47f2fdc added icons to the audioScope app 2017-03-10 18:13:35 -08:00
Brad Hefta-Gaub
b8a2525f9e add auto pause/resume to the Audio Scope App 2017-03-10 17:38:00 -08:00
Anthony J. Thibault
3abc78e7d3 Fix for finger/sytlus on invisible/hidden tablet. 2017-03-10 17:18:13 -08:00
Brad Hefta-Gaub
5f3ee2e98f add a basic tablet app for the audio scope 2017-03-10 17:08:54 -08:00
Anthony J. Thibault
07e10ae862 Merge branch 'tablet-ui' into feature/can-touch-this 2017-03-10 17:05:26 -08:00
Triplelexx
8a0dd55275 change naming and comment 2017-03-11 00:19:02 +00:00
Triplelexx
eb4dee0495 create audioMuteOverlay.js 
client scipt that creates an overlay to provide mute feedback
 2017-03-10 23:37:29 +00:00
Seth Alves
2098cd5b5e remove stylus and search-beams when grab script is shut down 2017-03-10 13:02:16 -08:00
Seth Alves
88e74251a1 cleanups 2017-03-10 12:51:34 -08:00
Seth Alves
411ec9a791 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-fix-edit-props-race 2017-03-10 10:22:10 -08:00
Seth Alves
fffff817a3 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-10 10:20:40 -08:00
Seth Alves
494b602d4c Merge pull request #9850 from druiz17/toolbar-MIA-afetr-snapshot 
toolbar becomes visible after taking a snapshot
 2017-03-10 10:20:01 -08:00
Seth Alves
cef4c988c4 Merge pull request #9835 from druiz17/toolbar-window-dont-close 
Close toolbar windows when reloading scripts
 2017-03-10 10:19:07 -08:00
Seth Alves
d792559d9a have edit.js resend properties of selected entity to entityProperties.js once it's ready 2017-03-10 09:59:23 -08:00
Dante Ruiz
d54005b62e no more duplicate snapshot buttons after taking reloading scripts 2017-03-10 00:17:44 +00:00
Dante Ruiz
c6c0c6d382 toolbar becomes visible after taking a snapshot 2017-03-09 22:54:22 +00:00
Anthony J. Thibault
d8f04d90a7 Merge branch 'master' into feature/can-touch-this 2017-03-09 14:24:10 -08:00
Anthony J. Thibault
6f53aaed5c Small simplification of building stylusTarget list. 2017-03-09 14:04:13 -08:00
druiz17
0069569e96 Merge branch 'tablet-ui' into 21197 2017-03-09 09:31:15 -08:00
Seth Alves
023b01814e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-quick-summon-1 2017-03-09 09:16:37 -08:00
druiz17
007ed9fe81 Merge pull request #9836 from druiz17/2-tablets-fix 
Fixed having more than one tablet when reloading scripts
 2017-03-09 09:13:14 -08:00
Anthony J. Thibault
1acc5ea760 Finger now points when near tablet + deadspot added when touching the tablet 2017-03-08 19:03:56 -08:00
Dante Ruiz
2a275a4f4b removed tab at the end of word 2017-03-09 00:15:02 +00:00
Seth Alves
9435c58c2c Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-quick-summon-1 2017-03-08 16:10:38 -08:00
Dante Ruiz
b878f164fb minimize diff again 2017-03-09 00:10:38 +00:00
Dante Ruiz
f6d799c048 minimize diff 2017-03-09 00:09:32 +00:00
Dante Ruiz
561bd27c38 minimize diff 2017-03-09 00:08:50 +00:00
Dante Ruiz
5f7a0ea8fc Close tablet when switching form HMD to desktop and vice versa 2017-03-09 00:05:26 +00:00
Seth Alves
6aac2eb338 for overlay tablets, precreate them so that they show up quickly when summoned 2017-03-08 15:31:24 -08:00
Seth Alves
de2dd7383d didn't need invis flag, after all 2017-03-08 15:30:49 -08:00
Dante Ruiz
ce105e0329 fix double tablets when reloading scripts 2017-03-08 22:21:57 +00:00
Dante Ruiz
881213259d Merge branch 'master' of github.com:highfidelity/hifi into toolbar-window-dont-close 2017-03-08 21:44:20 +00:00
Dante Ruiz
59b4fa5fd7 Close toolbar windows when scripts are reloaded 2017-03-08 21:44:04 +00:00