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

8884 commits

Author SHA1 Message Date
Seth Alves
4a59dc24c5 split entity-add and entity-edit messages 2015-05-20 14:52:03 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99 sort out script interface changes 2015-05-20 12:30:06 -07:00
Seth Alves
a769cfdaf2 client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
Seth Alves
b32e069f1d bump protocol version 2015-05-19 14:45:01 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Howard Stearns
bb4df26690 Fix indentation. 2015-05-18 14:25:35 -07:00
Howard Stearns
95be605233 Typo: unlock=>lock in rednerDebugMeshBoxes. 2015-05-18 14:05:13 -07:00
Howard Stearns
7e1b6a48c5 Merge branch 'master' of https://github.com/highfidelity/hifi into grab-picking-crash 2015-05-18 13:35:28 -07:00
Howard Stearns
f2a66f3106 Simplest fix for the grab crash that occurs with animated complex models. 
(e.g., clicking on air hockey props in front of a spinning windmill).
 2015-05-18 13:08:11 -07:00
ZappoMan
1bb682180c workaround for segregateMeshGroups() crash 2015-05-18 12:24:18 -07:00
Stephen Birarda
2eb796eca6 resolve conflicts on merge with upstream/master 2015-05-18 10:25:24 -07:00
Philip Rosedale
1f8008e5b5 Merge pull request #4897 from samcake/yellow 
Remove the loading time when moving to a zone
 2015-05-16 20:50:26 -07:00
Andrew Meadows
180590145d check for NULL before using pointer to EntityItem 2015-05-16 11:12:19 -07:00
Sam Cake
c3dfd574b4 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-05-15 15:27:14 -07:00
Sam Cake
07fe43e175 moving forward with the void* hack for gpu::Texture 2015-05-15 15:26:40 -07:00
Philip Rosedale
36031eb308 Merge pull request #4886 from sethalves/finglonger 
rays never pick a line entity.  some fixes to pointer.js
 2015-05-15 13:27:13 -07:00
Seth Alves
bb3d1a6a58 rays never pick a line entity. some fixes to pointer.js 2015-05-15 13:10:16 -07:00
Sam Cake
97b18fcd52 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-05-15 11:29:43 -07:00
Sam Cake
765145b898 Moving the load of the texture and the generation of the cube map irradiance in the same thread 2015-05-15 11:28:59 -07:00
Howard Stearns
9f7a56e3e5 Ask audio injector to delete itself. 
Put in null guards.
Tune parameters (including higher threshold).
 2015-05-15 11:00:28 -07:00
Stephen Birarda
e462617a6b add error log debug for script fail 2015-05-15 10:29:24 -07:00
Sam Cake
ad9834283d Fixing the magic numbers! 2015-05-14 15:54:40 -07:00
Philip Rosedale
15d2ce6ecc Merge pull request #4876 from AndrewMeadows/thermonuclear 
adjust margin for hulls with small dimensions
 2015-05-14 15:53:34 -07:00
Sam Cake
e3d80088da Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-05-14 15:22:18 -07:00
Sam Cake
40ee78195e remove magic numbers 2015-05-14 15:21:57 -07:00
Stephen Birarda
5645fdc8b9 send user to token creation page 2015-05-14 15:21:33 -07:00
Howard Stearns
5accb4d0d2 Remove debug logging. 2015-05-14 15:12:31 -07:00
Andrew Meadows
7a47e04b9c adjust margin for hulls with small dimensions 2015-05-14 14:57:18 -07:00
Howard Stearns
b5a28730ea Filter out low-penetration continuous contact from all entity collision activity including scripts: 
We don't want sound for these.
   This appears to avoid the Entities.getEntityProperties() deadlock within entity scripts.
Variable names:
  energyPercentOfFull => energyFactorOfFull, because the range is 0-1, not 0-100.
  COLLISION_SOUND_COMPRESSION => COLLISION_SOUND_COMPRESSION_RANGE (portion of full dynamic range)
Tune constants:
  COLLISION_ENERGY_AT_FULL_VOLUME 10 => 1
  COLLISION_MINIMUM_VOLUME 0.01 => 0.001
  COLLISION_SOUND_COMPRESSION_RANGE 0.5 => 0.95
Refer to SoundCache later, after filtering for collision threshold.
 2015-05-14 14:41:32 -07:00
Andrew Meadows
53e241fb07 merge upstream/master into andrew/thermonuclear 2015-05-14 12:37:41 -07:00
Andrew Meadows
d28c400cea add restitution and friction Entity properties 2015-05-14 12:36:59 -07:00
Seth Alves
41d77e6146 Merge pull request #4852 from AndrewMeadows/nova 
improved distributed simulation ownership negotiation
 2015-05-14 11:40:49 -07:00
Seth Alves
1e2e4001b1 don't allow buildModelMesh to spam logs when it encounters flawed models 2015-05-14 10:24:02 -07:00
Andrew Meadows
81d06e0dc3 Merge upstream/master into andrew/nova 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-14 10:09:55 -07:00
Brad Hefta-Gaub
d1f52231be Merge pull request #4863 from samcake/orange 
Using the skymap for ambient lighting
 2015-05-14 09:12:46 -07:00
Andrew Meadows
c631f85bf9 cleanup of simulation ownership/update logic 2015-05-14 08:43:54 -07:00
Brad Davis
a77816617d Make web entities interactive (via the mouse) if they're not locked. 2015-05-14 01:15:20 -07:00
Seth Alves
baf4157da0 Merge pull request #4859 from ZappoMan/typeSafePropertyCleanup 
Clean up Entity Properties and Macros to be more type-safe friendly and consistent
 2015-05-13 20:52:03 -07:00
Brad Hefta-Gaub
99cd3989c6 Merge pull request #4865 from sethalves/fix-ray-intersection 
sam's mesh code
 2015-05-13 20:46:05 -07:00
Brad Hefta-Gaub
77019eafa7 Merge pull request #4831 from jherico/plugins_pt2 
Display plugins part 2
 2015-05-13 20:40:33 -07:00
ZappoMan
0dcb89fce7 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-13 20:33:10 -07:00
Brad Hefta-Gaub
5da0a8d7a3 Merge pull request #4860 from howard-stearns/entity-sound 
Entity sound.
 2015-05-13 20:07:44 -07:00
Seth Alves
9935b2ba22 Merge branch 'master' of github.com:highfidelity/hifi into fix-ray-intersection 2015-05-13 18:17:07 -07:00
David Rowe
2032d36b1f Fix double/float mismatch build warnings 2015-05-13 17:32:40 -07:00
ZappoMan
045c0141e8 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-13 17:09:21 -07:00
Brad Hefta-Gaub
3b7acae8a2 Merge pull request #4850 from jherico/web-entity 
Web entity
 2015-05-13 17:02:55 -07:00
Sam Cake
d13106f4c9 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-13 16:00:42 -07:00
Sam Cake
238d3751c5 cleaning up the SH generation 2015-05-13 16:00:05 -07:00
Howard Stearns
ef187b390b Server versioning. 2015-05-13 15:52:05 -07:00