Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 09:02:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21927 commits 76 branches 59 tags 1.2 GiB
Commit graph

1847 commits

Author SHA1 Message Date
Philip Rosedale
b515a0468b Merge branch 'master' of https://github.com/worklist/hifi 2015-01-28 09:35:07 -08:00
Philip Rosedale
117e6abb46 remove debug and PR fixes 2015-01-28 09:34:15 -08:00
David Rowe
7286a9c5fb Merge branch 'master' into 20276 2015-01-27 19:08:40 -08:00
David Rowe
2ee1570a40 Merge branch 'master' into 20276 2015-01-27 16:38:41 -08:00
Ryan Huffman
1ba398c0e3 Remove blank line 2015-01-27 15:57:27 -08:00
Ryan Huffman
defb796c1e Update editEntities to auto-focus on selection 2015-01-27 15:56:24 -08:00
Brad Hefta-Gaub
0c4dc4100d Merge pull request #4176 from huffman/fix-inspect 
Fix inspect + editEntities cameras from clashing
 2015-01-27 13:05:33 -08:00
Brad Hefta-Gaub
0c53193e79 Merge pull request #4175 from cozza13/20283 
CR for Job #20283 - Clean up scripts that have recently been added.
 2015-01-27 13:05:17 -08:00
Andrew Meadows
6b6e846378 Merge pull request #4177 from ZappoMan/fixGlitches 
Some physics improvements
 2015-01-27 13:02:11 -08:00
Chris Collins
283a056a43 remove VRui 
remove VRui
 2015-01-27 11:37:31 -08:00
Ryan Huffman
80002551f9 Update editEntities camera to not enable if camera is in independent mode 2015-01-27 11:28:39 -08:00
Ryan Huffman
2556b4790b Update inspect.js to not activate if camera is in independent mode 2015-01-27 11:28:20 -08:00
Chris Collins
411541b884 Tidy up some scripts. 
Tidy up scripts. Make some changes to some script references and
reorganize.
 2015-01-27 11:04:50 -08:00
Philip Rosedale
e8f4783bea border, new size for blocks, smoother hydra grab action 2015-01-26 22:06:59 -08:00
Philip Rosedale
8b5a451886 Grab now correctly adds linear velocity so that you can grab and throw things 2015-01-26 21:09:21 -08:00
Philip Rosedale
005cd2ba53 Add block building toolset, first version 2015-01-26 20:44:47 -08:00
Philip Rosedale
bf0cde060c Merge branch 'master' of https://github.com/worklist/hifi 2015-01-26 20:35:34 -08:00
Philip Rosedale
e0c9af853c remove 'STICKS' mode, add drop line to better tell what something you are holding is above 2015-01-26 20:19:46 -08:00
Atlante45
cf631bf3fc Remove unnecessary stopAnimation in script to get rid of sacades 2015-01-26 19:20:47 -08:00
Philip Rosedale
6d3a9f7bc0 merge fix 2015-01-26 18:43:42 -08:00
Atlante45
64f8495681 Fixed mapped rotation + doubled it 2015-01-26 18:20:08 -08:00
Philip Rosedale
dd352e5a1a Merge branch 'master' of https://github.com/worklist/hifi 2015-01-26 17:31:35 -08:00
Philip Rosedale
a1babe3a33 Put paddle exactly in hand, add animation of fingers gripping paddle 2015-01-26 17:20:31 -08:00
Atlante45
4b3291d946 Some cleanup in hydraGrab.js 2015-01-26 17:11:49 -08:00
Philip Rosedale
bfdbe2e675 Detach both guns on shutdown 2015-01-26 16:25:07 -08:00
ZappoMan
d9835701b0 added comment 2015-01-26 12:48:57 -08:00
ZappoMan
08fbcbaf40 tweaks for debugging 2015-01-26 12:38:02 -08:00
ZappoMan
a1ec44b8e0 add developer menu item to disable sending physics updates 2015-01-26 12:05:57 -08:00
David Rowe
c8a755df1b Remove unused variable 2015-01-26 08:32:23 -08:00
Philip Rosedale
09527cc264 hit target 2015-01-25 21:52:08 -08:00
Philip Rosedale
67632fa589 remove debug 2015-01-25 21:51:12 -08:00
Philip Rosedale
901044fc53 First version, popcorn machine 2015-01-25 21:40:16 -08:00
Philip Rosedale
1048c9cda3 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-23 16:09:51 -08:00
Philip Rosedale
806c1851be add save/restore of gravity 2015-01-23 16:09:45 -08:00
Atlante45
7a1300d66c Request blocking calls 2015-01-23 16:05:06 -08:00
David Rowe
22347dd794 Add AudioDevice.deviceChanged() signal and use to update audio menu 2015-01-22 19:11:55 -08:00
Ryan Huffman
4fd5f74365 Update editEntities.js to load includes in parallel 2015-01-22 14:14:49 -08:00
Philip Rosedale
59f79fd436 Add handedness choice, default to right handed 2015-01-22 13:42:19 -08:00
Philip Rosedale
45a84895e1 Paddle ball game, first version 2015-01-22 12:44:07 -08:00
David Rowe
7d1cc1f20d Make 3D "x" button work 2015-01-21 21:44:55 -08:00
David Rowe
ef7ea0eaa6 Position and angle 3D notifications in lower part of view 2015-01-21 21:34:34 -08:00
Brad Hefta-Gaub
7d7411ceee Merge pull request #4146 from PhilipRosedale/master 
Improved Billiards, Gun
 2015-01-21 19:36:20 -08:00
David Rowe
00de7062cc Longer persist time for 3D notifications 2015-01-21 18:03:00 -08:00
David Rowe
f3147ab3e4 Move 3D notifications up as old ones are deleted 2015-01-21 17:58:50 -08:00
David Rowe
567ac9eb2f Update 3D notification positions as avatar moves 2015-01-21 17:08:31 -08:00
Philip Rosedale
6567fcfe0b Added shootable blocks on platform, grenade, buttons for making grid of targets 2015-01-21 16:17:25 -08:00
David Rowe
be6c6ed8ca Add 3D notifications on a simple vertical plane 2015-01-21 16:10:33 -08:00
Philip Rosedale
e02e0088af Improvements to gun to add shootable targets on a platform 2015-01-21 13:58:48 -08:00
Ryan Huffman
2171427bbd Update style.css to use pt instead of px for proper rendering on hidpi screens 2015-01-21 12:31:06 -08:00
Philip Rosedale
ffbe924734 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-21 09:12:15 -08:00
David Rowe
42b9ee8e77 Lint: Preferred control constructs 2015-01-21 08:14:45 -08:00
David Rowe
adba46f90c Lint: Preferred operators 2015-01-21 08:14:44 -08:00
David Rowe
63310fac50 Lint: Syntax 2015-01-21 08:14:44 -08:00
David Rowe
ce0c91628a Lint: Declaration order 2015-01-21 08:14:43 -08:00
David Rowe
c4b024e510 Lint: Variable declarations 2015-01-21 08:14:42 -08:00
David Rowe
e35c6be45e Lint: White space 2015-01-21 08:14:41 -08:00
Philip Rosedale
e95cd30be6 better reticle, balls drop properly on table 2015-01-20 16:30:50 -08:00
Ryan Huffman
1f86edbfbf Remove console.log from entityList.html 2015-01-20 12:47:19 -08:00
Ryan Huffman
1a6557c72d Remove removeEntity from entityList.html 2015-01-20 12:46:26 -08:00
Ryan Huffman
3a287a08ab Fix removal of entity list menu item 2015-01-20 12:43:49 -08:00
Ryan Huffman
bc21faeefb Add entityListTool.toggleVisible 2015-01-20 12:41:58 -08:00
Ryan Huffman
903921e11f Update entity list to auto-refresh list on start 2015-01-20 12:40:31 -08:00
Ryan Huffman
891f6fa513 Move entity list to edit menu 2015-01-20 12:40:16 -08:00
Ryan Huffman
8202c84c79 Add entity list menu option 2015-01-20 12:37:39 -08:00
Ryan Huffman
0d9dbaccf7 Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates 2015-01-20 11:44:13 -08:00
Philip Rosedale
0f368f52fb first cut of billiards.js, good enough to play with a bit 2015-01-20 09:46:18 -08:00
Ryan Huffman
d3a6a411fb Update entity list to use list.js more directly 2015-01-16 16:23:29 -08:00
David Rowe
b2cadbe36a Stop notifications of all users at startup 2015-01-16 15:24:26 -08:00
Brad Hefta-Gaub
cc9ae17964 Merge pull request #4122 from PhilipRosedale/master 
Improvements to gun adding floating targets that topple
 2015-01-15 21:34:22 -08:00
Philip Rosedale
abad341244 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-15 17:35:12 -08:00
Philip Rosedale
a07b5a9723 laser pointers to guns, toppling targets (press 't') 2015-01-15 17:34:52 -08:00
David Rowe
61caf5e4b4 Fix path to hydraMove.js 2015-01-15 17:24:25 -08:00
Stephen Birarda
cdaecbd846 Update lobby.js 2015-01-15 16:40:13 -08:00
Stephen Birarda
336f28e014 repair to places array length 2015-01-15 15:00:42 -08:00
Stephen Birarda
00f4e92e06 fix places array grab 2015-01-15 14:58:49 -08:00
Stephen Birarda
e538669343 resolve conflicts on merge with upstream 2015-01-15 13:12:05 -08:00
Ryan Huffman
92b99237a2 Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates 2015-01-15 11:13:01 -08:00
Ryan Huffman
705e6181a1 Move entity delete action to function 2015-01-15 11:12:46 -08:00
Brad Hefta-Gaub
d5d4b4ee18 Merge pull request #4113 from huffman/edit-entity-click 
Update editEntities to do an accurate pick when the mouse is idle
 2015-01-15 11:04:34 -08:00
Brad Hefta-Gaub
fbc040759e Merge pull request #4112 from cozza13/20270 
CR for Job #20270 - Change reference of global.js
 2015-01-15 11:03:52 -08:00
Ryan Huffman
bf6d63cf0c Make accurateRay parameter required 2015-01-15 10:59:24 -08:00
Ryan Huffman
dcb4d9f02d Update editEntities to do accurate pick on mouse idle 2015-01-15 10:57:35 -08:00
Ryan Huffman
1b9b7b6797 Merge branch 'master' of github.com:highfidelity/hifi into update-properties-layout 
Conflicts:
	examples/html/entityProperties.html
 2015-01-15 10:53:07 -08:00
Chris Collins
d6a3b94c73 Changed references of global.js to a var 
Changed references of global.js to a var
 2015-01-15 10:48:31 -08:00
Ryan Huffman
dbb978e278 Update style and layout of entity properties window 2015-01-15 10:22:39 -08:00
Stephen Birarda
79d214619d update lobby for new places API 2015-01-14 18:18:26 -08:00
Thijs Wenker
80a81043ed Merge branch 'master' of https://github.com/highfidelity/hifi into 20216 
Conflicts:
	interface/src/Menu.cpp
 2015-01-15 02:28:31 +01:00
Brad Hefta-Gaub
89967fbe7a Merge pull request #4104 from AndrewMeadows/inertia 
store density in EntityItem instead of mass
 2015-01-14 17:17:45 -08:00
Philip Rosedale
fead12acca Merge pull request #4102 from cozza13/20268 
CR for Job #20268 - Change hands for gun scripts
 2015-01-14 15:52:04 -08:00
Ryan Huffman
10f8e54903 Update style of properties windows 2015-01-14 15:50:42 -08:00
Clément Brisset
ce12e61a27 Merge pull request #4101 from huffman/fix-rotation-image 
Fix rotation handles not showing up
 2015-01-14 15:49:09 -08:00
Andrew Meadows
f90b128ac3 use density instead of mass in scripts/UI 2015-01-14 15:48:05 -08:00
Chris Collins
6ce71d9655 Fix library and placement reference 
Fix library reference and switch the gun hand.
 2015-01-14 13:54:34 -08:00
Ryan Huffman
e7eb12202a Fix rotation handles not showing up 2015-01-14 09:41:34 -08:00
Brad Hefta-Gaub
7e55d79ab7 Merge pull request #4099 from huffman/update-entity-properties 
Add missing model properties to entity property window
 2015-01-13 17:12:06 -08:00
Clément Brisset
3034b8f733 Merge pull request #4091 from ctrlaltdavid/20229 
CR for Job #20229 - Expose the downloads section for models and metavoxels to javascript
 2015-01-13 17:07:17 -08:00
Andrew Meadows
26ab79e840 Merge pull request #4097 from huffman/update-camera-hud 
Enable and update camera tool
 2015-01-13 17:07:04 -08:00
Andrew Meadows
b4ee7b684c Merge pull request #4070 from cozza13/20259 
CR for Job #20259 - Fix up bad links on bot scripts
 2015-01-13 17:06:36 -08:00
Ryan Huffman
c51cac6381 Remove Model List dialog 2015-01-13 15:38:28 -08:00
Ryan Huffman
7ddec78cd5 Add list.min.js for entity list tool 2015-01-13 15:36:25 -08:00
Ryan Huffman
9e8458edd9 Add support for teleport, delete, and filtering in entity list 2015-01-13 15:35:30 -08:00
Ryan Huffman
ce60a410cf Reenable entity list tools 2015-01-13 15:34:26 -08:00
Ryan Huffman
00f7bf7efe Remove 'Edit Properties...' in favor of properties window 2015-01-13 10:12:15 -08:00
Ryan Huffman
96f75df831 Add missing model properties to entity property window 2015-01-13 10:09:05 -08:00
Ryan Huffman
0c58572d32 Reduce size of camera tool cubes 2015-01-13 08:45:11 -08:00
Ryan Huffman
e873df9680 Remove mode buttons from camera tool and increase size 2015-01-13 08:39:59 -08:00
Ryan Huffman
aad49e4404 Update camera tool to only show when edit entities is enabled 2015-01-13 08:26:32 -08:00
Ryan Huffman
80351a768e Enable camera tool 2015-01-13 08:26:11 -08:00
Atlante45
2b48d31cbb Move scripts to correct directory 2015-01-12 17:48:54 -08:00
Clément Brisset
10331c52a8 Merge pull request #4094 from birarda/master 
repairs to AudioScriptingInterface playSound
 2015-01-12 16:18:41 -08:00
Stephen Birarda
661221a189 repairs to AudioScriptingInterface playSound 2015-01-12 16:04:00 -08:00
Stephen Birarda
208af5cbca Revert "don't play muzak from lobby to avoid error" 
This reverts commit 69f5c769b8.
 2015-01-12 15:14:49 -08:00
Chris Collins
8f3aba3585 Removing double entry of gun.js 
Removing double entry of gun.js
 2015-01-12 14:39:13 -08: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
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
Chris Collins
9ca0df0796 Small fixes to scripts 
-merge duplicate gun scripts
-fix url of sit
 2015-01-08 16:05:32 -08:00
Atlante45
a46080cbf2 editModels > hydraGrab 2015-01-08 11:24:02 -08: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
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
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
David Rowe
40274df279 Add downloads information changed event for JavaScript 2015-01-07 11:20:46 -08: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
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
David Rowe
8b0d859686 Add method to access downloads information in JavaScript 2015-01-06 15:54:07 -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
Ryan Huffman
cf04c3313a Update inWorldTestTone.js to play in front of avatar 2015-01-02 11:43:41 -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
Ryan Huffman
cf798e0a2f Fix orbit camera capturing mouse 2014-12-30 15:30:25 -08:00