Stephen Birarda
|
626f22191c
|
add a QAbstractTableModel for domain connection steps
|
2015-05-26 14:17:02 -07:00 |
|
Stephen Birarda
|
f9251471da
|
add audio connection to final part of connection steps
|
2015-05-26 10:44:45 -07:00 |
|
Stephen Birarda
|
f28ade1075
|
log connection times for eventual stats display
|
2015-05-26 10:37:44 -07:00 |
|
Stephen Birarda
|
eda57ff5ef
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-dtls
|
2015-05-26 10:35:25 -07:00 |
|
samcake
|
ffca6a6502
|
Merge pull request #4935 from sethalves/sam-model-fixes
fixes Sam made in my branch while trying to get a mesh to render
|
2015-05-25 16:39:25 -07:00 |
|
Brad Hefta-Gaub
|
c141f41cee
|
Merge pull request #4960 from Atlante45/undef_ref
Fix entityProperties.html undefined ref
|
2015-05-24 12:41:11 -07:00 |
|
Atlante45
|
18812ab25f
|
Fix entityProperties.html undefined ref
|
2015-05-24 19:21:04 +02:00 |
|
Brad Hefta-Gaub
|
8c0bf19536
|
Merge pull request #4956 from Triplelexx/particle-entityProperties
expose particle properties for editing
|
2015-05-23 12:02:16 -07:00 |
|
Brad Hefta-Gaub
|
4ffe573d0d
|
Merge pull request #4957 from Atlante45/master
Fix incorrect scale constants
|
2015-05-23 11:47:43 -07:00 |
|
Atlante45
|
9e121aa387
|
Fix incorrect scale constants
|
2015-05-23 20:13:14 +02:00 |
|
Triplelexx
|
9a29489784
|
expose particle properties for editing
I have made these changes to aid with experimenting with particles when
running the edit scripts locally.
|
2015-05-23 17:57:25 +01:00 |
|
Brad Hefta-Gaub
|
225021671a
|
Merge pull request #4950 from ericrius1/particleScriptName
renamed ajt-test to particles.js since ajt-test doesn't tell us anyth…
|
2015-05-22 22:17:39 -07:00 |
|
Brad Hefta-Gaub
|
d7b2ca64cd
|
Merge pull request #4949 from sethalves/octree-send-thread-adjustments
entity-server sends initial planky more reliably
|
2015-05-22 22:17:17 -07:00 |
|
Stephen Birarda
|
27717db9d1
|
fire off DS check immediately once DS info is known
|
2015-05-22 16:38:26 -07:00 |
|
Stephen Birarda
|
69f1cd80e6
|
immediately send ICE heartbeat once data present
|
2015-05-22 16:29:01 -07:00 |
|
Eric Levin
|
71c0aa4913
|
renamed ajt-test to particles.js since ajt-test doesn't tell us anything about what the script does
|
2015-05-22 15:33:38 -07:00 |
|
Seth Alves
|
32cc0eacfc
|
improve a debug print
|
2015-05-22 15:21:26 -07:00 |
|
Seth Alves
|
53fe41ef4d
|
improve a debug print
|
2015-05-22 15:11:56 -07:00 |
|
Seth Alves
|
945a84d24f
|
adjust logic used by the entity-server to decide if the contents of an octree-element have already been sent to a particular interface with a particular frustum
|
2015-05-22 15:01:43 -07:00 |
|
Andrew Meadows
|
603528eede
|
Merge pull request #4945 from ctrlaltdavid/fix-float-warnings
Fix some double to float conversion warnings in Windows builds
|
2015-05-22 13:09:21 -07:00 |
|
David Rowe
|
a01830f8f8
|
Fix some double to float conversion warnings in Windows builds
|
2015-05-22 12:32:02 -07:00 |
|
Brad Hefta-Gaub
|
da8f99508c
|
Merge pull request #4871 from huffman/console-error
Add error handling to JSConsole
|
2015-05-22 10:57:18 -07:00 |
|
Brad Hefta-Gaub
|
0315bb5e28
|
Merge pull request #4942 from ericrius1/deleteLook
deleted look.js (no longer needed) and removed from default scripts
|
2015-05-22 10:55:37 -07:00 |
|
Brad Hefta-Gaub
|
7ed3a97bf2
|
Merge pull request #4939 from Atlante45/perf_timer_tweaks
Deactivate PerformanceTimer when not in use
|
2015-05-22 10:46:13 -07:00 |
|
Clément Brisset
|
e276926608
|
Add include/remove duplicate type
|
2015-05-22 18:23:42 +01:00 |
|
Eric Levin
|
d40d9cca69
|
deleted look.js (no longer needed) and removed from default scripts
|
2015-05-22 10:02:28 -07:00 |
|
Atlante45
|
c6ce5e7680
|
PerformanceTimer deactivated when not in use
|
2015-05-22 18:54:40 +02:00 |
|
Philip Rosedale
|
3a75dc4d1e
|
Merge pull request #4937 from ctrlaltdavid/dde-face-detection-interval
Throttle DDE face acquisition attempts in order to reduce CPU usage
|
2015-05-22 07:42:15 -07:00 |
|
Philip Rosedale
|
a1d0f4e3b8
|
Merge pull request #4936 from ericrius1/particleFix
fixed problem with particle entities not showing up on other clients …
|
2015-05-22 07:30:57 -07:00 |
|
David Rowe
|
a0c3c974a9
|
Throttle DDE face acquisition attempts in order to reduce CPU usage
|
2015-05-21 19:44:38 -07:00 |
|
Eric Levin
|
fe99941de3
|
fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp
|
2015-05-21 19:35:27 -07:00 |
|
Brad Hefta-Gaub
|
9b469226f3
|
Merge pull request #4934 from sethalves/fix-edit-js
fix edit.js -- selectionManager.selections holds ids, not properties
|
2015-05-21 18:32:05 -07:00 |
|
Seth Alves
|
258e3b901d
|
fixes Sam made in my branch while trying to get a mesh to render
|
2015-05-21 18:20:52 -07:00 |
|
Seth Alves
|
35b1a6eee4
|
selectionManager.selections holds ids, not properties
|
2015-05-21 18:15:05 -07:00 |
|
Philip Rosedale
|
05a73d8a79
|
Merge pull request #4933 from ericrius1/inspectFix
added oldMode as global vairable
|
2015-05-21 18:14:40 -07:00 |
|
Eric Levin
|
ce1ccf1c40
|
added oldMode as global vairable
|
2015-05-21 18:08:04 -07:00 |
|
Philip Rosedale
|
e0e1744d2e
|
Merge pull request #4931 from ericrius1/inspect
inspect now uses accurate picking and camera slerps to looks at targe…
|
2015-05-21 17:15:30 -07:00 |
|
Eric Levin
|
8a0c1cab1e
|
inspect now uses accurate picking and camera slerps to looks at target. pointer does not show u when user is inspecting
|
2015-05-21 15:31:30 -07:00 |
|
Stephen Birarda
|
986eea7c86
|
Merge pull request #4930 from birarda/domain-wizard
fix for domain-server settings account disconnect
|
2015-05-21 16:46:10 -04:00 |
|
Stephen Birarda
|
33545a0c3f
|
fix for domain-server settings account disconnect
|
2015-05-21 13:45:50 -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 |
|
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
|
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 |
|
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 |
|
Stephen Birarda
|
427e2e7dbf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-toggle
|
2015-05-20 18:00:40 -07:00 |
|