Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-19 20:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 74 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
24e7ad69ed Merge pull request #10 from druiz17/fix-parent-grab 
fix cloning equiping
 2017-09-26 10:46:11 -07:00
Stephen Birarda
b77ceab661 remove noisy logging added by auto-baking 2017-09-26 10:45:23 -07:00
druiz17
2cc8a55151 fix cloning equiping 2017-09-26 10:37:36 -07:00
Andrew Meadows
ec80846281 Merge pull request #11443 from SamGondelman/sharks 
Laser Pointer fixes and updates
 2017-09-26 10:22:55 -07:00
Howard Stearns
81cd00527a Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-26 10:15:37 -07:00
Seth Alves
afeb98059b Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab 2017-09-26 10:14:21 -07:00
utkarshgautamnyu
1ba7aefd03 Update JSBaker.h 2017-09-26 09:57:02 -07:00
Daniela
e264503b9f Merge remote-tracking branch 'upstream/master' 2017-09-26 17:49:15 +01:00
Daniela
179a426389 Address QA comments. 2017-09-26 17:44:46 +01:00
Sam Gateau
ff1101cc69 Merge pull request #11453 from Menithal/entity-custom-shader-emit-fix 
Experimental Fix: Entity Shader Lightmap use / emissive
 2017-09-26 09:39:33 -07:00
Andrew Meadows
67481287ff comment out asserts that fail to compile in Debug 2017-09-26 09:29:43 -07:00
Sam Gateau
953614fe65 More stuff out of render to the gameloop 2017-09-25 23:43:32 -07:00
utkarshgautamnyu
b86dd9dea4 Update JSBaker.cpp 2017-09-25 20:20:30 -07:00
utkarshgautamnyu
9e91ab7630 Update AssetServer.cpp 2017-09-25 20:19:53 -07:00
David Rowe
9b7197cf3f Don't highlight entity you're inside unless you laser it 2017-09-26 15:36:40 +13:00
Seth Alves
0b60928dd3 fix rollup-to-parent code to only roll up to entity parents 2017-09-25 19:07:40 -07:00
samcake
157b4f2e13 Moving some of the updates on the camera and the avatar out from render to game loop 2017-09-25 18:28:33 -07:00
Brad Davis
40c42d35a5 Fix long tablet lag on first load 2017-09-25 17:50:04 -07:00
druiz17
6332a53ee2 able to grab tablet in 3rd person 2017-09-25 16:36:29 -07:00
utkarshgautamnyu
209201e592 updates to handle white space within a single line comment 2017-09-25 15:55:12 -07:00
Andrew Meadows
cc8e618bc0 remove cruft 2017-09-25 15:52:14 -07:00
Seth Alves
5da5b24894 unmangle merge 2017-09-25 15:18:22 -07:00
utkarshgautamnyu
91dad385a6 Refactored AssetServer.cpp 2017-09-25 15:12:04 -07:00
samcake
11c55755d5 Removing unused call 2017-09-25 15:10:40 -07:00
Andrew Meadows
a3ac20d961 minor cleanup 2017-09-25 15:10:14 -07:00
David Rowe
d64e3aca55 Polyvoxels don't have a color property 2017-09-26 11:10:05 +13:00
beholder
5502a639e2 7877 Unexpected Behavior when pressing Enter on Input Field 2017-09-26 01:07:47 +03:00
utkarshgautamnyu
0a57874cc2 Made updates to JSBaker 2017-09-25 14:46:38 -07:00
David Rowe
428efa571e Merge branch 'master' into vr-edit-a 2017-09-26 10:40:07 +13:00
druiz17
ec40df711d fix tablet grabbing and eslint changes 2017-09-25 14:31:13 -07:00
Menithal
19a290be70 Fixed Entity Shader emmissive 
Makes sure that the emissiveAmount information is used correctly for a custom
shader, instead of using specular rgb information to generate the
emissiveness, which was incorrect
 2017-09-26 00:12:45 +03:00
vladest
074362b228 Remove logging 2017-09-25 23:10:26 +02:00
Andrew Meadows
37c501b131 LODManager uses renderTime instead of main loop fps 2017-09-25 13:17:21 -07:00
Howard Stearns
ee6bf7f761 Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-25 12:37:28 -07:00
Seth Alves
e09d82c8f2 Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab 2017-09-25 12:31:55 -07:00
vladest
083b52abaf CHeck containsMouse property for mouse area instead on hovered 2017-09-25 21:15:05 +02:00
Sam Gateau
191066a111 Merge pull request #11452 from SamGondelman/pos3D 
Fix pointer event properties
 2017-09-25 11:49:54 -07:00
samcake
abab7ff724 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-25 11:34:24 -07:00
druiz17
b1b31444f0 fix mouse visiblity 2017-09-25 11:34:18 -07:00
vladest
b190fac4f1 Fix stylus 2017-09-25 19:45:51 +02:00
SamGondelman
a73fdf4397 fix pointer event properties 2017-09-25 10:19:42 -07:00
druiz17
dda20c1ef5 fixing merge conflict 2017-09-25 09:45:29 -07:00
Nissim Hadar
27af4685e7 Added range and altitude to UI. 2017-09-25 09:32:52 -07:00
Seth Alves
5741782f45 merge from upstream 2017-09-25 09:16:43 -07:00
Brad Hefta-Gaub
030da7d850 Merge pull request #11401 from druiz17/module-scale-entities 
ScaleEntity Module
 2017-09-25 09:10:32 -07:00
Seth Alves
90954a4e4f Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab 2017-09-25 09:09:58 -07:00
Olivier Prat
27b9f3516d Added mix parameter to blur and bloom 2017-09-25 18:05:30 +02:00
vladest
1a2d38e31f Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds 2017-09-25 17:11:44 +02:00
vladest
b5f0c4d940 Added settings controls sounds 2017-09-25 16:46:36 +02:00
Olivier Prat
22b1507597 Fixed blur to work correctly on four sides of screen 2017-09-25 16:41:20 +02:00