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

42431 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
bf8cdabd1b CR feedback 2016-04-18 12:50:29 -07:00
Brad Hefta-Gaub
55010cebb7 remove unhelpful comment 2016-04-18 12:43:32 -07:00
Brad Hefta-Gaub
9e13b1bbae more CR feedback 2016-04-18 12:25:46 -07:00
Brad Hefta-Gaub
374ba10524 more CR feedback 2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e CR feedback 2016-04-18 12:13:21 -07:00
Brad Hefta-Gaub
c26115cf2e one small tweak 2016-04-18 11:40:17 -07:00
Brad Hefta-Gaub
1c111e20bd fix possible thread issue with Entities.callEntityMethod() 2016-04-18 11:20:26 -07:00
Brad Hefta-Gaub
47900df3e7 cleanup 2016-04-18 10:43:08 -07:00
Brad Hefta-Gaub
f6c75d0530 cleanup 2016-04-18 10:41:54 -07:00
Brad Hefta-Gaub
0520363da8 cleanup 2016-04-18 10:37:15 -07:00
Brad Hefta-Gaub
d1f6b371c9 cleanup 2016-04-18 10:27:12 -07:00
Brad Hefta-Gaub
a4f562672a cleanup 2016-04-18 10:08:33 -07:00
Brad Hefta-Gaub
9db0fe0d11 switch to using QSharedPointer for _entitiesScriptEngine 2016-04-18 09:46:04 -07:00
Brad Hefta-Gaub
a3221f36c8 Merge branch 'master' of https://github.com/highfidelity/hifi into resetScriptEngineOnDomainChange 2016-04-17 10:03:06 -07:00
Brad Hefta-Gaub
4b7a4e80ff Merge pull request #7675 from samcake/orange 
Fixing the Bump Map generating Normal Map path
 2016-04-17 10:00:45 -07:00
Brad Hefta-Gaub
71d57295eb handle possibly deleted ScriptEngine in getScriptContents 2016-04-16 19:39:45 -07:00
Brad Hefta-Gaub
87078b1ea2 first cut at resetting entities script engine on domain change 2016-04-16 11:09:23 -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
Chris Collins
c0f4b8573c Merge pull request #7673 from zzmp/fix/cache-tallies 
Decrement cache tallies for uncached resources
 2016-04-15 15:59:03 -07:00
Brad Hefta-Gaub
a7b5ea50d7 Merge pull request #7670 from hyperlogic/tony/validate-anim-state-handler-args 
Validate arguments to MyAvatar.addAnimationStateHandler()
 2016-04-15 14:26:22 -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
e4f8a67e60 Merge pull request #7649 from hyperlogic/tony/simplify-away-mode 
away.js: fix for permanent disabling avatar IK
 2016-04-15 13:35:14 -07:00
Zach Pomerantz
cff5886313 Use correct resources lock 2016-04-15 10:46:19 -07:00
Brad Hefta-Gaub
6a12425a2a Merge pull request #7669 from sethalves/not-away-if-walking 
clear away-ness if the avatar walks a certain distance
 2016-04-15 10:25:40 -07:00
Brad Hefta-Gaub
50856b715e Merge pull request #7674 from zzmp/leak/font 
Change Font to use shared_ptr instead of freeing on _exit
 2016-04-15 10:25:09 -07:00
Brad Hefta-Gaub
a88cd4b786 Merge pull request #7671 from AndrewMeadows/link-pthread 
add pthread link dependency to interface for UNIX
 2016-04-15 10:24:31 -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
samcake
fc29397d91 Clening up from review comments 2016-04-15 10:10:04 -07:00
samcake
920ab88ef3 remove a debug code 2016-04-15 01:00:57 -07:00
samcake
637da18e5c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-04-15 00:42:15 -07:00
samcake
30d0bfcfd3 FIxing the bump map loading which got broken in the past PR, fixed a double call to the glTexSUbIMage function and fixed a texel.Format 2016-04-15 00:41:37 -07:00
Zach Pomerantz
fc9de4b7e6 Merge branch 'master' of github.com:highfidelity/hifi into fix/cache-tallies 2016-04-15 00:37:03 -07:00
Brad Hefta-Gaub
3e03f85f07 Merge pull request #7650 from Atlante45/fix/clear-atp-cache 
Clear atp mapping cache between domain
 2016-04-14 18:44:20 -07:00
Brad Hefta-Gaub
f4604e300b Merge pull request #7666 from birarda/interface-name-osx 
rename .app on OS X to Interface
 2016-04-14 18:44:07 -07:00
samcake
a9fefcc802 Trying ti debug the bad normal maps 2016-04-14 18:16:14 -07:00
Brad Hefta-Gaub
21f30f1a10 Merge pull request #7672 from zzmp/fix/name-caches 
Name exposed cache objects
 2016-04-14 18:02:36 -07:00
Atlante45
b3b2f98f6c Merge branch 'master' of https://github.com/highfidelity/hifi into fix/clear-atp-cache 2016-04-14 17:59:36 -07:00
Zach Pomerantz
f803ecd2e7 Merge pull request #7633 from Atlante45/fix/shared-resource 
Fix raw pointers in shared resource cache items
 2016-04-14 17:52:04 -07:00
Atlante45
4ed8573f74 CR 2016-04-14 17:28:24 -07:00
Zach Pomerantz
2e4e1dd590 Fix leaking Font 2016-04-14 17:00:23 -07:00
Zach Pomerantz
32e9c49cf0 Fix cache tallies for uncached resources 2016-04-14 17:00:20 -07:00
Zach Pomerantz
bb02af793c Name exposed cache objects 2016-04-14 17:00:18 -07:00
Andrew Meadows
ae20bb5fa7 add pthread link dependency to interfac for UNIX 2016-04-14 16:35:51 -07:00
Anthony J. Thibault
253e4cbb73 validate arguments to MyAvatar.addAnimationStateHandler() 
Also validate arguments to MyAvatar.removeAnimationStateHandler() and the return result from the user provided callback function.
 2016-04-14 16:25:17 -07:00
Seth Alves
31270ebe6e clear away-ness if the avatar walks a certain distance 2016-04-14 16:03:22 -07:00
Brad Hefta-Gaub
91334d6a39 Merge pull request #7664 from ZappoMan/reduceJointProperties 
only export joint values if they've been explicitly set by scripts
 2016-04-14 15:30:04 -07:00
Seth Alves
50c8b5858e Merge pull request #7668 from birarda/ice-server-redundancy 
reduce ice.highfidelity.com DNS queries when not failing
 2016-04-14 15:05:58 -07:00
Stephen Birarda
84df6cfed0 only re-request ice addresses during failure 2016-04-14 14:46:08 -07:00
Seth Alves
f114888c1c Merge pull request #7665 from birarda/ice-server-redundancy 
allow domain-server to cycle through ice-servers when failing
 2016-04-14 14:36:29 -07:00
Stephen Birarda
9bca2309e0 remove the monitoring endpoint debug 2016-04-14 13:58:02 -07:00