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

36291 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
e2ecc388ca Indicate particle properties that (temporarily) aren't working 2015-12-18 15:10:47 +13:00
David Rowe
5aef309b8a Get particles in particlesTest.js emitting again 2015-12-18 15:09:36 +13:00
Andrew Meadows
1bb6ddb99f Merge pull request #6676 from sethalves/dejitter-hold-action 
Dejitter hold action
 2015-12-17 14:29:39 -08:00
Seth Alves
b80fa1c806 code review 2015-12-17 11:46:41 -08:00
Ryan Huffman
3da5cf1fe5 Merge pull request #6684 from birarda/read-type-assert 
fix reading of empty or malformed packets
 2015-12-17 11:26:47 -08:00
Seth Alves
f3adb8a2f7 fix offset math in hold action 2015-12-17 11:16:59 -08:00
Seth Alves
eb173815f5 Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action 2015-12-17 11:08:05 -08:00
Stephen Birarda
06e9731fe4 don't attempt to read an empty or malformed packet 2015-12-17 11:07:36 -08:00
Seth Alves
aabc544d6c Merge pull request #6683 from birarda/shtml-content-type 
serve SHTML files with HTML MIME type
 2015-12-17 11:05:34 -08:00
Stephen Birarda
08f42c08d9 use a ternary for single assignment 2015-12-17 10:54:32 -08:00
Stephen Birarda
286b984d6f serve SHTML files with HTML MIME type 2015-12-17 10:48:33 -08:00
Clément Brisset
40272faa3f Merge pull request #6679 from hyperlogic/tony/particle-system-invalidated-iterator-fix 
ParticleEffectEntityItem: fix for invalid iterator increment
 2015-12-17 09:43:39 -08:00
Seth Alves
32fb4decd5 Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action 2015-12-17 07:32:52 -08:00
Brad Hefta-Gaub
0db0ef89d7 Merge pull request #6674 from murillodigital/master 
Unifying Windows PR and Release installer pipeline
 2015-12-16 20:42:13 -08:00
Brad Hefta-Gaub
275b35ef60 Merge pull request #6670 from Atlante45/ac-race 
Fix entity server race
 2015-12-16 20:21:56 -08:00
Brad Davis
343d31b38f Merge pull request #6677 from AlessandroSigna/overlays 
Fix to remove a VS warning
 2015-12-16 20:12:27 -08:00
Anthony J. Thibault
2eecb61da5 Prefer erase over repeated pop_front calls 2015-12-16 19:08:31 -08:00
Anthony J. Thibault
1b08563079 ParticleEffectEntityItem: fix for invalid iterator increment 
Was causing an assert in debug, due to calling ++ on an invalid iterator.
In release this might lead to memory corruption.
 2015-12-16 16:56:49 -08:00
Atlante45
2c8be15e66 Unnecessary shutdown (Already shutting down) 2015-12-16 15:56:22 -08:00
Seth Alves
5f9bdcb2aa fix lock type 2015-12-16 15:52:20 -08:00
Seth Alves
ea202c5271 Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action 2015-12-16 15:44:44 -08:00
AlessandroSigna
364a70bb46 Fix to avoid MVS warning 2015-12-16 15:41:27 -08:00
Seth Alves
d7affcf811 keep track of palm rotation vs avatar as well as palm translation 2015-12-16 15:41:27 -08:00
Seth Alves
489d4099a7 add locationChanged to model entities 2015-12-16 15:21:20 -08:00
Leonardo Murillo
bbe444ffc1 Forgot to add file 2015-12-16 16:40:51 -06:00
Leonardo Murillo
a7b61cf791 Couple of fixes 2015-12-16 16:39:09 -06:00
Atlante45
b709c8162c Fix node flapping race 2015-12-16 14:27:26 -08:00
Atlante45
6bda8d3f18 CR logging category 2015-12-16 14:27:26 -08:00
Atlante45
b55d8f750f CR 2015-12-16 14:27:26 -08:00
Atlante45
0f7093bed7 Whitespace 2015-12-16 14:27:26 -08:00
Atlante45
df24fafe49 CR feedback 2015-12-16 14:27:26 -08:00
Atlante45
a655557af0 Make variable name more obvious 2015-12-16 14:27:26 -08:00
Atlante45
b4dc3b1b47 Fix windows compile error. 2015-12-16 14:27:26 -08:00
Atlante45
a541fdd2df Move OctreeSendThread to the OctreeServer 2015-12-16 14:27:26 -08:00
Atlante45
51ec7ae2ed Keep UUID of node in send thread 2015-12-16 14:27:26 -08:00
Atlante45
3cd1eea1dc Use weak pointer to the Node instead of strong ownership 2015-12-16 14:27:26 -08:00
Atlante45
95da71b19c Assignment don't inherit from NodeData 
This is an artefact from an old design that stuck around
 2015-12-16 14:27:26 -08:00
Atlante45
562d9ac2de Forward QThread's finished signal in GenericThread 2015-12-16 14:27:26 -08:00
Atlante45
346c28f9e2 Remove OctreeServer's static instance 2015-12-16 14:27:26 -08:00
Atlante45
09701fdcf1 deadlock 101 2015-12-16 14:27:26 -08:00
Atlante45
b65cdd2865 Add logging categories to assignment client. 2015-12-16 14:27:26 -08:00
Atlante45
bd7fa266cf Bit of cleanup 2015-12-16 14:27:26 -08:00
Seth Alves
8bfbb69316 clean up code, change try-locks to locks 2015-12-16 14:21:56 -08:00
Leonardo Murillo
66770cc907 Finishing touches 2015-12-16 16:11:35 -06:00
Seth Alves
d3c57821c0 call a method on actions before each physics simulation step. use this to attempt to dejitter held objects 2015-12-16 14:00:04 -08:00
Leonardo Murillo
cbed8bf35a NSIS Changes 2015-12-16 15:12:14 -06:00
Leonardo Murillo
5ed422e3a1 Removing unwanted changes 2015-12-16 14:28:49 -06:00
Leonardo Murillo
56ef52022d Removing unwanted changes 2015-12-16 14:28:05 -06:00
Leonardo Murillo
711d02ba2f Consolidating installer checkpoint 2015-12-16 14:26:24 -06:00
Anthony Thibault
0c1ae5bb61 Merge pull request #6657 from AndrewMeadows/avatar-capsule-2 
Correct collision capsule for scaled avatars
 2015-12-16 11:36:08 -08:00