Seth Alves
|
bd94d28075
|
Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox
|
2015-05-21 11:55:17 -07:00 |
|
Seth Alves
|
8e76887101
|
working on windows build of polyvox
|
2015-05-21 11:55:13 -07:00 |
|
Seth Alves
|
b74262f2ce
|
update polyvox
|
2015-05-21 11:53:56 -07:00 |
|
Seth Alves
|
c02b87ad1c
|
update polyvox
|
2015-05-21 11:09:44 -07:00 |
|
Seth Alves
|
b922976524
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-05-21 10:43:03 -07:00 |
|
Seth Alves
|
fe188f9a43
|
something draws, now
|
2015-05-21 10:42:14 -07:00 |
|
Stephen Birarda
|
f4f4be7917
|
Merge pull request #4926 from birarda/domain-toggle
reload the DS merged config after making version required changes
|
2015-05-21 13:27:51 -04:00 |
|
Stephen Birarda
|
5d9f62066a
|
reload the merged config after making versioned changes
|
2015-05-21 10:27:24 -07:00 |
|
Seth Alves
|
72e227eefe
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-05-21 09:55:14 -07:00 |
|
Brad Hefta-Gaub
|
a503deb3ca
|
Merge pull request #4920 from sethalves/no-id-swap-redux
No id swap redux
|
2015-05-21 09:51:11 -07:00 |
|
Seth Alves
|
52ce26d80d
|
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
|
2015-05-21 09:20:56 -07:00 |
|
Philip Rosedale
|
1b0ef406ed
|
Merge pull request #4921 from birarda/domain-toggle
add a global toggle for restricted users
|
2015-05-20 21:27:10 -07:00 |
|
Seth Alves
|
de6422683a
|
cleanups, trying to figure out why this doesn't draw
|
2015-05-20 21:21:39 -07:00 |
|
Seth Alves
|
7ee2ff6777
|
Merge pull request #4922 from birarda/ac-ice-connect
handle AC started before local assignment server
|
2015-05-20 19:40:24 -07:00 |
|
Seth Alves
|
38edc27cbb
|
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
|
2015-05-20 18:24:40 -07:00 |
|
Seth Alves
|
c3b26b78a0
|
Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox
|
2015-05-20 18:22:16 -07:00 |
|
Seth Alves
|
138077ede9
|
hook up mesh renderer
|
2015-05-20 18:22:07 -07:00 |
|
Seth Alves
|
a69518801f
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-05-20 18:21:04 -07:00 |
|
Brad Hefta-Gaub
|
3edf2af5ec
|
Merge pull request #4923 from jherico/matrix_assert
Fix assert caused by calling glm::perspective with nonsensical values
|
2015-05-20 18:20:28 -07:00 |
|
Brad Davis
|
079a7f2600
|
Fix assert caused by calling glm::perspective with nonsensical values
|
2015-05-20 18:11:14 -07:00 |
|
Seth Alves
|
d7ccd23b07
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-05-20 18:08:29 -07:00 |
|
Stephen Birarda
|
427e2e7dbf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-toggle
|
2015-05-20 18:00:40 -07:00 |
|
Stephen Birarda
|
b6f458eaf1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ac-ice-connect
|
2015-05-20 17:59:40 -07:00 |
|
Seth Alves
|
a935b923c8
|
Merge pull request #4919 from birarda/master
repairs to domain-server settings for hashes
|
2015-05-20 17:59:12 -07:00 |
|
Seth Alves
|
aa1d3eb82a
|
respond to code review
|
2015-05-20 17:31:57 -07:00 |
|
Stephen Birarda
|
45daabc86f
|
remove unused AssignmentClient shared mem var
|
2015-05-20 17:14:27 -07:00 |
|
Stephen Birarda
|
bea387af7d
|
extra debug for failed local AS port read
|
2015-05-20 17:13:18 -07:00 |
|
Stephen Birarda
|
7373bb6817
|
contain QSharedMemory for local server port to reader
|
2015-05-20 17:11:08 -07:00 |
|
samcake
|
496898273c
|
Merge pull request #4846 from jherico/dk1
Second attempt at fixing the HMD eye projections, without breaking the camera this time.
|
2015-05-20 17:02:28 -07:00 |
|
Stephen Birarda
|
27db69207d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ac-ice-connect
|
2015-05-20 16:50:15 -07:00 |
|
Stephen Birarda
|
4475ca4643
|
use new restricting access toggle for DS connection
|
2015-05-20 16:47:10 -07:00 |
|
Stephen Birarda
|
6306b69ec8
|
add a version and handle remapping for restricted access
|
2015-05-20 16:27:53 -07:00 |
|
Seth Alves
|
d8beed34d6
|
remove // ? comments
|
2015-05-20 16:27:28 -07:00 |
|
Stephen Birarda
|
ac954e1c43
|
fix for lowercase help text in settings
|
2015-05-20 15:00:11 -07:00 |
|
Stephen Birarda
|
19b669867e
|
cleanup entity checkboxes for new format
|
2015-05-20 14:58:09 -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 |
|
Stephen Birarda
|
e295f52c0a
|
handle change event for new checkboxes
|
2015-05-20 14:52:31 -07:00 |
|
Seth Alves
|
4a59dc24c5
|
split entity-add and entity-edit messages
|
2015-05-20 14:52:03 -07:00 |
|
Brad Hefta-Gaub
|
6955626b77
|
Merge pull request #4900 from ericrius1/hockey
added check to airhockey script so entities that have never been crea…
|
2015-05-20 14:50:00 -07:00 |
|
Brad Hefta-Gaub
|
6d20fa72db
|
Merge pull request #4899 from Nex-Pro/plankyUpdate
Planky Game. Added values for friction and restitution in the entity parameters.
|
2015-05-20 14:49:39 -07:00 |
|
Brad Hefta-Gaub
|
75f6092023
|
Merge pull request #4902 from Atlante45/fix_source_url
Fix sourceUrl box in edit.js
|
2015-05-20 14:49:15 -07:00 |
|
Brad Hefta-Gaub
|
79023763ef
|
Merge pull request #4869 from ctrlaltdavid/20543
CR for #20543 - Option to auto-mute mic if step away from PC when face tracking is enabled
|
2015-05-20 14:47:31 -07:00 |
|
Brad Hefta-Gaub
|
39ab2f43bf
|
Merge pull request #4885 from Atlante45/warings
Quiet warnings
|
2015-05-20 14:45:55 -07:00 |
|
Brad Hefta-Gaub
|
07366ca173
|
Merge pull request #4917 from huffman/fix-spotlight-size
Fix spotlight dimensions
|
2015-05-20 14:45:23 -07:00 |
|
Stephen Birarda
|
ab52df7254
|
change checkboxes to prettier bootstrap switches
|
2015-05-20 14:30:50 -07:00 |
|
Seth Alves
|
124ff68cee
|
make EntityItemID a subclass of QUuid
|
2015-05-20 14:22:08 -07:00 |
|
Philip Rosedale
|
f843acb673
|
Merge pull request #4918 from howard-stearns/anti-collision-deadlock
Fix collision deadlock
|
2015-05-20 13:56:39 -07:00 |
|
Seth Alves
|
f522334c99
|
sort out script interface changes
|
2015-05-20 12:30:06 -07:00 |
|
Stephen Birarda
|
227bdff07a
|
fix width of re-order column
|
2015-05-20 11:31:32 -07:00 |
|
Stephen Birarda
|
8fb5c53142
|
handle initial values for hash tables
|
2015-05-20 11:21:19 -07:00 |
|