Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 03:33:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32980 commits 25 branches 0 tags 1.1 GiB
Commit graph

32980 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
cf8955a8c5 kinematic grab 2015-10-02 15:27:01 -07:00
Brad Hefta-Gaub
627578826b Merge branch 'master' of https://github.com/highfidelity/hifi 2015-10-02 15:12:02 -07:00
Brad Hefta-Gaub
255689e24f add GLEW_STATIC to fix link warnings 2015-10-02 15:08:04 -07:00
Andrew Meadows
607cb9652e Merge pull request #5969 from kencooke/audio-src-sse2 
SSE2 optimization of new resampler.
 2015-10-02 15:07:03 -07:00
Brad Hefta-Gaub
86a3825a5a tweak 2015-10-02 14:50:59 -07:00
Atlante45
f5f349e13a Bumped packet version numbers 2015-10-02 14:20:20 -07:00
Brad Hefta-Gaub
57bf69cc48 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/entities/src/ModelEntityItem.cpp
	libraries/networking/src/udt/PacketHeaders.cpp
 2015-10-02 14:19:15 -07:00
Atlante45
1e56d0c99b Add parenthesis to quiet gcc warning 2015-10-02 14:18:18 -07:00
Atlante45
1f07ba46d0 Fix in-class initialization for windows build 2015-10-02 14:18:18 -07:00
Atlante45
48ff912dd2 Use one channel per packet list 2015-10-02 14:18:18 -07:00
Atlante45
3db99f50e5 Change takeFront name 2015-10-02 14:18:18 -07:00
Atlante45
7007d9f223 Use message part to check recieved packet list 2015-10-02 14:18:17 -07:00
Atlante45
c3fc6f4f79 Add message part to Packet 2015-10-02 14:18:17 -07:00
Brad Hefta-Gaub
02536a5ab9 remove animationSettings from particles, add isEmitting 2015-10-02 14:17:01 -07:00
Atlante45
8cecb95bf2 Use array for stats 2015-10-02 14:16:47 -07:00
Atlante45
f1a9aba704 Magic number 2015-10-02 14:16:46 -07:00
Atlante45
91c779ddd8 Templatized DoubleLock 2015-10-02 14:16:46 -07:00
Atlante45
732ad41080 Introduce PacketQueue 2015-10-02 14:16:46 -07:00
Atlante45
709dab6beb Release send queue before cleanup 2015-10-02 14:16:45 -07:00
Atlante45
290a0e573d House cleaning 2015-10-02 14:16:45 -07:00
Atlante45
b0fe8535fd Release _sendQueue before cleanup 2015-10-02 14:16:45 -07:00
Atlante45
eb8b37309d Use lock_guard when possible 2015-10-02 14:16:44 -07:00
Atlante45
a4d383b384 Check handshake separately 2015-10-02 14:16:44 -07:00
Atlante45
3a61e6b6a3 Coding standart for locks 2015-10-02 14:16:44 -07:00
Atlante45
a34e1d85a5 Close current packet fix 2015-10-02 14:16:44 -07:00
Seth Alves
a737b4024d Merge branch 'master' of github.com:highfidelity/hifi into fix-action-deletes 2015-10-02 13:57:24 -07:00
Howard Stearns
f6665a4ac6 Merge pull request #5839 from sethalves/transmit-joint-translation 
WARNING protocol change: Transmit joint translation
 2015-10-02 13:37:56 -07:00
Seth Alves
67cc944afc fix double free problem 2015-10-02 13:27:45 -07:00
Brad Hefta-Gaub
e6fb587a8c Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-02 13:04:14 -07:00
Brad Hefta-Gaub
98e8b3083d comment 2015-10-02 13:04:02 -07:00
Brad Hefta-Gaub
328467e019 Merge pull request #5909 from imgntn/particle_explorer 
[Scripts] Particle Explorer
 2015-10-02 12:40:36 -07:00
ericrius1
0497de47ea No longer removing non-existent entities from spray paint can; color tweaks to paint stream 2015-10-02 12:40:14 -07:00
Brad Hefta-Gaub
b27396606b fix first run 2015-10-02 12:34:46 -07:00
James Pollack
1c6e833028 cleanup weird function formatting, remove unused code, improve spacing for logical units 2015-10-02 12:31:55 -07:00
Seth Alves
c0e8b02a2f fix what happens when a distance grab is blocked because someone else already has it 2015-10-02 12:25:34 -07:00
samcake
a22ee03732 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-02 12:25:09 -07:00
samcake
edb485cb0f working on getting the Model payload to use model::Mesh 2015-10-02 12:24:41 -07:00
Brad Hefta-Gaub
9bb2ada0a7 Merge pull request #5964 from ericrius1/sprayPaint 
Added closePaint script and removed no longer used spray paint scripts
 2015-10-02 12:21:00 -07:00
ericrius1
4b62048fb1 more light changes 2015-10-02 12:12:36 -07:00
Brad Davis
83c9ebf06c Fixing Linux build failure 2015-10-02 11:57:14 -07:00
Brad Davis
7d4b680255 PR comments 2015-10-02 11:57:13 -07:00
Brad Davis
de5e95f7dc Improved procedural surfaces, textures and more standard uniforms 2015-10-02 11:57:13 -07:00
Seth Alves
880d92ee64 try to fix double-distance-grabbing lockout 2015-10-02 11:46:48 -07:00
Seth Alves
5b970e6b1a try to fix double-distance-grabbing lockout 2015-10-02 11:43:19 -07:00
Brad Hefta-Gaub
dce4d94f30 Merge pull request #5941 from ctrlaltdavid/particles-fix 
Fix particle radius, color, and alpha starts/finishes
 2015-10-02 11:40:47 -07:00
Anthony J. Thibault
c0be32d359 Fix for model offset when using Rig Animations. 2015-10-02 11:40:46 -07:00
Anthony J. Thibault
fc7b6dee84 Merge branch 'master' into transmit-joint-translation 2015-10-02 11:40:33 -07:00
Brad Hefta-Gaub
4c556dd43a Merge pull request #5962 from samcake/calvin 
Rendering the background elements after opaque and only work on the far pixels
 2015-10-02 11:38:45 -07:00
ericrius1
0d599458e6 Merged from toybox 2015-10-02 11:34:07 -07:00
James Pollack
55178cdc91 Merge remote-tracking branch 'upstream/master' into particle_explorer 2015-10-02 11:31:14 -07:00