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

32804 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
f55f146d1b More code cleanup 2015-10-06 13:56:22 -07:00
Atlante45
38f23ef79e Remove Application friend 2015-10-06 13:56:22 -07:00
Atlante45
311edabe51 More header cleanup 2015-10-06 13:56:21 -07:00
Atlante45
765608d0ff More unused 2015-10-06 13:56:21 -07:00
Atlante45
7da55747f5 Simplify friends window 2015-10-06 13:56:21 -07:00
Atlante45
77a7814854 Move sendPingPackets 2015-10-06 13:56:20 -07:00
Atlante45
e74df484cc Remove unused methods 2015-10-06 13:56:20 -07:00
Atlante45
a5f31dba5f Fix startup timer 2015-10-06 13:56:20 -07:00
Atlante45
0aab013a0e Remove unused members 2015-10-06 13:56:20 -07:00
Atlante45
92e974929c Move tray icon to MainWindow 2015-10-06 13:56:19 -07:00
Atlante45
0f18db886c Remove 4 Application static methods 
- Replace by lambda
- Cleaned up global scope
 2015-10-06 13:56:19 -07:00
Atlante45
cf3b33a96b Replace Application::getInstance() with qApp 2015-10-06 13:56:19 -07:00
Andrew Meadows
2c276bb13e Merge pull request #5986 from sethalves/kinematic-grab 
Kinematic grab
 2015-10-06 10:30:06 -07:00
Brad Davis
ee40859c85 Merge pull request #6001 from highfidelity/revert-5989-homer 
Revert "Enabling programmatic access to the IPD scale"
 2015-10-06 10:16:53 -07:00
Brad Davis
8090bc8e8d Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
Eric Levin
0afaf84e2a Merge pull request #5979 from imgntn/ping_pong_gun 
[Script] Updates to Ping Pong Gun
 2015-10-06 09:47:53 -07:00
Seth Alves
8caa7abca6 assert that deltaTimeStep is always greater than zero 2015-10-06 09:35:54 -07:00
Seth Alves
5abaf38efd include setVelocity in returned arguments 2015-10-06 09:24:18 -07:00
Seth Alves
18b5b994b4 include setVelocity in returned arguments 2015-10-06 09:23:38 -07:00
Seth Alves
febdb52b26 Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-06 09:20:13 -07:00
Seth Alves
c3142ab90b include setVelocity in returned arguments 2015-10-06 09:20:07 -07:00
Seth Alves
91f5a6fec6 make setting of rigid-body velocity controlled by an action argument 2015-10-06 08:08:33 -07:00
Brad Hefta-Gaub
a554f3afb7 Merge pull request #5996 from cozza13/20701 
CR for Job #20701 - Create a menu for HMD stereo and mono eye switching/
 2015-10-05 17:22:36 -07:00
Brad Hefta-Gaub
d95fe3ddb7 Merge pull request #5989 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-05 17:22:19 -07:00
Brad Hefta-Gaub
d5663ed773 Merge pull request #5946 from jherico/nelson 
Improved procedural surfaces, textures and additional standard uniforms
 2015-10-05 17:12:32 -07:00
Clément Brisset
b2ef114e13 Merge pull request #5993 from imgntn/furniture_adjustments 
[Scripts] Toybox Furniture adjustments
 2015-10-05 17:09:55 -07:00
Clément Brisset
5eda3095bb Merge pull request #5998 from birarda/qt-5.5 
suppress warnings for overriden methods in Xcode 7
 2015-10-05 17:00:43 -07:00
Stephen Birarda
d48f17e0e1 Merge pull request #5995 from Atlante45/log 
Make log more readable
 2015-10-05 16:04:47 -07:00
Stephen Birarda
5989cad054 add override qualifier to suppress warnings in entities-renderer 2015-10-05 15:55:05 -07:00
Stephen Birarda
7bd98354d8 add override to supress warnings in ui-test 2015-10-05 15:53:52 -07:00
Stephen Birarda
25a1f2dd11 add override to suppress warning for PluginContainerProxy 2015-10-05 15:53:37 -07:00
Stephen Birarda
a2c9d7a4b2 add overrides for Avatar classes in Interface 2015-10-05 15:52:47 -07:00
Stephen Birarda
3ddfcc10c2 override additions to input-plugins 2015-10-05 15:50:35 -07:00
Chris Collins
c0a881ec52 added the correct call 
added the correct call
 2015-10-05 15:37:04 -07:00
Chris Collins
1e01d6bd8f Add the ability to switch between mono and stereo in HMD 
Add the ability to switch between mono and stereo in HMD
 2015-10-05 15:30:53 -07:00
Stephen Birarda
e835b5ccf3 remove old gnutls code from domain-server 2015-10-05 15:30:26 -07:00
Anthony Thibault
2a406481d4 Merge pull request #5992 from howard-stearns/reset-on-calibration 
Reset (as though by apostrophe key) whenever we calibrate the hydra.
 2015-10-05 15:19:16 -07:00
Stephen Birarda
9bc95a0fc1 fix override warnings in assignment-client 2015-10-05 15:17:10 -07:00
Clément Brisset
70b9b1eb77 Merge pull request #5985 from hyperlogic/tony/anim-warning-fix 
animation lib warning fixes
 2015-10-05 15:03:47 -07:00
Atlante45
598aab884e Make log more readable 2015-10-05 14:59:28 -07:00
Seth Alves
99be44f92d smooth out vibrating appearance for kinematic hold 2015-10-05 14:58:42 -07:00
Seth Alves
7f8411d947 reference count grabs on an entity 2015-10-05 14:15:38 -07:00
James B. Pollack
8cd549c958 adjust chair and plant starting positions 2015-10-05 14:02:24 -07:00
Seth Alves
635c83dad1 reset gravity and ignore-for-collisions after grabs have released 2015-10-05 13:39:01 -07:00
Eric Levin
3f684307e9 Merge pull request #5990 from highfidelity/revert-5987-20699 
Revert "QA for 20699 - Sanitize particle property values when set"
 2015-10-05 13:36:21 -07:00
Eric Levin
c72c87b59c Revert "QA for 20699 - Sanitize particle property values when set" 2015-10-05 13:35:58 -07:00
Eric Levin
d0f0aae885 Merge pull request #5987 from ctrlaltdavid/20699 
QA for 20699 - Sanitize particle property values when set
 2015-10-05 13:13:16 -07:00
Seth Alves
7f84e882c5 attempt to keep ignoreForCollisions the same before and after grab 2015-10-05 13:06:39 -07:00
Seth Alves
8f924f0be4 merge from upstream 2015-10-05 13:05:37 -07:00
Howard Stearns
844270e306 Reset (as though by apostrophe key) whenever we calibrate the hydra. 2015-10-05 12:44:22 -07:00