Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-17 00:19:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26373 commits 25 branches 0 tags 1.1 GiB
Commit graph

2009 commits

Author SHA1 Message Date
Andrew Meadows
67f5d0773d some list management of AvatarMotionStates 2015-05-21 14:40:47 -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
Seth Alves
72e227eefe Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-21 09:55:14 -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
Stephen Birarda
6306b69ec8 add a version and handle remapping for restricted access 2015-05-20 16:27:53 -07:00
Seth Alves
4b263cf5c8 derieve PolyVox Entity from Model Entity 2015-05-19 21:40:05 -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
4725d5e676 Merge branch 'primitives_batch' into remove_gl_transform 2015-05-16 05:22:12 +02:00
Atlante45
7185589407 Add optional Batch to RenderArgs 2015-05-16 04:42:15 +02:00
Atlante45
92d4b08c38 Init _transform with correct values 2015-05-15 17:52:06 +02:00
Seth Alves
baf4157da0 Merge pull request #4859 from ZappoMan/typeSafePropertyCleanup 
Clean up Entity Properties and Macros to be more type-safe friendly and consistent
 2015-05-13 20:52:03 -07:00
Brad Hefta-Gaub
77019eafa7 Merge pull request #4831 from jherico/plugins_pt2 
Display plugins part 2
 2015-05-13 20:40:33 -07:00
ZappoMan
095b7701d8 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup 2015-05-13 12:12:12 -07:00
Philip Rosedale
349886c146 Merge pull request #4847 from birarda/domain-paths 
add initial support for local paths in domain
 2015-05-12 17:09:13 -07:00
ZappoMan
67df6e3c62 make READ_ENTITY_PROPERTY_TO_PROPERTIES() type safe 2015-05-12 16:24:16 -07:00
Stephen Birarda
0562fee82a Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths 2015-05-12 12:39:05 -07:00
Stephen Birarda
c66bd9b1aa complete addition of paths to DS settings 2015-05-12 11:58:55 -07:00
Seth Alves
f647db3bf0 Merge branch 'master' of github.com:highfidelity/hifi into line-entity 2015-05-12 11:36:56 -07:00
Clément Brisset
9bf4cf1262 Merge pull request #4830 from ZappoMan/moreZoneProperties 
New Zone Features
 2015-05-12 14:28:01 +02:00
Seth Alves
4881b0c53c copy box to make a new type of line entity item 2015-05-11 19:25:14 -07:00
ZappoMan
73428ec12d add support to not displace very large clipboards on import 2015-05-11 14:21:58 -07:00
Brad Davis
332d2091e5 Fixing license 2015-05-11 13:22:43 -07:00
Brad Davis
abab54aed8 Working on display plugins 2015-05-11 13:08:53 -07:00
Stephen Birarda
8c6715e4fc resolve conflicts on merge with upstream/master 2015-05-11 11:10:22 -07:00
Stephen Birarda
ebeba81233 make sure an ACM asks for PID in log 2015-05-08 17:37:48 -07:00
Stephen Birarda
acac2f5a22 don't init if Settings not init 2015-05-08 16:51:27 -07:00
Stephen Birarda
ddb52348bc don't force use of Settings to all QCoreApplication 2015-05-08 16:24:39 -07:00
Brad Hefta-Gaub
bfb2b278ee Merge pull request #4791 from jherico/scale 
Fixing scale resolution issues
 2015-05-08 15:54:24 -07:00
Stephen Birarda
78942b0a87 let QSettings destructor call Setting::Manager sync 2015-05-08 15:49:28 -07:00
Bradley Austin Davis
0751443a01 Merge branch 'master' into scale 2015-05-08 15:03:24 -07:00
Stephen Birarda
0a295bada1 add debugging to catch AC kill hang 2015-05-08 14:32:16 -07:00
Stephen Birarda
3d06a86670 drop packets on floor when shutting down 2015-05-08 11:57:25 -07:00
Bradley Austin Davis
c31d36be59 Fixing scale resolution issues 2015-05-07 12:01:56 -07:00
Seth Alves
d52a45b57e Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-07 11:30:46 -07:00
Atlante45
faabf29e84 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 19:58:26 +02:00
Atlante45
00571dad00 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 10:13:59 +02:00
ZappoMan
496da6fcd5 wire up the skybox color property to the new skybox renderer 2015-05-06 20:36:06 -07:00
Seth Alves
fe06ce2931 pull from upstream 2015-05-06 14:31:22 -07:00
Bradley Austin Davis
fc73676b4d Merge branch 'master' into plugins_pt1 2015-05-06 11:43:25 -07:00
Andrew Meadows
aa5a59c3dc merge upstream/master into andrew/nova 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/PhysicsEngine.cpp
 2015-05-05 10:24:17 -07:00
Atlante45
6fdb594dfd Forgot member initialisation 2015-05-05 16:40:16 +02:00
Atlante45
aa10dc3991 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-05 15:04:11 +02:00
Andrew Meadows
96acf96b76 entity-entity collision events emit signals again 2015-05-04 13:32:57 -07:00
Stephen Birarda
87e586dfe6 remove a stray space 2015-05-04 10:42:58 -07:00
Atlante45
12fcb35717 Made RenderArgs a default ctor 2015-05-04 17:22:46 +02:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
Stephen Birarda
475861c4be move KILO_PER_MEGA to numerical constants 2015-05-01 16:30:25 -07:00
Stephen Birarda
edade7baba resolve conflicts on merge with upstream master 2015-05-01 16:24:16 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Seth Alves
f75b599288 don't save default values in json file 2015-04-30 11:28:27 -07:00
Stephen Birarda
85919972e3 resolve conflicts on merge with upstream/master 2015-04-29 10:45:25 -07:00
Stephen Birarda
1995fa6a5e fix return value comment in SimpleMovingAverage 2015-04-28 18:28:12 -07:00
Stephen Birarda
c52426385d code review comments for #4713 2015-04-28 18:28:05 -07:00
Stephen Birarda
f2dcacffd0 show avatar data receive rate by default with display name 2015-04-28 18:27:42 -07:00
Stephen Birarda
4e6979cac8 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-mixer-throttling 2015-04-28 16:50:07 -07:00
Stephen Birarda
b917afa3cc show avatar data receive rate by default with display name 2015-04-28 09:47:19 -07:00
Brad Davis
897e47e8e6 Removing debug hack to load resources from source folder 2015-04-27 23:17:56 -07:00
Seth Alves
bdc6bb3c2d Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-27 12:20:58 -07:00
Brad Davis
a12bfd95f4 Merge remote-tracking branch 'upstream/master' into ui-refactor 
Conflicts:
	libraries/render-utils/src/MatrixStack.h
 2015-04-27 10:59:57 -07:00
Seth Alves
2cdbe8bf7b merge from upstream 2015-04-27 09:57:36 -07:00
Seth Alves
e007617112 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 09:56:24 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Atlante45
0b1d4fb1d6 Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 21:16:11 +02:00
Atlante45
b340cd06bf Fix volume formula for capsules 2015-04-23 19:14:07 +02:00
Atlante45
83490051d9 Move shape related contains() to ShapeInfo 2015-04-23 18:55:20 +02:00
Atlante45
6be0910966 Fix contain for collision hulls 2015-04-23 15:58:18 +02:00
Brad Davis
c4d2bd2cda More coding standard fixes 2015-04-22 19:18:09 -07:00
Atlante45
955723acf1 RenderableEntityItem uses collision hull in contains 2015-04-22 21:03:55 +02:00
Brad Davis
ce6b7e7aec Merge branch 'master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-16 14:02:40 -07:00
Bradley Austin Davis
36ca9132cc More build failure fixes 2015-04-16 01:02:13 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
Andrew Meadows
da9091a99d remove SHAPE_TYPE_CONVEX_HULL from libs and tests 2015-04-14 14:54:43 -07:00
Seth Alves
3cfafea5ca Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-07 15:09:50 -07:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1 
Introducing gpu::State and using it in the Model rendering path and more...
 2015-04-07 12:48:42 -07:00
Seth Alves
bc9e818b95 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-07 11:12:16 -07:00
Seth Alves
ef5dffecf6 fix filenames in comments 2015-04-07 10:03:14 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
fb607e2b26 logging groups for library/shared and interface 2015-04-06 18:45:06 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
Seth Alves
9ef9452cf6 make filename extension checking less wrong 2015-04-03 16:39:45 -07:00
Seth Alves
bfab522ee7 debuging render mode 2015-04-01 17:52:30 -07:00
Sam Gateau
0d721ec1e9 merging 2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72 Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations 2015-03-31 17:35:34 -07:00
Andrew Meadows
7fb9427f29 Merge pull request #4549 from jherico/dbg_macro 
Enabling the use of #ifdef DEBUG as a platform neutral idiom
 2015-03-31 17:08:12 -07:00
Brad Hefta-Gaub
d77333953e Merge pull request #4552 from sethalves/island 
Fix various collision-model related bugs
 2015-03-31 15:47:53 -07:00
Seth Alves
55d506bb53 formatting 2015-03-31 14:04:49 -07:00
Bradley Austin Davis
02b69f4a70 Enabling the use of #ifdef DEBUG as a platform neutral idiom 2015-03-31 13:32:13 -07:00
Brad Hefta-Gaub
e27a89b7c3 Merge pull request #4539 from birarda/settings-thread-delete-later 
fix for cleanup of SettingsManager thread
 2015-03-31 13:09:06 -07:00
Seth Alves
52fc75a114 merge upstream 2015-03-31 07:18:04 -07:00
Philip Rosedale
5325478940 Merge pull request #4528 from ZappoMan/avatarUI 
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
 2015-03-30 21:31:22 -07:00
Stephen Birarda
7d5b8c430a remove extra added space 2015-03-30 18:06:51 -07:00
Stephen Birarda
b7174b5170 fix for cleanup of SettingsManager thread 2015-03-30 18:03:18 -07:00
Seth Alves
071b6a21de Merge branch 'master' of github.com:highfidelity/hifi into vhacd-knobs 2015-03-30 13:44:39 -07:00
Andrew Meadows
10af59296d Merge pull request #4499 from sethalves/multi-hull-collisions 
Multi hull collisions
 2015-03-30 12:11:56 -07:00
Seth Alves
26230cf493 uninitialized variable (quiet valgrind) 2015-03-29 05:40:39 -07:00
ZappoMan
baa2f947e5 classifying FSTReader and moving ModelType into that class 2015-03-27 16:30:00 -07:00
Seth Alves
0d4b0ad11e Merge branch 'multi-hull-collisions' of github.com:sethalves/hifi into vhacd-knobs 2015-03-26 06:37:35 -07:00
Seth Alves
dd9290bd59 clear points for non-hull shapes 2015-03-25 15:21:28 -07:00
Seth Alves
c68f5dd1fa added various controls for the convex hull generator 2015-03-25 15:13:40 -07:00