Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-20 01:06:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
64064 commits 76 branches 59 tags 1.2 GiB
Commit graph

64064 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
9867b479fd APplying review feedback 2018-02-01 13:12:28 -08:00
samcake
fd501cf3af Addressing review comments 2018-02-01 10:37:54 -08:00
Sam Gateau
351f619555 Fixing a shader error on android 2018-01-31 23:35:16 -08:00
Sam Gateau
a650c5bbc6 Move a define to resume watchdog a bit further 2018-01-31 23:31:31 -08:00
Sam Gateau
60238fa644 Fixing the android build 2018-01-31 23:15:19 -08:00
Sam Gateau
d4a3932549 Merge branch 'master' of https://github.com/highfidelity/hifi into pastel 2018-01-31 21:53:09 -08:00
Sam Gateau
edb416d24e Fixing the program map sorting, good to go 2018-01-31 21:32:22 -08:00
John Conklin II
7d05b302d3
Merge pull request #12313 from highfidelity/stable 
Merge stable back into master
 2018-01-31 18:05:24 -08:00
samcake
89f4fe1c04 Adding the map of existing shaders and programs and ways to identify them to avoid recompiling them 2018-01-31 17:28:45 -08:00
John Conklin II
d37e9af7d4
Merge pull request #12307 from jherico/hotfix/amd_crash 
Fix for AMD crashes in QML rendering
 2018-01-31 16:30:53 -08:00
Liv
8767bc8790
Merge pull request #12293 from misslivirose/fix-remote-exterminator-sample 
removing old game sample from script-archive
 2018-01-31 16:10:21 -08:00
John Conklin II
453d0038d6
Merge pull request #12297 from hyperlogic/bug-fix/hair-freakout 
Fix avatars with extra joints during mirrored animations
 2018-01-31 15:33:34 -08:00
John Conklin II
fd92ef226a
Merge pull request #12274 from samcake/flash 
FIxing the dark ambient lighting on scattering surface
 2018-01-31 15:32:29 -08:00
samcake
0885b00ab8 Merge branch 'master' of https://github.com/highfidelity/hifi into pastel 2018-01-31 14:18:38 -08:00
Bradley Austin Davis
59a088f226
Merge pull request #12309 from highfidelity/revert-12126-addressbar_close_fix 
Revert "AddressBar trigger implemented. Fixed warnings on non existing contex…"
 2018-01-31 14:02:27 -08:00
Brad Hefta-Gaub
f5614618b9
Merge pull request #12288 from ctrlaltdavid/21729 
Add location.domainID as a synonym for location.domainId
 2018-01-31 13:50:48 -08:00
Seth Alves
a49097789a
Revert "AddressBar trigger implemented. Fixed warnings on non existing contex…" 2018-01-31 13:32:19 -08:00
Bradley Austin Davis
f40d83381d
Merge pull request #12300 from jherico/fix/amd_crash 
Trying to fix AMD crash in QML rendering
 2018-01-31 13:24:50 -08:00
John Conklin II
3d5742865d
Merge pull request #12266 from hyperlogic/bug-fix/neck-cauterization 
Bug fix for avatar neck cauterization
 2018-01-31 12:37:09 -08:00
Brad Davis
e5559fa865 Better fix for AMD crashing (hopefully 2018-01-31 12:10:06 -08:00
Seth Alves
0df4ae02fc
Merge pull request #12126 from vladest/addressbar_close_fix 
AddressBar trigger implemented. Fixed warnings on non existing contex…
 2018-01-31 11:26:05 -08:00
Seth Alves
50e6864988
Merge pull request #12138 from Triplelexx/21669_prompt_keyboard 
WL#21669: Allow better keyboard navigation of prompt windows such as Window.prompt()
 2018-01-31 11:19:49 -08:00
samcake
582ef2a8a2 MErging with master 2018-01-31 11:00:23 -08:00
Bradley Austin Davis
b97c938544
Merge pull request #12216 from thoys/feat/js-script-console-auto-complete 
JS scripting console auto-complete
 2018-01-31 10:39:51 -08:00
Brad Davis
ef699c2a78 Better fix for AMD crashing (hopefully 2018-01-31 10:38:20 -08:00
Sam Gateau
9a131cfab6
Merge pull request #12265 from SamGondelman/resourceCache 
Remove unnecessary invokeMethod from ResourceCache::getResource
 2018-01-31 09:35:05 -08:00
Seth Alves
600cc1b48e
Merge pull request #12250 from druiz17/fix-multihighlight 
Don't manually highlight tablet buttons from swipeview.
 2018-01-31 09:33:33 -08:00
John Conklin II
ece72501b9
Merge pull request #12279 from druiz17/fix-parenting-crash 
fix entity parenting crash
 2018-01-31 09:32:52 -08:00
Brad Davis
9893273d33 Trying to fix AMD crash in QML rendering 2018-01-31 08:36:52 -08:00
John Conklin II
2ae9395283
Merge pull request #12299 from highfidelity/stable 
Merge stable back into master
 2018-01-30 20:03:06 -08:00
John Conklin II
399c24bf06
Merge pull request #12298 from Atlante45/hotfix/crashpad-packaging 
Beta Release 63.1 - hotfix
 2018-01-30 18:40:16 -08:00
samcake
062bfbd7b6 Merging with master 2018-01-30 18:33:34 -08:00
samcake
f044cf76d6 add the count of compilations of shaders to avoid recompiling them if ot needed 2018-01-30 18:31:30 -08:00
John Conklin II
db255719db
Merge pull request #12296 from Atlante45/merge-back 
Merge stable back into master
 2018-01-30 18:09:38 -08:00
samcake
7aa5ef3de7 Merge branch 'pastel' of https://github.com/samcake/hifi into pastel 2018-01-30 17:18:10 -08:00
samcake
63371ff59c Fix the android build 2018-01-30 17:17:22 -08:00
Atlante45
97729e8f41 Cleanup bad install 2018-01-30 17:10:06 -08:00
Atlante45
d155d19198 Fix cmake install cmd 2018-01-30 17:08:10 -08:00
Anthony J. Thibault
ed67a5b408 Fix avatars with extra joints during mirrored animations 
When the avatar is rotated it will play a mirrored and non mirrored versions of the rotation animation.
The mirrored version would also mirror extra joints on the model, yielding unexpected results.
This refines the logic that determines which joints are NOT mirrored, so that extra joints
remain unaffected by the mirrored animation playback.
 2018-01-30 16:51:39 -08:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
John Conklin II
408189763b
Merge pull request #12229 from highfidelity/RC63 
Beta Release 63 - includes up to Developer Release 7741
 2018-01-30 15:54:56 -08:00
Sam Gateau
9ea6c78ac2 fix stupid copy paste 2018-01-30 15:31:34 -08:00
John Conklin II
215d03c4ce
Merge pull request #12269 from sethalves/backtrace-for-rc-63 
Backtrace for rc 63
 2018-01-30 15:13:01 -08:00
samcake
f078ff611a Refining the declaraion signatures and adding the binary capture 2018-01-30 15:10:52 -08:00
John Conklin II
eebbb7e563
Merge pull request #12276 from jherico/RC63_haze_hotfix 
RC63 Hotfix: Fix haze parameters uniform buffer size
 2018-01-30 15:04:07 -08:00
Liv Erickson
d0a0120dfe removing old game sample from script-archive 2018-01-30 13:34:38 -08:00
John Conklin II
0b03632437
Merge pull request #12289 from hyperlogic/bug-fix/mac-os-shader-compile-too-slow-rc63 
RC63: 8x shader compilation optimization and watchdog disable
 2018-01-30 13:26:49 -08:00
samcake
d5e52834ef cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation 2018-01-30 13:07:20 -08:00
samcake
2dcedf9f39 cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation 2018-01-30 12:52:05 -08:00
Seth Alves
bc014214fe
Merge pull request #17 from Atlante45/interface-backtrace 
Fix spaces
 2018-01-30 12:24:07 -08:00