Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 03:53:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46918 commits 71 branches 56 tags 1.2 GiB
Commit graph

46918 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
6aa39ec95a Polish the debugging of the light volumes 2016-10-04 11:03:12 -07:00
samcake
a378a6eccb separate the rendering of the light outline from the main rendering and introduce a way to support both platform 2016-10-03 18:28:44 -07:00
samcake
c72b330821 Simple change to the get cluster interface 2016-10-03 15:34:54 -07:00
samcake
92dbba0c8c merging with master 2016-10-03 13:58:11 -07: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
samcake
002d58d607 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-03 11:47:01 -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
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
sam
bda835361a Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-03 02:54:11 -07:00
sam
deab1db39a FIxed the flickering bug and make a better debuging view to control the overlap 2016-10-03 02:53:41 -07:00
sam
6f2452815c pass the visibility of the enitity to the LightPaylkoad correctly, clean up the ambient shader 2016-10-03 00:08:30 -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
Atlante45
fab0f8019d Ask windows to not try to be helpful 2016-10-02 17:33:07 -07:00
Brad Hefta-Gaub
546d4ff986 remove mic and window resize notifications 2016-10-02 09:10:12 -07:00
sam
9a492b3a88 refining the voxelizatoion, tracking one bug where light flickers 2016-10-02 03:43:55 -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
sam
bd4268ee18 Try to fix the exp2 float version for linux 2016-10-01 17:59:37 -07:00
samcake
bdf2738f21 One more fix for linux build 2016-10-01 17:25:26 -07:00
samcake
964f766427 Merge pull request #8704 from ZappoMan/calculateMaterialSizeFixes 
make calculateTextureInfo thread safe
 2016-10-01 17:15:39 -07:00
samcake
89717720f7 CLeaning up code for Linux and Mac 2016-10-01 16:12:45 -07:00
Brad Hefta-Gaub
7fe16442fa make calculateTextureInfo thread safe 2016-10-01 15:47:17 -07:00
samcake
918f7cd515 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-01 15:36:14 -07:00
samcake
35f0d4b8a2 cleaning for mac 2016-10-01 15:35:59 -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
Brad Hefta-Gaub
084560639d Merge pull request #8681 from kencooke/fix-debug-build 
Fix the Debug build of Interface on Windows
 2016-09-30 19:17:19 -07:00
samcake
0475833e3b Friday night state, down to ~3.5ms in hmd 2016-09-30 19:08:00 -07:00
samcake
5b4829e7b6 Brining back support for the ambinet lighting 2016-09-30 16:24:57 -07:00
howard-stearns
c806f6cad2 better shutdown check for timer firings 2016-09-30 16:05:39 -07:00
Brad Davis
42e28fa010 Fix crash in initializing texture transfer thread 2016-09-30 15:48:10 -07:00
Brad Hefta-Gaub
41e90eda49 Merge pull request #8648 from sethalves/no-groups-no-log-spam 
don't check for user membership in a null list of groups
 2016-09-30 11:23:30 -07:00
Clément Brisset
02991bffab Merge pull request #8687 from zzmp/feat/injector-loopback 
loopback local injectors on server echo
 2016-09-30 11:21:10 -07:00