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

25706 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
0315bb5e28 Merge pull request #4942 from ericrius1/deleteLook 
deleted look.js (no longer needed) and removed from default scripts
 2015-05-22 10:55:37 -07:00
Brad Hefta-Gaub
7ed3a97bf2 Merge pull request #4939 from Atlante45/perf_timer_tweaks 
Deactivate PerformanceTimer when not in use
 2015-05-22 10:46:13 -07:00
Seth Alves
380fed7aee metersToVoxelCoordinates and voxelCoordinatesToMeters 2015-05-22 10:37:48 -07:00
Clément Brisset
e276926608 Add include/remove duplicate type 2015-05-22 18:23:42 +01:00
Eric Levin
d40d9cca69 deleted look.js (no longer needed) and removed from default scripts 2015-05-22 10:02:28 -07:00
Atlante45
c6ce5e7680 PerformanceTimer deactivated when not in use 2015-05-22 18:54:40 +02:00
Andrew Meadows
01cc629224 fix crashes during init and shutdown 2015-05-22 09:20:08 -07:00
Seth Alves
ed082800f5 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-22 08:38:22 -07:00
Philip Rosedale
3a75dc4d1e Merge pull request #4937 from ctrlaltdavid/dde-face-detection-interval 
Throttle DDE face acquisition attempts in order to reduce CPU usage
 2015-05-22 07:42:15 -07:00
Philip Rosedale
a1d0f4e3b8 Merge pull request #4936 from ericrius1/particleFix 
fixed problem with particle entities not showing up on other clients …
 2015-05-22 07:30:57 -07:00
David Rowe
a0c3c974a9 Throttle DDE face acquisition attempts in order to reduce CPU usage 2015-05-21 19:44:38 -07:00
Eric Levin
fe99941de3 fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp 2015-05-21 19:35:27 -07:00
Seth Alves
b57ccc80e8 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-21 18:38:33 -07:00
Brad Hefta-Gaub
9b469226f3 Merge pull request #4934 from sethalves/fix-edit-js 
fix edit.js -- selectionManager.selections holds ids, not properties
 2015-05-21 18:32:05 -07:00
Seth Alves
ab9d6a948c Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-21 18:22:09 -07:00
Seth Alves
258e3b901d fixes Sam made in my branch while trying to get a mesh to render 2015-05-21 18:20:52 -07:00
Seth Alves
1100c832eb clean up diff 2015-05-21 18:18:04 -07:00
Seth Alves
f85cc89946 clean up diff 2015-05-21 18:17:07 -07:00
Seth Alves
35b1a6eee4 selectionManager.selections holds ids, not properties 2015-05-21 18:15:05 -07:00
Philip Rosedale
05a73d8a79 Merge pull request #4933 from ericrius1/inspectFix 
added oldMode as global vairable
 2015-05-21 18:14:40 -07:00
Eric Levin
ce1ccf1c40 added oldMode as global vairable 2015-05-21 18:08:04 -07:00
Seth Alves
90a5dd6dd1 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-21 18:07:52 -07:00
Seth Alves
a882fc7fb1 pull out common parts of the two sphere-in-volumes 2015-05-21 18:07:46 -07:00
Philip Rosedale
e0e1744d2e Merge pull request #4931 from ericrius1/inspect 
inspect now uses accurate picking and camera slerps to looks at targe…
 2015-05-21 17:15:30 -07:00
Seth Alves
8b2d570f3f clearSphereInVolume 2015-05-21 17:04:57 -07:00
Seth Alves
478cb40135 draws in the right place, now 2015-05-21 16:46:27 -07:00
Andrew Meadows
ac8cac9783 avatars use DYNAMIC motion 2015-05-21 16:37:10 -07:00
Seth Alves
2cb73b5430 added a volex-volume size member variable. drawing transform still isn't quite right 2015-05-21 16:31:01 -07:00
Seth Alves
85171f033e fallout from no-swap-id merge 2015-05-21 16:30:16 -07:00
Andrew Meadows
466af03fa9 support for ShapeInfo::offset 2015-05-21 16:25:05 -07:00
Andrew Meadows
f6721aa6eb moved ShapeInfoUtil to be ShapeFactory 2015-05-21 15:53:16 -07:00
Andrew Meadows
2e3973dfdd impl AvatarMotionState::set/getWorldTransform() 2015-05-21 15:34:30 -07:00
Eric Levin
8a0c1cab1e inspect now uses accurate picking and camera slerps to looks at target. pointer does not show u when user is inspecting 2015-05-21 15:31:30 -07:00
Seth Alves
bbb61a77d9 dodge stride bug in mesh code 2015-05-21 14:47:23 -07:00
Andrew Meadows
67f5d0773d some list management of AvatarMotionStates 2015-05-21 14:40:47 -07:00
Seth Alves
fd19c63449 fix bug in mesh 2015-05-21 14:26:40 -07:00
Stephen Birarda
986eea7c86 Merge pull request #4930 from birarda/domain-wizard 
fix for domain-server settings account disconnect
 2015-05-21 16:46:10 -04:00
Stephen Birarda
33545a0c3f fix for domain-server settings account disconnect 2015-05-21 13:45:50 -07:00
Seth Alves
6a3203475a Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-21 11:57:54 -07:00
Seth Alves
0c1ad258f3 update polyvox 2015-05-21 11:57:37 -07:00
Seth Alves
bd94d28075 Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-21 11:55:17 -07:00
Seth Alves
8e76887101 working on windows build of polyvox 2015-05-21 11:55:13 -07:00
Seth Alves
b74262f2ce update polyvox 2015-05-21 11:53:56 -07:00
Seth Alves
c02b87ad1c update polyvox 2015-05-21 11:09:44 -07:00
Seth Alves
b922976524 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-21 10:43:03 -07:00
Seth Alves
fe188f9a43 something draws, now 2015-05-21 10:42:14 -07:00
Stephen Birarda
f4f4be7917 Merge pull request #4926 from birarda/domain-toggle 
reload the DS merged config after making version required changes
 2015-05-21 13:27:51 -04:00
Stephen Birarda
5d9f62066a reload the merged config after making versioned changes 2015-05-21 10:27:24 -07:00
Seth Alves
72e227eefe Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-21 09:55:14 -07:00
Brad Hefta-Gaub
a503deb3ca Merge pull request #4920 from sethalves/no-id-swap-redux 
No id swap redux
 2015-05-21 09:51:11 -07:00