Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-18 13:55:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26935 commits 26 branches 28 tags 1.2 GiB
Commit graph

436 commits

Author SHA1 Message Date
Bradley Austin Davis
75f6ad3b99 Working on menus look 2015-04-29 00:43:18 -07:00
Brad Davis
0fb8884f9c Merge branch 'browser' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-28 17:54:04 -07:00
Brad Davis
9836ffed97 Merge branch 'vr_menus' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-28 01:17:51 -07:00
Brad Davis
4bb5e562ea Browser work 2015-04-27 22:39:48 -07:00
Brad Davis
19ca543c2c Cleaning up code and tweaking menu layout 2015-04-27 19:07:53 -07:00
Brad Davis
7bd8bbf565 Merge branch 'vr_menus' into infoview 2015-04-27 18:33:45 -07:00
Bradley Austin Davis
ca16d37ce5 Mac testing 2015-04-27 12:46:34 -07:00
Brad Davis
c799ecbf83 Fixing bad merge 2015-04-27 12:16:04 -07:00
Brad Davis
d8b814082e Removing extraneous header 2015-04-27 12:15:16 -07:00
Brad Davis
14b660baf7 Merge branch 'vr_menus' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-27 11:43:49 -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
fa31ba0754 Info-view 2015-04-26 10:37:14 -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
Seefo
ab590440be Cleaned up warnings on Windows 2015-02-23 22:15:24 -05:00
Stephen Birarda
5e264f8241 add GLEW as dependency external project 2015-02-20 13:47:38 -08:00
Stephen Birarda
6b08b2993a fix for bullet system include to silence warnings 2015-02-19 13:03:16 -08:00
Stephen Birarda
6f055ca0d7 add an external project to handle bullet 2015-02-19 12:01:40 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Stephen Birarda
7d25013659 add DLL copying for all project targets 2015-02-17 17:44:58 -08:00
Stephen Birarda
c110fcbfad merge with upstream/master 2015-02-17 17:34:48 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00
Andrew Meadows
53855c89e9 Merge pull request #4289 from birarda/dependencies 
add gverb and glm as cmake external projects
 2015-02-17 10:00:29 -08:00
ZappoMan
1fc0225939 change ScriptCache and SoundCache to derive from Dependency 2015-02-13 15:33:41 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Stephen Birarda
9c13bec476 remove glm include where no longer required 2015-02-13 10:38:01 -08:00
Stephen Birarda
263afdd22c use external project glm in physics tests 2015-02-13 10:37:17 -08:00
Stephen Birarda
d3973a724c remove glm requirement in audio tests 2015-02-13 10:35:52 -08:00
Andrew Meadows
e6a6946027 merge upstream/master into andrew/thermonuclear 2015-02-09 12:44:52 -08:00
Andrew Meadows
0ef5d42a5b unit tests support new ShapeInfo API 2015-02-08 15:13:21 -08:00
Stephen Birarda
41d2da8712 remove doubled Q_INIT_RESOURCE calls 2015-02-06 15:28:36 -08:00
Stephen Birarda
9a98e07b2d call Q_INIT_RESOURCE from mains to handle static link 2015-02-06 12:39:14 -08:00
Seth Alves
6d5d6b9085 Merge branch 'master' of github.com:highfidelity/hifi into allowed-editors 2015-02-06 09:15:41 -08:00
Seth Alves
60a4f48985 rather than a list of allowed editors, a list of allowed lockers/unlockers 2015-02-06 09:14:40 -08:00
Brad Davis
9b7743c6d3 making test code identical on old and new renderer 2015-02-05 21:25:16 -08:00
Brad Davis
be3cca2d04 Working on performance test 2015-02-05 13:11:35 -08:00
Brad Davis
dc1cc84c1c Working on porting to mac compatible shaders 2015-02-05 12:58:09 -08:00
Brad Davis
da05c26aad Moving shaders to standard format, adding bounding box support and using it in text node 2015-02-04 21:32:05 -08:00
Brad Davis
1745ba9a7e More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage 2015-02-04 12:42:27 -08:00
Brad Davis
ba277e802a Working on OSX compilability 2015-02-04 11:29:31 -08:00
Brad Davis
cb7f4ca672 Pre-pull checking 2015-02-03 23:06:09 -08:00
Brad Davis
42703d2234 Working on testing code 2015-02-03 22:13:16 -08:00
Brad Davis
6cfb51283e Working on the text renderer 2015-02-03 01:49:06 -08:00
Brad Davis
8d81607e28 Tweaking the example text renderer 2015-02-02 23:27:57 -08:00
Brad Davis
e71b61a256 remove oglplus references 2015-02-02 12:01:21 -08:00
Brad Davis
a096c79747 Working on text rendering test 2015-02-01 19:46:49 -08:00
Brad Davis
6835068496 Adding text rendering test tool 2015-02-01 16:24:43 -08:00
Andrew Meadows
ff171a5782 Bullet is now required dependency 2015-01-15 10:27:43 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
David Rowe
a5b3ae397a Code review 2015-01-08 18:20:23 -08:00
David Rowe
07b30da2ac Fix miscellaneous types and casts 2015-01-08 13:44:51 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
ZappoMan
27d8ccb51e more voxelEctomy 2014-12-30 19:58:04 -08:00
Andrew Meadows
6f72d4ad81 easier to read Bullet to GLM conversions and back 2014-12-30 13:15:57 -08:00
Andrew Meadows
439cdbdac1 re-expose unit tests for legacy shapes 2014-12-29 11:15:09 -08:00
Andrew Meadows
71ab4a5780 fix unit ShapeManager unit tests 2014-12-29 11:07:57 -08:00
Andrew Meadows
9b7e50858a merge upstream/master into andrew/inertia 
Conflicts:
	libraries/avatars/CMakeLists.txt
	libraries/entities/CMakeLists.txt
 2014-12-29 09:15:49 -08:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00