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

1489 commits

Author SHA1 Message Date
Ryan Huffman
a53e1c69fd Merge pull request #3914 from thoys/20163 
CR for Job #20163 - Implement virtual keyboard for use in HMD
 2014-12-07 10:22:34 -08:00
Thijs Wenker
351819708b style fixes 2014-12-06 23:50:30 +01:00
Brad Hefta-Gaub
2bf93bd9f0 Merge pull request #3913 from huffman/entity-tool-property-fixes 
Entity tool property fixes + add script property
 2014-12-06 00:40:18 -08:00
Thijs Wenker
ccdb13c951 virtualkeyboard: moved files to hifi public bucket 2014-12-06 00:33:33 +01:00
Ryan Huffman
a89411fd5e Add script URL to properties tool 2014-12-05 15:27:40 -08:00
Ryan Huffman
896a34212b Fix sections not properly updating in properties tool 2014-12-05 15:27:24 -08:00
Andrzej Kapolka
01c209ef07 Merge pull request #3912 from PhilipRosedale/master 
Add gamepad warp to headMove, remove step turning when head rotated
 2014-12-05 15:27:03 -08:00
Philip Rosedale
2c8b1721cc Add warp from right ('O') button on gamepad 2014-12-05 14:06:41 -08:00
Brad Hefta-Gaub
a3fbaab957 Merge pull request #3911 from huffman/entity-tool-window-polish 
Entity Properties Tool Window Polish
 2014-12-05 12:38:43 -08:00
Brad Hefta-Gaub
1de7db390e Merge pull request #3908 from PhilipRosedale/master 
Orbiting sound example, ability to set injector position, better butterflies
 2014-12-05 12:37:42 -08:00
Ryan Huffman
849397288e Update properties tool to be a resizable table 2014-12-05 10:46:35 -08:00
Ryan Huffman
0ece6c0968 Update properties window to show properties for locked entities 2014-12-05 10:43:15 -08:00
Philip Rosedale
bc609016a9 remove debug 2014-12-05 08:59:41 -08:00
Philip Rosedale
c5247ca65b Add ability to set injector properties during playing, and orbitingSound.js 2014-12-05 08:45:00 -08:00
Philip Rosedale
dbf64b2de7 Merge pull request #3898 from DaveDubUK/walk-JS-1.12 
Version 1.12 of the walk.js script
 2014-12-04 16:29:19 -08:00
Thijs Wenker
c0ba9e73c2 fixed font height bq 2014-12-05 01:07:49 +01:00
Philip Rosedale
47c2ea95f4 Merge branch 'master' of https://github.com/worklist/hifi 2014-12-04 16:07:28 -08:00
Thijs Wenker
a7185738e9 virtualkeyboard: scaling text in input box 2014-12-05 00:52:36 +01:00
Clément Brisset
26340353ac Merge pull request #3897 from ZappoMan/rayPickWork 
Work on improving pickable entities - Lights Optionally pickable, Spheres & Text pick properly, other bug fixes
 2014-12-04 15:43:17 -08:00
Ryan Huffman
ba3f051c8c Disable the warp button in gamepad.js 2014-12-04 15:11:16 -08:00
Ryan Huffman
3bbee640fb Make gamepad mirror button toggle 2014-12-04 14:48:03 -08:00
Ryan Huffman
500b8a49d1 Add button to gamepad.js to toggle mirror mode 2014-12-04 14:17:24 -08:00
Ryan Huffman
e3a34f6db0 Add multi-speed control to gamepad.js 2014-12-04 12:17:31 -08:00
Thijs Wenker
5e2d1c3364 more comfortable movement setting 2014-12-04 21:15:10 +01:00
Brad Hefta-Gaub
3a396b3256 Merge pull request #3900 from huffman/entity-tools-fix-rp-rotation 
Fix entity tool rotation to rotate around registration point
 2014-12-04 11:41:22 -08:00
Ryan Huffman
1ee45e8bd1 Fix entity tool rotation to rotate around registration point 2014-12-04 11:24:56 -08:00
Brad Hefta-Gaub
cab1be25ed Merge pull request #3899 from huffman/entity-tools-fix-registration-point 
Entity tools fix registration point
 2014-12-04 11:04:27 -08:00
Ryan Huffman
1f82831bcc Fix call to getRelativeCenterPosition 2014-12-04 10:47:09 -08:00
Clément Brisset
a7a7ad775e Merge pull request #3896 from huffman/fix-entity-selection 
Fix entity tool selection when inactive
 2014-12-04 10:39:42 -08:00
Ryan Huffman
acd5495b2a Add getRelativeCenterPosition 2014-12-04 10:29:10 -08:00
Ryan Huffman
b2c5b19fd7 Remove print 2014-12-04 10:20:02 -08:00
Ryan Huffman
efdc8f5494 Fix stretch tools to work correctly with registrationPoint 2014-12-04 10:19:51 -08:00
DaveDubUK
f223f51fa6 Version 1.12 of the walk.js script 2014-12-04 18:15:25 +00:00
Ryan Huffman
53f195eec4 Fix position of overlays when registrationPoint is not centered 2014-12-04 10:05:34 -08:00
Ryan Huffman
f48d304df0 Add registrationPoint to SelectionManager 2014-12-04 10:03:54 -08:00
Ryan Huffman
74acf9513b Fix entity tool selection when inactive 2014-12-04 08:47:18 -08:00
Philip Rosedale
dd8deeea59 simpler butterflies script that doesn't put as much traffic on entity server 2014-12-03 22:39:11 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
 2014-12-03 15:07:47 -08:00
Brad Hefta-Gaub
96c3bfceef Merge pull request #3889 from huffman/entity-tools-polish-2 
Entity tools polish - round 2
 2014-12-03 14:31:27 -08:00
Ryan Huffman
d08337326c Update selection box color to red 2014-12-03 12:59:51 -08:00
Stephen Birarda
f0b0c5fe0b change warp button to button face right 2014-12-03 11:08:41 -08:00
ZappoMan
5f9c1c490b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-03 10:44:56 -08:00
Ryan Huffman
5c5c66b265 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tools-polish-2 2014-12-03 08:40:38 -08:00
Ryan Huffman
4e78003520 Fix issue with selection boxes not being hidden 2014-12-02 18:03:00 -08:00
Ryan Huffman
f25d509363 Remove unused lastPlaneIntersection 2014-12-02 17:50:34 -08:00
Ryan Huffman
aa067bc153 Update UpDown translation to follow the mouse as other tools do 2014-12-02 17:49:25 -08:00
Ryan Huffman
c4ca7e1b18 Remove clearSelections from findClickedEntity - it shouldn't handle it 2014-12-02 16:01:40 -08:00
Ryan Huffman
30a7b60958 Update checkMove to only update rotation handles instead of all handles 2014-12-02 16:01:09 -08:00
Ryan Huffman
0fb0169ff2 Move baseOfEntityProjectionOverlay update to updateHandles() 2014-12-02 16:00:33 -08:00
Ryan Huffman
2f1ceb922a Increase size of selection boxes 2014-12-02 15:59:56 -08:00