Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 03:28:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
20929 commits 69 branches 56 tags 1.2 GiB
Commit graph

20929 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
ba2f7d88ce Update ImageOverlay to use TextureCache 2015-01-21 15:09:09 -08:00
Ryan Huffman
53a70c43e1 Add width and height to NetworkTexture 2015-01-21 15:08:38 -08:00
Andrew Meadows
cb536c5d4e Merge pull request #4143 from murillodigital/windows-bullet 
Windows bullet
 2015-01-21 12:13:04 -08:00
Leonardo Murillo
a825f2a495 Markdown fix 2015-01-21 11:31:24 -06:00
Leonardo Murillo
93edd82038 Markdown fix 2015-01-21 11:28:50 -06:00
Leonardo Murillo
e82b07caf8 Updated Windows build instructions 2015-01-21 11:26:43 -06:00
Andrew Meadows
b8f97ca978 Merge pull request #4142 from ey6es/master 
Fix for color/material texture alignment.
 2015-01-21 08:55:45 -08:00
Andrzej Kapolka
10c4408d94 Slight stitching tweak. 2015-01-20 21:52:56 -08:00
Andrzej Kapolka
79e18b161d Simplification. 2015-01-20 18:42:40 -08:00
Andrzej Kapolka
35547a5a02 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-20 18:30:50 -08:00
Brad Hefta-Gaub
5a621ba015 Merge pull request #4141 from huffman/entity-list-updates 
Entity list updates - sorting, search, style
 2015-01-20 18:18:15 -08:00
Brad Hefta-Gaub
08e8694ae1 Merge pull request #4139 from AndrewMeadows/bispinor 
lower cost when failing to add entity to physics engine
 2015-01-20 18:17:35 -08:00
Andrzej Kapolka
460a307ebe Better stitching. 2015-01-20 18:12:00 -08:00
Andrzej Kapolka
b2079ab849 Go ahead and generate mipmaps for the terrain color texture. 2015-01-20 14:42:48 -08:00
Andrzej Kapolka
fa466da072 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-20 13:08:25 -08:00
Andrzej Kapolka
b4cd13f0be Fix for misaligned color/material textures when resolution is greater than the 
height map.
 2015-01-20 13:07:35 -08:00
Ryan Huffman
1f86edbfbf Remove console.log from entityList.html 2015-01-20 12:47:19 -08:00
Ryan Huffman
1a6557c72d Remove removeEntity from entityList.html 2015-01-20 12:46:26 -08:00
Ryan Huffman
3a287a08ab Fix removal of entity list menu item 2015-01-20 12:43:49 -08:00
Ryan Huffman
bc21faeefb Add entityListTool.toggleVisible 2015-01-20 12:41:58 -08:00
Ryan Huffman
903921e11f Update entity list to auto-refresh list on start 2015-01-20 12:40:31 -08:00
Ryan Huffman
891f6fa513 Move entity list to edit menu 2015-01-20 12:40:16 -08:00
Ryan Huffman
8202c84c79 Add entity list menu option 2015-01-20 12:37:39 -08:00
Ryan Huffman
0d9dbaccf7 Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates 2015-01-20 11:44:13 -08:00
Clément Brisset
a41ef94f5c Merge pull request #4137 from ctrlaltdavid/null-dereference 
Guard against derefencing NULL
 2015-01-20 11:31:04 -08:00
Clément Brisset
b33b2bb5a9 Merge pull request #4138 from PhilipRosedale/master 
Billiards game in JS
 2015-01-20 11:30:20 -08:00
Clément Brisset
9ebd47d98c Merge pull request #4140 from birarda/master 
fix for path override in address bar
 2015-01-20 11:28:24 -08:00
Stephen Birarda
cd23876afc fix QHttpMultiPart destroy from AccountManager 2015-01-20 11:00:08 -08:00
Stephen Birarda
a66888939c add some debugging for domain switch 2015-01-20 10:51:11 -08:00
Stephen Birarda
483d072709 handle override path from address bar 2015-01-20 10:47:57 -08:00
Andrew Meadows
4112acc382 Merge pull request #4135 from ey6es/master 
Back to JPG compression for heightfield colors.
 2015-01-20 10:01:45 -08:00
Philip Rosedale
0f368f52fb first cut of billiards.js, good enough to play with a bit 2015-01-20 09:46:18 -08:00
Andrew Meadows
aa0f5d1bb1 merge upstream/master into andrew/bispinor 2015-01-20 08:29:37 -08:00
Andrzej Kapolka
f7f480cee4 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-19 21:54:07 -08:00
Andrzej Kapolka
35bd1cda89 I believe this should fix some problems with flickering/crashing on edits: 
don't reapply properties that we've already read (thus clearing cached data,
stepping on other threads, etc.)
 2015-01-19 21:52:56 -08:00
David Rowe
214a18c446 Guard against derefencing NULL 2015-01-19 19:33:12 -08:00
Andrew Meadows
e4f29412d5 cheaper failure adding entity to physics engine 2015-01-19 18:11:14 -08:00
Andrzej Kapolka
16de6a130b Scratch that last change; it wasn't the problem. 2015-01-19 17:29:43 -08:00
Andrzej Kapolka
a16b54a34a Let's try not using the "augmented" data, since we don't need it. 2015-01-19 17:23:31 -08:00
Andrzej Kapolka
dafa44570a That was not the shader change I wanted to check in. This was. 2015-01-19 17:15:58 -08:00
Andrzej Kapolka
e5f3d48ffb Fix for splatted textures against empty regions. 2015-01-19 16:33:41 -08:00
Brad Hefta-Gaub
dca07ed694 Merge pull request #4136 from AndrewMeadows/bispinor 
remove log about failure to add to physics engine
 2015-01-19 16:14:02 -08:00
Andrew Meadows
171fead347 remove log about failure to add to physics engine 2015-01-19 15:55:53 -08:00
Andrzej Kapolka
f8f9c25d38 Back to JPG compression for heightfield colors. 2015-01-19 14:59:28 -08:00
Brad Hefta-Gaub
215e3b732e Merge pull request #4134 from ey6es/metavoxels 
Big ol' metavoxel update.  Mostly the switch to "stack" representation for dual contour data, but also includes some heightfield fixes.
 2015-01-19 14:06:02 -08:00
Brad Hefta-Gaub
33152904bc Merge pull request #4133 from birarda/master 
add debugging for AddressManager connect to domain
 2015-01-19 13:25:48 -08:00
Andrzej Kapolka
eb320f37c7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-19 12:41:21 -08:00
Brad Hefta-Gaub
699964ebb9 Merge pull request #4111 from AndrewMeadows/bispinor 
require Bullet
 2015-01-19 12:30:14 -08:00
Brad Hefta-Gaub
c7c7c35654 Merge pull request #4132 from ctrlaltdavid/3d-text-size 
Tweak 3D text overlay text size calculations
 2015-01-19 12:24:51 -08:00
Andrzej Kapolka
ed287e9bb2 This function isn't used, either. 2015-01-19 12:16:06 -08:00