Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-03 23:13:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20929 commits 25 branches 0 tags 1.1 GiB
Commit graph

20929 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
c8a755df1b Remove unused variable 2015-01-26 08:32:23 -08:00
David Rowe
7d1cc1f20d Make 3D "x" button work 2015-01-21 21:44:55 -08:00
David Rowe
ef7ea0eaa6 Position and angle 3D notifications in lower part of view 2015-01-21 21:34:34 -08:00
David Rowe
00de7062cc Longer persist time for 3D notifications 2015-01-21 18:03:00 -08:00
David Rowe
f3147ab3e4 Move 3D notifications up as old ones are deleted 2015-01-21 17:58:50 -08:00
David Rowe
567ac9eb2f Update 3D notification positions as avatar moves 2015-01-21 17:08:31 -08:00
David Rowe
be6c6ed8ca Add 3D notifications on a simple vertical plane 2015-01-21 16:10:33 -08:00
David Rowe
504bd5e1b1 Expose default eye position to JavaScript 2015-01-21 08:14:46 -08:00
David Rowe
42b9ee8e77 Lint: Preferred control constructs 2015-01-21 08:14:45 -08:00
David Rowe
adba46f90c Lint: Preferred operators 2015-01-21 08:14:44 -08:00
David Rowe
63310fac50 Lint: Syntax 2015-01-21 08:14:44 -08:00
David Rowe
ce0c91628a Lint: Declaration order 2015-01-21 08:14:43 -08:00
David Rowe
c4b024e510 Lint: Variable declarations 2015-01-21 08:14:42 -08:00
David Rowe
e35c6be45e Lint: White space 2015-01-21 08:14:41 -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
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