Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47140 commits 2 branches 0 tags 1.1 GiB
Commit graph

47140 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
caf1a93354 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
 2016-10-04 10:51:14 +13:00
howard-stearns
8388e1044a cleanup to use script-driven cache cleaning 2016-10-03 14:09:52 -07:00
Atlante45
573d5898cc Make static control packets class members 2016-10-03 13:46:55 -07:00
howard-stearns
e55d4f97b3 Merge branch 'davidkelly-dk/testScriptRelocation' into domain-check 2016-10-03 13:10:50 -07:00
howard-stearns
e2051fef5c Merge branch 'howard-stearns-tribble-rez' into domain-check 2016-10-03 13:07:10 -07:00
howard-stearns
654461e97a Merge branch 'tribble-rez' of https://github.com/howard-stearns/hifi into howard-stearns-tribble-rez 2016-10-03 13:06:50 -07:00
howard-stearns
4fcddfdf2b Merge branch 'davidkelly-dk/triggerMenuInScriptPlus' into domain-check 2016-10-03 13:02:32 -07:00
howard-stearns
0809484e33 Merge branch 'dk/triggerMenuInScriptPlus' of https://github.com/davidkelly/hifi into davidkelly-dk/triggerMenuInScriptPlus 2016-10-03 13:01:51 -07:00
David Rowe
4818ad2615 Merge branch 'master' into 21055 2016-10-04 08:46:30 +13:00
Chris Collins
f84f98f804 Merge pull request #8708 from samcake/color 
Fix the crash on start up if default ambient map fails to load
 2016-10-03 12:36:45 -07:00
howard-stearns
43c29500bf ac script to provide an on-demand crowd, and an interface script to summon 
it
 2016-10-03 12:03:23 -07:00
David Kelly
70a63417cf point to tribbles.js on aws 
For now, anyways. Just temporary until dev is complete.
 2016-10-03 11:40:50 -07:00
samcake
0189e3aea7 Github is borked ? 2016-10-03 11:29:17 -07:00
samcake
5adedbbb8b replace the simple log by a unique log 2016-10-03 11:27:15 -07:00
Chris Collins
4c247aecb3 Merge pull request #8702 from Atlante45/console 
Restore "Are you sure?" pop-up. Default to "No"
 2016-10-03 11:12:18 -07:00
Howard Stearns
d3606da059 Merge pull request #8709 from howard-stearns/initial-domain-check 
initial domain-check script
 2016-10-03 10:47:03 -07:00
Howard Stearns
ee801f4cc2 initial domain-check script 2016-10-03 10:29:33 -07:00
samcake
afcb5b8557 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-10-03 10:17:46 -07:00
Howard Stearns
76d9d4c635 fix canRez logic in tribble script: only need canRezTemp, and fail hard rather than retry 2016-10-03 10:16:06 -07:00
samcake
0df69b8e15 Protecting the usage of the defaultSkyboxTexture in case its creation has failed to avoid crash on the first usage, removing an uncorrect assert in GL45BackendTexture that would trigger in debug 2016-10-03 10:06:58 -07:00
Chris Collins
0ee1156e5c Merge pull request #8705 from ZappoMan/removeMicNotifications 
remove mic and window resize notifications
 2016-10-03 09:51:00 -07:00
Ken Cooke
9590d2eef9 Fix support for audio when input rate != output rate 2016-10-03 09:08:32 -07:00
Brad Hefta-Gaub
3612ed95c3 Merge pull request #8703 from hyperlogic/bug-fix/qml-surface-get-root-item-crash 
Fix for crash bug in web entities
 2016-10-02 20:31:35 -07:00
Bradley Austin Davis
ce8fcfed36 Fix mac build (again?) 2016-10-02 17:42:10 -07:00
Atlante45
fab0f8019d Ask windows to not try to be helpful 2016-10-02 17:33:07 -07:00
Brad Davis
9bc0f24777 Fix GLEW linker warnings 2016-10-02 12:22:00 -07:00
Brad Davis
53f358d77a Fix warnings 2016-10-02 11:44:36 -07:00
Brad Davis
f3f55c9857 Fixing render-perf 2016-10-02 11:44:35 -07:00
Brad Davis
488d191428 Remove all oglplus usage and references 2016-10-02 11:44:34 -07:00
Brad Davis
d3d3aa587c Remove oglplus usage from OpenVR 2016-10-02 11:44:33 -07:00
Brad Davis
d83d3fe98e Make shader compilation from non-GPU code easier 2016-10-02 11:44:32 -07:00
Brad Davis
f28962af12 Remove dead class from oglplus helpers 2016-10-02 11:44:32 -07:00
Brad Hefta-Gaub
546d4ff986 remove mic and window resize notifications 2016-10-02 09:10:12 -07:00
Brad Hefta-Gaub
c7551a2207 Merge pull request #8700 from ZappoMan/fetchTextureMapCrashFix 
fix crash when bouncing to eschatology and eschatology-dev
 2016-10-01 21:34:20 -07:00
Brad Hefta-Gaub
51e67df39a Merge pull request #8669 from jherico/oglplus_b_gone 
Remove oglplus usage in Offscreen QML rendering
 2016-10-01 21:20:51 -07:00
Brad Hefta-Gaub
7ef8e53d03 Merge pull request #8701 from ZappoMan/getShapeKeyCrashFix 
add guards to getShapeKey
 2016-10-01 20:23:50 -07:00
samcake
964f766427 Merge pull request #8704 from ZappoMan/calculateMaterialSizeFixes 
make calculateTextureInfo thread safe
 2016-10-01 17:15:39 -07:00
Brad Hefta-Gaub
7fe16442fa make calculateTextureInfo thread safe 2016-10-01 15:47:17 -07:00
Atlante45
2d87e3eb1a Fix CSS to wrap folder path 2016-10-01 14:07:11 -07:00
Atlante45
12ecc02899 Default popup choices to "No" 2016-10-01 13:44:41 -07:00
Atlante45
46c0e83127 Restore "Are you sure" popup 2016-10-01 13:44:41 -07:00
Anthony Thibault
a79485f8c2 Fix for crash bug in web entities 
Guard against nullptrs in RenderableWebEntitItem and WebEntityAPIHelper.
These pointers can go null if the webEntity is deleted on the main thread.
Also, the backing offscreen qml surface can be destroyed if the webEntity has not been rendered for 30 seconds
due to frustum culling.
 2016-10-01 13:43:49 -07:00
Brad Hefta-Gaub
04f6547940 add guards to getShapeKey 2016-10-01 12:15:03 -07:00
Brad Davis
933388bc61 Remove oglplus usage from offscreen UI 2016-10-01 11:39:46 -07:00
Brad Davis
265996156c Remove unused header and typedef 2016-10-01 11:39:45 -07:00
Brad Hefta-Gaub
769a29332c Merge pull request #8695 from jherico/texture_transfer_crash 
Fix crash in initializing texture transfer thread
 2016-10-01 11:31:37 -07:00
Brad Hefta-Gaub
55d5e80220 Merge pull request #8699 from jherico/gl_context_bug 
Don't use GL functions before making the context current
 2016-10-01 11:30:50 -07:00
Brad Hefta-Gaub
2cba3db2b6 fix crash when bouncing to escotology, which may or may not be related 2016-10-01 11:08:52 -07:00
Brad Davis
0f06d0e4cc Don't use GL functions before making the context current 2016-10-01 10:40:36 -07:00
Howard Stearns
4c5bf3119e Merge pull request #8696 from howard-stearns/check-timers-during-shutdown 
fix crash in scripted timer on shutdown
 2016-10-01 10:00:49 -07:00