Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 01:19:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
33223 commits 71 branches 56 tags 1.2 GiB
Commit graph

33223 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
9937b6a3ef quiet some debugging 2015-10-14 13:12:11 -07:00
Seth Alves
d72152da87 more locking 2015-10-14 13:01:56 -07:00
Seth Alves
07a4dc3a7f more lock fixing 2015-10-14 12:49:06 -07:00
Seth Alves
fa2bf2b2d9 tighten up locking in actions 2015-10-14 11:43:03 -07:00
Seth Alves
9a9e5b962e make edit logging terse vs not a domain-server setting 2015-10-14 09:45:35 -07:00
Seth Alves
77bb11675d terse entity-edit logging 2015-10-14 09:31:44 -07:00
Seth Alves
2a9b1c0fc3 fix refresh of hold action 2015-10-14 09:31:29 -07:00
Seth Alves
698a4001a8 Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-14 06:18:02 -07:00
Seth Alves
742cc0f511 rename a function 2015-10-14 06:17:55 -07:00
Seth Alves
f61a005ebc cleanups 2015-10-13 17:47:41 -07:00
Seth Alves
74ced250c1 don't compress joint rotations 2015-10-13 17:18:28 -07:00
Andrew Meadows
073b019458 Merge pull request #6072 from howard-stearns/skip-some-reload-recenter-on-startup 
Don't reload/recenter some avatar data on startup
 2015-10-13 17:08:00 -07:00
Seth Alves
644076214e fix hang 2015-10-13 16:55:04 -07:00
Andrew Meadows
a331edcee9 Merge pull request #6073 from ZappoMan/comfortModeHack 
implement comfort mode hack
 2015-10-13 16:47:45 -07:00
Seth Alves
4402242c3c allow an action to suppress sending of physics related edits to the entity-server 2015-10-13 16:27:40 -07:00
Brad Hefta-Gaub
8a2e23cae4 CR feedback 2015-10-13 16:20:52 -07:00
Seth Alves
2ecb7e8d29 fix bug that was making action deletes fail 2015-10-13 16:19:12 -07:00
Stephen Birarda
c328941b9d Merge pull request #6074 from huffman/fix-empty-hash 
Fix crash when atp url is empty
 2015-10-13 16:02:28 -07:00
Seth Alves
4fa85441b8 tweak 2015-10-13 15:14:34 -07:00
Ryan Huffman
c468cabe7e Fix crash when atp url is empty 2015-10-13 15:12:01 -07:00
Brad Hefta-Gaub
ad96d76921 implement comfort mode hack 2015-10-13 15:06:11 -07:00
Seth Alves
257e3845de get action type correct 2015-10-13 14:45:20 -07:00
Seth Alves
755b971906 tweak 2015-10-13 14:31:52 -07:00
Seth Alves
fcbb107bc0 tweak 2015-10-13 14:13:53 -07:00
Seth Alves
8b72f6e7c6 tweak 2015-10-13 13:50:43 -07:00
James B. Pollack
5f36972cfc Merge pull request #6071 from imgntn/invert_solids 
[Scripts] Toybox Updates
 2015-10-13 13:48:31 -07:00
Seth Alves
54eac099b9 tweak 2015-10-13 12:52:53 -07:00
Howard Stearns
93e908a592 Don't reload/recenter some avatar data on startup, when we don't necessarilly have all the required data initialized. 2015-10-13 12:15:13 -07:00
Seth Alves
83780296de don't send physical property updates if there's an action on the object 2015-10-13 12:12:57 -07:00
Seth Alves
7c52849740 change how hold action works 2015-10-13 11:36:58 -07:00
James B. Pollack
c84d2fc36a fix target script url 2015-10-13 10:44:43 -07:00
James B. Pollack
309cde7f28 invert solidity of most toybox objects while held 2015-10-13 10:31:36 -07:00
James B. Pollack
0f2ad8dd49 Merge branch 'wall_targets_2' into invert_solids 2015-10-13 10:15:48 -07:00
James B. Pollack
8d9bcbd793 Merge pull request #6067 from hyperlogic/tony/remove-middle-mouse-overlay-toggle 
Remove overlay hiding from middle mouse button.
 2015-10-13 10:14:15 -07:00
Andrew Meadows
ef3775c44d Merge pull request #6059 from Atlante45/warning 
Fix warning
 2015-10-13 08:39:42 -07:00
Brad Hefta-Gaub
8e8ba15aaa Merge pull request #6065 from sethalves/reorder-sims 
grab changes
 2015-10-13 08:35:38 -07:00
Andrew Meadows
25685f97eb Merge pull request #6062 from howard-stearns/fix-startup-position-failure 
fix-startup-position-failure
 2015-10-13 08:34:33 -07:00
Anthony J. Thibault
6a8ff676ed Remove overlay hiding from middle mouse button. 
Because it conflicts with edit.js camera panning.
You can still toggle the overlay via the O key.
 2015-10-12 17:33:27 -07:00
Eric Levin
12548df0a3 Merge pull request #6060 from imgntn/lighting_explorer 
[Scripts] Fix Edit.js bug that would lock Entity camera in orbit or pan mode
 2015-10-12 17:30:27 -07:00
Clément Brisset
3e65c3bc35 Merge pull request #6064 from birarda/default-asset-server 
turn on the asset server by default
 2015-10-12 17:21:33 -07:00
Howard Stearns
e8b074c85c Merge pull request #6031 from AndrewMeadows/ik-moves-hips 
IK moves hips
 2015-10-12 17:03:33 -07:00
James B. Pollack
0f998e81af add min reset distance 2015-10-12 17:03:32 -07:00
James B. Pollack
fc8a4f4f2d cleanup 2015-10-12 17:00:49 -07:00
James B. Pollack
02620c4b0d make targets ungrabbable 2015-10-12 16:59:42 -07:00
Seth Alves
f0ce698d78 switch back to springy grab 2015-10-12 16:57:20 -07:00
Stephen Birarda
60f5a06308 turn on the asset-server by default 2015-10-12 16:44:51 -07:00
Stephen Birarda
8240dff03f Merge pull request #6061 from Atlante45/asset-drop 
Asset drop
 2015-10-12 16:37:50 -07:00
James B. Pollack
bc4200d8d7 push last positions to array 2015-10-12 16:35:06 -07:00
James B. Pollack
47471e837f reset targets once they have stopped moving 2015-10-12 16:31:36 -07:00
Seth Alves
ed9907ce66 do avatar simulation before physics simulation so that physics actions can update based on avatar 2015-10-12 16:23:12 -07:00