Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 06:23:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28874 commits 76 branches 59 tags 1.2 GiB
Commit graph

28874 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
ee641335fa Merge pull request #5421 from thoys/20552 
CR for Job #20552 - Add the ability to modify the parameters of planky from a popup dialog
 2015-07-28 09:57:22 -07:00
Brad Hefta-Gaub
6d1bfd8134 Merge pull request #5427 from kevinmthomas-carpool/20622 
CR for Job #20622 - JS Stream Player
 2015-07-28 09:56:39 -07:00
Philip Rosedale
275ab6b96b Merge pull request #5442 from ctrlaltdavid/throttle-fps-by-default 
Make Throttle FPS If Not Focus be enabled by default
 2015-07-27 20:39:56 -07:00
Howard Stearns
6433a48fdb Merge pull request #5441 from sethalves/fix-vhacd 
if OBJ data isn't from a url, don't dereference null QUrl pointers
 2015-07-27 20:27:44 -07:00
David Rowe
8a7cdb1c64 Make Throttle FPS If Not Focus be enabled by default 2015-07-27 19:53:38 -07:00
Seth Alves
f4a23065b4 if obj data isn't from a url, don't dereference null url pointer 2015-07-27 19:06:14 -07:00
Brad Hefta-Gaub
9783740b21 Merge pull request #5436 from huffman/edit-oob 
Show an alert window when new objects would be out of bounds
 2015-07-27 11:47:54 -07:00
Brad Hefta-Gaub
9464fe8f90 Merge pull request #5433 from hyperlogic/ajt/particle-render-fix 
Improved ParticleEffectEntityItem rendering and updates
 2015-07-27 11:47:09 -07:00
Ryan Huffman
ceffbb6383 Update edit.js to show an alert window when new objects would be out of bounds 2015-07-27 11:41:53 -07:00
Brad Hefta-Gaub
e6f97810f4 Merge pull request #5434 from birarda/master 
fix for OctreeSceneStat unpacking in Application
 2015-07-27 11:14:57 -07:00
Stephen Birarda
d3c6d8b3cc move call to get VoxelPositionSize inside debug that uses it 2015-07-27 10:06:34 -07:00
Stephen Birarda
615218c77d use a ref in stats unpacking 2015-07-27 09:58:58 -07:00
Stephen Birarda
9c57d1544f fix OctreeSceneStat unpacking in Application 2015-07-27 09:53:27 -07:00
Anthony J. Thibault
604ef5dc71 Fixed float constant. 2015-07-27 09:28:56 -07:00
Anthony J. Thibault
5844b594dc Converted magic numbers to constants. 2015-07-27 09:27:16 -07:00
Kevin M. Thomas
a82bf1d407 Merge branch 'master' of https://github.com/highfidelity/hifi into 20622 2015-07-27 12:15:40 -04:00
Kevin M. Thomas
d17ddae537 Added .js file to examples/example/audio and added public bucket url functionality. 2015-07-27 12:14:50 -04:00
Brad Hefta-Gaub
a9d5723eb3 Merge pull request #5410 from kevinmthomas-carpool/20618 
CR for Job #20618 - Move Reload Content item to Developer menu.
 2015-07-26 21:54:55 -07:00
Anthony J. Thibault
5cc0b45850 Improved ParticleEffectEntityItem rendering and updates 
* Created custom pipelines and shaders for untextured and textured
  particle rendering.
* Created custom render payload for particles
* Moved all particle updates into simulation rather then render.
* Uses pendingChanges.updateItem lambda to update the playload with
  new data for rendering.
* ParticleEffectEntityItem now updates its dimensions properly,
  based on emitter properties.
* Bug fix for dt not accumulating properly, during gaps between updates.
  now we just update all the time.  (super cheap tho, if there are no particles
  animating)
 2015-07-26 17:21:17 -07:00
Brad Hefta-Gaub
8a34df380c Merge pull request #5432 from sethalves/quiet-compiler 
quiet compiler
 2015-07-26 12:06:40 -07:00
Brad Hefta-Gaub
89d1e82f89 Merge pull request #5431 from jherico/homer 
Limit the amount of time consumed by QML rendering
 2015-07-26 11:54:05 -07:00
Seth Alves
24fff719c5 quiet compiler 2015-07-25 21:11:23 -07:00
Brad Davis
f66492b444 Merge pull request #5422 from ctrlaltdavid/20591 
CR for 20591 - Fix setting WebWindow's width and height
 2015-07-25 11:49:53 -04:00
Brad Davis
843a333727 Merge pull request #5424 from samcake/yellow 
Cleaning up the FBO cache and the output stage in general
 2015-07-25 11:49:22 -04:00
Bradley Austin Davis
7be33dcb58 Limit the amount of time consumed by rendering QML 2015-07-25 11:40:58 -04:00
Kevin M. Thomas
52fd45da2c Merge branch 'master' of https://github.com/highfidelity/hifi into 20622 2015-07-25 08:02:54 -04:00
Philip Rosedale
e24395a226 Merge pull request #5383 from ctrlaltdavid/20630 
Improve looking-at-me indication
 2015-07-24 16:15:13 -07:00
Sam Gateau
776d4747b2 Cleaning up the FBO cache and the output stage in general 2015-07-24 14:47:44 -07:00
Kevin M. Thomas
ddada17b08 move jsstreamplayer.html into example/html 
move jssstreamplayer.js script into example/example/audio
 2015-07-24 15:27:16 -04:00
Kevin M. Thomas
67c9a33cc0 Update Menu.cpp 2015-07-24 15:16:02 -04:00
Kevin M. Thomas
5f7fe30b9b Merge branch 'master' of https://github.com/highfidelity/hifi into 20618 
# Conflicts:
#	interface/src/Menu.cpp
 2015-07-24 15:10:34 -04:00
Kevin M. Thomas
a6af80fa5c Merge branch 'master' of https://github.com/highfidelity/hifi into 20622 2015-07-24 15:03:15 -04:00
David Rowe
3893add148 Fix setting WebWindow's width and height 
Width and height parameters now set the WebWindow's width and height
instead of its minimum size, when not part of a tool window.
 2015-07-24 10:43:24 -07:00
samcake
f3dc159e33 Merge pull request #5401 from ZappoMan/renderLaserPointers 
remove renderLaserPointers()
 2015-07-24 10:41:32 -07:00
Seth Alves
5f2e8f5b71 Merge pull request #5419 from birarda/master 
only output the no listener for type message once
 2015-07-24 10:41:11 -07:00
Brad Hefta-Gaub
939638a3a8 Merge pull request #5414 from birarda/slow-events 
allow the QEvent queue in Application to get behind
 2015-07-24 10:10:42 -07:00
Brad Davis
6eec04c798 Merge pull request #5407 from samcake/yellow 
Removing the glNaked code for capturing the billboard snaphot and rendering the rearViewMirror in a separate render target
 2015-07-24 13:09:07 -04:00
Stephen Birarda
71557a1846 only output no listener for type message one time 2015-07-24 09:36:27 -07:00
samcake
e6f2504514 FIx the problem of clear when the color mask is not WRITE_ALL 2015-07-24 09:26:32 -07:00
Brad Davis
6899279d7d Merge pull request #5399 from ZappoMan/fixJSRayPick 
Fix JS calls to computePickRay() when mini-mirror is showing
 2015-07-24 11:46:07 -04:00
Andrew Meadows
c6b2644539 Merge pull request #5418 from sethalves/hull-tool-fatten-ignore-walls 
hull creation tool ignores walls in fatten-mesh mode
 2015-07-24 08:37:47 -07:00
Seth Alves
bd1a661d01 Merge pull request #5416 from ctrlaltdavid/webwindow-title 
Add ability to update title of WebWindow after it's created
 2015-07-24 08:27:54 -07:00
Philip Rosedale
f04291ef65 Merge pull request #5408 from thoys/20626 
CR for Job #20626 - edit.js - entities list html - multi select using shift key / working delete key
 2015-07-24 07:47:30 -07:00
Seth Alves
6841a47c4b Merge pull request #5412 from AndrewMeadows/bohrium 
decouple FPS from rotation rate during mouse drag
 2015-07-24 07:44:22 -07:00
Seth Alves
6ba135de09 when creating a walking surface collision hull from a flat mesh, ignore triangles with a normal that's not mostly up or down 2015-07-24 07:16:40 -07:00
Kevin M. Thomas
28e6a4ac63 Updating master as old job related to AudioClient.h was incorretly included with current job. 2015-07-24 09:36:35 -04:00
samcake
52ac5b3ef6 On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize 2015-07-24 03:38:21 -07:00
Sam Gateau
cb375e8ece FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler 2015-07-24 02:15:50 -07:00
Sam Gateau
66cd17ec66 REmove the crappy solution for drawing transparent texture into overlay by a proper shader 2015-07-23 23:09:40 -07:00
David Rowe
c1e1caa709 Add ability to update title of WebWindow after it's created 2015-07-23 21:59:19 -07:00