Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20557 commits 2 branches 0 tags 1.1 GiB
Commit graph

1659 commits

Author SHA1 Message Date
Thijs Wenker
7b88deef16 Implement UI sounds for virtualKeyboard & notifications 2015-01-13 22:08:35 +01:00
Thijs Wenker
7acb4e4716 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-13 00:43:47 +01:00
Andrew Meadows
22d500bd54 Merge pull request #4074 from huffman/rescale-properties 
Add rescale button to edit properties window
 2015-01-12 14:22:45 -08:00
Andrew Meadows
9f1a612865 Merge pull request #4073 from Atlante45/editModels 
editModels => hydraGrab
 2015-01-12 14:21:02 -08:00
Stephen Birarda
69f5c769b8 don't play muzak from lobby to avoid error 2015-01-12 10:07:20 -08:00
Thijs Wenker
636073474c Merge branch '20224' of github.com:thoys/hifi into 20224 2015-01-12 09:40:27 +01:00
Ryan Huffman
8d8352946b Add rescale button to edit properties window 2015-01-09 10:01:58 -08:00
Atlante45
5ab0df3288 removed editModels 2015-01-08 18:31:10 -08:00
Atlante45
22e7c6d507 Merge branch 'master' of https://github.com/highfidelity/hifi into editModels 
Conflicts:
	examples/editModels.js
 2015-01-08 18:30:38 -08:00
Atlante45
a46080cbf2 editModels > hydraGrab 2015-01-08 11:24:02 -08:00
Thijs Wenker
c791422fab make gamepads and A (select key) and B (delete character) button function 2015-01-08 02:22:08 +01:00
Philip Rosedale
a04ce68fba Merge pull request #4063 from ZappoMan/restoreLookAt 
restore camera lookAt and keepLookingAt features
 2015-01-07 16:31:07 -08:00
Thijs Wenker
da95d413a0 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-07 23:25:05 +01:00
Thijs Wenker
40b4a17ba8 include globals.js from runnable scripts for now. 2015-01-07 23:14:31 +01:00
ZappoMan
806e691bbf restore camera lookAt and keepLookingAt features 2015-01-07 13:41:07 -08:00
Chris Collins
d15ae92e1e Guitar fix 
Guitar position fix
 2015-01-07 13:40:36 -08:00
Brad Hefta-Gaub
23559743d9 Merge pull request #4060 from PhilipRosedale/gun 
Added improved gun to /examples
 2015-01-07 13:16:09 -08:00
Brad Hefta-Gaub
49508733aa Merge pull request #4053 from cozza13/20254 
CR for Job #20254 - Additional Script updates
 2015-01-07 13:14:34 -08:00
Philip Rosedale
9bf56516e0 Added improved gun to /examples 2015-01-07 13:02:00 -08:00
Chris Collins
3a75a6f920 Minor typo fix 
Minor typo fix
 2015-01-07 12:57:40 -08: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
Ryan Huffman
fbdc509428 Increase size of url input boxes 2015-01-07 12:15:14 -08:00
Ryan Huffman
92fc08fa70 Update property list window to only show after selection 2015-01-07 12:14:47 -08:00
Thijs Wenker
ff6cae738b fixed library paths 2015-01-07 20:47:59 +01:00
Thijs Wenker
19eec81173 moved goTo.js and virtualKeyboardTextEntityExample.js to the right category folder 2015-01-07 20:46:39 +01: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
53f24954e0 Updates based on PR comments 
Commented out Camera.stopLooking and Camera.keepLookingAt . This can be
put back when we merge back the C++ issue.
 2015-01-07 11:15:30 -08:00
Thijs Wenker
0ec25acc9c Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-07 14:39:27 +01:00
Chris Collins
816e369c08 More Script updates 
More Script updates
 2015-01-06 22:32:45 -08: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
Chris Collins
95f8447191 Incremental update to scripts cleanup 
-Moved more of the scripts around
-Fixed up the location on assets on start. e.g. gun.js
-Removed additional Scripts.
 2015-01-06 15:47:25 -08:00
Chris Collins
602275a0f7 First pass moving scripts into an example folder. 
This is just a quick first pass to move some of the scripts into an
examples folder. There are also a couple of obvious deletions.
 2015-01-06 11:16:40 -08:00
Andrew Meadows
278be3d31b remove use of "radius" property for entities 
use "dimensions" instead
 2015-01-05 18:13:50 -08:00
Andrew Meadows
ec86f0bd50 fixing toyball.js to work under Bullet 2015-01-05 17:30:50 -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
125dc5010e Merge pull request #4039 from AndrewMeadows/inertia 
Bullet physics part 2
 2015-01-05 13:10:55 -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
Andrew Meadows
21b2d14956 converting existing JS scripts to use new damping 
Old formula the scripts were using:  v *= damping

So a value of 0.999 was "little damping" and a value of 0.001 was "very strong damping",
but now that is reversed.

New formula: v *= (1 j- damping)^dt

A damping value of 0.001 now means "very little damping"
and a value of 0.999 means "very strong damping".
 2015-01-05 11:25:15 -08:00
Thijs Wenker
08c48f0779 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-03 15:02:58 +01:00
Ryan Huffman
cf04c3313a Update inWorldTestTone.js to play in front of avatar 2015-01-02 11:43:41 -08:00
Thijs Wenker
f0320caad3 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-02 19:16:06 +01:00
Ryan Huffman
50bbeae30b Disable camera tool temporarily 2014-12-31 15:40:11 -08:00
Thijs Wenker
605e895de7 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2014-12-31 21:17:03 +01: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