Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41961 commits 29 branches 0 tags 1.1 GiB
Commit graph

41961 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
f3d948e20f Merge pull request #7564 from sethalves/search-ray-follows-controller 
make handGrabController search ray follow controller
 2016-04-04 14:38:05 -07:00
Stephen Birarda
4fb53246a9 Merge pull request #7561 from zzmp/log/checkin-reset 
Log when limit of checkins reached
 2016-04-04 14:26:32 -07:00
Zach Pomerantz
107cfcf10b Change Resource setBytes->setSize 2016-04-04 13:59:57 -07:00
Zach Pomerantz
f34e951c3f Make resource cache props thread-safe 2016-04-04 13:59:56 -07:00
Brad Hefta-Gaub
606cf55b1b Merge pull request #7565 from ZappoMan/simpleTestPR 
Simple test PR
 2016-04-04 13:31:28 -07:00
Brad Hefta-Gaub
04471f1c88 Merge branch 'master' of https://github.com/highfidelity/hifi into simpleTestPR 
Conflicts:
	interface/src/Application.cpp
 2016-04-04 13:16:39 -07:00
Brad Hefta-Gaub
b3b5c5d1ea small change to trigger a build 2016-04-04 13:14:52 -07:00
Seth Alves
ace4546dec make handGrabController search ray follow controller rather than IK driven hand 2016-04-04 12:49:03 -07:00
Anthony J. Thibault
d7b13d226f Application: fix for jittery hands when moving. 
The issue was that the hands are sampled in sensor coordinates.
But when the avatar is moved via physics, the sensor to world matrix
must be updated to move the hands in the world by the correct amount.
These new hand positions are then computed before IK is performed.
 2016-04-04 12:36:18 -07:00
Anthony J. Thibault
a9197385b5 Make debug builds work again. 
Only run mt.exe on the manifest in non development builds.
 2016-04-04 12:24:26 -07:00
Zach Pomerantz
aa0245b9c2 Debug when limit of checkins reached 2016-04-04 12:22:03 -07:00
samcake
f3e6c490a4 merging with master, moving the TexelFOrmat function to a cpp 2016-04-04 12:03:37 -07:00
Andrew Meadows
a08ab8e127 restore setFlag in simulateKinematicMotion() 2016-04-04 11:48:45 -07:00
Seth Alves
30fc9ef3f7 Merge pull request #7559 from birarda/ice-server-lockup 
fix extra connections to QNetworkAccessManager in IceServer
 2016-04-04 11:42:07 -07:00
Andrew Meadows
a53cb2e532 use _gravity rather than _acceleration 
also tweaks and comments about supporting low gravity
 2016-04-04 11:10:50 -07:00
Zach Pomerantz
6660f0959b Merge pull request #7557 from hyperlogic/tony/reset-thread-priority 
ModelCache: reset thread priority back to normal
 2016-04-04 11:07:18 -07:00
Seth Alves
0bd747fa06 remove code that sends entity 'touch' events 2016-04-04 11:00:27 -07:00
Zach Pomerantz
2bd53935fc Merge branch 'master' of github.com:highfidelity/hifi into fix/tex-invoke-method 2016-04-04 11:00:03 -07:00
Zach Pomerantz
d23d0f6432 Restore thread priority after tex parsing 2016-04-04 10:57:04 -07:00
Stephen Birarda
e70319d83d don't re-connect multiple times to QNetworkAccessManager signal 2016-04-04 10:53:16 -07:00
Anthony J. Thibault
d1898eeac6 ModelCache: reset thread priority back to normal 
Based on PR feedback on https://github.com/highfidelity/hifi/pull/7550
 2016-04-04 10:31:36 -07:00
Brad Davis
d98abbc7df First pass at threaded texture transfers 2016-04-04 10:23:01 -07:00
samcake
2dd1b14b32 Merge pull request #7551 from jherico/load_stutter 
Working on addressing stuttering in the frame while loading content - Part 1
 2016-04-04 10:04:51 -07:00
Seth Alves
21ed5677d3 Merge pull request #7556 from birarda/ice-server-lockup 
remove packet mismatch debug from ice-server log
 2016-04-04 10:03:08 -07:00
Seth Alves
f93d114730 Merge pull request #7555 from thoys/application-fixes 
used "ReSharper C++" to fix some style and spelling in Application.(h|cpp)
 2016-04-04 09:55:49 -07:00
Stephen Birarda
145b734b98 completely remove version mismatch debug 2016-04-04 09:49:04 -07:00
Stephen Birarda
1da8fe5838 only a single log line per client version mismatch 2016-04-04 09:46:10 -07:00
Seth Alves
278fe93f2b Merge pull request #7546 from zzmp/fix/release-skyboxes 
Release skybox textures when rendering stars
 2016-04-04 09:23:54 -07:00
Thijs Wenker
2be4097bc5 another 3.1.2.1 rollback 2016-04-04 17:36:43 +02:00
Thijs Wenker
142f37da1c fix accidentally violated style rule 3.1.2.1 2016-04-04 17:33:47 +02:00
Thijs Wenker
b2058376ba used "ReSharper C++" to fix some style and spelling in Application.(h|cpp) 2016-04-04 17:03:05 +02:00
Brad Davis
667c27866e Pushing texel format translation into header 2016-04-03 20:41:35 -07:00
Brad Davis
4f373937f9 Additional performance markers 2016-04-03 20:41:34 -07:00
Andrew Meadows
74058ac049 more correct moving test for ballistic kinematics 2016-04-03 19:15:16 -07:00
Andrew Meadows
7ea81f3937 add and fix comments 2016-04-03 19:15:01 -07:00
Brad Hefta-Gaub
e5f3ec4600 Merge pull request #7545 from birarda/marketplace-to-examples 
renaming of marketplace icon/window to examples
 2016-04-03 14:25:00 -07:00
Brad Hefta-Gaub
ecaaa34576 Merge pull request #7547 from howard-stearns/lock-trees-on-import-export 
Lock trees on import export
 2016-04-03 14:23:54 -07:00
Brad Hefta-Gaub
4a78ad877e Merge pull request #7550 from hyperlogic/tony/avatar-thrasher 
Model: fixed two crash issues when changing avatars
 2016-04-03 13:47:35 -07:00
Brad Hefta-Gaub
338f4e0eb4 Merge pull request #7552 from zzmp/fix/model-tex-check 
Avoid setting textures on empty models
 2016-04-03 13:47:14 -07:00
Zach Pomerantz
79e5286335 Fix ImageReader threading issues 2016-04-03 12:38:18 -07:00
Zach Pomerantz
fc19b60f8a Avoid setting null texs on uncaching models 2016-04-03 11:25:48 -07:00
Anthony Thibault
07cfa13a82 GeometryReader: We should delete the fbxGeometry if we've lost the resource. 2016-04-03 09:23:53 -07:00
Anthony Thibault
865a77ae20 Model: fixed two crash issues when changing avatars 
* When the GeometryReader has the last ref to the GeometryResource ptr
  It needs to hold on to the reference until invokeMethod is completed.
  Otherwise, invokeMethod will call a method on a deleted object, leading
  to memory corruption or crashes.

* When the Model URL is changed, the clusterMatrices are invalided and the
  RenderItemsSets are cleared.  However, there still might be renderItems in
  the scene pending changes list that might refer to those RenderItems and their
  clusterMatrices.  We need to guard against this access to prevent reading from
  memory that was previously freed.

Both of these issues were uncovered using the [avatar-thrasher](https://gist.github.com/hyperlogic/d82a61d141df43d576428501a82c5ee6) test script.
 2016-04-02 21:48:22 -07:00
Zach Pomerantz
3c86191a59 Add resources prop to caches 2016-04-02 17:37:51 -07:00
Anthony Thibault
d899d7d696 Merge pull request #7530 from hyperlogic/tony/culling-fixes 
Culling fixes
 2016-04-01 21:29:34 -07:00
Zach Pomerantz
d78338330c Rm unused trigger from renderStats 2016-04-01 20:06:10 -07:00
Zach Pomerantz
b0185dc355 Add cacheStats.js 2016-04-01 20:06:10 -07:00
Zach Pomerantz
41cdb29bd2 Use a timer in plotperf 2016-04-01 20:06:09 -07:00
Zach Pomerantz
36e04f4434 Mv PlotPerf to shared dir 2016-04-01 19:52:44 -07:00
Zach Pomerantz
5b9198ed3d Expose tex/model cache to js/qml 2016-04-01 19:52:43 -07:00