Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 20:54:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41775 commits 71 branches 56 tags 1.2 GiB
Commit graph

41775 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Pomerantz
06e827cb5e Guard against no script engine thread affinity 2016-04-06 15:41:13 -07:00
Zach Pomerantz
1e710712cc Check entities scripting thread before signaling it 2016-04-06 11:19:07 -07:00
Brad Hefta-Gaub
699c717828 Merge pull request #7580 from hyperlogic/tony/keyboard-focus-on-web-entity-fix 
Application: focusOut keyboard device when clicking on web entity.
 2016-04-05 18:44:30 -07:00
Brad Hefta-Gaub
70f3a39463 Merge pull request #7593 from hyperlogic/tony/keyboard-focus-improvements 
Application: change keyboard input focus when using ui overlay.
 2016-04-05 18:44:16 -07:00
Anthony J. Thibault
07ff687bfe Application: change keyboard input focus when using ui overlay. 
call focusOutEvent on keyboard input plugin when an offscreen ui has activeFocus.
 2016-04-05 18:12:02 -07:00
Brad Hefta-Gaub
5cf2906cd4 Merge pull request #7576 from hyperlogic/tony/show-collision-geometry-fixes 
Model: Toggling Physics > Draw Collision Hulls works again
 2016-04-05 17:50:19 -07:00
Brad Hefta-Gaub
52497b1dfc Merge pull request #7560 from sethalves/remove-handcontroller-touch 
remove code that sends entity 'touch' events
 2016-04-05 17:50:07 -07:00
Stephen Birarda
fdde3f2551 Merge pull request #7587 from huffman/fix/assignment-duplicate 
Fix AssignmentClient unpacking an assignment when it already has one
 2016-04-05 17:28:44 -07:00
Brad Hefta-Gaub
891cc12d3f Merge pull request #7549 from zzmp/feat/resource-vis 
Add a visualization of cacheable resource usage
 2016-04-05 15:43:27 -07:00
Ryan Huffman
29c287227c Fix AssignmentClient unpacking an assignment when it already has one 2016-04-05 15:30:53 -07:00
Anthony J. Thibault
4c632cb4c4 Application: focusOut keyboard device when clicking on web entity. 2016-04-05 14:00:43 -07:00
Anthony J. Thibault
1a4ae72270 Merge branch 'master' into tony/show-collision-geometry-fixes 2016-04-05 13:55:51 -07:00
Brad Hefta-Gaub
7c6c75c484 Merge pull request #7575 from jherico/oculus_crash 
Don't release the Oculus plugin when disabling the plugin
 2016-04-05 13:50:46 -07:00
Brad Davis
fd4a374e08 Add comment 2016-04-05 13:04:17 -07:00
Brad Davis
71e6f9bdd6 Display a blank frame before switching away from oculus 2016-04-05 13:03:14 -07:00
Anthony J. Thibault
6a7a572b53 Model: Toggling Physics > Draw Collision Hulls works again 
Collision renderItems were never getting removed when shouldShowCollisionHull became false.
 2016-04-05 11:06:24 -07:00
Brad Davis
ffc2c75534 Don't release the Oculus plugin when disabling the plugin 2016-04-05 09:59:12 -07:00
Brad Hefta-Gaub
08a19c0471 Merge pull request #7554 from jherico/load_stutter2 
Addressing stuttering in the frame while loading content - Part 2
 2016-04-05 09:45:31 -07:00
Brad Hefta-Gaub
3fee1abd2d Merge pull request #7574 from zzmp/guard/octree-del 
Hold onto octree child after creation
 2016-04-05 09:45:00 -07:00
Ryan Huffman
ab89e47bba Merge pull request #7562 from hyperlogic/tony/make-debugger-work-again 
Fix for debugging on windows
 2016-04-05 09:08:50 -07:00
Brad Hefta-Gaub
ff4f693267 Merge pull request #7553 from zzmp/fix/tex-invoke-method 
Fix ImageReader threading issues
 2016-04-04 18:29:24 -07:00
Zach Pomerantz
ac30aed948 Hold onto octree child after creation 2016-04-04 17:52:41 -07:00
Brad Davis
c168e2cc58 PR feedback 2016-04-04 16:53:30 -07:00
Seth Alves
d60fcdbf42 Merge pull request #7569 from highfidelity/revert-7544-faster-kinematics 
Revert "faster kinematic motion for entities"
 2016-04-04 16:12:08 -07:00
Seth Alves
69bb0ebd74 Revert "faster kinematic motion for entities" 2016-04-04 16:11:54 -07:00
Brad Davis
e86066c1ce Merge pull request #7563 from hyperlogic/tony/jittery-hands-fix 
Application: fix for jittery hands when moving.
 2016-04-04 15:58:22 -07:00
Seth Alves
c48a67b933 Merge pull request #7544 from AndrewMeadows/faster-kinematics 
faster kinematic motion for entities
 2016-04-04 15:26:32 -07:00
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
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