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

21211 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
e95cd30be6 better reticle, balls drop properly on table 2015-01-20 16:30:50 -08:00
Sam Gateau
7dad11bfc6 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-20 16:02:58 -08:00
Sam Gateau
4302db109f First take at using the gpu::Texture in the Model rendering instead of the previous pass with raw glTexture 2015-01-20 16:02:26 -08:00
Atlante45
8d37f5ae00 More setting handles 2015-01-20 15:35:22 -08:00
Andrzej Kapolka
b2079ab849 Go ahead and generate mipmaps for the terrain color texture. 2015-01-20 14:42:48 -08:00
Andrew Meadows
790d07d346 track known contacts and generate collision events 2015-01-20 14:18:10 -08:00
Atlante45
f254591c88 Don't use (set)Geometry to save/restore mainWindow 2015-01-20 14:03:26 -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
Andrew Meadows
5da38834e2 introduce notion of NumSteps vs NumSubsteps 2015-01-20 11:16:40 -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
Atlante45
88872825fa Don't call settings in render loop 2015-01-20 10:56:58 -08:00
Atlante45
d7f6add74c Use QThreadStorage to store QSettings 2015-01-20 10:53:16 -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
Atlante45
997f9384da Remove window default geometry 2015-01-20 02:11:51 -08:00
Atlante45
e4fa9e508e Moved loadSetting to MyAvatar 2015-01-20 00:56:25 -08:00
Atlante45
75ce99cd62 Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-20 00:32:32 -08:00
Atlante45
6a00dcbf0a More switches to new Settings 2015-01-20 00:30:29 -08:00
Atlante45
cdb0c22207 interface/ui uses new settings 2015-01-19 22:49:27 -08:00
Atlante45
27390e6c99 Replaced wrong namespace 2015-01-19 22:36:46 -08:00
Atlante45
4f2fa227b2 Got rid of SettingHandle::type 2015-01-19 22:35:38 -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
Atlante45
23bab601c5 LODManager uses new settings 2015-01-19 21:27:21 -08:00
Atlante45
d0d16e088e Introduced SettingsBridge class 
Class use to privatize direct access to settings
 2015-01-19 21:24:57 -08:00
Atlante45
6cf00041f8 Introduced SettingHandle 
New class that serves as an accesor to a single setting
 2015-01-19 20:56:15 -08:00
David Rowe
214a18c446 Guard against derefencing NULL 2015-01-19 19:33:12 -08:00
ZappoMan
44b48bab5e remove some dead code we don't use 2015-01-19 18:15:47 -08:00
Andrew Meadows
e4f29412d5 cheaper failure adding entity to physics engine 2015-01-19 18:11:14 -08:00
ZappoMan
2b2bd3cb47 more work on renderGrid with color 2015-01-19 18:08:34 -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