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

11183 commits

Author SHA1 Message Date
Brad Hefta-Gaub
750f8a09fa Merge pull request #4394 from AndrewMeadows/isentropic 
EntityItem now stores position in meters and angular velocity in radians/sec
 2015-03-09 12:47:00 -07:00
ZappoMan
559945c0c6 temporarily remove skeleton check from upload 2015-03-09 10:50:09 -07:00
Andrew Meadows
c3a8c44545 oops, removing a typo 2015-03-09 09:55:35 -07:00
Andrew Meadows
c0ed3edbbb remove exception when connecting to old server 2015-03-09 09:38:26 -07:00
Andrew Meadows
51d05cc43e merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-03-09 08:51:49 -07:00
Atlante45
61649ee0a5 Fix dialog labels 2015-03-09 13:42:14 +01:00
Brad Hefta-Gaub
80675f8459 Merge pull request #4391 from ZappoMan/fbxFixes 
different mixamo detection
 2015-03-08 11:42:29 -07:00
Brad Hefta-Gaub
e2a367607a Merge pull request #4384 from ctrlaltdavid/20369 
CR for Job #20369 - Uploaded avatars without skeletons crash Interface
 2015-03-08 11:42:07 -07:00
Brad Hefta-Gaub
21cd7e36e0 Merge pull request #4381 from Atlante45/disk_cache 
Disk cache tweaks
 2015-03-08 11:40:40 -07:00
Andrew Meadows
ba6e66f169 merge upstream/master into andrew/isentropic 2015-03-07 18:03:49 -08:00
ZappoMan
7088c0287a different mixamo detection 2015-03-06 18:29:22 -08:00
samcake
174e359c50 Merge pull request #4387 from ZappoMan/fbxFixes 
tweaks to hacks for detecting mixamo files
 2015-03-06 17:25:19 -08:00
Brad Hefta-Gaub
c9dd96c98d Merge pull request #4389 from birarda/master 
render application overlay only if enabled
 2015-03-06 17:06:05 -08:00
Andrew Meadows
f5352333f0 entities use radians per second for angular velocity 2015-03-06 16:42:06 -08:00
Brad Hefta-Gaub
fd6f8c7792 Merge pull request #4382 from huffman/import-export 
Improvements to Import/Export entities
 2015-03-06 16:31:57 -08:00
Andrew Meadows
021510ae68 merge upstream/master into andrew/isentropic 2015-03-06 15:38:10 -08:00
Andrew Meadows
373be95297 entity cubes are in meters 2015-03-06 15:32:03 -08:00
Stephen Birarda
a4963f1895 render application overlay only if enabled 2015-03-06 15:22:25 -08:00
Grayson Stebbins
7c78e598b8 Update to .com instead of .io in Welcome dialog 2015-03-06 15:15:48 -08:00
ZappoMan
ffab6ffe48 tweaks to hacks for detecting mixamo files 2015-03-06 15:11:02 -08:00
Clément Brisset
aed208a339 Merge pull request #4383 from huffman/fix-script-editor-icons 
Fix issue with Script Editor icons not showing up on first show
 2015-03-06 06:02:50 -08:00
Ryan Huffman
299035bc85 Move script editor show() call to DialogsManager 2015-03-05 15:05:17 -08:00
Ryan Huffman
03c03a20f9 Update pasteEntities to use vec3 2015-03-05 13:52:30 -08:00
Ryan Huffman
6848025504 Add exporting by entity ID to Application 2015-03-05 13:36:16 -08:00
Atlante45
7690301e58 Include functional 2015-03-05 21:49:22 +01:00
Ryan Huffman
71768ef275 Return entity IDs on paste 2015-03-05 12:36:45 -08:00
Ryan Huffman
a922619ebc Add Clipboard.exportEntities that takes a list of entity IDs 2015-03-05 12:36:10 -08:00
Atlante45
f4d8ee39dc Menu item for cache editor 2015-03-05 21:10:02 +01:00
Atlante45
908e946ac5 Hook up disk cache to the dialog manager 2015-03-05 21:09:23 +01:00
Atlante45
53f23d8452 Added disk cache editor 2015-03-05 21:08:14 +01:00
Atlante45
9d7144dab0 Bumped disk cache size to 10GB 2015-03-05 18:52:48 +01:00
Andrew Meadows
49eee89c19 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-03-05 08:22:02 -08:00
Andrew Meadows
ca1c9b4105 EntityItem::findEntities() uses meters 2015-03-04 16:05:29 -08:00
Andrew Meadows
b9cbd1ea6e witch internal EntityItem data to use meters 2015-03-04 09:38:37 -08:00
David Rowe
8686e090c9 Don't upload skeletonless avatar model to HiFi servers 2015-03-03 22:34:07 -08:00
David Rowe
aad3f1dfd9 Automatically switch to default model if avatar model is skeletonless 2015-03-03 22:34:07 -08:00
David Rowe
30b77d4200 Don't crash if avatar model at start-up or loaded is skeletonless 2015-03-03 22:34:06 -08:00
Stephen Birarda
0a74291377 Merge pull request #4373 from birarda/remove-xmpp 
fix web chat link for IRC
 2015-03-03 16:26:12 -08:00
Stephen Birarda
d3682b0297 fix web chat link for IRC 2015-03-03 16:03:47 -08:00
Brad Hefta-Gaub
fc048c3b03 Merge pull request #4368 from ctrlaltdavid/20377 
CR for 20377
 2015-03-03 15:51:42 -08:00
samcake
6b1f42df83 Merge pull request #4366 from ZappoMan/removeMetavoxels 
remove metavoxels
 2015-03-03 15:50:53 -08:00
Stephen Birarda
8f2dc7e38b resolve conflicts on merge with upstream master 2015-03-03 12:22:25 -08:00
Stephen Birarda
a961cd8ff3 show link to IRC in place of Qxmpp removal 2015-03-03 12:17:35 -08:00
Brad Hefta-Gaub
b118912708 Merge pull request #4361 from samcake/temp0 
evolve the Transform stack away from the legacy GL to the brand new shader way
 2015-03-03 11:43:01 -08:00
Brad Hefta-Gaub
29340b6586 Merge pull request #4369 from ctrlaltdavid/20370 
CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361
 2015-03-03 11:17:31 -08:00
David Rowe
1b34b80b1a Use BrowsC_U to control both brows' up and down 2015-03-03 11:05:59 -08:00
Brad Hefta-Gaub
b88d52a310 Merge pull request #4363 from huffman/block-restricted-users 
Add permission-checking to edit entities
 2015-03-03 11:04:46 -08:00
Sam Gateau
4619ba1f5b Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-03 10:56:04 -08:00
Stephen Birarda
27b9b345ca remove ChatWindow includes from DialogsManager 2015-03-03 10:15:34 -08:00
Stephen Birarda
b270297406 remove a missed XmppClient include 2015-03-03 10:14:35 -08:00