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

46885 commits

This branch
This branch
All branches
Author SHA1 Message Date
sam
9a492b3a88 refining the voxelizatoion, tracking one bug where light flickers 2016-10-02 03:43:55 -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
89717720f7 CLeaning up code for Linux and Mac 2016-10-01 16:12:45 -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
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 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
Clément Brisset
becee3bba3 Merge pull request #8685 from thoys/ac-fixes 
Assignment Client fixes
 2016-09-30 11:05:58 -07:00
samcake
337fe155b7 clean up warning and merge with upstream 2016-09-30 11:01:25 -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
sam
e143c05ef8 Keep on investigating the shading cost per light 2016-09-30 02:41:21 -07:00
samcake
2a0e67ee2a REvisiting the full lighting code to optimize the perf 2016-09-29 19:06:26 -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
Ken Cooke
f42c0dbd7c Fix cmake checksum, for updated qtaudio_wasapi.zip with release and debug plugins 2016-09-29 13:01:15 -07:00
Ken Cooke
858297241b Even lower audio latency 2016-09-29 12:48:21 -07:00
Atlante45
701c710857 Fix windows odd folder name issue 2016-09-29 12:15:48 -07:00
Brad Hefta-Gaub
38eccd32a8 add developer menu support to enable/disable dynamic texture management 2016-09-29 10:18:54 -07:00
Ken Cooke
468281f92d Fix the Debug build of Interface on Windows 2016-09-29 06:58:14 -07:00
Atlante45
4830b5c2a0 Backup old domain. 2016-09-28 19:17:52 -07:00
samcake
bb5493106f smaller struct descriptions 2016-09-28 18:33:34 -07:00
samcake
b09151f2a2 Rearrange the light struc description in the shader side, needs the c++ to match now 2016-09-28 18:32:35 -07:00
samcake
21b7e9dfe8 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-28 10:04:13 -07:00
samcake
cd9dff57be back to normal 2016-09-28 10:03:51 -07:00
Brad Davis
f73cd1d65e Merge branch 'RC-21' back into master 
Conflicts:
	libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
 2016-09-28 09:58:13 -07:00
Brad Davis
31fb395c27 Add support for disabling incremental texture transfers 
Conflicts:
	libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
 2016-09-28 09:56:50 -07:00
Brad Hefta-Gaub
aff9999f4b Merge pull request #8673 from jherico/incremental_disable 
Add support for disabling incremental texture transfers
 2016-09-28 09:54:19 -07:00
samcake
81e0266e7e Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-28 09:34:29 -07:00