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

20663 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
bddb7856af more work 2015-01-19 13:34:09 -08:00
ZappoMan
439a1c0495 solid cube now streamizing 2015-01-15 18:46:44 -08:00
ZappoMan
daafa20ec6 first cut at moving wire cube to support gpu streams 2015-01-15 17:00:08 -08:00
ZappoMan
149f365410 fix colors for renderBevelCornersRect() 2015-01-15 11:55:45 -08:00
ZappoMan
72f2e6f3aa work on colored quads 2015-01-15 11:37:53 -08:00
ZappoMan
db94949649 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-01-14 17:55:03 -08:00
Brad Hefta-Gaub
89967fbe7a Merge pull request #4104 from AndrewMeadows/inertia 
store density in EntityItem instead of mass
 2015-01-14 17:17:45 -08:00
Brad Hefta-Gaub
9d45bed0e2 Merge pull request #4103 from Atlante45/applications_diet_cpp11 
DependencyManager update
 2015-01-14 17:17:07 -08:00
Philip Rosedale
1188be52e4 Merge pull request #4106 from ZappoMan/rayPickWork 
fix ray pick of ellipsoids away from origin
 2015-01-14 17:10:30 -08:00
Philip Rosedale
627689f587 Merge pull request #4105 from Atlante45/body_not_rotating 
Fixes body not rotating for other avatars
 2015-01-14 17:07:44 -08:00
ZappoMan
ff60833129 fix ray pick of ellipsoids away from origin 2015-01-14 16:55:24 -08:00
Atlante45
b922b028e9 Fixes body not rotating for other avatars 2015-01-14 16:47:20 -08:00
Philip Rosedale
fead12acca Merge pull request #4102 from cozza13/20268 
CR for Job #20268 - Change hands for gun scripts
 2015-01-14 15:52:04 -08:00
Clément Brisset
ce12e61a27 Merge pull request #4101 from huffman/fix-rotation-image 
Fix rotation handles not showing up
 2015-01-14 15:49:09 -08:00
Andrew Meadows
f90b128ac3 use density instead of mass in scripts/UI 2015-01-14 15:48:05 -08:00
Andrew Meadows
ccc50dd94f use density instead of mass 2015-01-14 15:47:44 -08:00
Atlante45
7b5babb02a Set AddressManager before NodeList 2015-01-14 15:46:33 -08:00
Andrew Meadows
03b8badd81 EntityItem stores density rather than mass. 2015-01-14 15:00:57 -08:00
Andrew Meadows
8236837dd0 add ShapeInfo::computeVolume() 2015-01-14 15:00:31 -08:00
ZappoMan
2f549c776c Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-14 14:41:51 -08:00
Atlante45
1399de52a5 Only use limited nodelist in DS 2015-01-14 14:24:54 -08:00
Chris Collins
6ce71d9655 Fix library and placement reference 
Fix library reference and switch the gun hand.
 2015-01-14 13:54:34 -08:00
Ryan Huffman
e7eb12202a Fix rotation handles not showing up 2015-01-14 09:41:34 -08:00
Atlante45
48f1cbe644 Fixed QSharedPointer in connect() 2015-01-13 20:54:15 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Atlante45
476e2124b7 Moved DM::get() calls to auto 2015-01-13 20:51:02 -08:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
Atlante45
38729c5790 Made dependencies inherit from Dependency 2015-01-13 20:38:01 -08:00
Atlante45
36db547c0f Setup DependencyManager before any member of Application 2015-01-13 20:35:45 -08:00
Atlante45
27cc3d297e DependencyManager update 
- Now need a call to DependencyManager::set(...) that support
	  variable arguments number and type
	- Now support destroy operation via DependencyManager::destroy()
	- Now support inheritance. All inheritance relationship need to
	  be specified via DependencyManager::registerInheritance<Base,
Derived>() before any call to the DepedencyManager involving Base.
	- Dependencies should now inherit from the class Dependency as
	  well as using SINGLETON_DEPENDENCY
 2015-01-13 20:27:38 -08:00
Andrew Meadows
dd2421ffcd Merge pull request #4100 from ZappoMan/backupBugFix 
Add support for multiple backup rules
 2015-01-13 17:59:44 -08:00
Brad Hefta-Gaub
7e55d79ab7 Merge pull request #4099 from huffman/update-entity-properties 
Add missing model properties to entity property window
 2015-01-13 17:12:06 -08:00
Brad Hefta-Gaub
b3b43b4c14 Merge pull request #4093 from samcake/temp0 
Factorize the shader code for deferred lighting
 2015-01-13 17:11:17 -08:00
Brad Hefta-Gaub
284ee32b7b Merge pull request #4089 from AndrewMeadows/inertia 
fix glitchy entity motion in Bullet simulation
 2015-01-13 17:10:35 -08:00
Clément Brisset
3034b8f733 Merge pull request #4091 from ctrlaltdavid/20229 
CR for Job #20229 - Expose the downloads section for models and metavoxels to javascript
 2015-01-13 17:07:17 -08:00
Andrew Meadows
26ab79e840 Merge pull request #4097 from huffman/update-camera-hud 
Enable and update camera tool
 2015-01-13 17:07:04 -08:00
Clément Brisset
5635ac3d7b Merge pull request #4090 from ctrlaltdavid/no-show-voxel-nodes 
Remove menu item for Show Voxel Nodes which is no longer available
 2015-01-13 17:06:58 -08:00
Clément Brisset
808cbfe16a Merge pull request #4088 from ctrlaltdavid/qnetworkreply-error-code 
Use more appropriate QNetworkReply error code
 2015-01-13 17:06:42 -08:00
Andrew Meadows
b4ee7b684c Merge pull request #4070 from cozza13/20259 
CR for Job #20259 - Fix up bad links on bot scripts
 2015-01-13 17:06:36 -08:00
Clément Brisset
aff0554a62 Merge pull request #4079 from thoys/fix-GetVersionEx-deprication-warnings 
[WINDOWS ONLY] replaced GetVersionEx with new Version helpers to resolve deprecation warnings.
 2015-01-13 17:06:26 -08:00
ZappoMan
1b0a5c881b Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-13 16:14:29 -08:00
ZappoMan
6eb35bf98c tweaks to descriptions 2015-01-13 16:13:18 -08:00
Andrew Meadows
04b4a95ccb fix for bad cleanup (3 places) 2015-01-13 14:21:41 -08:00
Andrew Meadows
cee7a4db10 merge upstream/master into andrew/inertia 2015-01-13 14:03:27 -08:00
Andrew Meadows
dcca5d532a fix for glitchy physics updates 
The main problem was: ObjectMotionState::_sentPosition and friends
were not being updated when the EntityServer update arrives.
 2015-01-13 14:00:37 -08:00
ZappoMan
0e19e1f8a5 cleanup some dead code 2015-01-13 13:48:28 -08:00
ZappoMan
60aec8ac00 add support for multiple backup rules 2015-01-13 13:41:32 -08:00
Atlante45
4429e144f4 Fix merge accidental code delete 2015-01-13 11:10:13 -08:00
Atlante45
d8170516ff Remove VoxelServer.cpp kept during merge 2015-01-13 11:05:51 -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