Seth Alves
72e227eefe
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-21 09:55:14 -07:00
Seth Alves
d7ccd23b07
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-20 18:08:29 -07:00
Seth Alves
aa1d3eb82a
respond to code review
2015-05-20 17:31:57 -07:00
Seth Alves
782402b4c8
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-20 14:53:05 -07:00
Seth Alves
4a59dc24c5
split entity-add and entity-edit messages
2015-05-20 14:52:03 -07:00
Seth Alves
124ff68cee
make EntityItemID a subclass of QUuid
2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99
sort out script interface changes
2015-05-20 12:30:06 -07:00
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -07:00
Ryan Huffman
6f69ed2561
Fix calculated dimensions of spotlight
...
The spotlights region of effect is the intersection of the spotlight
with radius r, and the sphere of radius r
2015-05-20 09:11:48 -07:00
Ryan Huffman
bb38b3eb3f
Update default light cutoff to PI / 2
2015-05-20 09:11:21 -07:00
Seth Alves
f2c1c43da3
polyvox code runs, no rendering yet
2015-05-20 08:44:41 -07:00
Seth Alves
4b263cf5c8
derieve PolyVox Entity from Model Entity
2015-05-19 21:40:05 -07:00
Seth Alves
4166c3224f
link polyvox library in with entities
2015-05-19 16:24:13 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Andrew Meadows
180590145d
check for NULL before using pointer to EntityItem
2015-05-16 11:12:19 -07:00
Seth Alves
bb3d1a6a58
rays never pick a line entity. some fixes to pointer.js
2015-05-15 13:10:16 -07:00
Andrew Meadows
53e241fb07
merge upstream/master into andrew/thermonuclear
2015-05-14 12:37:41 -07:00
Andrew Meadows
d28c400cea
add restitution and friction Entity properties
2015-05-14 12:36:59 -07:00
Andrew Meadows
81d06e0dc3
Merge upstream/master into andrew/nova
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItemProperties.cpp
2015-05-14 10:09:55 -07:00
ZappoMan
0dcb89fce7
Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItemProperties.cpp
2015-05-13 20:33:10 -07:00
Brad Hefta-Gaub
5da0a8d7a3
Merge pull request #4860 from howard-stearns/entity-sound
...
Entity sound.
2015-05-13 20:07:44 -07:00
ZappoMan
045c0141e8
Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
...
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
2015-05-13 17:09:21 -07:00
Howard Stearns
dc2e923583
Ordering for packets.
2015-05-13 15:51:11 -07:00
Howard Stearns
1a87ca04da
Entity sound.
2015-05-13 13:18:02 -07:00
ZappoMan
b4f15304ba
standardize COPY_PROPERTY_FROM_QSCRIPTVALUE for vec3, quat, and color
2015-05-13 13:12:47 -07:00
ZappoMan
4fecd33115
use new macros in Line entity
2015-05-13 12:38:11 -07:00
ZappoMan
095b7701d8
Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
2015-05-13 12:12:12 -07:00
ZappoMan
f28ca90ac5
clean up COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE to be type safe
2015-05-13 09:38:49 -07:00
Brad Davis
a8d343bbf1
Working on web entities
2015-05-13 00:27:57 -07:00
Andrew Meadows
7e9e223b3e
merge upstream/master into andrew/nova
2015-05-12 21:48:55 -07:00
Andrew Meadows
4872a565c9
bid for simulation ownership
2015-05-12 21:46:52 -07:00
Andrew Meadows
45d4fa91ab
add a TODO comment
2015-05-12 21:46:04 -07:00
Andrew Meadows
2165d18c05
don't copy simulatorID from script value
2015-05-12 21:45:36 -07:00
Brad Davis
e9b83e1c02
Working on web entities
2015-05-12 21:15:54 -07:00
ZappoMan
8d731b15ee
some warning fixes
2015-05-12 17:21:59 -07:00
ZappoMan
8169d82141
consolidate COPY_PROPERTY_TO_QSCRIPTVALUE and COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE to be type safe
2015-05-12 17:13:20 -07:00
ZappoMan
67df6e3c62
make READ_ENTITY_PROPERTY_TO_PROPERTIES() type safe
2015-05-12 16:24:16 -07:00
ZappoMan
98474376de
consolidate READ_ENTITY_PROPERTY() macros into single typesafe version
2015-05-12 15:59:45 -07:00
Brad Davis
8c4f802dbf
Merge remote-tracking branch 'upstream/master' into web-entity
...
Conflicts:
libraries/entities/src/EntityItemProperties.h
libraries/entities/src/EntityTypes.h
2015-05-12 15:56:02 -07:00
Brad Davis
745182a963
Working on web entities
2015-05-12 14:39:54 -07:00
ZappoMan
83d212861d
make APPEND_ENTITY_PROPERTY type safe
2015-05-12 11:41:04 -07:00
Seth Alves
f647db3bf0
Merge branch 'master' of github.com:highfidelity/hifi into line-entity
2015-05-12 11:36:56 -07:00
ZappoMan
c81f6dc69c
fix particle properties
2015-05-12 11:03:16 -07:00
Seth Alves
38caed00ca
Attempt to draw line entity item
2015-05-12 10:25:50 -07:00
Brad Hefta-Gaub
cbaa503934
Merge pull request #4838 from Atlante45/quiet_compiler
...
Quiet compiler
2015-05-12 08:57:57 -07:00
Brad Hefta-Gaub
4d9e413b3f
Merge pull request #4820 from hyperlogic/ajt/particle-system-improvements
...
Improvements to particle entity.
2015-05-12 08:40:11 -07:00
Atlante45
00864afe53
Quiet compiler
2015-05-12 17:06:40 +02:00
Seth Alves
4881b0c53c
copy box to make a new type of line entity item
2015-05-11 19:25:14 -07:00
Anthony Thibault
e1cbfcd901
Merge branch 'master' into ajt/particle-system-improvements
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-05-11 19:24:13 -07:00
Anthony Thibault
b3af515224
Particle entity improvements based on code review.
...
* Updated variable naming to match coding standards.
* Changed particle raw float arrays to vectors.
* Bug fix: changing maxParticles will no longer lead to memory corruption.
* Made particle ring buffer more explicit, added _particleTailIndex.
* Added getLivingParticleCount() private method.
* Moved integration and bounds code into private methods.
* Bug fix: high emit rates now properly integrate particles forward for the
remaing frame time, not the entire frame.
* Bug fix: new particles were not initiaized to origin.
* Added more particles to ajt-test.js.
* Bug fix: ajt-test.js script was not shutting down properly.
* Removed random seed, unless we have a psudo random number generator per
particle system instance, it's unlikely that this will preserve sync.
* Bumped packet version number.
2015-05-11 19:21:33 -07:00
