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

21180 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
e4a9e429e0 reset NodeList if there is domain silence 2015-01-20 15:48:38 -08:00
Stephen Birarda
466ea12d0f turn off verbose HTTP request debug 2015-01-20 15:44:14 -08:00
Stephen Birarda
16dbc8048f inital connection of android client to domain 2015-01-20 15:40:34 -08:00
Stephen Birarda
a3a1350676 repairs to QInputDialog placement 2015-01-20 15:22:30 -08:00
Andrzej Kapolka
b2079ab849 Go ahead and generate mipmaps for the terrain color texture. 2015-01-20 14:42:48 -08:00
Stephen Birarda
94a9bf52fa handle gvr-interface address lookup 2015-01-20 14:38:33 -08:00
Stephen Birarda
17979d962f hookup basic input dialog for address bar 2015-01-20 14:26:32 -08:00
Andrew Meadows
790d07d346 track known contacts and generate collision events 2015-01-20 14:18:10 -08:00
Stephen Birarda
5704ed78ff add a working menu to interface to jump to address 2015-01-20 13:14:12 -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
Stephen Birarda
246ee41cf3 fix deps of linked target, create QMainWindow 2015-01-20 11:37:20 -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
Andrew Meadows
5da38834e2 introduce notion of NumSteps vs NumSubsteps 2015-01-20 11:16:40 -08:00
Stephen Birarda
b4d6a44fc2 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-20 11:15:54 -08:00
Andrew Meadows
0154c613d0 change FrameCount to NumSubsteps for more accuracy 2015-01-20 11:02:48 -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
549e3fac5f store backpointer to MotionState in btRigidBody 2015-01-20 10:45:58 -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
Stephen Birarda
6b2843e33d remove old test code from GVRInterface 2015-01-19 14:49:47 -08:00
Stephen Birarda
c844502b97 use Qt 5.3 for android build as well 2015-01-19 14:49:01 -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
Stephen Birarda
be317af2b8 add beginning of requirements for android CMake 2015-01-19 13:05:57 -08:00
Stephen Birarda
ea9c498979 add android sdk and ndk to requirements 2015-01-19 12:59:16 -08:00