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

27251 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
35f9d49c06 Fix DrawOverlay3D::getOpaquePipeline invalid signature 2015-06-19 10:47:25 -07:00
ericrius1
1eaf5ae82a fixed utilities file to be able to be referenced by other files 2015-06-19 10:37:57 -07:00
Ryan Huffman
665baff665 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate 
Conflicts:
	interface/src/ui/overlays/Circle3DOverlay.cpp
	libraries/render-utils/src/RenderDeferredTask.cpp
	libraries/render-utils/src/RenderDeferredTask.h
 2015-06-19 10:07:57 -07:00
Ryan Huffman
b9ecff02f9 Disable edit.js rotation text overlay temporarily 2015-06-19 09:45:33 -07:00
Ryan Huffman
690e2e38f2 Move circle3d and text overlays to batches 2015-06-19 09:45:13 -07:00
Brad Hefta-Gaub
587bf78826 Merge pull request #5170 from samcake/punk 
Fix the cookie cutter issue in stereo
 2015-06-19 09:19:00 -07:00
Sam Gateau
873955b17e Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-06-19 18:02:56 +02:00
Clément Brisset
5192796851 Merge pull request #5168 from samcake/daft 
Improving the rendering job architecture
 2015-06-19 18:00:39 +02:00
Sam Gateau
2920197e88 Merge branch 'daft' of https://github.com/samcake/hifi into punk 2015-06-19 17:48:07 +02:00
Sam Gateau
598d0a5375 Just remove these changes on SkeletonModel.cpp 2015-06-19 17:44:56 +02:00
samcake
c1e0d24a5c Merge pull request #5169 from Atlante45/rot 
Fix rotation handle crash
 2015-06-19 17:36:54 +02:00
Sam Gateau
b0f5990bd7 fix syntax 2015-06-19 17:13:29 +02:00
Atlante45
9c7f24eeb6 Add culled option for simple programs 2015-06-19 16:50:38 +02:00
Atlante45
67473ac254 Fix rotation handle crash 2015-06-19 16:40:42 +02:00
Sam Gateau
5a2d2485c0 Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque 2015-06-19 16:30:48 +02:00
Sam Gateau
9adfdb06fe undo local modif to SKeletonModel.cpp 2015-06-19 11:00:27 +02:00
Sam Gateau
31633eca10 IMproving the probe system and cleaning the engine script 2015-06-19 10:41:40 +02:00
Sam Gateau
b09991d75b Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-19 09:35:40 +02:00
Brad Davis
9bef5f011b Reverting mirror functionality 2015-06-19 00:03:46 -07:00
Brad Davis
0fa6ac175f Merge branch 'master' into overlay 2015-06-18 21:56:11 -07:00
Brad Davis
d65e5882aa Working on 64 bit builds 2015-06-18 21:44:12 -07:00
Sam Gondelman
9cfe8ecc01 added hmdControls.js to hmdDefaults.js 2015-06-18 18:59:10 -07:00
Sam Gondelman
aab8161fa4 remove unused function 2015-06-18 18:57:04 -07:00
Sam Gondelman
decae5c1f1 finished hmdControls.js 2015-06-18 18:43:47 -07:00
Niraj Venkat
afc2db6c6a address bar commit 2015-06-18 18:25:48 -07:00
ericrius1
0e177a3e31 deleted unnessary line break 2015-06-18 18:23:09 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-18 18:17:59 -07:00
ericrius1
7293330ced fixed indentation and lines delete when user exits to help with large model.svo/json file size 2015-06-18 18:17:02 -07:00
ericrius1
830a8b6909 checking for bounds and modified paint script to start a new line entity if user paints outside of line entity's bounding box 2015-06-18 18:14:03 -07:00
Brad Hefta-Gaub
a7a53d8be7 Merge pull request #5148 from SamGondelman/rotationModes 
center player in view mode
 2015-06-18 18:02:47 -07:00
Brad Hefta-Gaub
750ce250fa Merge pull request #5150 from SamGondelman/mouseLook 
mouse look script
 2015-06-18 17:41:20 -07:00
David Rowe
709508857c Delete maximum rolling backup file if it exists before rolling backup 2015-06-18 17:39:31 -07:00
Niraj Venkat
894a245318 Further changes to address bar 2015-06-18 17:35:50 -07:00
Philip Rosedale
2f080a8e29 Merge pull request #5147 from sethalves/more-actions 
offset action
 2015-06-18 17:35:50 -07:00
Brad Davis
8e5da5acaa Fix debug compile error 2015-06-18 17:05:49 -07:00
ericrius1
8183e7393d adding check for points inside bounds' 2015-06-18 17:00:27 -07:00
ericrius1
6a5deaaef1 returning true from set line points 2015-06-18 16:54:39 -07:00
Seth Alves
c9a7136d51 Merge pull request #5162 from PhilipRosedale/smoother 
Smoother motion for physical objects as viewed by remote observer
 2015-06-18 16:30:34 -07:00
ericrius1
2b4146125f adding logic to check points of line are inside bounds 2015-06-18 16:27:06 -07:00
Sam Gondelman
012a508eb2 removed extraneous code 2015-06-18 16:25:12 -07:00
Sam Gondelman
c84a6cbf28 added warping 2015-06-18 16:05:58 -07:00
Niraj Venkat
55b6efb1e9 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-18 15:48:37 -07:00
Andrew Meadows
bd25d6b78b Merge pull request #5140 from sethalves/float-vs-double 
Fixed compiler warnings related to implicit float/double casts
 2015-06-18 15:33:36 -07:00
Sam Gondelman
fb7ddde0ca removed magic numbers 2015-06-18 15:29:20 -07:00
Niraj Venkat
5645491170 Further changes to address bar 2015-06-18 15:09:13 -07:00
Niraj Venkat
1be303e3ed Address bar polish 2015-06-18 15:07:27 -07:00
Brad Davis
edfb25bfe2 Removing debug define for VR overlay 2015-06-18 15:05:32 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Andrew Meadows
d88d9b2b88 Merge pull request #5141 from sethalves/overloaded-virtual 
use -Woverloaded-virtual with g++.  quiet compiler warnings
 2015-06-18 14:58:47 -07:00
Sam Gondelman
53bbd519a3 two new customizable actions for use in js 2015-06-18 14:37:09 -07:00