Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 19:01:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26718 commits 75 branches 59 tags 1.2 GiB
Commit graph

26718 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
f5cea57a48 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-06-17 07:20:15 -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
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
Seth Alves
d7eddc398b don't make changes if the polyvox is locked 2015-06-16 10:14: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
Seth Alves
e98b28c1d8 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-06-16 09:32:53 -07:00
ericrius1
70e042085b fixed indentation 2015-06-16 09:11:36 -07:00
Stephen Birarda
ef62f7e9f0 fix relative path lookup effect on history 2015-06-16 08:46:04 -07:00
Stephen Birarda
8e46043f14 add fixed back/forward, buttons to menu 2015-06-16 08:41:21 -07:00
Seth Alves
6def25de92 formatting 2015-06-15 16:22:06 -07:00
Seth Alves
445381bb6b fix DEFAULT_VOXEL_DATA, recompress voxel data when a script calls setVoxel. Use provided transform when rendering. 2015-06-15 16:07:28 -07:00
Seth Alves
4a00bd3e7f quiet compiler 2015-06-15 16:06:20 -07:00
ericrius1
67ed1369cc fixed indentation 2015-06-15 15:04:38 -07:00
ericrius1
2663e5a876 correct particle count for systems without textures 2015-06-15 14:43:13 -07:00
eric levin
27c6190665 fixed particles not showing up by fixing billboarding code to account for new winding order 2015-06-15 14:24:18 -07:00
Philip Rosedale
ab73905832 Merge pull request #5130 from ZappoMan/fixRayPicking 
fix detailed ray picking against models
 2015-06-15 13:45:28 -07:00
ZappoMan
1c3b484466 fix detailed ray picking against models 2015-06-15 12:48:51 -07:00
Brad Hefta-Gaub
03409fa7d8 Merge pull request #5128 from sethalves/unreasonably-deep-recursion 
unreasonably deep recursion
 2015-06-15 11:47:00 -07:00
Seth Alves
5f3b902798 remove debugging print 2015-06-15 11:24:29 -07:00
Seth Alves
c1668553fd make sure that the root node always appends an entity count (even if it's zero). This keeps the unreasonably-deep-recursion warnings from happening 2015-06-15 11:22:07 -07:00
Leonardo Murillo
c065269ba7 Merging with upstream 2015-06-15 11:58:52 -06: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
Clément Brisset
214f07d5f4 Merge pull request #5123 from ZappoMan/LODstats 
add LOD stats to the default stats
 2015-06-13 16:02:48 +02:00
ZappoMan
648f9bebdf add LOD stats to the default stats 2015-06-12 15:58:26 -07:00
Philip Rosedale
c834937472 Merge pull request #5122 from huffman/fix-rear-view-mirror 
Fix rear view mirror
 2015-06-12 15:49:38 -07:00
Philip Rosedale
b628df45bc Merge pull request #5121 from ZappoMan/attemptRevertOverlaysBork2 
REVERT recent changes to overlays that seem to be breaking stuff
 2015-06-12 13:50:53 -07:00
Ryan Huffman
81d003bdb8 Add post-scale to view matrix when in mirror mode 2015-06-12 13:05:10 -07:00
Ryan Huffman
66a65e3675 Update model to select clockwise backface culling program when in mirror mode 2015-06-12 13:04:02 -07:00
Ryan Huffman
ad77374732 Fix setting of _renderMode 2015-06-12 13:03:33 -07:00
ZappoMan
1feceec0c7 Revert "Fix broken identity transforms on OSX" 
This reverts commit 9262839564.
 2015-06-12 12:57:37 -07:00
ZappoMan
0cdc2b53fe Revert "Merge pull request #5106 from jherico/render_cursor" 
This reverts commit 4d18bd7cec, reversing
changes made to 24fda9a733.
 2015-06-12 12:57:24 -07:00
David Rowe
e16116ce78 Have auto mute mic upon losing camera tracking disabled by default 2015-06-12 12:33:42 -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
Philip Rosedale
6d0335055e Merge pull request #5117 from ZappoMan/bugfix 
quick hack to fix stats texture bleed through
 2015-06-12 11:59:21 -07:00