Brad Hefta-Gaub
|
84f541285f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck
|
2016-05-25 15:01:15 -07:00 |
|
Seth Alves
|
cb40cfbead
|
Merge pull request #7972 from jherico/entity_shape_protocol_fix
Fix broken protocol for shapes
|
2016-05-25 14:13:15 -07:00 |
|
Brad Davis
|
b16e701ea3
|
Fix broken protocol for shapes
|
2016-05-25 13:53:28 -07:00 |
|
Seth Alves
|
36ce6491dd
|
Merge pull request #7969 from jherico/entity_shape_collision_fix
Fix primitive shape collisions
|
2016-05-25 11:39:18 -07:00 |
|
Brad Davis
|
8f3918b5ba
|
Fix primitive shape collisions
|
2016-05-25 11:21:05 -07:00 |
|
Brad Hefta-Gaub
|
ff45633c21
|
bump entities version/CR feedback
|
2016-05-24 17:36:52 -07:00 |
|
Brad Hefta-Gaub
|
fb9f6185db
|
CR feedback
|
2016-05-24 17:19:53 -07:00 |
|
Brad Hefta-Gaub
|
183f38e4f0
|
pop up warning if domain over capacity
|
2016-05-24 16:07:57 -07:00 |
|
Brad Hefta-Gaub
|
5668db9e4a
|
cleanup and dead code removal
|
2016-05-24 15:43:30 -07:00 |
|
Brad Hefta-Gaub
|
3b0081fbbb
|
cleanup and dead code removal
|
2016-05-24 15:42:55 -07:00 |
|
Brad Hefta-Gaub
|
0553ff5f9f
|
cleanup and dead code removal
|
2016-05-24 15:41:11 -07:00 |
|
Brad Hefta-Gaub
|
2eef07e414
|
cleanup and dead code removal
|
2016-05-24 15:38:08 -07:00 |
|
Brad Hefta-Gaub
|
12a1857280
|
check point with protocol refusal working
|
2016-05-24 15:20:11 -07:00 |
|
Brad Hefta-Gaub
|
1cf8236860
|
Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck
|
2016-05-24 13:31:36 -07:00 |
|
Brad Hefta-Gaub
|
1d9981e624
|
first cut at support for verifying all protocol version compatibility
|
2016-05-24 13:31:19 -07:00 |
|
Brad Hefta-Gaub
|
b8b39b962d
|
Merge pull request #7868 from jherico/entity_shape
Add a generic shape primitive
|
2016-05-24 08:40:58 -07:00 |
|
Brad Hefta-Gaub
|
49ded9c4df
|
Merge pull request #7873 from ctrlaltdavid/20917
restyle file browser
|
2016-05-24 08:40:38 -07:00 |
|
Brad Hefta-Gaub
|
f16a3ce6bb
|
Merge pull request #7962 from zzmp/fix/throttle
fix throttling when Interface is not in focus
|
2016-05-24 08:25:38 -07:00 |
|
Seth Alves
|
0bd6702fce
|
Merge pull request #7963 from ctrlaltdavid/flying-and-ghosting
tidy zone flying and ghosting entities editor options
|
2016-05-24 07:18:30 -07:00 |
|
David Rowe
|
3391430f0a
|
Tidy zone flying and ghosting entities editor options
Move options to top of section from under "skybox" subsection
Fix capitalization of labels
|
2016-05-24 20:28:49 +12:00 |
|
Brad Hefta-Gaub
|
bfb3f2cdfe
|
Merge pull request #7955 from sethalves/quiet-compiler
quiet gcc 5 warnings
|
2016-05-23 19:44:21 -07:00 |
|
Zach Pomerantz
|
7dabce9cff
|
Check throttle before idling/painting
|
2016-05-23 19:04:35 -07:00 |
|
David Rowe
|
504516b627
|
Merge branch 'master' into 20917
|
2016-05-24 08:03:54 +12:00 |
|
David Rowe
|
099a675a18
|
Remove extra logging
|
2016-05-24 08:03:29 +12:00 |
|
Clément Brisset
|
a8b359dd60
|
Merge pull request #7943 from birarda/api-recheck-on-fail
refresh connection info for place/domain while not connected
|
2016-05-23 10:57:58 -07:00 |
|
Brad Hefta-Gaub
|
f69c0ce5e5
|
Merge pull request #7957 from jherico/procedural_skybox_fix
fix broken procedural skybox when leaving and re-entering
|
2016-05-23 09:29:31 -07:00 |
|
Brad Hefta-Gaub
|
72dc24178f
|
Merge pull request #7958 from jherico/keystick_fix
fix keys getting stuck
|
2016-05-23 08:19:43 -07:00 |
|
Brad Davis
|
1f2f9da019
|
fix keys getting stuck
|
2016-05-22 23:34:45 -07:00 |
|
Brad Davis
|
11de8a52b2
|
fix broken procedural skybox when leaving and re-entering
|
2016-05-22 22:52:56 -07:00 |
|
Brad Davis
|
2c703e963c
|
More shapes
|
2016-05-22 19:48:59 -07:00 |
|
Brad Davis
|
cd1e910844
|
Add a generic shape primitive
|
2016-05-21 23:46:44 -07:00 |
|
Seth Alves
|
d7142aee80
|
try to make osx clang happy, also
|
2016-05-21 18:06:21 -07:00 |
|
Seth Alves
|
40e862cf9e
|
quiet gcc 5 warnings
|
2016-05-21 16:53:01 -07:00 |
|
Brad Davis
|
e07674134f
|
Merge pull request #7950 from ZappoMan/removeDisableEntityNACKS
remove old debug feature that is no longer needed.
|
2016-05-21 10:12:19 -07:00 |
|
Brad Hefta-Gaub
|
567f7f4b77
|
Merge pull request #7953 from ctrlaltdavid/20929
fix not being able to teleport to user when users window moved right
|
2016-05-21 09:25:07 -07:00 |
|
Brad Hefta-Gaub
|
ac49feda22
|
Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS
Conflicts:
libraries/entities/src/EntityEditPacketSender.h
|
2016-05-21 09:23:45 -07:00 |
|
Brad Hefta-Gaub
|
5b98b062f8
|
Merge pull request #7840 from sethalves/avatar-entities-3
Avatar entities
|
2016-05-21 07:57:11 -07:00 |
|
David Rowe
|
a294170c74
|
Fix not being able to teleport to user when users window moved right
|
2016-05-21 15:50:06 +12:00 |
|
Seth Alves
|
637735bbc3
|
unmangle merge
|
2016-05-20 18:07:38 -07:00 |
|
David Rowe
|
5a27d656c5
|
Potential OSX fix plus extra logging
|
2016-05-21 13:03:58 +12:00 |
|
Seth Alves
|
f91a2403be
|
merge from upstream
|
2016-05-20 17:07:34 -07:00 |
|
Brad Hefta-Gaub
|
e012630db2
|
Merge pull request #7860 from birarda/place-referrer
send lookup hostname to DS for split counts, correct number of DS connected users
|
2016-05-20 17:00:46 -07:00 |
|
Brad Hefta-Gaub
|
18613908df
|
Merge pull request #7800 from sethalves/no-fly-zones
No fly zones
|
2016-05-20 16:59:55 -07:00 |
|
Brad Hefta-Gaub
|
5906f88226
|
Merge pull request #7952 from sethalves/fix-walking-far-grab
fix distance-grabbing and walking at the same time
|
2016-05-20 16:54:52 -07:00 |
|
Brad Hefta-Gaub
|
dc29e97d32
|
Merge pull request #7870 from jherico/input_cleanup
Update input plugins default active state & joint handling
|
2016-05-20 16:13:06 -07:00 |
|
Seth Alves
|
a24d63a39c
|
make distance-grab work better when avatar is walking
|
2016-05-20 15:45:00 -07:00 |
|
Brad Hefta-Gaub
|
2062291810
|
Merge pull request #7926 from zzmp/fix/debug-script-crash
fix crash on shutdown in debug
|
2016-05-20 15:35:32 -07:00 |
|
Brad Hefta-Gaub
|
9dded91af3
|
Merge pull request #7934 from AndrewMeadows/trim-convex-hulls
reduce number of points in unreasonable convex hulls
|
2016-05-20 15:30:36 -07:00 |
|
Chris Collins
|
8dbc6af719
|
Merge pull request #7944 from Atlante45/fix/edit-js
fix edit.js to handle userData that's not in JSON
|
2016-05-20 15:14:13 -07:00 |
|
Brad Hefta-Gaub
|
2a94b641e3
|
Merge pull request #7930 from zzmp/fix/zero-copy-crash
fix crash from zero-sized copy
|
2016-05-20 15:11:00 -07:00 |
|