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

2317 commits

Author SHA1 Message Date
samcake
382161659e Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork 2018-04-24 11:37:00 -07:00
Sam Gateau
2cae294ab4
Merge pull request #12904 from AndrewMeadows/lhf-needsToCallUpdate 
LHF optimiaztion: only call ModelEntityItem::update() on instances that actually need it
 2018-04-24 11:22:48 -07:00
Brad Davis
861200db27 Attempt to shutdown web surfaces more consistently 2018-04-23 14:32:38 -07:00
Andrew Meadows
e36dbab838 remove unused data member 2018-04-23 12:08:40 -07:00
Seth Alves
ba43640950
Merge pull request #12785 from birarda/bug/xcode-warnings 
fix some xcode warnings for unnecessary captured this
 2018-04-20 10:30:27 -07:00
Olivier Prat
46a1ff4dd2 Set jitter to O on RenderableWebEntityItems 2018-04-20 12:02:17 +02:00
Sam Gateau
19aa49832b
Merge pull request #12750 from SamGondelman/androidPrimitives 
Forward pipelines for primitives
 2018-04-16 11:18:56 -07:00
SamGondelman
e0b2c076ef cleanup and fix forward procedural rendering 2018-04-11 13:03:57 -07:00
SamGondelman
d841eeb6e9 Merge remote-tracking branch 'upstream/master' into androidPrimitives 2018-04-10 16:52:08 -07:00
SamGondelman
0c069574c5 forward pipelines for primitives 2018-04-10 15:56:08 -07:00
SamGondelman
bba47ba2b4 materials on client only entities 2018-04-10 11:35:24 -07:00
SamGondelman
d38dadaf58 possible fix for qml texture leak 2018-04-06 09:34:00 -07:00
Stephen Birarda
3a8c9de4fb fix some xcode warnings for unnecessary captured this 2018-04-04 10:38:32 -07:00
SamGondelman
5a7e9d8e3e fix shadows on primitives 2018-03-30 09:48:04 -07:00
John Conklin II
2d63afbe28
Merge pull request #12588 from SamGondelman/shapeTex 
Materials on primitives
 2018-03-21 12:08:24 -07:00
Cristian Luis Duarte
17fddd9e0e RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface 2018-03-19 15:33:14 -03:00
Cristian Luis Duarte
ee6c65c1ac Android - Prevent crash when setting the url property to _webSurface. 2018-03-16 12:03:26 -03:00
Brad Davis
baa4dc3383 Don't leave trash web processes when changing web entity urls 2018-03-14 11:38:46 -07:00
SamGondelman
4adc357534 apply taa to text and web entities/overlays 2018-03-13 11:57:14 -07:00
John Conklin II
5be2f0acc7
Merge pull request #12490 from Zvork/taa 
Temporal Anti-Aliasing
 2018-03-13 09:03:50 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709 
Entities API JSDoc
 2018-03-12 14:40:09 -07:00
Olivier Prat
aad571f6bd Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-03-12 14:22:57 -04:00
Andrew Meadows
2750f3ee71 remove unused cruft and avoid useless work 2018-03-09 08:35:18 -08:00
Olivier Prat
da6bd92ff6 Merged with master 2018-03-09 10:07:25 +01:00
David Rowe
b461a422c6 Merge branch 'master' into 21709 2018-03-09 14:18:42 +13:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
Sam Gondelman
f51a35455a
Merge pull request #12515 from SamGondelman/scriptableMaterials 
Material reflection
 2018-03-07 14:29:31 -08:00
SamGondelman
96e48a0162 warnings 2018-03-07 13:50:51 -08:00
SamGondelman
19e4fb2355 materials on primitives 2018-03-07 12:22:17 -08:00
David Rowe
a62b6b7150 Merge branch 'master' into 21709 2018-03-07 17:34:53 +13:00
NissimHadar
000b08f7c0 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 08:07:01 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
David Rowe
a782b6779a Merge branch 'master' into 21709 
# Conflicts:
#	interface/src/ui/overlays/Overlays.h
#	interface/src/ui/overlays/Shape3DOverlay.cpp
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/EntityScriptingInterface.h
 2018-02-28 12:42:05 +13:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
SamGondelman
cc53b338db Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-02-27 13:30:03 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting 
Leopoly_Phase1_010 Graphics Scripting
 2018-02-27 07:53:25 -08:00
Olivier Prat
2d71d7da9f Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-02-27 09:11:43 +01:00
Brad Davis
b9387f2a21 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-26 13:18:14 -08:00
SamGondelman
6fe2d46d7c merge 2018-02-26 12:40:14 -08:00
Anthony J. Thibault
f5fcaae283 Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions 2018-02-26 10:55:44 -08:00
Brad Davis
5aa15b5422 Fixing build warnings 2018-02-26 10:17:07 -08:00
humbletim
f824edd04e * remove Model_temporary_hack 
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
 2018-02-26 04:58:22 -05:00
SamGondelman
b56f755034 material reflection 2018-02-23 17:58:46 -08:00
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08:00
humbletim
6ea4b660b7 CR feedback; remove ok bool pointer and all metadata; cleanup 2018-02-23 07:47:39 -05:00
Anthony J. Thibault
0469eafbe4 Switch between dualQuats and matrix skinning based on model entity scale factor. 2018-02-22 18:35:16 -08:00
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08:00
humbletim
ec4f9fdc11 fix displayName 2018-02-22 08:31:05 -05:00
humbletim
4fd3d9bf7b cleanup; formalize data structures 2018-02-22 08:18:38 -05:00