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

380 commits

Author SHA1 Message Date
Stephen Birarda
14fa89858e use epsilon constant in MovingMinMaxAvgTests 2015-05-04 10:45:26 -07:00
Stephen Birarda
7ce62f49e2 fix absolute value checks in MovingMinMaxAvgTests.cpp 2015-05-01 16:37:53 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Brad Davis
19ca543c2c Cleaning up code and tweaking menu layout 2015-04-27 19:07:53 -07:00
Bradley Austin Davis
ca16d37ce5 Mac testing 2015-04-27 12:46:34 -07:00
Brad Davis
76ce34a74b Scanning for code style 2015-04-27 11:41:10 -07:00
Brad Davis
d55d467d3f Tweaking VR menu for PR 2015-04-27 11:35:57 -07:00
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
Brad Davis
ee30588fd4 More menu work 2015-04-25 10:41:06 -07:00
Brad Davis
fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
 2015-04-24 18:02:12 -07:00
Brad Davis
e7b8efc2d9 Cleaning up unused stuff 2015-04-24 16:44:48 -07:00
Brad Davis
08d60c6a01 Fixing message dialog 2015-04-24 16:19:39 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Brad Davis
1ff8c67576 More work on menus and some code cleanup 2015-04-24 12:54:11 -07:00
Brad Davis
c0d562ed55 Merge branch 'offscreen' into m_and_m 2015-04-23 23:45:11 -07:00
Brad Davis
f17387fab4 Working on menus 2015-04-23 21:23:21 -07:00
Brad Davis
bb1c73adc7 Working on menus 2015-04-23 14:24:01 -07:00
Brad Davis
8cb298a55b Working on menus 2015-04-23 14:23:15 -07:00
Brad Davis
a9d65f168b Working on marketplace dialog 2015-04-23 14:23:11 -07:00
Atlante45
0b1d4fb1d6 Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 21:16:11 +02:00
Brad Davis
930ec7a6d8 One more 2015-04-22 19:22:10 -07:00
Brad Davis
c4d2bd2cda More coding standard fixes 2015-04-22 19:18:09 -07:00
Atlante45
b446644549 Rename CollisionModelURL handle 2015-04-22 21:03:56 +02:00
Brad Davis
16efa2a46f Improving toggle visibility and loading behavior 2015-04-17 16:59:04 -07:00
Bradley Austin Davis
4b73481604 Respond to changes in the device pixel ratio in the test window 2015-04-17 10:19:31 -07:00
Brad Davis
ce6b7e7aec Merge branch 'master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-16 14:02:40 -07:00
Bradley Austin Davis
f700607a65 Working on OSX functionality 2015-04-15 23:08:55 -07:00
Brad Davis
aba2b395a6 Working on testing the QML ui 2015-04-15 12:35:30 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
Andrew Meadows
da9091a99d remove SHAPE_TYPE_CONVEX_HULL from libs and tests 2015-04-14 14:54:43 -07:00
Brad Davis
54f2774d2e Organize projects into folders for IDEs that support it 2015-03-19 15:45:11 -07:00
Philip Rosedale
6a4dbd35b5 Merge pull request #4449 from AndrewMeadows/thermonuclear 
ShapeManager can release shape by pointer
 2015-03-13 17:34:32 -07:00
Andrew Meadows
e4c6d49c4d ShapeManager can release shape by pointer 2015-03-13 16:36:18 -07:00
Andrew Meadows
d1b977ec9e remove warnings about unused variables 
and remind us to impelement unit test for tetrahedron mass props
 2015-03-12 16:36:08 -07:00
Andrew Meadows
feafa0a60b remove old Ragdoll and avatar interactions 2015-03-11 14:29:03 -07:00
Virendra Singh
7954dd4d67 anticlockwise triangle order 2015-03-11 03:27:26 +05:30
Virendra Singh
a0e7125e11 code revamp and correction in parallel axis theorem 2015-03-11 03:11:17 +05:30
Virendra Singh
ce4226d6b9 Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-10 22:36:18 +05:30
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -07:00
Seth Alves
e4baaa38b4 collision model url 2015-03-07 20:33:00 -08:00
Andrew Meadows
373be95297 entity cubes are in meters 2015-03-06 15:32:03 -08:00
Virendra Singh
84e05e361e Accuracy improved to 0.01 2015-03-06 22:07:35 +05:30
Virendra Singh
42867bf98d code revamp 2015-03-06 11:10:38 +05:30
Andrew Meadows
49eee89c19 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-03-05 08:22:02 -08:00
Virendra Singh
126d3cf237 Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-04 08:22:20 +05:30
Virendra Singh
4627d2e7b5 Parallel axis theorem correction 2015-03-04 03:52:59 +05:30
Virendra Singh
7a129235c2 Mass properties unit tests 2015-03-04 01:12:20 +05:30
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Andrew Meadows
93c77d557a EntityTree::findClosestEntity() now takes meters 2015-02-26 14:14:17 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00