Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-30 13:31:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
45208 commits 71 branches 59 tags 1.2 GiB
Commit graph

45208 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thijs Wenker
b3b1bf7884 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-duplicate-teleport-target-overlays 2016-07-20 03:12:02 +02:00
Zander Otavka
4a11e4accc Merge pull request #1 from AndrewMeadows/edit-model-ui 
fix bug where some model shapes are momentarily incorrect
 2016-07-19 18:07:19 -07:00
Andrew Meadows
2afd65467a fix bug where model is not yet ready for col shape 2016-07-19 18:01:22 -07:00
Andrew Meadows
22e7e150fc remove debug cruft 2016-07-19 18:01:06 -07:00
Seth Alves
56726183f6 clear internal bullet flag before switching entity to kinematic 2016-07-19 16:45:57 -07:00
Howard Stearns
0b5cdcef42 Merge pull request #8252 from howard-stearns/suggestions 
suggestions
 2016-07-19 15:46:23 -07:00
Chris Collins
0632f6df2d Merge pull request #8279 from birarda/master 
fix crash with multiple solo nodes in closeCurrentPacket
 2016-07-19 14:57:00 -07:00
Anthony J. Thibault
837b19ed1b fix for pushing avatar into floor when exiting away mode. 
* Removed MyAvatar.reset() access from JavaScript
* Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation.
* Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history.
* Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes
  are facing the same direction as the current HMD orientation.

away.js now uses the above new API's instead of MyAvatar.reset()
 2016-07-19 14:42:24 -07:00
Chris Collins
de06c7c370 Merge pull request #8276 from ZappoMan/addCodecNameToStream 
Fix issues with mismatched codecs
 2016-07-19 13:45:45 -07:00
samcake
91a0b86d40 Merge pull request #8280 from samcake/skin 
Update the upstream skin with master changes and bug fixes for skin
 2016-07-19 13:43:45 -07:00
howard-stearns
4a6132874f encodeURIComponent of the protocol signature 2016-07-19 13:43:28 -07:00
samcake
8f663f20e0 FIx warnings 2016-07-19 13:24:03 -07:00
Zander Otavka
acf4539f4f Return a JSON string from QML instead of JS object 
Idk why QML can't return a JS object, but it can't.  Strings work, so I
use a string.
 2016-07-19 13:21:08 -07:00
samcake
7f169b8e4f Adjust qml positions and fix one shader bug 2016-07-19 13:20:19 -07:00
samcake
3e7126f5be Removed reference to LIghtingModel.slh in teh DefereedBufferWrite.slh to avoid side effects 2016-07-19 13:06:26 -07:00
Thijs Wenker
2adff24a05 silly workaround- workaround 2016-07-19 21:34:42 +02:00
samcake
4742f40128 Separating the normal packing into it s own file and make sure to sclae the filter radius correctly dpeending on the resolution of diffusion 2016-07-19 12:23:57 -07:00
Stephen Birarda
f28f3d7fcf force removal of an old solo node when added new one 2016-07-19 12:02:37 -07:00
Seth Alves
be001a652f when doing a parenting grab, zero velocity 2016-07-19 11:50:53 -07:00
Seth Alves
5f6e608207 don't overwrite physical properties with those from the entity during editEntity -- only set those that the script didn't. 2016-07-19 11:23:21 -07:00
Anthony Thibault
897627ebd6 Merge pull request #8272 from hyperlogic/bug-fix/mac-os-quality-of-life-fixes 
Mac OS X fixes
 2016-07-19 11:18:46 -07:00
Brad Hefta-Gaub
866ba2f185 Merge pull request #8273 from hyperlogic/bug-fix/far-grab-zoom 
far-grabbed objects no longer fly away when the avatar body shifts
 2016-07-19 10:40:48 -07:00
samcake
36d58a2b82 Finish the integration of the diffusion pass in the SurfaceGeometryPass job, clean up ui 2016-07-19 10:34:06 -07:00
Anthony J. Thibault
212175bdaa bug fix for far-grab pulling the object in the wrong direction 2016-07-19 10:23:00 -07:00
samcake
18ec4aa4e2 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-19 09:27:33 -07:00
Brad Hefta-Gaub
48705d33c5 Merge pull request #8277 from jherico/pause_lighting 
Ensure the pause overlay is unlit (emissive)
 2016-07-19 08:34:15 -07:00
Brad Hefta-Gaub
1ee5023f6d fix warnings 2016-07-19 08:33:54 -07:00
Brad Davis
d98ae1ba9c Ensure the pause overlay is unlit (emissive) 2016-07-19 07:10:34 -07:00
samcake
ff132fa712 Gathering the diffusion passes in the SUrfaceGEometryPAss job 2016-07-19 02:11:22 -07:00
samcake
3638a3b9c3 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 23:15:21 -07:00
Brad Hefta-Gaub
c484fec51d cleanup 2016-07-18 22:54:57 -07:00
Brad Hefta-Gaub
dbf60a594c Merge branch 'master' of https://github.com/highfidelity/hifi into addCodecNameToStream 2016-07-18 22:43:16 -07:00
Brad Hefta-Gaub
c6ffd81c4b some cleanup 2016-07-18 22:42:38 -07:00
Brad Hefta-Gaub
2e63aba8c9 when getting unexpected codec in the mixer, send a message to the client to select a different codec 2016-07-18 22:29:05 -07:00
Brad Hefta-Gaub
20824f038c include codec in audio stream packets so that each side can discard packets that don't match 2016-07-18 21:59:44 -07:00
Brad Hefta-Gaub
2e491e0afb Merge pull request #8275 from jherico/web_entity_leak 
Cleanup resources used by offscreen GL surfaces
 2016-07-18 21:46:18 -07:00
Brad Hefta-Gaub
0a6aee1707 Merge pull request #8254 from murillodigital/master 
Changes for hifiCodec plugin building on Linux
 2016-07-18 21:14:46 -07:00
Brad Hefta-Gaub
90c8abb4e9 Merge pull request #8268 from sethalves/fix-throwing-some-more 
improve throwing release velocity
 2016-07-18 21:13:35 -07:00
Brad Davis
cbbb2a7975 Properly delete GL context and offscreen surfaces 2016-07-18 19:47:23 -07:00
Brad Davis
455d890358 Merge pull request #8266 from jherico/texture_free_fix 
Actually delete textures we're not using
 2016-07-18 19:41:35 -07:00
samcake
a8dd06ad38 Better groupint of the diffuseion of the curvature for easier fix for mini mirror 2016-07-18 19:24:43 -07:00
samcake
dabb7c0eea Merge pull request #8274 from samcake/skin 
Adding the check for Obscurrance
 2016-07-18 18:16:16 -07:00
howard-stearns
57955a2b56 Expose protocol version to qml, and use it in query. 2016-07-18 18:12:27 -07:00
samcake
34f2a96888 Adding the check for Obscurrance 2016-07-18 18:11:51 -07:00
howard-stearns
98555be987 Merge branch 'protocol3' of https://github.com/howard-stearns/hifi into suggestions 2016-07-18 18:11:05 -07:00
Brad Hefta-Gaub
171b9d8ecc Merge pull request #8270 from davidkelly/dk/audioPlayingFix 
NotFinished never should have had its own bit
 2016-07-18 18:05:55 -07:00
Anthony J. Thibault
ad7fa971aa copy scripts into build directory 2016-07-18 17:09:10 -07:00
Anthony J. Thibault
7fd40a5d10 MacOS: fix crash when touchscreen device is nullptr. 2016-07-18 17:08:17 -07:00
howard-stearns
17e64cf5e6 suggest only unrestricted domains, and also use server to sort 2016-07-18 16:58:29 -07:00
Ryan Downe Karpf
6e71e369a4 Merge pull request #8261 from hyperlogic/feature/grab-script-improvements-iii 
grab script improvements
 2016-07-18 16:46:38 -07:00