Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-16 14:12:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20557 commits 26 branches 28 tags 1.2 GiB
Commit graph

193 commits

Author SHA1 Message Date
Thijs Wenker
7b88deef16 Implement UI sounds for virtualKeyboard & notifications 2015-01-13 22:08:35 +01:00
Thijs Wenker
636073474c Merge branch '20224' of github.com:thoys/hifi into 20224 2015-01-12 09:40:27 +01:00
Thijs Wenker
40b4a17ba8 include globals.js from runnable scripts for now. 2015-01-07 23:14:31 +01:00
Thijs Wenker
527576eeba or not... 2015-01-07 21:38:31 +01:00
Thijs Wenker
6771252eab seems like you need to offset the include from the script that uses it 2015-01-07 21:34:34 +01:00
Thijs Wenker
4fdcdf095c trying to fix url 2015-01-07 21:27:14 +01:00
Ryan Huffman
eafe1ae951 Update position of grid-to-avatar to be at the left foot 2015-01-07 12:15:36 -08:00
Thijs Wenker
2d56070eae Merge branch 'master' of https://github.com/highfidelity/hifi into 20224 
Conflicts:
	examples/controllers/oculus/virtualKeyboard.js
	examples/libraries/virtualKeyboard.js
	examples/virtualKeyboard.js
 2015-01-07 20:45:18 +01:00
Chris Collins
0a1a64b7e6 Script updates and fixes to highfidelity-public 
Script updates and fixes to highfidelity-public
 2015-01-06 17:04:42 -08:00
Andrew Meadows
162854c5a5 Merge pull request #4025 from ZappoMan/voxelEctomy 
Voxel ectomy
 2015-01-05 13:20:30 -08:00
Brad Hefta-Gaub
58a2a5eb83 Merge pull request #4027 from huffman/grid-shader-updates 
Grid shader updates
 2015-01-05 13:00:05 -08:00
Ryan Huffman
50bbeae30b Disable camera tool temporarily 2014-12-31 15:40:11 -08:00
Ryan Huffman
a8de290482 Update grid alpha 2014-12-31 11:12:02 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
ZappoMan
48285b21c4 remove voxel related scripts 2014-12-30 20:50:07 -08:00
Thijs Wenker
c73b496cac press X button with gamepad 2014-12-31 02:25:55 +01:00
Thijs Wenker
1365ecede3 removed unused variables 2014-12-31 01:42:19 +01:00
Thijs Wenker
e856d302d3 - improved keyboard visibility setting 
- added posibility to teleport to location through hmd
 2014-12-31 01:37:51 +01:00
Ryan Huffman
0105906dc7 Merge branch 'master' of github.com:highfidelity/hifi into camera-display 
Conflicts:
	examples/editEntities.js
 2014-12-30 15:02:59 -08:00
Ryan Huffman
2b835e621c Rename 2D -> HUD, 3D -> World in Overlays 2014-12-30 14:50:17 -08:00
Thijs Wenker
a8122e5a85 virtualKeyboard.js - scale 50% 
virtualKeyboardLocation.js - toggle visibility with Enter/Return key
virtualKeyboardTextEntityExample.js - attempt to fix character glyphs
 2014-12-30 23:30:48 +01:00
Ryan Huffman
ea69dcaf29 Update grid colors 2014-12-30 13:10:23 -08:00
Clément Brisset
ecdf415954 Merge pull request #4016 from huffman/grid-tools-overlay 
Grid tools overlay
 2014-12-30 12:18:13 -08:00
Ryan Huffman
1da253d39f Remove duplicate minorGridWidth variable 2014-12-30 12:13:40 -08:00
Ryan Huffman
16bf4e87e6 Remove unused function 2014-12-30 11:34:59 -08:00
Ryan Huffman
552a421f24 Update grid tool to be an overlay 2014-12-30 11:31:29 -08:00
Ryan Huffman
fbd189bde3 Rename minorGridSpacing to minorGridWidth 2014-12-30 11:28:10 -08:00
Ryan Huffman
fdba41a69d Add grid colors to Grid 2014-12-30 11:27:16 -08:00
Ryan Huffman
9a6bce3767 Add getters/setters to Grid 2014-12-30 11:26:44 -08:00
Thijs Wenker
4eec066d69 split up virtualKeyboard script in a library and two script that will use it: 
virtualKeyboardLocation.js - Location through virtual keyboard
virtualKeyboardTextEntityExample.js - Initial example for virtual keyboard
 2014-12-30 19:51:53 +01:00
Chris Collins
e105ba61e8 Fix for model uploading to work 
Fix for model uploading to work. The deleted elements were causing an
error when trying to upload models.
 2014-12-23 11:01:25 -08:00
Ryan Huffman
588d7e62f4 Update camera-controls.svg url 2014-12-19 15:18:26 -08:00
Ryan Huffman
15389b5fce Add camera UI to camera tool 2014-12-19 10:37:21 -08:00
Ryan Huffman
93aaa38c4c Add camera orientation overlay 2014-12-19 09:03:04 -08:00
Ryan Huffman
cb7f5a5b45 Roll gridTool.js back temporarily 2014-12-17 12:41:58 -08:00
Ryan Huffman
b95eac759e Fix minor grid spacing not updating 2014-12-17 08:52:48 -08:00
Stephen Birarda
55ec455f77 Merge pull request #3928 from huffman/entity-tool-settings 
Entity tool settings
 2014-12-09 12:14:17 -08:00
ZappoMan
79fc8a5a71 remove debug ryans rotate problem 2014-12-09 11:58:01 -08:00
Ryan Huffman
19ba2a1f84 Remove print statement 2014-12-09 08:56:29 -08:00
Ryan Huffman
e5aee44ceb Add setting save/load to grid tool 2014-12-09 08:51:04 -08:00
ZappoMan
7449821a9b add ID to the properties dialog box 2014-12-08 15:06:50 -08:00
Clément Brisset
681a1a3297 Merge pull request #3917 from ctrlaltdavid/20202 
CR for Job #20202 - Add "backgroundVisible" property to text overlays
 2014-12-08 11:43:52 -08:00
ZappoMan
aefeda37bd more debugging 2014-12-08 09:41:58 -08:00
David Rowe
ca62e61579 Update scripts with text overlays to use new backgroundAlpha property 2014-12-06 11:11:52 -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
Ryan Huffman
1ee45e8bd1 Fix entity tool rotation to rotate around registration point 2014-12-04 11:24:56 -08:00
Ryan Huffman
1f82831bcc Fix call to getRelativeCenterPosition 2014-12-04 10:47:09 -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