Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 21:14:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26765 commits 71 branches 56 tags 1.2 GiB
Commit graph

26765 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gondelman
f752534f7c actionEvent signal, captureActions, began work on hmdControls.js 2015-06-18 09:52:36 -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
Stephen Birarda
71475f13b5 Merge pull request #5146 from birarda/master 
fix for path handling on return of place info
 2015-06-17 14:57:55 -04: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
Stephen Birarda
bc20ea6ed2 fix for path handling on return of place info 2015-06-17 11:18:43 -07:00
Sam Gondelman
17322645f2 added mouselook script, reticle and icons need changes 2015-06-17 11:17:38 -07:00
Philip Rosedale
8b8f0bcbde Merge pull request #5132 from sethalves/polyvox 
Polyvox fixes
 2015-06-17 10:49:35 -07:00
Clément Brisset
d67d350e72 Merge pull request #5143 from ZappoMan/atmosphereBatchFix 
Change atmospheres to render using batch compatible pipeline and shaders
 2015-06-17 19:48:11 +02:00
Clément Brisset
42a5ddd116 Merge pull request #5144 from birarda/master 
make goToUser public again
 2015-06-17 19:27:29 +02:00
Stephen Birarda
dc4ae082f8 make goToUser public again 2015-06-17 10:13:53 -07:00
ZappoMan
fb59939cf4 CR feedback 2015-06-17 10:02:02 -07:00
ZappoMan
e9bf553254 CR feedback 2015-06-17 09:59:38 -07:00
ZappoMan
689e10cc27 build buster fix 2015-06-17 09:53:50 -07:00
ZappoMan
467609f2b6 standardize skybox and atmosphere batch 2015-06-17 09:44:26 -07:00
ZappoMan
af5a910f58 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix 2015-06-17 09:36:16 -07:00
ZappoMan
8162c37013 cleanup 2015-06-17 09:33:15 -07:00
Ryan Huffman
4f4bbddf9b Merge pull request #5142 from samcake/yellow 
Migrating the rendering of 3D overlay elements to the batch rendering
 2015-06-17 09:31:26 -07:00
ZappoMan
268bb370cc cleanup 2015-06-17 09:24:42 -07:00
ZappoMan
0e18c75b0b cleanup 2015-06-17 09:23:12 -07:00
ZappoMan
ea98581d22 reorganize files to cleanup headers 2015-06-17 09:18:00 -07:00
ZappoMan
b5731135dd cleanup 2015-06-17 09:08:41 -07:00
ZappoMan
2356a071dd some cleanup 2015-06-17 08:48:04 -07:00
Sam Gateau
3176c8e93c polish before PR 2015-06-17 17:09:33 +02:00
samcake
febc3333cd Solving the rendering of textured overlay3d 2015-06-17 16:50:35 +02:00
samcake
d703748ec3 trying to solve the rendering of overlay3d 2015-06-17 16:44:02 +02:00
Seth Alves
f5cea57a48 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-06-17 07:20:15 -07:00
Sam Gateau
5c547037f2 Migrating the overaly 3d rendering in their own job and their own shader 2015-06-17 15:54:20 +02:00
Sam Gateau
0653be445a Merge branch 'batch-overlay' of https://github.com/huffman/hifi into yellow 2015-06-17 10:39:45 +02:00
ZappoMan
006899d73f more hacking almost working 2015-06-16 22:23:14 -07:00
ZappoMan
569971582d more hacking on trying to port atmospheres to the new pipeline 2015-06-16 18:39:35 -07:00
ZappoMan
722ac618f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix 2015-06-16 17:08:15 -07:00
Ryan Huffman
d47f5a2abb Update Rectangle, Grid, and Billboard overlays to use batches 2015-06-16 16:45:53 -07:00
Seth Alves
0ef75da5d5 Merge pull request #5139 from ZappoMan/fixRayPicking 
fix FPS while still maintaining ray picking
 2015-06-16 16:17:42 -07:00
ZappoMan
6f0ae96f56 fix warning 2015-06-16 16:01:01 -07:00
Brad Hefta-Gaub
dfc3664469 Merge pull request #5131 from ericrius1/particleFix 
fixed particles not showing up by fixing billboarding code to account…
 2015-06-16 15:58:40 -07:00
ZappoMan
5abd608ccc fix typo 2015-06-16 15:55:37 -07:00
ZappoMan
1beb95cfe7 fix FPS while still maintaining ray picking 2015-06-16 15:38:16 -07:00
Seth Alves
49a68b4565 Merge pull request #5137 from murillodigital/auto-updater 
Fixing bug on platforms for which we don't release
 2015-06-16 15:31:48 -07:00
ZappoMan
167e7d1377 first cut at atmospheres in batch (doesn't work) 2015-06-16 14:05:14 -07:00
Andrew Meadows
7721f6de96 Merge pull request #5134 from birarda/master 
add goBack and goForward to AddressManager
 2015-06-16 13:50:20 -07:00
Leonardo Murillo
80ab2f31f4 typo 2015-06-16 14:49:55 -06:00
Leonardo Murillo
e1fb01e6dd Fixing bug on platforms for which we don't release 2015-06-16 14:49:19 -06:00
Stephen Birarda
e9bdf7e73a add missing bools to handleViewpoint call 2015-06-16 13:39:11 -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
Stephen Birarda
1af4b1c54c cleanup handleUrl call, add disabling of Menu items 2015-06-16 13:17:13 -07:00
Stephen Birarda
b0b52ddcd2 Merge pull request #5082 from murillodigital/auto-updater 
Checkpoint towards auto updater
 2015-06-16 16:06:19 -04:00
Leonardo Murillo
917aa5db6d Code review changes 2015-06-16 13:21:40 -06:00
Leonardo Murillo
6fcdb83d46 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-16 12:54:32 -06:00