Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30517 commits 29 branches 0 tags 1.1 GiB
Commit graph

1387 commits

Author SHA1 Message Date
Andrew Meadows
fe2d03fd37 merge 
Conflicts:
	libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/stereo/StereoDisplayPlugin.cpp
	libraries/shared/src/GLMHelpers.cpp
 2015-09-01 11:17:08 -07:00
Seth Alves
f6fbf4f324 fix whitespace 2015-08-28 14:08:30 -07:00
Andrew Meadows
614fad0811 remove warnings from linux build 2015-08-27 19:12:25 -07:00
Seth Alves
e97e7de19c Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-27 13:19:15 -07:00
Brad Hefta-Gaub
7b2f944f48 Merge pull request #5561 from ericrius1/particleExtensions 
Extended Particle entity to allow for more varied effects
 2015-08-27 10:45:03 -07:00
ericrius1
5586c2ff17 fixed ordering of bitsream reading for old svo files with particle entities 2015-08-26 11:45:19 -07:00
Seth Alves
696e34b996 Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox 2015-08-26 11:11:41 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
ericrius1
f25b75093c cleaned up conditional bitstream parsing 2015-08-26 09:44:29 -07:00
Seth Alves
da6a1c958b clean up debugging prints 2015-08-25 16:40:58 -07:00
Seth Alves
f6c440756c do slow polyvox operations on a thread 2015-08-25 11:46:51 -07:00
Seth Alves
7cb9968864 more work on polyvox threading 2015-08-25 05:53:36 -07:00
ericrius1
13892db866 removed logging 2015-08-24 11:41:03 -07:00
ericrius1
5fa27a7cf1 added back computeAndUpdate mmethod for particles, and now handling parsing old streams 2015-08-24 10:59:38 -07:00
Seth Alves
dc31c7e233 back out previous attempt at theading polyvox code. lay groundwork for threading that can be reasoned about 2015-08-23 08:14:05 -07:00
Seth Alves
f9fb65bb4b Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox 2015-08-20 10:15:16 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Seth Alves
ef6116465d make edged-cubic be the default polyvox surface style 2015-08-19 19:15:36 -07:00
Andrew Meadows
5a442bdb30 Merge pull request #5555 from ZappoMan/centerOrigin 
Make domains 8x larger (2x in each dimension), with origin at center of buildable space
 2015-08-19 15:59:04 -07:00
Stephen Birarda
6860f3d126 add readWithoutCopy for clarity in Packet read 2015-08-19 14:32:26 -07:00
ZappoMan
684ee3bdd0 Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-19 11:20:15 -07:00
Andrew Meadows
990dce6795 Merge pull request #5578 from sethalves/polyvox 
Polyvox improvements
 2015-08-19 10:31:13 -07:00
Seth Alves
2dc2757eca code review 2015-08-18 13:03:54 -07:00
Andrew Meadows
9ee49c3e1e Merge pull request #5551 from sethalves/quiet-compiler 
Quiet compiler
 2015-08-18 09:54:29 -07:00
Seth Alves
b129c2a933 in edged mode, make sure border voxels are zeroed out. expose some more voxel matrix math to javascript 2015-08-16 09:36:54 -07:00
Seth Alves
558f68c150 increase max polyvox dimension from 32 to 128. don't recompress compressed data unless something changed../../libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp 2015-08-15 16:53:47 -07:00
Seth Alves
5ecdbaa19d have functions that change polyvox voxes return true if they changed anything, else false. added voxelCoordsToWorldCoords and worldCoordsToVoxelCoords 2015-08-15 15:18:25 -07:00
Seth Alves
79a7755cdb add SURFACE_EDGED_MARCHING_CUBES polyvox surface extraction style 2015-08-15 12:18:36 -07:00
ZappoMan
44fcf71f07 change domain to be 32k and still have origin centered at 0 2015-08-14 15:26:49 -07:00
ZappoMan
bdc78e9666 some CR cleanup 2015-08-14 10:16:48 -07:00
ZappoMan
daeb90c1e0 fix clamp in AddEntityOperator 2015-08-14 09:35:39 -07:00
ZappoMan
5fdd7304aa Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-14 09:33:53 -07:00
ericrius1
b8a6105a03 Merge branch 'master' into particleExtensions 2015-08-14 08:56:59 -07:00
ericrius1
e191a301d8 added a spread to defaults to create a default fountain effect 2015-08-13 16:08:38 -07:00
ericrius1
bb84e0e403 fixed defaults 2015-08-13 15:57:45 -07:00
ericrius1
6fe8703492 added defaults to particle effect for velocity and acceleration 2015-08-13 15:50:00 -07:00
ericrius1
5b2e966ca5 fixing accel issues 2015-08-13 10:55:21 -07:00
ericrius1
d38d29e0f5 fixed argument signatues and optimized particle position calculations 2015-08-13 10:35:32 -07:00
ericrius1
f3d6992dd2 remove outdated comment 2015-08-12 17:28:07 -07:00
ericrius1
36ca0c54fc acceleration spread working properly 2015-08-12 16:13:00 -07:00
ericrius1
16279bd415 emitters trail particles now 2015-08-12 14:01:42 -07:00
ericrius1
528d662c58 getting acceleration spread hooked up 2015-08-12 09:50:01 -07:00
ZappoMan
4fe8f49d4c move origin to center of domain 2015-08-11 23:47:40 -07:00
ZappoMan
0990229c64 cache calculation of aabox and aacubes 2015-08-11 18:05:22 -07:00
ericrius1
2db053e56a adding acceleration spread property 2015-08-11 17:09:48 -07:00
ericrius1
0031c2a39a changed localGravity prop to acceleration, which can be along any arbitrary direction 2015-08-11 16:05:18 -07:00
ericrius1
c2915fc0f5 changing to velocity spread 2015-08-11 15:16:36 -07:00
ericrius1
ddaba19a4e chaning to velocity from direction 2015-08-11 14:43:05 -07:00
Seth Alves
d6322903a2 quiet compiler 2015-08-11 10:12:46 -07:00
ericrius1
7ed408bf97 fixed merge conflics 2015-08-10 15:50:51 -07:00