Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-26 05:49:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
67819 commits 74 branches 59 tags 1.2 GiB
Commit graph

767 commits

Author SHA1 Message Date
Andrew Meadows
c7c4324b3c Merge 'master' into 'workload' 2018-05-15 10:22:50 -07:00
Seth Alves
7466d08f1f more suppression of logging 2018-05-09 13:01:49 -07:00
samcake
33bbbcef83 Merging with master 2018-04-24 11:49:34 -07:00
samcake
f686ef1f25 Exposing more uniforms to ui for refining the controller 2018-04-23 18:02:09 -07:00
Sam Gateau
d3fccc4104
Merge pull request #12881 from SamGondelman/scaleAssert 
Minimum entity dimension (1mm)
 2018-04-23 13:40:53 -07:00
samcake
a6bd589f4f Merging upstream 2018-04-19 12:20:10 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp 
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
 2018-04-18 17:28:48 -07:00
SamGondelman
527d71c379 CR 2018-04-17 10:58:54 -07:00
SamGondelman
b71a06a18e min dim = 1 mm 2018-04-13 15:26:37 -07:00
SamGondelman
284364683d Merge remote-tracking branch 'upstream/master' into scaleAssert 2018-04-12 14:46:40 -07:00
SamGondelman
9f3a431c5d minimum entity dimension 2018-04-12 14:12:52 -07:00
samcake
e2f9eef5e2 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-12 12:27:27 -07:00
John Conklin II
e47dca77ec
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership 
entity-server will expire stale simulation ownership
 2018-04-12 12:04:52 -07:00
Sam Gateau
6a7ae55d9c Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-11 19:08:57 -07:00
Andrew Meadows
a0f3e3a031 add simulation ownership expiry 2018-04-11 09:40:32 -07:00
SamGondelman
8f65813924 fix asserts on domain switch 2018-04-09 17:10:49 -07:00
Andrew Meadows
299f2a92e0 merge 'master' into 'workload' 2018-04-05 12:01:19 -07:00
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category 
Original macros use default settings.
 2018-04-04 09:49:15 -07:00
Simon Walton
7d16ca9c1c Remove uses of addRepeatedMessageRegex() and its implementation 
Change to new log-message ID scheme.
 2018-04-03 17:54:01 -07:00
samcake
59a081bcdb merge with upstream 2018-03-30 18:08:38 -07:00
Andrew Meadows
4e0f307dc0 quint8 --> uint8_t 2018-03-30 13:18:32 -07:00
Andrew Meadows
e1d2a5e5f3 more cleanup for deleting entities 2018-03-30 13:18:32 -07:00
Seth Alves
98e9f1168a allow href to be set to a serverless domain 2018-03-16 10:50:03 -07:00
samcake
9bec8cdd0b Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master 2018-03-12 12:01:00 -07:00
Andrew Meadows
9fbe7ec194 time-box Picks and solve in round-robin sequence 2018-03-09 08:35:18 -08:00
samcake
a0db5c6135 Merge with master 2018-03-08 15:35:58 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
Andrew Meadows
e7495d830b maintain Space proxies for entities 2018-02-20 17:39:05 -08:00
Andrew Meadows
7ed68ced62 Merge master into highfidelity/workload 2018-02-20 12:31:37 -08:00
Nissim Hadar
b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/ShapeEntityItem.h
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2018-02-19 13:05:57 -08:00
Nissim Hadar
a69816f885 WIP. 2018-02-17 15:21:57 -08:00
Nissim Hadar
4c1f22f84e Models and Avatar cast shadows (box doesn't, yet). 2018-02-16 14:01:33 -08:00
Andrew Meadows
6d347cf44f revert deadlock, remove Space stubbery in EntityTree 2018-02-15 17:40:15 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
Andrew Meadows
f35469c0de give EntityTree a workload/Space instance 2018-02-15 12:57:58 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars, 
and albedo swap on shape entities
 2018-02-09 12:00:08 -08:00
Dante Ruiz
ab20643ada fix mistakes 2018-02-01 08:13:43 -08:00
Dante Ruiz
bd5fc65bfb fix getDirtyFlags & getSpecialFlags function 2018-01-31 16:19:14 -08:00
Dante Ruiz
f6029ed9dc made requested changes 2018-01-31 15:21:22 -08:00
Dante Ruiz
01f8227fa2 remove stray prints 2018-01-31 10:41:08 -08:00
Dante Ruiz
9ff6e079ee fix functions 2018-01-31 10:09:23 -08:00
Dante Ruiz
9c81909be5 restructures _dirtyFlags name and bits 2018-01-30 16:42:08 -08:00
Dante Ruiz
93594fb0bb make dynamic entities collide with avatar when removing grab action 2018-01-18 08:55:51 -08:00
Sam Gateau
6d6aad4aa8
Merge pull request #12060 from SamGondelman/burp5 
Reduce EntityItem access in EntityRenderer::needsRenderUpdateFromEntity
 2018-01-10 09:08:54 -08:00
SamGondelman
7c17603f3e Merge remote-tracking branch 'upstream/master' into burp5 2018-01-08 14:27:31 -08:00
Melissa Brown
2fddace71e
Merge pull request #12019 from Delanir/C10594 
Case 10594 - Fix entity property href not being able to reset (empty) ...
 2018-01-08 14:22:28 -08:00
Andrew Meadows
13538006ec fix bug preventing sim owenrship on local domain 2018-01-04 14:46:16 -08:00