Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 11:32:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25697 commits 75 branches 59 tags 1.2 GiB
Commit graph

25697 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
e5aa696dda syncInputStateCache 2015-05-22 17:39:08 +02:00
Atlante45
9561086d0d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into simple_program 2015-05-22 17:21:50 +02:00
Atlante45
f089143cf1 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-22 17:16:51 +02:00
Clément Brisset
e980859059 Simple Program uses gpu API 2015-05-22 16:14:32 +01: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
Atlante45
5d2187cedf Remove non batch call to bind/releaseSimpleProgram 2015-05-22 16:37:02 +02: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
Atlante45
314486ab88 Ignore scale in Transform when 0.0f 
Also cleaned up some coding standard
 2015-05-22 16:21:12 +02: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
Sam Gateau
bec8d1838c Adding th etask class 2015-05-21 17:12:01 -07:00
Brad Hefta-Gaub
3e6a28e534 Merge pull request #4932 from samcake/punk 
FIxing typos and refining naming again, getting ready to use a Payload
 2015-05-21 16:19:23 -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
Sam Gateau
a87d2927f1 FIxing typos and refining naming again, getting ready to use a Payload 2015-05-21 15:27:55 -07:00
Brad Hefta-Gaub
44dfa1dbec Merge pull request #4929 from samcake/punk 
TEAM TEACHING: Sam's scene rendering refinement
 2015-05-21 13:48:26 -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
Sam Gateau
f0daa3ebcb Refining the namings, creating the bucketing system, making a first example 2015-05-21 12:06:47 -07:00
Atlante45
6b9f9a32bb Merge branch 'yellow' of http://github.com/samcake/hifi into simple_program 2015-05-21 20:58:42 +02:00
Sam Gateau
a71df42ca4 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-21 10:52:40 -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
Sam Gateau
1881b51f66 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-05-21 10:00:19 -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
Sam Gateau
13a2c733d1 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-05-21 09:49:28 -07:00
Sam Gateau
8f9a1d1074 THursday morning commit before merging with teaching team 2015-05-21 09:45:48 -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