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

38535 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
a5603140de Fix for mac 2016-02-01 18:50:01 +01:00
Atlante45
72790d361b Update gpu-test 2016-02-01 18:50:01 +01:00
Atlante45
8cf393bb59 Mac compatibility 2016-02-01 18:50:01 +01:00
Atlante45
8d4dab19c7 Only bind once per render batch 2016-02-01 18:50:01 +01:00
Atlante45
9e8a3f19e9 Revert max input slot changes 2016-02-01 18:50:01 +01:00
Atlante45
38a223b270 Split declareStandardTransform 2016-02-01 18:50:01 +01:00
Atlante45
71ecd1662c Add correct vertex attrib divisor 2016-02-01 18:50:01 +01:00
Atlante45
6ee88c15ec Use vbo for draw call infos 2016-02-01 18:50:01 +01:00
Atlante45
7471646569 Disable attrib vertex on normal passes 2016-02-01 18:50:01 +01:00
Atlante45
d639a838ad set currentNamedCall during setupNamedCalls 2016-02-01 18:50:01 +01:00
Atlante45
670cfc263b Capture draw call info and model xfm in batch 2016-02-01 18:50:01 +01:00
Atlante45
7e8ea4dc77 Update primitive instance rendering calls 2016-02-01 18:50:01 +01:00
Atlante45
1658c15cca Reserve last input slot for draw call info 2016-02-01 18:50:01 +01:00
Atlante45
78cd4407db Don't pass binding manually, link named call correctly 2016-02-01 18:50:01 +01:00
Atlante45
eb55e55367 Clear buffers between each batch render 2016-02-01 18:50:01 +01:00
Atlante45
6ff38bc32f Make sure _currentDraw has correct value 2016-02-01 18:50:01 +01:00
Atlante45
3e027fc5c5 Use ssbo for model transforms 2016-02-01 18:50:01 +01:00
Atlante45
23cf72bd6c Add multi draw to factored setup 2016-02-01 18:50:01 +01:00
Atlante45
6464fabd71 Update current draw call 2016-02-01 18:50:01 +01:00
Atlante45
ccb183e518 Unify Named/Normal calls 2016-02-01 18:50:01 +01:00
Atlante45
9e0af63441 Bind model transform as single buffer 2016-02-01 18:50:01 +01:00
Atlante45
bff2a2a8e5 Factor draw call updates 2016-02-01 18:50:01 +01:00
Atlante45
6463136240 start/stopNamedCall run in renderPassTransfer too 2016-02-01 18:50:01 +01:00
Atlante45
bd8f62504d Capture DrawCallInfo during renderPassTransfer 2016-02-01 18:50:01 +01:00
Atlante45
4d6931c5a8 Add private start/stopNamedCall batch commands 2016-02-01 18:50:01 +01:00
Seth Alves
753fc44c12 Merge pull request #6996 from thoys/hydra-scaling-fix 
Fix for controller palm movement for scaled avatars
 2016-02-01 09:17:22 -08:00
Seth Alves
b553c8400d Merge pull request #6988 from huffman/market-import-fail 
Fix marketplace imports failing silently if edit.js not running
 2016-02-01 07:06:34 -08:00
Seth Alves
fb33131ac5 Merge pull request #6985 from imgntn/entitySpawnerAC 
Show how to use an AC to spawn / respawn entities
 2016-02-01 07:05:07 -08:00
Seth Alves
6927f9f503 Merge pull request #6984 from huffman/fix-edit-import-cancel 
Fix 'Import Entities' causing error when cancelling
 2016-02-01 07:04:36 -08:00
Seth Alves
f5ccf19f41 Merge pull request #6982 from howard-stearns/update-away-for-image-overlay 
Update away.js to use an image instead of text.
 2016-02-01 07:04:11 -08:00
Thijs Wenker
8f6e7018bd Fix for Hydra scaling 
This PR fixes the hydra (and probably other hand controllers) while scaling.

Testing notes:
- Enable your hydra's
- Grow your avatar (x5 or x10) (With the `+` key)
- Spreading your arms in a T-pose should work without any scaling issues
- Reset your scale using the `=` key
 2016-01-31 23:39:43 +01:00
James B. Pollack
ef380ca38c Merge pull request #6989 from ctrlaltdavid/20796 
Restart at last location after crash
 2016-01-30 20:10:58 -08:00
Brad Davis
ffe7a0eaf1 Merge pull request #6978 from PhilipRosedale/flocking 
Fish Tank flocking example - FlockOfFish.js
 2016-01-29 21:37:09 -05:00
Philip Rosedale
1766f3fc23 remove debug 2016-01-29 17:20:22 -08:00
Philip Rosedale
ca459e0bd6 Merge branch 'master' of https://github.com/highfidelity/hifi into flocking 2016-01-29 17:18:35 -08:00
Philip Rosedale
11890badd8 Changes per PR suggestions 2016-01-29 17:16:48 -08:00
James B. Pollack
16f353719b Merge pull request #6969 from ericrius1/textEntityProps 
Moves text properties to top of Entity Properties panel
 2016-01-29 17:02:31 -08:00
ericrius1
559fb9cbde fixed merge conflicts 2016-01-29 16:42:10 -08:00
ericrius1
c54711614e Merge remote-tracking branch 'upstream/master' 2016-01-29 16:33:51 -08:00
Ryan Huffman
4ed38c4104 Merge pull request #6986 from birarda/injector-restart 
fix for injector restart not restarting
 2016-01-29 16:27:34 -08:00
Ryan Huffman
bab27e6b79 Merge pull request #6957 from birarda/audio-mixer-coma 
force AC assignment stop during DOS, process events for rapid injectors
 2016-01-29 15:56:58 -08:00
Ryan Huffman
acf96a401f Fix marketplace imports failing silently if edit.js not running 2016-01-29 15:48:08 -08:00
David Rowe
e07baf916b Fixed a typo noticed in passing 2016-01-30 12:30:21 +13:00
David Rowe
a5bc1cfd19 Periodically store avatar location 2016-01-30 12:27:47 +13:00
David Rowe
d2cdbebc94 Store avatar location after a teleport 2016-01-30 12:26:50 +13:00
David Rowe
be4022983b Don't store avatar location immediately after a host change 
Because the avatar location is 0,0,0 rather than the end target.
 2016-01-30 12:25:56 +13:00
Stephen Birarda
d7990bf88a reset hasSentFirstFrame to false for double frame on first send 2016-01-29 14:55:08 -08:00
Stephen Birarda
d3028606c5 retart the nextFrame and frameTimer on injector restart 2016-01-29 14:47:27 -08:00
James B. Pollack
cb2fbd7e7f clear octree interval 2016-01-29 14:29:27 -08:00
James B. Pollack
5e5c6158bb show how to use an ac to spawn and respawn entities 2016-01-29 14:22:21 -08:00