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

26989 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
samcake
be8ae9580d Merge pull request #5177 from bwent/doubleClickEvent 
Expose mouseDoublePressEvents to js
 2015-06-22 11:13:05 +02: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
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
Brad Davis
cc45693f55 Merge pull request #5163 from venkatn93/master 
Address bar polish
 2015-06-19 16:59:08 -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
Brad Davis
3ab8025b82 Responding to Sam's comments 2015-06-19 16:14:05 -07:00
Niraj Venkat
482f12be8c Returning ref to stack to view controller 2015-06-19 16:05:45 -07:00
bwent
c315bcec24 Expose mouseDoublePressEvents to js 2015-06-19 15:52:27 -07:00
Brad Davis
cc6b589ae5 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-19 14:48:38 -07:00
Brad Davis
99c217184b Fixing the mic/camera buttons and the mirror UI buttons 2015-06-19 14:46:39 -07:00
Niraj Venkat
03c10d15e6 Adding lambdas and removing dead code 2015-06-19 14:37:21 -07:00
Niraj Venkat
054e12a315 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-19 11:22:50 -07:00
Niraj Venkat
1494aa4faa Adding new icon and getters 2015-06-19 11:18:16 -07:00
Niraj Venkat
b15e7cec21 Back and forward are red if not possible 2015-06-19 11:17:56 -07:00
Ryan Huffman
1e69e647bb Remove pointer.js from defaultScripts because it causes crashes 2015-06-19 11:02:00 -07:00
Ryan Huffman
ff66eb584d Add correct line3doverlay bounds 2015-06-19 10:48:07 -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
Niraj Venkat
afc2db6c6a address bar commit 2015-06-18 18:25:48 -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
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
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
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