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

46837 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
Clément Brisset
becee3bba3 Merge pull request #8685 from thoys/ac-fixes 
Assignment Client fixes
 2016-09-30 11:05:58 -07:00
Chris Collins
322a6e7f2d Merge pull request #8686 from kencooke/unbuffered-audio-output 
Even lower audio latency
 2016-09-30 10:53:29 -07:00
Thijs Wenker
4f7fdfc345 eliminated else, this might look cleaner 2016-09-30 03:31:35 +02:00
Clément Brisset
b69a49d7bc Merge pull request #8690 from Atlante45/console 
CR for Backup old content on update
 2016-09-29 17:55:29 -07:00
Atlante45
f17a062399 CR 2016-09-29 17:08:34 -07:00
Chris Collins
e165c0515a Merge pull request #8680 from Atlante45/console 
Backup old content on update
 2016-09-29 16:30:58 -07:00
Chris Collins
b3fd9eeb63 Merge pull request #8688 from zzmp/fix/fade-injectors 
fix incorrect repetition with fade for injectors on the mixer
 2016-09-29 16:05:02 -07:00
Atlante45
b83243d65d Fixed CSS madness 2016-09-29 15:49:47 -07:00
Atlante45
165e609851 Update instructions UI 2016-09-29 15:43:11 -07:00
Zach Pomerantz
43c40aa090 avoid repetition with fade on injectors 2016-09-29 15:25:41 -07:00
Zach Pomerantz
768354e49f loopback local injectors on server echo 2016-09-29 15:25:17 -07:00
Chris Collins
01d2d9243a Merge pull request #8682 from ZappoMan/graphicsSettings 
add developer menu support to enable/disable dynamic texture management
 2016-09-29 15:11:43 -07:00
Ken Cooke
d925a22fd4 Use new filename for the external as a simple form of versioning 2016-09-29 14:09:38 -07:00
Thijs Wenker
5025b4a5ed NodeList set the sessionUUID before emitting the connectedToDomain signal 2016-09-29 22:15:53 +02:00
Thijs Wenker
7e3073e163 fix spelling bugs 2016-09-29 22:13:27 +02:00
Thijs Wenker
3d14a32d17 fix controller::ScriptingInterface not found warning in AC 2016-09-29 22:11:12 +02:00