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

9761 commits

Author SHA1 Message Date
Niraj Venkat
9b9aba48f0 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-17 13:50:30 -07:00
Philip Rosedale
196a1546ab Merge pull request #5135 from howard-stearns/not-clipped-local-sounds 
Don't clip local audio sounds
 2015-06-17 13:37:56 -07:00
Seth Alves
ac491dabdb Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 13:20:14 -07:00
Bradley Austin Davis
2172445db7 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 12:56:41 -07:00
Howard Stearns
b4dfaba55e Incorporate ctrlaltdavid's changes. 2015-06-17 11:59:15 -07:00
Seth Alves
3e758a8f43 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 11:53:12 -07:00
Seth Alves
85564199c6 git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point 2015-06-17 11:22:10 -07:00
Stephen Birarda
bc20ea6ed2 fix for path handling on return of place info 2015-06-17 11:18:43 -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
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
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
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
Seth Alves
0ec7d3ded8 fix some float/double jumble 2015-06-17 07:02:54 -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
Seth Alves
b8cf4ea29d use -Woverloaded-virtual with g++. quiet compiler warnings 2015-06-16 21:19:31 -07:00
ZappoMan
569971582d more hacking on trying to port atmospheres to the new pipeline 2015-06-16 18:39:35 -07:00
Seth Alves
2ad25a2386 Merge branch 'master' of github.com:highfidelity/hifi into float-vs-double 2015-06-16 18:25:38 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
ZappoMan
722ac618f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix 2015-06-16 17:08:15 -07:00
Niraj Venkat
5fcf8e5922 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-16 16:34:38 -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
Stephen Birarda
1af4b1c54c cleanup handleUrl call, add disabling of Menu items 2015-06-16 13:17:13 -07: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
Howard Stearns
6d99d50f72 Don't clip local audio sounds (https://app.asana.com/0/32622044445063/37633564937422) 
and quiet some warnings (of https://app.asana.com/0/32622044445063/37620738098871).
 2015-06-16 10:51:42 -07:00
Seth Alves
d7eddc398b don't make changes if the polyvox is locked 2015-06-16 10:14:01 -07:00
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -07:00
Niraj Venkat
de13fe85fe Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-16 09:50:37 -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
ZappoMan
1c3b484466 fix detailed ray picking against models 2015-06-15 12:48:51 -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
Niraj Venkat
428b80a50d Removing old debug print code 2015-06-12 17:49:07 -07:00
Niraj Venkat
df8e1ac467 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-12 17:46:58 -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
Niraj Venkat
fcd4dd32ef Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-12 14:08:33 -07:00
Niraj Venkat
b9b8cfd60d Starting the new address bar layout 2015-06-12 14:08:06 -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
ZappoMan
becd9646f2 Merge branch 'master' of https://github.com/highfidelity/hifi into cullingBugs 2015-06-12 11:43:08 -07:00
ZappoMan
7d7db65fd1 fix avatar mesh boxes not staying in sync with avatar position 2015-06-12 11:42:38 -07:00
Brad Hefta-Gaub
a5b28660ad Merge pull request #5113 from Atlante45/debug 
Fix text entities wrapping
 2015-06-12 11:23:31 -07:00
Brad Hefta-Gaub
b11b1d408b Merge pull request #5116 from jherico/osx_overlay_fix 
Fix broken identity transforms on OSX
 2015-06-12 10:59:37 -07:00
Atlante45
30ae78e3b6 Rename getRowHeight 2015-06-12 19:50:32 +02:00
Atlante45
26dd067982 Advance with _leading on y 2015-06-12 19:44:40 +02:00
Atlante45
f3d3bd7bec Remove _rowHeight 2015-06-12 19:44:15 +02:00
Bradley Austin Davis
9262839564 Fix broken identity transforms on OSX 2015-06-12 10:33:52 -07:00
Clément Brisset
e4511e37f5 Merge pull request #5111 from ZappoMan/cullingBugs 
hack to fix culling bugs for some subMesh parts in the windmill scene
 2015-06-12 18:53:46 +02:00
ZappoMan
c17ae593f0 CR feedback 2015-06-12 09:04:16 -07:00
Atlante45
228f8c2e61 Fix a few items rendering without pipeline 2015-06-12 17:34:16 +02:00
Atlante45
565bf8bcb2 Fix text entities wrapping 2015-06-12 15:41:37 +02:00
ZappoMan
2fc0233096 hack to fix culling bugs for some subMesh parts in the windmill scene 2015-06-11 20:50:31 -07:00
ZappoMan
feb3f68a00 hack to fix culling bugs for some subMesh parts in the windmill scene 2015-06-11 20:49:19 -07:00
Howard Stearns
27f40ea881 Signal Audio.disconnected, and use new hello/goodbye sounds in resources. 2015-06-11 20:33:30 -07:00
Brad Hefta-Gaub
c0deff9fdc Merge pull request #5097 from jherico/cursor_manager 
Cursor manager first pass
 2015-06-11 18:05:43 -07:00
Brad Hefta-Gaub
c27c20c142 Merge pull request #5109 from birarda/master 
fix for sticking windows audio-mixer
 2015-06-11 17:39:55 -07:00
Brad Davis
09cfe004a1 Combining with new cursor render code 2015-06-11 16:55:23 -07:00
Niraj Venkat
9a193acfa0 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-11 16:28:16 -07:00
Niraj Venkat
366be3c0c0 Check if entity looked at has valid hyperlink href attached 2015-06-11 16:27:50 -07:00
Brad Davis
9148b866bb Merge branch 'render_cursor' into cursor_manager 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-11 16:19:57 -07:00
Stephen Birarda
f45c2a3e56 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-11 15:49:12 -07:00
Brad Davis
b7cd1ea72a Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 15:04:56 -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