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

26937 commits

Author SHA1 Message Date
Sam Gondelman
c59d29f4ee
Merge pull request #12623 from SamGondelman/android 
Android: Fix corruption on startup
 2018-03-12 15:03:07 -07:00
Ken Cooke
c9e253ab14
Merge pull request #12621 from ctrlaltdavid/21791 
Fix CPU and GPU not throttling when Interface minimized from maximized
 2018-03-12 14:43:47 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709 
Entities API JSDoc
 2018-03-12 14:40:09 -07:00
SamGondelman
9953e7051f Merge remote-tracking branch 'upstream/master' into android 2018-03-12 14:15:31 -07:00
SamGondelman
4bef033d6f cleanup, don't compress rcc file to fix corruption 2018-03-12 13:05:03 -07:00
John Conklin II
1c403b7532
Merge pull request #12616 from NissimHadar/bug12435 
Mitigation of Manuscript issue 12435
 2018-03-12 12:01:42 -07:00
John Conklin II
5bd49ce9dc
Merge pull request #12617 from samcake/punk 
Fix shadow: other avatars casting shadow, graphics settings checkboxes & menu layout
 2018-03-12 10:49:48 -07:00
David Rowe
3001225cb7 Fix CPU and GPU not throttling when Interface minimized from maximized 2018-03-12 15:49:20 +13:00
samcake
10016756b7 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-03-09 16:32:37 -08:00
Simon Walton
cc166dbece LogHandler regexps - use vector of values 2018-03-09 15:44:56 -08:00
Simon Walton
d4cf22fbaf LogHandler class stores regexps - code tweaks 
Code standard changes from review.
 2018-03-09 15:29:10 -08:00
Simon Walton
4b27cd73ff LogHandler class stores regexps rather than always recreating 
General efficiency tweaks; move to C++11.
 2018-03-09 15:29:09 -08:00
NissimHadar
9b9b62d0e4 Transition to hover if falling and height above ground is greater than the threshold. 2018-03-09 15:20:51 -08:00
John Conklin II
42a686ad93
Merge pull request #12578 from druiz17/use-correct-audio-api 
use correct scripting api  for audio in Audio.qml
 2018-03-09 13:41:20 -08:00
samcake
10447bf10e Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there 2018-03-09 13:04:04 -08:00
Sam Gateau
d0de5b2d96
Merge pull request #12496 from AndrewMeadows/faster-raypick 
faster per-entity raypick culling and time-boxed picks
 2018-03-09 13:01:52 -08:00
Dante Ruiz
3a39fca268 made requested changes 2018-03-09 10:09:51 -08:00
Dante Ruiz
c49d0557fc fixing check box issues 2018-03-09 09:29:37 -08:00
Brad Hefta-Gaub
6b55fa1fcd
Merge pull request #12539 from ctrlaltdavid/21702 
Remove deprecated Window.location.protocolVersion() function from API
 2018-03-09 08:52:55 -08:00
Andrew Meadows
858b02f29d more readable code 2018-03-09 08:35:18 -08:00
Andrew Meadows
3f1944eb8a fix variable name typo 2018-03-09 08:35:18 -08:00
Andrew Meadows
9eecd3cb80 update styluses first: they are cheap 2018-03-09 08:35:18 -08:00
Andrew Meadows
f83c6000df use 'auto' for very long type 2018-03-09 08:35:18 -08:00
Andrew Meadows
24635b0451 remove unused debug cruft variable 2018-03-09 08:35:18 -08:00
Andrew Meadows
7a39bd5c81 remove tab whitespace 2018-03-09 08:35:18 -08:00
Andrew Meadows
9fbe7ec194 time-box Picks and solve in round-robin sequence 2018-03-09 08:35:18 -08:00
Andrew Meadows
7a19f48b9c move rayHitsSphere logic to AABox method 2018-03-09 08:35:18 -08:00
Andrew Meadows
2750f3ee71 remove unused cruft and avoid useless work 2018-03-09 08:35:18 -08:00
Andrew Meadows
6ab85d5800 cleanup and a few small optimizations 2018-03-09 08:35:18 -08:00
Andrew Meadows
79b9fec900 add rayHitsSphere() util method 2018-03-09 08:35:18 -08:00
Andrew Meadows
81de668c1e faster per-entity raypick culling 2018-03-09 08:35:18 -08:00
David Rowe
f1ef085b4b Add canCastShadows and castShadows properties 2018-03-09 15:34:56 +13:00
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08:00
David Rowe
b461a422c6 Merge branch 'master' into 21709 2018-03-09 14:18:42 +13:00
John Conklin II
260715d616
Merge pull request #12580 from elisa-lj11/RC65-blocks-image-bug 
Fixed blocks importer textures being interpreted as image entities
 2018-03-08 13:33:41 -08:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
NissimHadar
a703b5a3b5 Added check to correct crashing when selecting ambient occlusion from menu. 2018-03-08 12:15:26 -08:00
Brad Hefta-Gaub
d2e264ab32
Merge pull request #12583 from samcake/punk 
Fix Local lights not showing anymore
 2018-03-08 10:31:58 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android 
Android Tip
 2018-03-08 10:18:35 -08:00
John Conklin II
1341774450
Merge pull request #12482 from SimonWalton-HiFi/declare-metatype 
Add a Q_DECLARE_METATYPE in TextureCache.
 2018-03-08 09:37:06 -08:00
Clément Brisset
b7ac07f590
Merge pull request #12589 from highfidelity/RC65 
merge back RC65 to master after RC hotfixes
 2018-03-07 17:22:41 -08:00
David Rowe
d4487e92b8 Further JSDoc tweaks 2018-03-08 12:23:13 +13:00
Sam Gondelman
f51a35455a
Merge pull request #12515 from SamGondelman/scriptableMaterials 
Material reflection
 2018-03-07 14:29:31 -08:00
David Rowe
e2bf84224a Add further examples. 2018-03-08 10:59:12 +13:00
SamGondelman
0aacdcd558 docs 2018-03-07 13:34:48 -08:00
David Rowe
dba0c1046e Fix typo 2018-03-08 08:17:26 +13:00
David Rowe
a62b6b7150 Merge branch 'master' into 21709 2018-03-07 17:34:53 +13:00
David Rowe
eeb7f5ca8d Doc review 2018-03-07 17:29:39 +13:00
Elisa Lupin-Jimenez
c6e5f4c9c8 zip file drags don't auto add model textures 2018-03-06 19:24:09 -08:00
samcake
923c81ae28 Swap order of the ZoneRendererJob with DrawLocalLights to fix the local lights 2018-03-06 17:38:27 -08:00