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

27328 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
f50ac9dcd5 remove debugging print 2015-06-22 13:12:05 -07:00
Seth Alves
55975fd611 don't add an action of we're about to remove it 2015-06-22 13:11:42 -07:00
Philip Rosedale
fd96c3a280 Merge pull request #5184 from ericrius1/utilities 
Utilities
 2015-06-22 12:14:17 -07:00
Howard Stearns
240272be11 Merge pull request #5161 from PhilipRosedale/master 
Always test and remove DC Offset
 2015-06-22 12:09:08 -07:00
Philip Rosedale
111b0f286d Merge pull request #5160 from ctrlaltdavid/addressbar-tidy 
Tidy address bar code
 2015-06-22 12:08:33 -07:00
Philip Rosedale
e5c1e0ca67 Merge pull request #5159 from howard-stearns/refactor-playSound 
Refactor playSound
 2015-06-22 12:07:08 -07:00
Brad Davis
1cfc0b2e42 Fixing mac/linux compilation 2015-06-22 12:06:08 -07:00
Brad Davis
8c9deb9d16 Removing flickering mouse cursor in HMD 2015-06-22 12:04:55 -07:00
Stephen Birarda
ff21c22245 fix AC crash with no controller scripting interface 2015-06-22 11:56:07 -07:00
Niraj Venkat
e66206ec4f Fixed tooltip position relative to the cursor 2015-06-22 11:29:44 -07:00
Stephen Birarda
a9eccb687a fix for double store on index path lookup 2015-06-22 11:26:17 -07:00
Brad Davis
4cd1c52987 Fixing HMD position offset bug in picking & stereo rendering in HMD 2015-06-22 11:20:48 -07:00
ericrius1
6c84e5ad77 actually syncing brush to line color 2015-06-22 11:08:40 -07:00
ericrius1
1b69563b29 changed quad back to line; 2015-06-22 11:06:40 -07:00
Howard Stearns
edf024dff8 Merge pull request #5178 from ctrlaltdavid/20584 
CR for #20584 - Improve legibility of entities editor
 2015-06-22 10:46:15 -07:00
ericrius1
362d9a2481 syncing brush sphere with line color 2015-06-22 10:35:00 -07:00
Philip Rosedale
293a88b3d4 Merge pull request #5158 from ctrlaltdavid/20545 
DO NOT MERGE - QA for #20545 - Eye saccades are too jittery and too fast
 2015-06-22 10:31:10 -07:00
Philip Rosedale
30b08af7e2 Merge pull request #5125 from jherico/overlay 
Overlay overhaul and tooltip refactor
 2015-06-22 10:06:26 -07:00
Brad Davis
3231bbba5a Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
 2015-06-22 09:44:16 -07:00
Brad Davis
1b44c220a7 Prep work for procedural stars & stuff 2015-06-22 09:43:12 -07:00
Howard Stearns
f5b0b304d7 Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound 2015-06-22 09:20:57 -07:00
Seth Alves
bce8b0cc1b Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-22 07:19:55 -07:00
Seth Alves
c14276145d lock when reading or writing _actionsToAdd or _actionsToRemove 2015-06-22 07:19:40 -07:00
Seth Alves
03a2d190b0 quiet valgrind 2015-06-22 07:18:55 -07:00
Seth Alves
f284e9d070 quiet compiler 2015-06-22 07:18:30 -07:00
DaveDubUK
796d76004c Merge branch 'master' of https://github.com/highfidelity/hifi into walk-1.25 2015-06-22 17:52:13 +07:00
DaveDubUK
10d981e6d5 walk.js 1.25 comments removal 2015-06-22 17:51:49 +07:00
samcake
be8ae9580d Merge pull request #5177 from bwent/doubleClickEvent 
Expose mouseDoublePressEvents to js
 2015-06-22 11:13:05 +02:00
DaveDubUK
54608b9cb3 walk.js version 1.25 2015-06-22 14:18:07 +07:00
Seth Alves
77cb3c0caa quiet valgrind 2015-06-21 18:13:13 -07:00
Seth Alves
3afdcfd6d1 quiet compiler 2015-06-21 18:12:58 -07:00
Seth Alves
717c8ed3ad formatting 2015-06-21 18:12:24 -07:00
Bradley Austin Davis
02510790c3 Fixing projection during star rendering 2015-06-21 17:16:30 -07:00
Bradley Austin Davis
4ccdc78866 Fixing frustum perspective bug 2015-06-21 15:53:24 -07:00
Brad Davis
012b0973b9 removing cruft 2015-06-21 14:26:19 -07:00
Bradley Austin Davis
5bbfb97c37 Fixing blurry UI on retina displays 2015-06-21 13:31:18 -07:00
Seth Alves
746033f3bd Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-21 07:34:48 -07:00
Brad Davis
e66b2d4141 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-20 22:54:45 -07:00
Brad Hefta-Gaub
13c5c830d7 Merge pull request #5173 from huffman/fix-line-bounds 
Add correct line3doverlay bounds
 2015-06-20 11:39:08 -07:00
Bradley Austin Davis
577962cb67 Merge branch 'master' into overlay 2015-06-20 10:37:55 -07:00
Philip Rosedale
51a2363707 Merge pull request #5174 from huffman/remove-pointer 
Remove pointer.js from defaultScripts because it causes crashes (temporary)
 2015-06-19 21:57:46 -07:00
ericrius1
8fcff2d648 changed indent spacing to 4 spaces 2015-06-19 19:03:47 -07:00
ericrius1
18014e968d removed horizontal "line break" style comment blocks 2015-06-19 19:00:42 -07:00
ericrius1
8bc9fc2e1f simplified paint.js script to allow for faster iteration and more thorough testing 2015-06-19 18:58:09 -07:00
ericrius1
dbec1aad0c line entity points are now local to entity position. Changed paint script to reflect this 2015-06-19 18:54:28 -07:00
David Rowe
0b13accf94 Merge branch 'master' into addressbar-tidy 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
 2015-06-19 17:42:27 -07:00
Brad Davis
cc45693f55 Merge pull request #5163 from venkatn93/master 
Address bar polish
 2015-06-19 16:59:08 -07:00
Ryan Huffman
1371f775ee Add mutex lock around access to Model::_calculatedMeshPartOffset 2015-06-19 16:51:13 -07:00
Ryan Huffman
a7f291154b Add lock around recalculateMeshPartOffsets call 2015-06-19 16:28:58 -07:00
David Rowe
bdcf87a3c6 Improve legibility of entities editor 
Increased font sizes.
Improved contrast between values and backgrounds.
 2015-06-19 16:28:45 -07:00