Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 23:22:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29735 commits 75 branches 59 tags 1.2 GiB
Commit graph

29735 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
d33c9e734b Merge pull request #5538 from jherico/marge 
Automatically show HMD tools when switching an HMD plugin
 2015-08-09 17:54:16 -07:00
Bradley Austin Davis
56e73ef807 Merge remote-tracking branch 'upstream/master' into plugins 2015-08-09 12:28:44 -07:00
Brad Davis
57408c4338 Automatically show HMD tools when switching an HMD plugin 2015-08-09 12:14:29 -07:00
Brad Hefta-Gaub
862be9a1f0 Merge pull request #5535 from nivardus/include-qdatastream-qt5.5 
Qt 5.5 Compilation: Add QDataStream include
 2015-08-08 22:03:36 -07:00
Brad Hefta-Gaub
986827aefe Merge pull request #5537 from jherico/plugins 
PLUGINS - Decouple Application and plugin definitions, cleanup container usage
 2015-08-08 19:12:11 -07:00
Bradley Austin Davis
bfd0362bd8 Fixing mac build 2015-08-08 18:00:08 -07:00
Brad Davis
5515b9d8ee Decouple Application and plugin definitions, cleanup container usage 2015-08-08 17:51:16 -07:00
Brad Hefta-Gaub
a79095dcec Merge pull request #5536 from jherico/plugins 
PLUGINS - Fix crash on startup on mac
 2015-08-08 15:30:08 -07:00
Bradley Austin Davis
2878950dbe Fix crash on startup on mac 2015-08-08 15:26:38 -07:00
Brad Hefta-Gaub
74e79f15d8 Merge pull request #5534 from jherico/plugins 
PLUGINS - Merge fixes
 2015-08-08 14:44:33 -07:00
Brad Davis
751db23bc8 Fixing naming, and improving viewport handling 2015-08-08 14:19:43 -07:00
Bennett Goble
d5691b1196 Add QDataStream include to DomainServerWebSessionData.cpp 
Fixes compilation error with Qt 5.5.0, QDataStream >> QSet
 2015-08-08 17:17:29 -04:00
Brad Davis
639a0822fe Fixing aspect ratio 2015-08-08 14:08:41 -07:00
Brad Davis
ba498e8f33 Fixing plugin construction after removing OVR dependency from interface 2015-08-08 14:02:26 -07:00
Brad Davis
ccc4a59992 Cleanup and PR comments 2015-08-08 13:54:37 -07:00
Brad Davis
4b5c71e16d Merge fixes 2015-08-08 13:37:46 -07:00
Brad Davis
caf93d1aff Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.h
 2015-08-08 13:18:13 -07:00
Andrew Meadows
331c8c0967 Merge pull request #5503 from AlexanderOtavka/panel-attachable-improvements 
Improvements to FloatingUIPanels.
 2015-08-07 17:21:51 -07:00
Andrew Meadows
c0d287f48d Merge pull request #5527 from ZappoMan/lod 
change LOD dialog to no longer reset when you close the dialog box
 2015-08-07 16:10:24 -07:00
Andrew Meadows
48c5a227a7 Merge pull request #5528 from ZappoMan/removeBrokenShadows 
remove shadow menu items
 2015-08-07 16:09:00 -07:00
Brad Hefta-Gaub
7a59688521 Merge pull request #5531 from ctrlaltdavid/find-scale-assert 
Add temporary debug info for tracking down invalid scale value assert
 2015-08-07 16:02:55 -07:00
Bradley Austin Davis
cd6667303e Merge remote-tracking branch 'upstream/master' into plugins 2015-08-07 15:32:33 -07:00
Brad Davis
64fcd2da96 Merge pull request #5530 from ZappoMan/RenderableModelEntityItemOptimization 
optimizations to RenderableModelEntityItem::render()
 2015-08-07 15:32:07 -07:00
Bradley Austin Davis
fb2c84484e Merge remote-tracking branch 'upstream/master' into plugins 2015-08-07 15:26:43 -07:00
David Rowe
3995c4476d Add temporary debug info for tracking down invalid scale value assert 2015-08-07 14:38:43 -07:00
Seth Alves
b1e69537f3 Merge pull request #5524 from howard-stearns/cleanup-jointstate 
Clean Up JointState
 2015-08-07 13:50:02 -07:00
ZappoMan
cec0f8ed1d optimize ModelEntityItem::getAnimationFrame() 2015-08-07 13:43:57 -07:00
ZappoMan
f4c3c30f6a quick optimization to RenderableModelEntityItem::render() 2015-08-07 12:49:48 -07:00
Howard Stearns
145b730f80 Clean up instantiation. 2015-08-07 12:27:26 -07:00
Zander Otavka
987fb56124 Simplify applied transformations in scripts. 2015-08-07 11:51:22 -07:00
Zander Otavka
743e73874f Add back the anchor to panel transform names. 
position -> anchorPosition
rotation -> anchorRotation
scale -> anchorScale
 2015-08-07 11:38:33 -07:00
ZappoMan
87f609b9af remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows 2015-08-07 11:26:07 -07:00
Stephen Birarda
b3f6c45fa3 Update BUILD_OSX.md 2015-08-07 10:59:57 -07:00
Sam Gateau
fdb370e798 cleaning th ecode 2015-08-07 10:59:56 -07:00
Sam Gateau
dcedcc2fa6 cleaning th ecode 2015-08-07 10:59:55 -07:00
Sam Gateau
30900cb802 SImple fix to the case of multiple material in a mesh with different opacity 2015-08-07 10:59:55 -07:00
Ryan Huffman
41e68b1c52 Disable back-face culling when rendering BillboardOverlay 2015-08-07 10:59:54 -07:00
Howard Stearns
5aa85a5b03 Don't let individual startAnimation get messed up by blend/fade. 2015-08-07 10:59:54 -07:00
bwent
d4e22ba78e clean up formatting, make connectionUUID const in NodeList 2015-08-07 10:59:53 -07:00
bwent
e2be6f7604 add check if user is local user 2015-08-07 10:59:53 -07:00
bwent
1f2bd62f54 clean-up formatting 2015-08-07 10:59:52 -07:00
samcake
6864c7bcb4 Ready for release 2015-08-07 10:59:51 -07:00
Sam Gateau
0e3e0d05f1 Introducing the Normal fitting algorithm for better normal in the deferred buffer 2015-08-07 10:59:51 -07:00
bwent
fb22ccf652 Remove ERR_get_error call 2015-08-07 10:59:50 -07:00
bwent
d9c98ca4cd Add connection token to sign with username when connecting to domain-server 2015-08-07 10:59:50 -07:00
bwent
6368fc2ae6 Parital fix for padding error using RSA_sign and RSA_verify 2015-08-07 10:59:49 -07:00
bwent
cb57b6ccab fix username signature not const 2015-08-07 10:59:49 -07:00
bwent
ba225875cf debugging 2015-08-07 10:59:48 -07:00
bwent
cb8663de36 Debug null QUuid being stored in conenctionTokenHash 2015-08-07 10:59:47 -07:00
bwent
64cac1db5e To debug RSA padding error 2015-08-07 10:59:47 -07:00