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

52308 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
3fe4d6e733 Merge pull request #9910 from jherico/vs2017 
Fix build problems on VS 2015 and VS 2017
 2017-03-16 14:41:33 -07:00
Brad Hefta-Gaub
49bd3bd408 Merge pull request #9894 from Atlante45/new-stable 
Cancel reverts from last hotfix and pull them to master
 2017-03-16 13:43:12 -07:00
humbletim
87d62ad1eb Merge branch 'master' into 21114-part3 2017-03-16 16:39:37 -04:00
Stephen Birarda
a69cf76d06 Merge pull request #9879 from birarda/bug/no-unload 
make sure deleted entities are unloaded first
 2017-03-16 13:29:36 -07:00
Zach Pomerantz
2059c58c23 Merge pull request #9896 from zzmp/agent/noise-gate 
Add AudioNoiseGate to Agent
 2017-03-16 16:28:17 -04:00
Brad Davis
e265a0a1f8 Fix possible crash in Menu::removeSeparator 2017-03-16 13:12:30 -07:00
Andrew Meadows
6f4d9bfba3 Merge pull request #9858 from kunalgosar/logBolding 
Change to Log Font and Formatting
 2017-03-16 13:09:37 -07:00
kunalgosar
0cee9ee172 font change 2017-03-16 11:57:46 -07:00
Zach Pomerantz
abac14ee19 Merge branch 'master' of https://github.com/highfidelity/hifi into agent/noise-gate 2017-03-16 18:48:09 +00:00
Zach Pomerantz
3b8c82491a add AudioNoiseGate to Agent 2017-03-16 18:47:58 +00:00
Seth Alves
eba2417f41 Merge pull request #9912 from AndrewMeadows/model-cleanup-4 
minor cleanup of render pipeline for models and avatars
 2017-03-16 10:39:43 -08:00
humbletim
758c07c7d4 Merge branch 'master' into 21114-part3 2017-03-16 14:29:17 -04:00
kunalgosar
e7a16d4294 code standard fixes 2017-03-16 10:53:35 -07:00
samcake
4ef7fc61f0 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2017-03-16 10:43:07 -07:00
Seth Alves
a3fadbc367 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1 2017-03-16 09:38:56 -07:00
Seth Alves
31e0cfe296 Merge pull request #9825 from thoys/record-fixes 
Avatar Recorder and Playback Fixes
 2017-03-16 07:27:42 -08:00
humbletim
366c90ef6a add Q_ASSERT to IS_THREADSAFE_INVOCATION 2017-03-16 01:28:50 -04:00
humbletim
52a571558c * changes per CR feedback 
* revert JSON content-type workaround
* add specific error check / advice for unanchored module ids
* update unit tests
 2017-03-16 01:23:23 -04:00
Seth Alves
438fb42da4 oops 2017-03-15 20:54:08 -07:00
Seth Alves
60d10f3374 command-line utility for fetching an asset from a remote asset-server 2017-03-15 20:44:19 -07:00
Brad Davis
4367e3d036 PR comments 2017-03-15 18:13:10 -07:00
samcake
0399249a03 Expeand the wireframe to the primitive entities and the polyvox 2017-03-15 16:58:31 -07:00
Andrew Meadows
361e03fc78 remove unused variable 2017-03-15 16:57:31 -07:00
Seth Alves
693aee0628 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting 2017-03-15 16:54:40 -07:00
Andrew Meadows
d3fa28d4bc remove cruft and fix indentation 2017-03-15 16:17:59 -07:00
Brad Davis
2837ae9183 More VS 2017/2015 fixes 2017-03-15 16:13:15 -07:00
Andrew Meadows
cf848d73e4 don't updateClusterMatrices() in render() 2017-03-15 16:03:36 -07:00
Brad Davis
b8ded015c6 Fix packetlist compilation on VS 2017 2017-03-15 15:20:41 -07:00
Andrew Meadows
f250c0d298 simpler bindTransform() for ModelMeshPartPayload 2017-03-15 14:41:13 -07:00
Brad Davis
3e68018a12 Fix node persmissions hash 2017-03-15 14:33:32 -07:00
Brad Hefta-Gaub
ed380a7738 Merge pull request #9895 from zzmp/clean/noise-gate 
Strip AudioNoiseGate of dead code
 2017-03-15 13:21:56 -07:00
samcake
ea2f1359bc Expose rendering in wireframe mode 2017-03-15 12:23:44 -07:00
Stephen Birarda
0c657a1d55 add parameter to unload to remove entityID from map 2017-03-15 10:57:12 -07:00
Anthony Thibault
495deba771 Merge pull request #9877 from hyperlogic/bug-fix/debug-draw-races 
Fixes for race conditions in DebugDraw
 2017-03-15 10:38:26 -07:00
Stephen Birarda
d13752a7c6 use the correct property name for useAdvancedMovementControls 2017-03-15 10:34:43 -07:00
Seth Alves
dc82895feb Merge pull request #9870 from Atlante45/fix/js-exceptions 
Fix JS exception messages formatting
 2017-03-15 09:32:04 -08:00
Zach Pomerantz
789bb7c855 rename audio(Mic)OutboundPPS 2017-03-15 13:30:39 -04:00
Zach Pomerantz
2d0e11e2d1 add AudioNoiseGate to recording 2017-03-15 13:30:39 -04:00
Seth Alves
94e2cd6e68 Merge pull request #9845 from AndrewMeadows/fix-rare-physics-crash 
fix rare physics crash
 2017-03-15 09:30:29 -08:00
Stephen Birarda
bfc51d8222 use property not function for advanced movement controls 2017-03-15 10:25:06 -07:00
Seth Alves
7afe091c52 quiet warnings 2017-03-14 19:47:30 -07:00
Seth Alves
0785172398 quiet warnings 2017-03-14 19:01:13 -07:00
Stephen Birarda
7ddb5ff770 use correct boolean when changing AMC 2017-03-14 18:09:17 -07:00
Seth Alves
08ad56d254 quiet warnings 2017-03-14 18:05:53 -07:00
Seth Alves
40b87171a9 quiet warnings 2017-03-14 17:49:39 -07:00
Stephen Birarda
188530590a add missing curly brace to script 2017-03-14 17:16:49 -07:00
Zach Pomerantz
e6fbdf8f06 add isNoiseGateEnabled to Agent 2017-03-15 00:15:49 +00:00
Zach Pomerantz
b1e5e43faa mv AudioNoiseGate to audio 2017-03-15 00:15:33 +00:00
Atlante45
a9658ce9fb Revert "Trivial PR to trigger build" 
This reverts commit a0befa7f95.
 2017-03-14 17:15:23 -07:00
Zach Pomerantz
f43706dfe1 clean AudioNoiseGate 2017-03-15 00:14:55 +00:00