Andrew Meadows
|
dcca5d532a
|
fix for glitchy physics updates
The main problem was: ObjectMotionState::_sentPosition and friends
were not being updated when the EntityServer update arrives.
|
2015-01-13 14:00:37 -08:00 |
|
Andrew Meadows
|
7a2ecd27fd
|
fix typo
|
2015-01-12 14:32:32 -08:00 |
|
Andrew Meadows
|
081037bc5f
|
merge upstream/master into andrew/inertia
|
2015-01-12 12:34:50 -08:00 |
|
Andrew Meadows
|
bece05a994
|
entity prop defaults move to their own header
|
2015-01-12 11:49:31 -08:00 |
|
Andrew Meadows
|
89a782c55a
|
remove functional code from inside assert
|
2015-01-11 13:31:37 -08:00 |
|
ZappoMan
|
60f55c7f3f
|
remove important code from assert so it still runs in release build
|
2015-01-11 12:07:16 -08:00 |
|
Andrew Meadows
|
5309fb6a43
|
remove lock at EntityTreeRenderer::loadEntityScript
|
2015-01-11 10:44:36 -08:00 |
|
Andrew Meadows
|
e711b86519
|
scale DEFAULT_DIMENSIONS correctly
also remove a block of commented out cruft
|
2015-01-10 19:07:58 -08:00 |
|
Andrew Meadows
|
1184f5b668
|
merge upstream/master into andrew/inertia
|
2015-01-10 12:45:14 -08:00 |
|
Andrew Meadows
|
25e64d619c
|
move statics out of EntityItem
This makes for much more readable core dumps
|
2015-01-10 11:46:42 -08:00 |
|
Andrew Meadows
|
ecd352fd4d
|
merge upstream/master into andrew/bispinor
|
2015-01-10 07:47:52 -08:00 |
|
Andrew Meadows
|
99e1fdd46e
|
fix for EntityServer crash
adding EntityItem::_element backpointer for easier add/remove logic
|
2015-01-10 07:44:26 -08:00 |
|
Brad Hefta-Gaub
|
f18594cfdb
|
Merge pull request #4076 from Atlante45/master
Don't call delete later unless you have to
|
2015-01-09 15:43:45 -08:00 |
|
Atlante45
|
6d67b8e20c
|
Don't call delete later unless you have to
|
2015-01-09 15:32:08 -08:00 |
|
Atlante45
|
063e95bd79
|
Clement doesn't know how to use radians
|
2015-01-09 14:31:34 -08:00 |
|
Atlante45
|
02b9aaacf8
|
Bump packet version
|
2015-01-09 11:16:58 -08:00 |
|
Atlante45
|
f2b7cb005a
|
Removed leans/Changed Head rotation in avatardata packets
|
2015-01-09 11:16:49 -08:00 |
|
Atlante45
|
16e1fc8c3a
|
Added isMyAvatar to AvatarData too
|
2015-01-09 11:16:05 -08:00 |
|
Atlante45
|
05d2887c94
|
Move Torso twist to HeadData with Lean
|
2015-01-09 11:15:01 -08:00 |
|
Andrew Meadows
|
4946ec18b6
|
remove some TODO comments
|
2015-01-09 09:28:01 -08:00 |
|
Philip Rosedale
|
336378679f
|
Merge pull request #4068 from ctrlaltdavid/type-definitions
Fix miscellaneous types and casts
|
2015-01-09 08:40:08 -08:00 |
|
Philip Rosedale
|
285e588266
|
Merge pull request #4072 from Atlante45/network_replies_cleanup
Windows crash fix
|
2015-01-09 07:42:36 -08:00 |
|
Atlante45
|
441a1e4fee
|
Turns out windows doesn't like constexpr
|
2015-01-08 18:35:23 -08:00 |
|
Atlante45
|
891d8d5abf
|
Removed unecessary foreach
|
2015-01-08 18:22:25 -08:00 |
|
David Rowe
|
a5b3ae397a
|
Code review
|
2015-01-08 18:20:23 -08:00 |
|
Atlante45
|
ea832cfd45
|
Added constant
|
2015-01-08 17:33:47 -08:00 |
|
Atlante45
|
77e4a2ef35
|
Add byte limit to chaches
|
2015-01-08 17:06:05 -08:00 |
|
Atlante45
|
1c4903c346
|
Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix
|
2015-01-08 16:33:01 -08:00 |
|
David Rowe
|
07b30da2ac
|
Fix miscellaneous types and casts
|
2015-01-08 13:44:51 -08:00 |
|
Atlante45
|
8dbaeeb646
|
Delete each entityItems
|
2015-01-08 13:08:43 -08:00 |
|
Andrew Meadows
|
f8c512b690
|
fix deleteEntity() to actually delete result
|
2015-01-08 12:42:16 -08:00 |
|
Atlante45
|
e73f8baf93
|
Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix
|
2015-01-08 11:54:54 -08:00 |
|
Atlante45
|
6fc3e1cf81
|
change message size
|
2015-01-08 11:51:14 -08:00 |
|
Atlante45
|
af9525ed33
|
Bump AvatarData packet number
|
2015-01-08 11:49:39 -08:00 |
|
Atlante45
|
0bae05b924
|
Remove chat message
|
2015-01-08 11:25:53 -08:00 |
|
Atlante45
|
b8a3bdb6bd
|
Cleanup headers
|
2015-01-08 11:25:35 -08:00 |
|
Andrew Meadows
|
b0b2eb5d38
|
use exact equality for filtering dimension changes
|
2015-01-08 11:09:32 -08:00 |
|
Andrew Meadows
|
1d371a9627
|
merge upstream/master into andrew/inertia
|
2015-01-08 10:24:05 -08:00 |
|
Andrew Meadows
|
c37c1515ba
|
EntitySimulation is lockable
also DeleteEntityOperator just removes the entities
and EntityTree does the actual delete
(after properly locking its _simulation)
|
2015-01-08 10:22:25 -08:00 |
|
Andrew Meadows
|
d2bd95703a
|
use degrees/sec for EntityItem angular velocity
|
2015-01-07 14:04:22 -08:00 |
|
Andrew Meadows
|
af9bafae87
|
fix typo
|
2015-01-07 12:48:16 -08:00 |
|
Andrew Meadows
|
1745548665
|
fix rapid attenuation of angular velocity
|
2015-01-07 12:42:50 -08:00 |
|
ZappoMan
|
e0338dd787
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
|
2015-01-06 16:42:25 -08:00 |
|
Clément Brisset
|
fb6fb8a38d
|
Merge pull request #4050 from birarda/lasagna-not-spaghetti
put back current address storage in Menu
|
2015-01-06 16:29:52 -08:00 |
|
Stephen Birarda
|
9c191be106
|
use the AddressManager's method to store current address
|
2015-01-06 16:13:06 -08:00 |
|
ZappoMan
|
1bc91e7d29
|
removed renderTriangleProxies
|
2015-01-06 16:01:06 -08:00 |
|
ZappoMan
|
1bfce7d876
|
more removal of immediate mode
|
2015-01-06 14:14:13 -08:00 |
|
ZappoMan
|
873403a333
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
interface/src/Audio.cpp
interface/src/Audio.h
interface/src/Menu.cpp
interface/src/Menu.h
|
2015-01-06 12:27:16 -08:00 |
|
Philip Rosedale
|
413cbacbc1
|
Merge pull request #4043 from ZappoMan/voxelEctomy
more voxel-ectomy cleaning up some remaining references to voxels
|
2015-01-06 10:07:38 -08:00 |
|
ZappoMan
|
ac1f7c9a84
|
multi-mode renderVertices
|
2015-01-06 09:52:27 -08:00 |
|