Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-27 11:25:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26840 commits 29 branches 28 tags 1.2 GiB
Commit graph

26840 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
7391aebf60 fix change that introduced interger division 2015-06-17 06:51:38 -07:00
Seth Alves
fdd5953e44 fix change that introduced interger division 2015-06-17 06:48:06 -07: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
Seth Alves
2a841cc0b8 clang doesn't know -Wdouble-promotion 2015-06-16 19:19:18 -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
Ryan Huffman
d47f5a2abb Update Rectangle, Grid, and Billboard overlays to use batches 2015-06-16 16:45:53 -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
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
Sam Gondelman
156adb1a98 one more coding standard fix 2015-06-16 11:34:59 -07:00
Sam Gondelman
814e22364a coding standard fixes 2015-06-16 11:30:28 -07: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
Sam Gondelman
1ecc954656 coding standard fixes 2015-06-16 10:25:30 -07:00
Sam Gondelman
68a08d969d code review fixes 2015-06-16 10:19:40 -07: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
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -07:00
Ryan Huffman
8241a2170b Update cube, line, and sphere overlays to use batches 2015-06-16 09:50:42 -07:00
Niraj Venkat
de13fe85fe Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-16 09:50:37 -07:00
Niraj Venkat
a24e0f7b14 Finishing up new address bar layout 2015-06-16 09:50:03 -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