Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 09:15:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
42768 commits 76 branches 59 tags 1.2 GiB
Commit graph

2726 commits

Author SHA1 Message Date
Brad Hefta-Gaub
04dab65b59 Merge pull request #7727 from ZappoMan/supportLargeClockSkew 
support for larger than 35 minute clock skew
 2016-04-23 08:42:38 -07:00
Brad Hefta-Gaub
f1f9c6740d Merge pull request #7745 from jherico/mac_texture_fix 
Fixing texture storage allocation on OSX/GL 4.1
 2016-04-22 17:07:12 -07:00
Bradley Austin Davis
d87c92baee Fixing memory detection on OSX 2016-04-22 16:30:36 -07:00
Chris Collins
9bd9de5710 Merge pull request #7636 from samcake/red 
Stereo drawcall amplification
 2016-04-22 15:46:18 -07:00
Brad Hefta-Gaub
410bf3c95a Merge pull request #7711 from AndrewMeadows/faster-kinematics 
faster hifi kinematic motion calculations take-4
 2016-04-22 13:41:02 -07:00
Brad Hefta-Gaub
c410242fb2 Merge pull request #7688 from jherico/texture_derez 
Reducing GPU texture memory footprint
 2016-04-22 13:20:54 -07:00
Seth Alves
e827a99222 Merge pull request #7732 from Atlante45/fix/settings-crash 
Fix crash on exit in Settings
 2016-04-22 11:46:30 -07:00
Andrew Meadows
afcf6d68a7 move deactivation thresholds to shared header 2016-04-22 09:38:43 -07:00
Andrew Meadows
c8f0b0501a avoid active object update cycles 2016-04-22 09:38:43 -07:00
Andrew Meadows
3639ffe53e optimize kinematic motion math 2016-04-22 09:38:43 -07:00
Andrew Meadows
905c5398c4 add EntityItem::set/getTransformAndVelocities() 2016-04-22 09:38:43 -07:00
Brad Hefta-Gaub
72c81e2378 Merge branch 'master' of https://github.com/highfidelity/hifi into supportLargeClockSkew 2016-04-21 16:26:44 -07:00
Brad Hefta-Gaub
d87d631871 Merge pull request #7708 from zzmp/feat/render-rates 
Add renderRates.js to visualize rates over time
 2016-04-21 15:59:58 -07:00
Brad Hefta-Gaub
2abcc454b0 CR feedback 2016-04-21 15:48:18 -07:00
Brad Davis
2689f2cc4a Add MB/KB/Byte conversion macros 2016-04-21 14:46:11 -07:00
Howard Stearns
7f748153c5 Mac code for gpu memory. 2016-04-21 14:46:08 -07:00
Atlante45
0c32f47f50 Don't call virtual method from base dtor 2016-04-21 13:25:31 -07:00
Brad Hefta-Gaub
f9c4959578 remove some debugging, tweak formatting 2016-04-21 09:53:00 -07:00
Brad Hefta-Gaub
ddf5b0f316 some debugging 2016-04-21 10:32:22 -07:00
howard-stearns
c274df6066 uint64 2016-04-20 22:57:33 -07:00
howard-stearns
904e87313e Match the gpu adapter names gainst the vendor and renderer names used by 
the ogl we're using, so that we pick the right GPU to get info from.
 2016-04-20 22:57:32 -07:00
howard-stearns
b403dcb0d9 An experiment to see if dual-card Windows desktops can be made to answer 
the correct card.
 2016-04-20 22:57:32 -07:00
howard-stearns
cb137635db Fix stupid MSVC default indentation. 2016-04-20 22:57:31 -07:00
howard-stearns
c12772e4c6 GPU identification utilities 2016-04-20 22:57:30 -07:00
Brad Hefta-Gaub
31f9d592e0 support for larger than 35 minute clock skew 2016-04-20 18:42:00 -07:00
Zach Pomerantz
477d6f40e4 Avoid use of atomic copy ctor in RateCounter 2016-04-20 13:39:57 -07:00
samcake
474d667f27 One more uneeded change 2016-04-19 11:03:35 -07:00
samcake
28521aa66a REmoving uneeded changes 2016-04-19 11:01:41 -07:00
samcake
265f6f1275 Updating & Merging with master 2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
b0f3b24caa Merge pull request #7699 from OmegaHeron/gcc53 
Gcc53
 2016-04-19 07:34:24 -07:00
Brad Hefta-Gaub
8f19eba5c2 Merge pull request #7685 from zzmp/debug/sub 
Add sub to Debug Counter
 2016-04-19 07:27:49 -07:00
Omega Hereon [J.L.]
64f6a59bb3 Merge remote-tracking branch 'upstream/master' into gcc53 2016-04-19 01:11:35 +00:00
Zach Pomerantz
6d7f8f4a6f Make RateCounter rate atomic 2016-04-18 17:42:45 -07:00
Brad Hefta-Gaub
01907f181f Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-18 16:01:42 -07:00
Seth Alves
4bf98a80b9 Merge pull request #7667 from AndrewMeadows/fix-entity-server-crash 
fix entity-server crash when entity moves out of bounds
 2016-04-18 14:09:21 -07:00
Omega Hereon [J.L.]
b3b58b8176 Fix instances of error: isnan was not declared in this scope with GCC5.3/Ubuntu 16.04 
In all but these 3 files isnan is glm::isnan
 2016-04-18 18:45:15 +00:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Joe Large [Omega Heron]
be208ba682 Revert "Correct references to isnan to glm::isnan for compat with Ubuntu 16.04/GCC 5.3" 
Moving this to a branch.

This reverts commit b88fc62b97.
 2016-04-16 18:24:50 -04:00
Brad Hefta-Gaub
54777c9cd5 Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-16 15:19:35 -07:00
Joe Large [Omega Heron]
b88fc62b97 Correct references to isnan to glm::isnan for compat with Ubuntu 16.04/GCC 5.3 2016-04-16 17:46:37 -04:00
samcake
d2cb017a04 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-16 10:44:56 -07:00
Brad Hefta-Gaub
04df84974c handle repositioning of qml windows 2016-04-15 19:50:12 -07:00
Zach Pomerantz
cf9d160602 Add sub to Debug Counter 2016-04-15 16:39:57 -07:00
Chris Collins
7b49552066 Merge pull request #7677 from howard-stearns/RateCounter-adjustment 
Don't truncate time when accumulating, and then divide by non-truncated.
 2016-04-15 15:59:13 -07:00
samcake
298300e42f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-15 14:16:02 -07:00
Anthony J. Thibault
38418d0169 Moved isListOfStrings into shared/ScriptValueUtils 
Also fixed some single line ifs.
 2016-04-15 13:47:30 -07:00
howard-stearns
089e7eb6b3 Don't truncate time when accumulating, and then divide by non-truncated. 2016-04-15 10:17:57 -07:00
Andrew Meadows
a263091c94 fix entity-server crash for out of bounds 2016-04-14 15:23:14 -07:00
Andrew Meadows
4d7efbc43f faster isNaN() and friends 2016-04-14 11:18:10 -07:00
Andrew Meadows
bb59860cfe update Aabb's of static objects when they move 2016-04-14 11:18:10 -07:00