Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 04:56:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
31812 commits 74 branches 59 tags 1.2 GiB
Commit graph

31812 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric Levin
e9ea42f9ad Merge pull request #5740 from ZappoMan/boombox 
add a boom box entity script
 2015-09-08 16:16:41 -07:00
ericrius1
717cbf3d5b handControllerGrab.js is active by default 2015-09-08 16:13:17 -07:00
Brad Hefta-Gaub
ca6c413221 tweak THE_SONG 2015-09-08 16:02:10 -07:00
Brad Hefta-Gaub
8c4d7b98fd fix header comment 2015-09-08 16:01:07 -07:00
Brad Hefta-Gaub
fe90af0e07 Merge pull request #5737 from ericrius1/grabChanges 
hydraGrab is now called handControllerGrab.js now grabs entities based on how they want to be grabbed (th…
 2015-09-08 15:59:28 -07:00
Seth Alves
ab82d12f96 Merge pull request #5694 from birarda/protocol 
Asset Transfer Protocol and UDT in networking layer
 2015-09-08 15:57:41 -07:00
ericrius1
572b120bf0 removed print statements 2015-09-08 15:57:31 -07:00
Stephen Birarda
c670c9a0d5 fix for AnimNodeLoader use of Resource loaded 2015-09-08 15:31:37 -07:00
Howard Stearns
26f63a44fc Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 15:30:22 -07:00
Seth Alves
8a60bba4eb Merge branch 'master' of github.com:highfidelity/hifi into octree-shared-pointers 2015-09-08 15:28:46 -07:00
Stephen Birarda
e1a31f4dbe put back TextureCache headers 2015-09-08 15:23:26 -07:00
Stephen Birarda
255f896f7b remove extra cmake debug 2015-09-08 15:21:34 -07:00
Stephen Birarda
a3959109f1 resolve conflicts on merge with upstream/master 2015-09-08 15:18:39 -07:00
Brad Hefta-Gaub
152a86b0e9 Merge pull request #5735 from hyperlogic/tony/no-particle-fix 
Fix for RenderableParticleffectEntityItem assert.
 2015-09-08 15:13:38 -07:00
Brad Hefta-Gaub
8185a8da7f Merge pull request #5732 from jherico/selma 
Procedural skyboxes
 2015-09-08 15:12:59 -07:00
Andrew Meadows
4a40781e2f remove some commented out cruft 2015-09-08 15:11:19 -07:00
Andrew Meadows
281e4f21fc fix avatar bounding capsule calculations 2015-09-08 15:03:12 -07:00
Andrew Meadows
90fe54e6d6 remove cruft and minor cleanup 2015-09-08 15:03:12 -07:00
Stephen Birarda
e1c395f5ea resolve conflicts on merge with upstream/master 2015-09-08 14:56:23 -07:00
Brad Hefta-Gaub
a6395e9438 add a boom box entity script 2015-09-08 14:54:22 -07:00
Eric Levin
69612551e2 Merge pull request #5739 from ctrlaltdavid/20669 
CR for 20669 - Add additional particle properties controlling size, colour, and opacity
 2015-09-08 14:51:54 -07:00
Stephen Birarda
b8bf9a1104 fix OBJReader loading with URL 2015-09-08 14:51:51 -07:00
Howard Stearns
27f4bca0a4 Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread! 
Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.
 2015-09-08 14:49:58 -07:00
Brad Davis
5f1affaff9 Procedural skybox work 2015-09-08 14:31:16 -07:00
James B. Pollack
4d907aa53b Merge pull request #5726 from SeijiEmery/jsbenchmarks 
Javascript benchmarking
 2015-09-08 14:24:30 -07:00
James B. Pollack
11f53708e0 Merge pull request #5738 from ZappoMan/boombox 
added an example script that detects being touched by avatars hand
 2015-09-08 14:12:23 -07:00
Stephen Birarda
b8ac2ff48e Merge branch 'protocol' of github.com:birarda/hifi into protocol 2015-09-08 13:43:51 -07:00
Stephen Birarda
e0a8469354 fix for sequence point warning 2015-09-08 13:42:52 -07:00
David Rowe
2325cb8ee0 Merge branch 'master' into 20669 2015-09-08 13:26:20 -07:00
David Rowe
99c1e06201 Code tidying 2015-09-08 13:25:15 -07:00
Brad Hefta-Gaub
57c27f7049 added an example script that detects being touched by avatars hand 2015-09-08 13:06:20 -07:00
ericrius1
7133fc94f5 hydraGrab now grabs entities based on how they want to be grabbed (through setting of userData field with a key called spatialKey 2015-09-08 12:54:02 -07:00
Brad Hefta-Gaub
781f19c9e3 position the puppet on level of nearby table 2015-09-08 12:27:24 -07:00
Anthony J. Thibault
c728cd4c4c Fix for RenderableParticleffectEntityItem assert. 
When a particle system had no living particles, PendingChanges::updateItem
would assert, due to the access to _vertices[0].  In release this might be
harmless as this memory is never accessed, but different implementations of
std::vector might do different things here.  So, let's be safe and early
return when the number of particles is 0.
 2015-09-08 12:03:41 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Stephen Birarda
9a8bd607b5 Merge pull request #5729 from rudi-c/build_docs_and_fixes 
Build docs and dependency fixes
 2015-09-08 11:29:15 -07:00
David Rowe
cdd5e68815 Add colorStart and colorFinish entity particle properties 2015-09-08 11:28:53 -07:00
Anthony J. Thibault
6d5927c0c9 Now with less copies. 
* AnimSkeleton now returns AnimPoses by const ref.
* AnimDebugDraw: uses references to Poses on the stack instead of copies
  within inner loops.
* AnimDebugDraw: Removed unnecessary universal refs in range based for loops.
 2015-09-08 10:51:23 -07:00
Christoph Haag
ddcee763ca extend macros to take return value if necessary 2015-09-08 19:10:15 +02:00
Stephen Birarda
b3f1b1a8e1 Merge pull request #52 from huffman/byte-range-comment 
Add comment about byte range for ATP get asset request
 2015-09-08 09:53:49 -07:00
Ryan Huffman
8fffb77f13 Add comment about byte range for ATP get asset request 2015-09-08 09:53:02 -07:00
Brad Hefta-Gaub
ed546885af Merge pull request #5730 from jherico/marge 
Procedural shaders V2
 2015-09-08 09:16:35 -07:00
Stephen Birarda
9878143661 repairs to ShaderCache for Resource changes 2015-09-08 08:58:35 -07:00
Stephen Birarda
25aeda2e18 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-08 08:40:51 -07:00
Stephen Birarda
b2778bff09 fix a bad replacement for AC server hostname 2015-09-08 08:30:16 -07:00
Stephen Birarda
c49088846f add an alias for AvatarDataSequenceNumber 2015-09-08 08:26:14 -07:00
Christoph Haag
6a8f131a83 move assert into ifndef QT_NO_DEBUG it belongs to 2015-09-08 10:07:06 +02:00
Christoph Haag
fa221fa7e3 In gcc5 nullptr can't be directly used as bool 
See https://gcc.gnu.org/gcc-5/porting_to.html
"Converting std::nullptr_t to bool"
 2015-09-08 10:07:06 +02:00
Brad Davis
743d79335d Procedural shaders V2 2015-09-07 17:37:45 -07:00
Howard Stearns
d472fd66ff Cleanup. 2015-09-07 17:26:22 -07:00