Stephen Birarda
41c6220731
resolve conflicts on merge with upstream/master
2015-07-31 17:27:23 -07:00
Brad Hefta-Gaub
b46a430fba
Merge pull request #5468 from bwent/reset-position
...
Add gettable naturalPosition property for model entities
2015-07-31 11:03:27 -07:00
bwent
aab1f70800
Renaming vars
2015-07-31 10:47:05 -07:00
bwent
67760fad79
Add gettable naturalPosition property for model entities
2015-07-31 10:15:35 -07:00
Stephen Birarda
d340515ab3
complete the initial version of UDTTest
2015-07-30 17:09:25 -07:00
Seth Alves
a9556660c4
fix linux build
2015-07-29 20:53:24 -07:00
Anthony J. Thibault
604ef5dc71
Fixed float constant.
2015-07-27 09:28:56 -07:00
Anthony J. Thibault
5844b594dc
Converted magic numbers to constants.
2015-07-27 09:27:16 -07:00
Anthony J. Thibault
5cc0b45850
Improved ParticleEffectEntityItem rendering and updates
...
* Created custom pipelines and shaders for untextured and textured
particle rendering.
* Created custom render payload for particles
* Moved all particle updates into simulation rather then render.
* Uses pendingChanges.updateItem lambda to update the playload with
new data for rendering.
* ParticleEffectEntityItem now updates its dimensions properly,
based on emitter properties.
* Bug fix for dt not accumulating properly, during gaps between updates.
now we just update all the time. (super cheap tho, if there are no particles
animating)
2015-07-26 17:21:17 -07:00
Stephen Birarda
9e7fb9ae16
shuffle Packet headers, use static enum for PacketType
2015-07-23 13:56:47 -07:00
Atlante45
8d6ff2d9f9
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 14:50:44 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Stephen Birarda
f8c832e50b
resolve conflicts on merge with upstream master
2015-07-17 16:48:46 -07:00
Andrew Meadows
32b1fe0918
proper fix for incorrect render of scaled entities
2015-07-17 15:21:02 -07:00
Andrew Meadows
f09b3eb736
set creation time when loading unknown timestamp
2015-07-17 12:14:07 -07:00
Atlante45
cf453952f4
Rename should nack
2015-07-17 10:52:27 -07:00
Stephen Birarda
0811553c41
add a direct registration for EntityEditPacketSender
2015-07-17 10:49:24 -07:00
Stephen Birarda
2d5428276a
shouldNack default to true
2015-07-17 09:56:27 -07:00
Stephen Birarda
7d60b86f52
kill the PacketLister (AKA Huffman 1 : PacketListener 0)
2015-07-17 09:07:39 -07:00
Andrew Meadows
2441be21e2
restore order of setting properties
2015-07-16 20:58:34 -07:00
Andrew Meadows
18d0cb5158
cleanup of EntityItem ctors and friends
2015-07-16 17:48:28 -07:00
Stephen Birarda
61653bd88d
remove old PacketHeader methods
2015-07-16 16:04:12 -07:00
Atlante45
b4121eb464
Remove unnecessary move
2015-07-16 13:14:17 -07:00
Stephen Birarda
60ae02e4e9
some formatting changes in entities
2015-07-16 12:38:39 -07:00
Stephen Birarda
8921f59e23
fix entity packet send from interface client
2015-07-16 12:09:35 -07:00
Stephen Birarda
05dde9d8f5
resolve conflicts on merge with upstream/master
2015-07-15 16:18:47 -07:00
Stephen Birarda
8b5026a817
cleanup some warnings
2015-07-15 11:20:55 -07:00
Stephen Birarda
b115bd1a55
resolve conflicts on merge with huffman/receive_packets
2015-07-15 10:52:07 -07:00
Ryan Huffman
44c99ef89a
Replace bytesAvailable with bytesLefToRead
2015-07-15 10:44:51 -07:00
Stephen Birarda
e127c5c06d
rename Packet methods for clarity
2015-07-15 10:40:40 -07:00
Stephen Birarda
0327a8d477
fix bytesAvailable, don't double seek in Packet
2015-07-14 20:47:16 -07:00
Stephen Birarda
1450036b59
move EntityEditPacketSender method to slot
2015-07-14 17:18:28 -07:00
Atlante45
fbb6a94579
Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol
2015-07-14 16:36:28 -07:00
Ryan Huffman
56b5c9acff
Merge branch 'atp' of github.com:birarda/hifi into receive_packets
...
Conflicts:
assignment-client/src/entities/EntityServer.cpp
domain-server/src/DomainServer.cpp
2015-07-14 14:53:45 -07:00
Stephen Birarda
23548a99bc
move NACK packet disabling to EntityEditPacketSender
2015-07-14 14:43:01 -07:00
Stephen Birarda
d617b71232
remove SharedNodePointer from some packet callbacks
2015-07-14 14:27:26 -07:00
Atlante45
bbb00b9d3a
Merge branch 'protocol' of https://github.com/birarda/hifi into protocol
2015-07-14 14:11:41 -07:00
Stephen Birarda
0637f589b5
add PacketListener to help unregister for packets
2015-07-14 13:52:38 -07:00
Atlante45
7bf45308b6
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-14 12:31:37 -07:00
Ryan Huffman
0edc909818
Merge branch 'protocol' of github.com:birarda/hifi into receive_packets
...
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
interface/src/Application.cpp
libraries/networking/src/Packet.cpp
2015-07-14 10:21:31 -07:00
Stephen Birarda
821c16cbc4
resolve conflicts on merge with uptream/master
2015-07-14 09:52:20 -07:00
Andrew Meadows
7610fe48c2
filter action updates during simulation ownership
...
This fixes a bug where actions can be thrashed (created/deleted)
by late entity update echos from the entity-server.
2015-07-14 09:24:37 -07:00
Clément Brisset
24eb4c8263
Merge pull request #5309 from sethalves/quiet-compiler
...
quiet compiler
2015-07-13 15:55:35 -07:00
Atlante45
c80df94b06
Update includes for moved files
2015-07-13 15:28:55 -07:00
Stephen Birarda
d990420565
repairs to octree packet receiving in interface
2015-07-13 13:10:57 -07:00
Stephen Birarda
264f39fa59
resolve conflicts on merge with upstream/master
2015-07-13 11:25:24 -07:00
Seth Alves
5aca0c28ef
quiet compiler
2015-07-13 07:37:59 -07:00
Seth Alves
87152a4de2
Merge pull request #5302 from AndrewMeadows/astatine
...
cleanup of ObjectActionSpring and AvatarActionHold
2015-07-12 11:17:09 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
Andrew Meadows
9ce9c541de
fix activation of object when action changes
2015-07-10 18:45:40 -07:00
