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

27116 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brad Davis
68595ef5dc Delete sync object after use 2015-06-18 14:27:19 -07:00
Bradley Austin Davis
e75b1a6794 Merge branch 'temp' into overlay 2015-06-18 14:03:25 -07:00
Bradley Austin Davis
96ac5070f6 Adding some more protection to the viewport 2015-06-18 14:00:17 -07:00
Bradley Austin Davis
1bae1d6065 Changing font size for timings 2015-06-18 13:59:48 -07:00
Sam Gondelman
fd0efd91ff added shift action, added timers and fast mode to hmdControls.js 2015-06-18 13:59:37 -07:00
Bradley Austin Davis
100f7acddc Working on tooltip placement 2015-06-18 13:46:27 -07:00
Bradley Austin Davis
7bbaf026f3 use a monospace font on all platforms 2015-06-18 13:33:37 -07:00
Philip Rosedale
61a2196a30 Reduce error tolerances for ballistic prediction that trigger updating the server 2015-06-18 13:21:37 -07:00
Brad Davis
1243c54767 More merge bugs 2015-06-18 12:44:57 -07:00
Philip Rosedale
e46a820872 remove debug 2015-06-18 12:37:50 -07:00
Philip Rosedale
bffc1a38a7 Separate DC offset rejection, and call it all the time 2015-06-18 12:33:05 -07:00
Brad Davis
0cdee2d6ec preprocessor error on Linux/Mac 2015-06-18 12:14:55 -07:00
Sam Gateau
fb42613344 Fixing transparency that i just broke 2015-06-18 20:25:51 +02:00
Brad Hefta-Gaub
b008b810e1 Merge pull request #5145 from Atlante45/text 
Bring back display names
 2015-06-18 11:25:45 -07:00
David Rowe
1047703718 Tidy address bar code 
Re-enable and reposition mouse drag areas
Remove unused graphics assets
Remove unused includes
 2015-06-18 11:18:56 -07:00
Brad Davis
4404917003 Fix HMD projection post-merge 2015-06-18 11:16:25 -07:00
Howard Stearns
37d6e21ce3 Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound 2015-06-18 11:16:16 -07:00
Seth Alves
7d707447ca move multi-line function out of header 2015-06-18 11:07:50 -07:00
Seth Alves
97eeb20625 Merge branch 'master' of github.com:highfidelity/hifi into overloaded-virtual 2015-06-18 11:04:24 -07:00
David Rowe
c88ba2c6d1 Increase the saccade interval 2015-06-18 10:41:51 -07:00
Howard Stearns
fdf5860c4f Refactor playSound. 2015-06-18 10:39:58 -07:00
Brad Davis
cd325f7bf4 Merge pull request #5157 from ZappoMan/fixOpenGLDependency 
first cut and removing openGl dependency in shared
 2015-06-18 10:21:38 -07:00