Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 19:14:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
25570 commits 71 branches 56 tags 1.2 GiB
Commit graph

25570 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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