Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-18 05:21:10 +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
Ryan Huffman
52193fce38 Remove qDebug 2015-01-22 08:35:38 -08:00
Brad Hefta-Gaub
d8d0972cb6 Merge pull request #4148 from AndrewMeadows/isentropic 
reduce flood of collision events
 2015-01-21 19:37:04 -08:00
Brad Hefta-Gaub
7d7411ceee Merge pull request #4146 from PhilipRosedale/master 
Improved Billiards, Gun
 2015-01-21 19:36:20 -08:00
Andrew Meadows
77c4362991 fix typo 2015-01-21 18:14:24 -08:00
Andrew Meadows
b2e79a0157 don't process results when no simulation 2015-01-21 18:06:19 -08:00
Andrew Meadows
2751fab2c3 don't send collision events for inactive pairs 
also throttle collision events to 30/sec
 2015-01-21 18:02:13 -08:00
Andrzej Kapolka
cc9bbc3490 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-21 17:47:40 -08:00
Andrzej Kapolka
0d8380a288 Put the indices for our extra triangles into the spatial hash. 2015-01-21 17:47:13 -08:00
ZappoMan
9152865116 first cut at supporting streamized spheres 2015-01-21 16:56:41 -08:00
ZappoMan
02a68096c3 add debug for vec4 2015-01-21 16:56:04 -08:00
Sam Gateau
ea37d7cfd0 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-21 16:55:25 -08:00
Sam Gateau
18b3b1a6b1 Merge branch 'temp0bis' of https://github.com/samcake/hifi into temp0 2015-01-21 16:54:11 -08:00
Sam Gateau
1e84f260a9 Removing gl calls for texture from TextureCache 2015-01-21 16:53:35 -08:00
Brad Hefta-Gaub
5a7912de17 Merge pull request #4144 from AndrewMeadows/isentropic 
Bullet collisions trigger collision events in scripts.
 2015-01-21 16:21:57 -08:00
Philip Rosedale
6567fcfe0b Added shootable blocks on platform, grenade, buttons for making grid of targets 2015-01-21 16:17:25 -08:00
Andrzej Kapolka
8bd944e32e Incremental improvement to stitching. 2015-01-21 16:10:00 -08:00
ZappoMan
d3ae9af8ed Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-21 15:18:41 -08:00
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
1b7074e52a purge EntityCollisionSystem 2015-01-21 14:16:34 -08:00
Philip Rosedale
78f157d6b0 Merge pull request #4145 from huffman/fix-dpi 
Update style.css to use pt instead of px for proper rendering on hidpi s...
 2015-01-21 14:09:41 -08:00
Andrew Meadows
1c38b08e8f remane emitEntityCollision... to entityCollision... 2015-01-21 14:07:23 -08:00
Philip Rosedale
e02e0088af Improvements to gun to add shootable targets on a platform 2015-01-21 13:58:48 -08:00
Andrzej Kapolka
8636f0c48e Simplification. 2015-01-21 12:57:24 -08:00
Ryan Huffman
2171427bbd Update style.css to use pt instead of px for proper rendering on hidpi screens 2015-01-21 12:31:06 -08:00
Andrzej Kapolka
87e3339791 Fix for normal selection with degenerate triangles. 2015-01-21 12:28:05 -08:00
Andrew Meadows
cb536c5d4e Merge pull request #4143 from murillodigital/windows-bullet 
Windows bullet
 2015-01-21 12:13:04 -08:00
Andrew Meadows
6840daa0b5 removing tabs from formatting 2015-01-21 11:55:28 -08:00
Andrew Meadows
e49c76656f merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/physics/src/PhysicsEngine.cpp
 2015-01-21 11:35:36 -08:00
Andrew Meadows
86583f3f3f physics collisions emit script collision events 2015-01-21 11:27:32 -08:00
Atlante45
11ea3e4047 Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-21 11:15:31 -08:00
Atlante45
2f39b93823 Use QDickCache for every QNAM 2015-01-21 11:12:11 -08:00
Sam Gateau
33dcbded22 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0bis 2015-01-21 10:07:58 -08:00
Sam Gateau
d19bfa69f2 Even more gpu::Texture in the model rnedering 2015-01-21 10:07:10 -08:00
ZappoMan
4c9b7f46a2 cleanup 2015-01-21 10:03:25 -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
Philip Rosedale
ffbe924734 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-21 09:12:15 -08: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
Atlante45
850f92eae3 Don't call Settings::set when you don't need too. 2015-01-20 17:54:11 -08:00
Atlante45
e1725d1eee Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-20 17:41:08 -08:00
Atlante45
77bab2a8c2 Setup Thread and timer for settings 2015-01-20 17:11:46 -08:00
Atlante45
2b3f12a7c4 More settings hooks 2015-01-20 16:52:42 -08:00