Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 17:13:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20282 commits 75 branches 59 tags 1.2 GiB
Commit graph

6462 commits

Author SHA1 Message Date
dev
e3d474db3d FIx shaders for mac 2015-01-05 12:27:16 -08:00
Sam Gateau
b8e44a3e7a Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2015-01-05 11:27:53 -08:00
Sam Gateau
458ea6759e Adding the shadow.slh file containing the shader functions used for shadowing, itis used by both normal and cascaded shadow deferred lighting passes 2015-01-05 11:27:29 -08:00
Philip Rosedale
a01ab38f1b Merge pull request #4029 from Atlante45/new_glm_fix 
Fix compile error with new glm version
 2015-01-04 11:26:37 -08:00
ZappoMan
139f96c8b0 remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe 2015-01-02 14:41:09 -08:00
Philip Rosedale
384899e977 Merge pull request #4032 from Atlante45/uninitialized_entity_members 
Initialize entities' _locked and _script
 2015-01-02 14:01:55 -08:00
Atlante45
022beff569 Initialize entities' _locked and _script 2015-01-02 12:37:00 -08:00
Sam Gateau
46ab4833be applying the shadowing improvment to the cascaceded path shader and cleaning the code 2015-01-02 12:12:41 -08:00
Sam Gateau
24d39f4453 refining the shadowing 2015-01-02 11:29:54 -08:00
Sam Gateau
ef7c002237 Improving the shadow effect with lightmaps 2015-01-02 10:31:34 -08:00
Atlante45
b1f0ec8dfb Fix compile error with new glm version 2014-12-31 15:49:56 -08:00
Sam Gateau
02949dbc5a Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-31 10:59:42 -08:00
Philip Rosedale
bd88e0f38d Merge pull request #4026 from ZappoMan/entityScriptsAndEvents 
evaluate entity scripts in a sandbox before constructing
 2014-12-31 10:44:55 -08:00
Brad Hefta-Gaub
eaa6d4455d Merge pull request #4024 from samcake/temp1 
Moving deferred lighting shaders from the resource folder to embedded source in the executable
 2014-12-31 10:33:30 -08:00
Brad Hefta-Gaub
43e6ba77fa Merge pull request #4007 from AndrewMeadows/inertia 
Bullet physics part 1
 2014-12-31 10:33:00 -08:00
ZappoMan
eb28efa648 evaluate entity scripts in a sandbox before constructing 2014-12-31 09:58:18 -08:00
Sam Gateau
e1a295fb37 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-12-31 08:40:15 -08:00
Andrew Meadows
ec1ef39a7f Merge pull request #4023 from PhilipRosedale/master 
Torso twists to follow head, fix bug with head rotations
 2014-12-31 08:01:39 -08:00
Sam Gateau
ae6ccf1a7d Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-12-30 17:56:08 -08:00
Sam Gateau
4fb9e9c775 cleaning the code 2014-12-30 17:55:49 -08:00
Sam Gateau
8d95639416 moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:43:52 -08:00
Sam Gateau
37017d0c16 moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:42:10 -08:00
Philip Rosedale
dc9937e11a only twist own body, remove unused head functions 2014-12-30 17:02:53 -08:00
samcake
20d66d201e Merge pull request #4020 from ZappoMan/gpuStreamizing 
Improvements to GeometryCache::renderQuad()
 2014-12-30 16:49:16 -08:00
ZappoMan
86a9d5719b fix one more case of animaiton stutter 2014-12-30 15:12:23 -08:00
Clément Brisset
860098585c Merge pull request #4018 from samcake/temp0 
Moving the shaders used in Model.cpp from resources folder into the built-in executable
 2014-12-30 13:36:13 -08:00
ZappoMan
eb4b8291d7 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-30 13:28:49 -08:00
ZappoMan
4e6ed4a449 fix comments 2014-12-30 13:26:13 -08:00
ZappoMan
28569836bb rename parameters and reuse previously registered quad if geometry didn't change 2014-12-30 13:24:31 -08:00
Andrew Meadows
6f72d4ad81 easier to read Bullet to GLM conversions and back 2014-12-30 13:15:57 -08:00
Andrzej Kapolka
180bed4609 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-30 12:51:03 -08:00
Sam Gateau
a022e94814 Adding the shader files 2014-12-30 12:38:36 -08:00
ZappoMan
be137534b5 first cut at registered quads to reduce copies of constantly changing quads 2014-12-30 12:38:16 -08:00
Sam Gateau
e752edc44a Moving the shaders used in Model.cpp from resources folder into the built-in executable 2014-12-30 12:35:00 -08:00
Andrzej Kapolka
c9b3b5ff7d Scale back on first dropped packet, use Qt send/receive buffer size options 
rather than setsockopt/getsockopt.
 2014-12-30 12:30:38 -08:00
Andrew Meadows
5e2246625b fix layout to abide by the coding standard 2014-12-30 12:09:22 -08:00
Clément Brisset
9a1c521df2 Merge pull request #4014 from ZappoMan/animationFrameIndex 
Fix stuttering in animation caused when animation plays too long without lastFrame set
 2014-12-30 12:07:26 -08:00
Andrew Meadows
e43d7b7369 fix indentation in ctor init 2014-12-30 12:05:28 -08:00
Andrew Meadows
da551a0a76 restore script change detection to what it was 2014-12-30 11:56:39 -08:00
Andrew Meadows
ba873deb49 ignore Entity updates that don't change anything 2014-12-30 11:38:24 -08:00
ZappoMan
53a7d83f35 CR feedback spacing 2014-12-30 10:33:22 -08:00
ZappoMan
cb951763fd CR feedback spacing 2014-12-30 10:29:18 -08:00
ZappoMan
a4520f6a07 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-30 10:27:06 -08:00
ZappoMan
a0ec2ddfe9 clamp frame index between 0 and 100,000 2014-12-29 21:07:04 -08:00
Andrew Meadows
ce14c823a1 add comment about stubbed ObjectMotionState 
for when Bullet lib is not found
 2014-12-29 16:41:27 -08:00
Andrew Meadows
a97b8b0ea9 fix memory leak of EntityMotionState's 2014-12-29 16:33:41 -08:00
Andrew Meadows
97f44b64fc assert NULL EntityItem::_physicsInfo in dtor 2014-12-29 15:27:54 -08:00
Andrew Meadows
213133c705 restoring EntityTreeElement::cleanupEntities() 2014-12-29 15:19:25 -08:00
ZappoMan
49e350fab2 Merge branch 'master' of https://github.com/highfidelity/hifi into animationFrameIndex 2014-12-29 14:01:35 -08:00
Andrew Meadows
8cb8092310 remove unused code 
I forget what I was using UUIDHashKey for
 2014-12-29 10:55:47 -08:00