Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-27 07:45:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25628 commits 29 branches 28 tags 1.2 GiB
Commit graph

8972 commits

Author SHA1 Message Date
samcake
c6b20da8b5 fix typos 2015-05-22 13:12:03 -07:00
Sam Gateau
e7e3eb2b7c FIrst version of the design for the Engine, the Tasks and a DrawTask. Introduced the ItemFilter 2015-05-22 12:58:18 -07:00
Sam Gateau
bec8d1838c Adding th etask class 2015-05-21 17:12:01 -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
Sam Gateau
f0daa3ebcb Refining the namings, creating the bucketing system, making a first example 2015-05-21 12:06:47 -07:00
Sam Gateau
a71df42ca4 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-21 10:52:40 -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
Sam Gateau
1881b51f66 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-05-21 10:00:19 -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
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
ZappoMan
ce81d9a817 fix merge issue 2015-05-20 19:30:44 -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
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
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
aa1d3eb82a respond to code review 2015-05-20 17:31:57 -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
6306b69ec8 add a version and handle remapping for restricted access 2015-05-20 16:27:53 -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
Seth Alves
4a59dc24c5 split entity-add and entity-edit messages 2015-05-20 14:52:03 -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
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99 sort out script interface changes 2015-05-20 12:30:06 -07:00
Howard Stearns
c5b8dd51d8 Fix https://app.asana.com/0/32622044445063/34195351184789 
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
 2015-05-20 11:07:03 -07:00
Seth Alves
a769cfdaf2 client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
Brad Davis
827d7f6221 Merge branch 'master' into dk1 2015-05-20 09:41:20 -07:00
Ryan Huffman
6f69ed2561 Fix calculated dimensions of spotlight 
The spotlights region of effect is the intersection of the spotlight
with radius r, and the sphere of radius r
 2015-05-20 09:11:48 -07:00
Ryan Huffman
bb38b3eb3f Update default light cutoff to PI / 2 2015-05-20 09:11:21 -07:00
Atlante45
9c9aee667a Header cleanup 2015-05-20 17:17:03 +02:00
Atlante45
ee4b28b6b9 Other TextRenderer memory leak 2015-05-20 16:56:04 +02:00
Atlante45
9a007ab135 Remove unused method 2015-05-20 16:50:31 +02:00
Atlante45
ee264368c0 Add renderQuad to DeferredLighting 2015-05-20 16:45:21 +02:00
Atlante45
e5d0851337 Remove unnecessary glPush/Pop 2015-05-20 16:29:43 +02:00
Seth Alves
b32e069f1d bump protocol version 2015-05-19 14:45:01 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Atlante45
eef87412fd Particles render in Batch 2015-05-19 15:54:19 +02:00
Atlante45
229f88617d Header cleanup 2015-05-19 15:19:02 +02:00
Howard Stearns
bb4df26690 Fix indentation. 2015-05-18 14:25:35 -07:00
Howard Stearns
95be605233 Typo: unlock=>lock in rednerDebugMeshBoxes. 2015-05-18 14:05:13 -07:00
Howard Stearns
7e1b6a48c5 Merge branch 'master' of https://github.com/highfidelity/hifi into grab-picking-crash 2015-05-18 13:35:28 -07:00