Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 10:36:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40552 commits 74 branches 59 tags 1.2 GiB
Commit graph

40552 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
3d71226f72 Crash fix for moving reticle via script. 
sendMessage is not thread-safe, use invokeMethod to call into application thread instead.
 2016-03-07 18:33:09 -08:00
samcake
3a810152fb Trying to consolidate the FBX reader for Blender /maya 2016-03-07 18:30:22 -08:00
David Rowe
e5188108a1 Fix width of delete bookmark drop-down 2016-03-08 15:21:15 +13:00
ericrius1
7b69aa375e moved plant to home folder 2016-03-07 18:18:38 -08:00
Stephen Birarda
20ab108d51 remove some debug for local socket check error 2016-03-07 18:01:57 -08:00
Stephen Birarda
ed9faf4189 add a secondary check for local IP address 2016-03-07 18:00:09 -08:00
Chris Collins
5078f486b1 Merge pull request #7266 from sethalves/local-messages 
allow sending interface-local messsages
 2016-03-07 17:21:45 -08:00
Brad Davis
8988dd9771 Fix mouse drag turning 2016-03-07 17:14:44 -08:00
Brad Davis
634f8fbc83 Fix texture leak 2016-03-07 17:14:43 -08:00
Brad Davis
f5acf49e47 Fix reticle transform when depth != 1 2016-03-07 17:14:42 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
David Rowe
2f91b29c06 Set default focus 2016-03-08 14:03:54 +13:00
David Rowe
09390ffffd Remove colon from dialog label 2016-03-08 14:00:49 +13:00
David Rowe
b71a512a6f Reorder OK and Cancel buttons 2016-03-08 13:58:20 +13:00
David Rowe
7f2938c53f Tidy message dialog code 2016-03-08 13:56:25 +13:00
David Rowe
b7fd5467ba Restyle query dialogs 2016-03-08 13:53:05 +13:00
David Rowe
d893b2e3b1 Handle no icon in modal dialogs 2016-03-08 13:52:24 +13:00
Ryan Huffman
bc99e871e1 Add asset mapping cache 2016-03-07 16:51:49 -08:00
David Rowe
ba1e8db34a Add QML UI test dialogs for creating and deleting bookmarks 2016-03-08 13:51:13 +13:00
James B. Pollack
fbe640e351 the model was different so adjust things 2016-03-07 16:38:15 -08:00
Ryan Huffman
37c0417ea6 Add GetAll and Delete mapping requests 2016-03-07 16:31:49 -08:00
Stephen Birarda
08f181be76 handle mapping requests from AssetResourceRequest 2016-03-07 16:30:26 -08:00
Anthony J. Thibault
0d62b10a8f Added Mat4 support to script 
Also, hooked up MyAvatar.sensorToWorldMatrix access to script.
 2016-03-07 16:16:14 -08:00
ericrius1
d4bc83f408 cleanup and bug fixes 2016-03-07 16:16:06 -08:00
Andrew Meadows
dfe0575237 Merge pull request #7260 from imgntn/newponggun 
New Ping Pong Gun Model
 2016-03-07 15:51:59 -08:00
Stephen Birarda
12a774d47f return error if persistence fails for set/delete operations 2016-03-07 15:46:44 -08:00
Andrew Meadows
592d29fc7c Merge pull request #7251 from sethalves/fix-hulls-for-non-default-registration 
fix collisions with non-default registration
 2016-03-07 15:46:13 -08:00
ericrius1
3dc39600cd stop pouring on release 2016-03-07 15:32:40 -08:00
Stephen Birarda
5aa287a789 handle read/write to asset-server map file 2016-03-07 15:30:30 -08:00
Seth Alves
ee55721f79 allow sending interface-local messsages 2016-03-07 15:13:24 -08:00
Philip Rosedale
7c765f3d5a Merge pull request #7258 from hyperlogic/tony/better-lean-detection 
MyAvatar: use a box instead of a sphere for horizontal re-centering
 2016-03-07 15:05:10 -08:00
ericrius1
b9bd4cae93 better water effect 2016-03-07 14:58:59 -08:00
Stephen Birarda
82cd8aed8c protect mapping clobbering when migrating 2016-03-07 14:46:54 -08:00
Stephen Birarda
18b22cbd16 add a mapping for pre-mapping migrated files 2016-03-07 14:43:17 -08:00
Stephen Birarda
9d61de6cd5 add a mapping migration for pre-mapping assets 2016-03-07 14:38:55 -08:00
James B. Pollack
2d554f4b40 Merge pull request #7249 from ericrius1/playaFireworks 
Playa fireworks and associated tutorial
 2016-03-07 14:32:06 -08:00
ericrius1
ca747bb4e9 fixed dates 2016-03-07 14:29:17 -08:00
James B. Pollack
567039ef82 Update createPingPongGun.js 2016-03-07 14:28:16 -08:00
ericrius1
caca60c039 added headers to tutorial code 2016-03-07 14:09:21 -08:00
ericrius1
cdd4fdb03e slower growth 2016-03-07 14:04:45 -08:00
Seth Alves
320645de8d Merge pull request #7263 from imgntn/masterlightsfix 
Increase brightness of lights in demo
 2016-03-07 14:04:20 -08:00
Seth Alves
e8001d0346 Merge pull request #7264 from imgntn/flashlightbrightfix 
Make the flashlight brighter
 2016-03-07 14:04:02 -08:00
Seth Alves
34a76f1962 Merge pull request #7265 from ctrlaltdavid/fix-treeview 
Fix Running Script's tree view
 2016-03-07 14:03:50 -08:00
Seth Alves
cc16fca7a6 Merge pull request #7248 from birarda/ac-logs 
disable AC child file logging by default
 2016-03-07 14:03:23 -08:00
Stephen Birarda
83b563cf9c use AssetHash alias for hash in AssetResourceRequest 2016-03-07 14:00:12 -08:00
Stephen Birarda
4bf69f20b7 fix removal of requestHash method during cherry-pick 2016-03-07 13:59:17 -08:00
Stephen Birarda
e6ce517041 remove committed version control marker 2016-03-07 13:57:41 -08:00
Stephen Birarda
7bb97ec3da add an extra space before debug in AssetServer 2016-03-07 13:57:12 -08:00
Stephen Birarda
e7124d4b10 add server handling for no extension requests 2016-03-07 13:57:11 -08:00
Stephen Birarda
267ed3af82 remove client side handling of extension for ATP hash URLs 2016-03-07 13:57:02 -08:00