Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 14:33:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
46328 commits 71 branches 56 tags 1.2 GiB
Commit graph

46328 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
b6ef6fec73 Revert "fill in linked node data for avatar identity packets, also" 2016-09-02 15:43:25 -07:00
Brad Hefta-Gaub
6e25c97eef Merge pull request #8564 from jherico/fix_rate_stats 
Updating stats display for threaded rendering
 2016-09-02 15:22:45 -07:00
Ryan Downe Karpf
c923d06d97 Merge pull request #8563 from sethalves/fix-ac-agent-sees-others 
fill in linked node data for avatar identity packets, also
 2016-09-02 15:01:30 -07:00
Brad Davis
91bfa7677c Updating stats display for threaded rendering 2016-09-02 14:41:49 -07:00
Seth Alves
f34f0f51ec Merge branch 'master' of github.com:highfidelity/hifi into fix-ac-agent-sees-others 2016-09-02 13:57:10 -07:00
Seth Alves
014190a1bf fill in linked node data for avatar identity packets, also 2016-09-02 13:52:37 -07:00
Brad Hefta-Gaub
861cf468a3 Merge pull request #8547 from imgntn/save_default_scripts_settings 
Remember setting for 'debug defaultScripts.js'
 2016-09-02 13:08:19 -07:00
Brad Hefta-Gaub
0dfd0fdab7 Merge pull request #8562 from jherico/fix_fence_leak 
Fix incorrect fence delete
 2016-09-02 13:07:17 -07:00
Brad Davis
2c8b795c5f Fix incorrect fence delete 2016-09-02 11:26:21 -07:00
Brad Hefta-Gaub
8ec5798b7a Merge pull request #8548 from samcake/blue 
Exposing GPU & Batch running time to Engine gpu jobs
 2016-09-02 09:31:09 -07:00
Brad Hefta-Gaub
667137f951 Merge pull request #8552 from AndrewMeadows/invoke-updateModel 
eliminate log warning about invokeMethod of EntityTreeRenderer::updateModel()
 2016-09-02 09:17:57 -07:00
Brad Hefta-Gaub
df9ac9fd6e Merge pull request #8519 from birarda/installer-fixes 
add removal of resources folder before install
 2016-09-02 09:06:20 -07:00
Brad Hefta-Gaub
e3bad8e8f4 Merge pull request #8556 from ZappoMan/renderStats 
add support for renderInfo properties to model entities
 2016-09-02 09:04:56 -07:00
Brad Hefta-Gaub
cf242eca9f Merge pull request #8537 from hyperlogic/feature/larger-marketplace-tablet 
Marketplace tablet is a bit larger and lower DPI.
 2016-09-02 08:45:29 -07:00
Brad Hefta-Gaub
b3e5e21f40 Merge pull request #8559 from birarda/android-interface 
create a foundation for interface target compile on android
 2016-09-01 13:10:45 -07:00
Stephen Birarda
f48da0252a use the correct Qt windows macro 2016-09-01 11:33:20 -07:00
Stephen Birarda
545181a465 avoid numeric_limits use on Q_OS_WINDOWS 2016-09-01 11:18:40 -07:00
Stephen Birarda
8977f9ed92 fix else condition in hifiAudioCodec 2016-09-01 10:57:30 -07:00
Stephen Birarda
a94fe62b37 use shared libc++ to reduce shared lib size 2016-09-01 10:56:49 -07:00
Stephen Birarda
ae87f966c8 update ndk version in BUILD_ANDROID 2016-09-01 10:50:10 -07:00
James B. Pollack
a8a9577866 actually remove the math.random 2016-08-31 21:14:50 -07:00
Stephen Birarda
7b8293dc80 repairs for non-android builds after changes 2016-08-31 17:28:09 -07:00
Stephen Birarda
65c1edfb1c add missing link from render-utils to entities 2016-08-31 16:57:52 -07:00
Stephen Birarda
b660a82cc7 fix physics compile for android 2016-08-31 16:55:31 -07:00
Stephen Birarda
dae40c944b fix audio and audio-client compile for android 2016-08-31 16:55:19 -07:00
Stephen Birarda
6efa47a04e workaround plugin build failures 2016-08-31 16:45:12 -07:00
Stephen Birarda
85ba0f36cf fix controllers/shared compile for android interface port 2016-08-31 16:34:31 -07:00
Stephen Birarda
47f15f6ad8 use libc++ and clang toolchain 2016-08-31 16:16:40 -07:00
Chris Collins
02afa460ff Merge pull request #8557 from jherico/location_bar 
Don't show address bar when starting up in a connected state
 2016-08-31 16:03:37 -07:00
Stephen Birarda
aea60692de update to latest android.toolchain.cmake 2016-08-31 15:39:46 -07:00
Chris Collins
76a7226bba Merge pull request #8550 from zzmp/fix/ambient-skybox 
fix washed out white ambient (by restoring tex)
 2016-08-31 15:36:55 -07:00
Brad Davis
b9a97712d5 Don't show address bar when starting up in a connected state 2016-08-31 15:17:57 -07:00
Brad Hefta-Gaub
e1845e2c3f add support for renderInfo properties to model entities 2016-08-31 15:00:21 -07:00
Zach Pomerantz
c8ff6ee4cc Merge branch 'master' of github.com:highfidelity/hifi into fix/ambient-skybox 2016-08-31 14:33:57 -07:00
Andrew Meadows
8c520afd1e Merge pull request #8530 from zzmp/fix/skybox-nesting 
fix skybox nesting
 2016-08-31 14:21:09 -07:00
Stephen Birarda
d113105315 clarify SCRIBE_PATH error message 2016-08-31 14:08:59 -07:00
Stephen Birarda
7c45ed043e fix solo render compile 2016-08-31 14:08:46 -07:00
Stephen Birarda
fc8fad0753 check SCRIBE_PATH for scribe, add instructions 2016-08-31 13:56:02 -07:00
James B. Pollack
2acf316d1c fix 2016-08-31 13:45:58 -07:00
Stephen Birarda
f67f53a4fa remove the mtc tool that is no longer used 2016-08-31 13:24:21 -07:00
Stephen Birarda
b56a596c29 put android build output in target folder 2016-08-31 13:23:19 -07:00
James B. Pollack
193065eb05 remove auto toggle 2016-08-31 12:36:28 -07:00
Stephen Birarda
c9e18e8d90 spacing repairs in autoscribe_shader_lib 2016-08-31 11:59:51 -07:00
Stephen Birarda
02dcc39185 use numeric limits for recording library compile 2016-08-31 11:56:20 -07:00
Stephen Birarda
62504d457b put the apk and apk-build folders in root of build 2016-08-31 11:50:39 -07:00
Stephen Birarda
feef76cbab add tools, no plugins, add InterfaceActivity 2016-08-31 11:31:07 -07:00
Stephen Birarda
7d7cba4dd2 fix networking compile for android setsockopt 2016-08-31 11:30:47 -07:00
Stephen Birarda
3f1545008d don't target any plugins for android 2016-08-31 11:19:01 -07:00
Stephen Birarda
51085350f1 remove quazip targeting from android build 2016-08-31 11:06:01 -07:00
Stephen Birarda
7c2fea4598 remove glew/oglplus requirement for android interface 2016-08-31 11:03:53 -07:00