Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-03 03:09:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25619 commits 74 branches 59 tags 1.2 GiB
Commit graph

25619 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
6fd474a1a3 Fix comment 2015-05-22 09:56:21 -07:00
Ryan Huffman
4a4c9c75fc Add gpu::context to RenderArgs and start using RenderArgs in place of the flags 2015-05-22 09:50:51 -07:00
Brad Hefta-Gaub
ebda2581a1 Merge pull request #4927 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING: Merge with master
 2015-05-21 10:51:25 -07:00
ZappoMan
c7fb8fab85 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-21 10:36:22 -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
Clément Brisset
d19f701f35 Merge pull request #4925 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING: Sam's new scene API
 2015-05-21 18:38:28 +02:00
ZappoMan
43fe147b5f Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-21 09:34:13 -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
Clément Brisset
8a51da9c09 Merge pull request #4924 from ZappoMan/team-teaching 
TEAM TEACHING: update team-teaching from master
 2015-05-21 14:26:29 +02: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
ZappoMan
ce81d9a817 fix merge issue 2015-05-20 19:30:44 -07:00
ZappoMan
946878006d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-05-20 18:46:32 -07:00
ZappoMan
e1c5c5b12e Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-20 18:42:54 -07:00
Brad Hefta-Gaub
89e42826bd Merge pull request #4904 from Atlante45/remove_gl_transform 
TEAM TEACHING - Primitive entities render in batch
 2015-05-20 18:39:23 -07:00
ZappoMan
8b95b538e6 Merge branch 'render' of https://github.com/samcake/hifi into team-teaching-scene-api 2015-05-20 18:34:53 -07:00
ZappoMan
5b27bac72d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-05-20 18:31:50 -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
samcake
22c99d02b9 FIxing the Render::Item compilation on mac 2015-05-20 18:07:17 -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
Sam Gateau
1a59f4a97c fix typo 2015-05-20 17:08:19 -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
Sam Gateau
3893dff94f Renaming the PendingChanges 2015-05-20 16:59:10 -07:00
Sam Gateau
2ed7aae8d5 merging and updating 2015-05-20 16:50:43 -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