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

41783 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
32a90b4709 Merge pull request #7521 from sethalves/fix-load-from-disk 
fix script load from disk on windows
 2016-03-30 19:29:11 -07:00
James B. Pollack
6f06c0ca7f reset stuffs 2016-03-30 19:17:42 -07:00
Seth Alves
c3b95e8284 Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk 2016-03-30 19:12:31 -07:00
Brad Hefta-Gaub
28978c8adb optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently 2016-03-30 17:49:30 -07:00
Brad Hefta-Gaub
f0cc8c0dd3 Merge pull request #7491 from jherico/oculus_release 
Update to latest Oculus SDK, add input device support
 2016-03-30 17:42:32 -07:00
Brad Hefta-Gaub
89d41c55ea Merge pull request #7520 from hyperlogic/tony/octree-tests 
OctreeTests: added unit tests for EntityTreeElement child accessors
 2016-03-30 17:30:12 -07:00
Clément Brisset
be07426d5a Merge pull request #7515 from birarda/console-to-sandbox 
rename the Server Console to Sandbox
 2016-03-30 17:29:15 -07:00
James B. Pollack
265e1f0643 fixes 2016-03-30 17:28:31 -07:00
Seth Alves
651d2c8954 fix script load from disk on windows 2016-03-30 17:27:36 -07:00
Clément Brisset
14934678fc Merge pull request #7513 from birarda/ice-server-lockup 
use NetworkAccessManager in IceServer for single QNAM instance
 2016-03-30 17:05:13 -07:00
Stephen Birarda
d8b0dbf3bf fix indentation for last inactive check timestamp 2016-03-30 16:58:35 -07:00
Anthony Thibault
26b9469df5 Merge pull request #7516 from hyperlogic/tony/show-collision-geometry-crash-fix 
Model: fix for crash when displaying collision mesh
 2016-03-30 16:48:07 -07:00
Anthony J. Thibault
f4d834b07b OctreeTests: added unit tests for EntityTreeElement child accessors 2016-03-30 16:15:29 -07:00
ericrius1
c74b71aa37 updated growing plant 2016-03-30 16:10:31 -07:00
Seth Alves
d9909fb7da Merge pull request #7518 from hyperlogic/tony/model-hand-grab-fix 
Model: Fix for equipped models not updating their matrices
 2016-03-30 16:10:21 -07:00
samcake
c13e24438c Merge pull request #7512 from zzmp/fix/light-buf-fmt 
Correctly represent lighting framebuffer
 2016-03-30 16:10:10 -07:00
Zach Pomerantz
6e0d6ee45b Guard updateClusterMatrices from unloaded geo 2016-03-30 16:04:00 -07:00
Zach Pomerantz
00db095306 Guard against reset model geo on scene update 2016-03-30 15:49:45 -07:00
Brad Hefta-Gaub
84bbeef72b Merge pull request #7511 from zzmp/guard/gl 
Add GL checks
 2016-03-30 15:47:16 -07:00
Brad Hefta-Gaub
eb61a4fee9 Merge pull request #7514 from zzmp/guard/model-tex 
Add lock on model texs
 2016-03-30 15:46:52 -07:00
Brad Hefta-Gaub
4a1e82892a Merge pull request #7494 from sethalves/use-local-scripts 
Use local scripts
 2016-03-30 15:46:32 -07:00
Brad Hefta-Gaub
2381ab1cba Merge pull request #7496 from kencooke/master 
make self-reverb depend on wetDryMix
 2016-03-30 15:44:20 -07:00
Brad Hefta-Gaub
e31546e172 Merge pull request #7509 from samcake/orange 
Avoid the spot lights flickering in Home
 2016-03-30 15:44:08 -07:00
ericrius1
182e05e125 adding collision hulls to can and bowl 2016-03-30 15:38:21 -07:00
James B. Pollack
0d1e7a478a fishie fish fish 2016-03-30 15:36:21 -07:00
Zach Pomerantz
02273e067a Add GL checks 2016-03-30 15:20:21 -07:00
Anthony J. Thibault
f6344c34e7 Model: Fix for equipped models not updating their matrices 2016-03-30 15:19:35 -07:00
Zach Pomerantz
530cb40528 Check for valid qml gl context creation 2016-03-30 15:11:54 -07:00
samcake
6213e0859d Expose to counters fro drawcalls, one for the API drawcalls and the other for gpu drawcalls spawned 2016-03-30 15:07:45 -07:00
Seth Alves
92981a6660 Merge pull request #7503 from sethalves/lock-tree-before-moving-av-children 
lock entity-tree before moving entity-children of avatars
 2016-03-30 15:05:38 -07:00
Seth Alves
e8f26b675a try to fix path to osx scripts 2016-03-30 15:04:29 -07:00
James B. Pollack
59a0e95e5f maze update 2016-03-30 15:03:20 -07:00
James B. Pollack
5ea5336ba5 tidy button 2016-03-30 14:56:35 -07:00
Zach Pomerantz
01db2be6b8 Avoid JSON parsing texs every render cycle 2016-03-30 14:48:57 -07:00
Stephen Birarda
b6853a0679 fix packaged server console folder for OS X 2016-03-30 14:47:40 -07:00
Zach Pomerantz
b6bf392f94 Defer avatar URL change to render thread 2016-03-30 14:39:35 -07:00
Anthony J. Thibault
103257493c Model: fix for crash when displaying collision mesh. 
This was due to a default constructed PayloadPointer being sent to the scene via resetItem.

The fix is to A) not do that anymore, B) make resetItem more robust and not crash if this happens.
 2016-03-30 14:24:28 -07:00
samcake
f09593e106 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-30 14:16:16 -07:00
James B. Pollack
6bd00f3203 fix da typo 2016-03-30 14:16:10 -07:00
Zach Pomerantz
54b8a9278d Guard model texs 2016-03-30 14:11:45 -07:00
Zach Pomerantz
e4f12c81e0 Get remap textures through getter 2016-03-30 14:11:36 -07:00
ericrius1
286bc5de1d changed json desk lamp to work with parenting 2016-03-30 14:06:51 -07:00
James B. Pollack
cad8d1ff17 reset block 2016-03-30 14:05:22 -07:00
Seth Alves
065c238dd0 Merge branch 'use-local-scripts' of github.com:sethalves/hifi into use-local-scripts 2016-03-30 14:02:21 -07:00
James B. Pollack
cefe672a93 updatez 2016-03-30 14:01:46 -07:00
Seth Alves
62372415be get this working on windows 2016-03-30 14:01:35 -07:00
samcake
3cf2eeb4d5 IMproving the perfplot qml and adding 2 more info 2016-03-30 13:58:32 -07:00
Stephen Birarda
f29647b519 use HF shortcuts for setup options 2016-03-30 13:56:57 -07:00
Stephen Birarda
7d042fc47d keep server-console as sandbox folder in Program Files 2016-03-30 13:54:55 -07:00
James B. Pollack
9e01cbb4ef inner tank for ze fishes 2016-03-30 13:44:40 -07:00