Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 09:30:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26906 commits 71 branches 59 tags 1.2 GiB
Commit graph

2583 commits

Author SHA1 Message Date
Sam Gateau
31633eca10 IMproving the probe system and cleaning the engine script 2015-06-19 10:41:40 +02:00
Brad Hefta-Gaub
750ce250fa Merge pull request #5150 from SamGondelman/mouseLook 
mouse look script
 2015-06-18 17:41:20 -07:00
Sam Gondelman
fb7ddde0ca removed magic numbers 2015-06-18 15:29:20 -07:00
Philip Rosedale
61a2196a30 Reduce error tolerances for ballistic prediction that trigger updating the server 2015-06-18 13:21:37 -07:00
Sam Gondelman
3baf6d80ae removed magic numbers from mouseLook.js 2015-06-18 10:10:54 -07:00
Sam Gondelman
a37b089b33 merge with master 2015-06-17 12:17:09 -07:00
Sam Gondelman
c0797313a1 added mouseLook.js to default scripts 2015-06-17 12:08:23 -07:00
Andrew Meadows
61f62f96b0 Merge pull request #5129 from SamGondelman/master 
Integrating gamepads/hydras to input mapping system, zooming
 2015-06-17 11:39:38 -07:00
Sam Gondelman
3af0c138dd removed button image, extraneous variables 2015-06-17 11:39:11 -07:00
Sam Gondelman
17322645f2 added mouselook script, reticle and icons need changes 2015-06-17 11:17:38 -07:00
Seth Alves
f5cea57a48 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-06-17 07:20:15 -07:00
Philip Rosedale
7ead2bc46b Merge pull request #5120 from ctrlaltdavid/20576 
DO NOT MERGE - QA for #20576 - Play sound when mic is muted
 2015-06-16 13:27:01 -07:00
Seth Alves
a5f7ba51b6 only show polyvox property widgets if we are editing a polyvox. 2015-06-16 10:13:47 -07:00
Sam Gondelman
40bd747080 added trigger buttons to hydra, removed hydraMove.js from default scripts 2015-06-15 11:13:07 -07:00
Philip Rosedale
0b4d4c24d4 Merge pull request #5119 from ericrius1/paintingOptimizations 
added lifetime to painted lines to prevent huge model.json files when…
 2015-06-14 21:47:56 -07:00
Philip Rosedale
c113b4620d Merge pull request #5107 from howard-stearns/draggable-toolbar 
Draggable toolbar
 2015-06-14 21:46:49 -07:00
David Rowe
c369e305f8 Include dialTone.js in default scripts 2015-06-12 12:33:30 -07:00
David Rowe
f0b6b0f548 Play sound upon microphone being muted 2015-06-12 12:33:17 -07:00
David Rowe
546442ff9a Fix sound URLs 
Three slashes needed for Windows.
 2015-06-12 12:32:40 -07:00
Eric Levin
7ee609396c added lifetime to painted lines to prevent huge model.json files when lots of people draw in one domain. Got rid of gaps in lines when switching line entities 2015-06-12 11:58:43 -07:00
Howard Stearns
27f40ea881 Signal Audio.disconnected, and use new hello/goodbye sounds in resources. 2015-06-11 20:33:30 -07:00
Howard Stearns
3cb4ee183e Update header. 2015-06-11 16:24:22 -07:00
Howard Stearns
e6bafb9bf1 Draggable toolBar.js, with persistence, and update some scripts for it. 2015-06-11 16:19:54 -07:00
Brad Hefta-Gaub
24fda9a733 Merge pull request #5085 from SamGondelman/master 
Exposing Input Key Binding To JavaScript
 2015-06-11 14:41:34 -07:00
Andrew Meadows
a3c5ea1b58 Merge pull request #5088 from sethalves/actions 
spring action with rotation and position target, rework grab script to use it
 2015-06-11 13:23:57 -07:00
Seth Alves
8ed9a3ca02 add handedness setting to avatar-hold action. update stick.js to allow use of hydra 2015-06-11 11:04:19 -07:00
Brad Hefta-Gaub
a1ee339765 Merge pull request #5103 from samcake/punk 
TEAM TEACHING : Repair the Overlay 3D rendering and introduce the concept of layer in the scene
 2015-06-11 10:17:38 -07:00
Andrew Meadows
f77f3f1e1e fix bug where grab.js moves mouse to screen corner 
when CTRL is pressed
 2015-06-11 08:43:19 -07:00
Sam Gateau
7685fe2229 Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool 2015-06-11 06:40:21 -07:00
Philip Rosedale
b32994b359 Merge pull request #5083 from ctrlaltdavid/20551 
CR for Job #20551 - Create a directory button that opens up the Directory. Similar to the marketplace
 2015-06-10 22:32:25 -07:00
Seth Alves
8bd80c511e make stick follow mouse motion 2015-06-10 21:08:00 -07:00
Seth Alves
4216308b9b Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 19:05:25 -07:00
Seth Alves
45c7cd4929 respond to code review, add a simple hold-a-stick script 2015-06-10 18:48:51 -07:00
Niraj Venkat
9ed8daa97c Removing unnecessary functions 2015-06-10 15:33:07 -07:00
Seth Alves
1c0c7f0fe3 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 15:30:28 -07:00
Niraj Venkat
182a3e918c Hyperlink properties now propagate locally and over network 2015-06-10 13:12:18 -07:00
Niraj Venkat
c45d409383 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-10 09:51:17 -07:00
Niraj Venkat
4617b7331c Working on creating functions to serialize and deserialize properties 2015-06-10 09:50:47 -07:00
Niraj Venkat
d90e43c5aa Adding text boxes for hyperlink href and description 2015-06-09 16:15:47 -07:00
Stephen Birarda
091ed5b514 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-09 15:51:45 -07:00
Seth Alves
6cce845984 rotate based on initial mouse-position and initial entity rotation rather than doing small deltas as the mouse moves 2015-06-09 14:26:44 -07:00
Seth Alves
23dab530f9 fix some glitchy behavior during rotation 2015-06-09 14:11:01 -07:00
David Rowe
a4885ff38c Close directory window after domain change 2015-06-09 12:33:30 -07:00
Seth Alves
ccb2f17b33 grab.js rotation sort-of works now 2015-06-09 11:21:13 -07:00
Seth Alves
42f94307d5 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-09 09:51:29 -07:00
Sam Gondelman
b1b2d1f85c ;) (added semicolons to js example) 2015-06-09 09:45:19 -07:00
David Rowe
cb6aef16e6 Merge branch 'master' into 20551 2015-06-09 09:36:44 -07:00
David Rowe
9e3ce344fb Display directory button just above edit toobar 2015-06-09 07:26:18 -07:00
Brad Hefta-Gaub
3fb5e47dcc Merge pull request #5064 from ericrius1/paint 
bumped max line points to 80
 2015-06-08 21:20:58 -07:00
Seth Alves
2fb64aad91 fix variable name 2015-06-08 20:31:35 -07:00