Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 21:00:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
52463 commits 25 branches 28 tags 1.2 GiB
Commit graph

2304 commits

Author SHA1 Message Date
Andrew Meadows
b9e80d3fa5 Merge pull request #9972 from kunalgosar/marketsBug 
Fixed buttons on Marketplace
 2017-03-28 12:45:25 -07:00
Clément Brisset
82114ae6ab Merge pull request #9940 from Atlante45/fix/sit 
Fix a few sitting bugs noticed at the meetup
 2017-03-28 11:14:31 -07:00
Brad Hefta-Gaub
3bdcfd8b78 Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick 
remove properties from RayToEntityIntersectionResult
 2017-03-27 14:26:51 -07:00
Seth Alves
90db9af2f9 Merge pull request #9978 from Triplelexx/fix-tablet-users-typo 
fix myVisibility typo
 2017-03-26 07:36:11 -08:00
Brad Hefta-Gaub
9b26e8ee95 Merge pull request #9871 from Triplelexx/21208 
21208 - Muted microphone indicator
 2017-03-24 13:07:43 -07:00
Lexx
fa606446a7 remove cache buster 2017-03-24 18:27:38 +00:00
ZappoMan
52335e20a2 fix typo 2017-03-24 09:59:55 -07:00
ZappoMan
84836d9331 fix typo that broke gun 2017-03-24 09:58:56 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00
Triplelexx
6a17e328e8 fix myVisibility typo 2017-03-22 22:13:39 +00:00
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
 2017-03-22 14:25:23 -07:00
Triplelexx
c7b9492620 revert removing rightUnitVec 
.....
 2017-03-22 19:14:20 +00:00
Triplelexx
d1db04f93a fix lost forwardOffset declaration 2017-03-22 18:57:00 +00:00
Triplelexx
2fc8dd48de change testFront to testForward 2017-03-22 17:13:45 +00:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00
Ryan Huffman
1285f2a9eb Merge pull request #9937 from thoys/boppo 
El Boppo the Clown punching bag game
 2017-03-22 09:30:54 -07:00
Triplelexx
6e740a5fbb change Mat4 getFront to getForward 2017-03-21 22:33:37 +00:00
Triplelexx
66d697873f change mat4test back to getFront 
premature, including in seperate commit
 2017-03-21 22:31:06 +00:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
kunalgosar
f09ee92fe1 spacing issues 2017-03-21 14:16:49 -07:00
kunalgosar
30d2ea0ea5 spacing issues 2017-03-21 14:15:56 -07:00
kunalgosar
a4af973ae4 fixed back button on marketplace 2017-03-21 14:12:54 -07:00
Ryan Huffman
13222468e3 Merge pull request #9712 from huffman/feat/edit-particle-icon 
Add particle system overlay in edit.js
 2017-03-21 10:02:52 -07:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Brad Hefta-Gaub
af790d8474 Merge pull request #9875 from birarda/bug/spin-strafe 
fix double snap turn strafing
 2017-03-20 10:08:05 -07:00
Ryan Huffman
df644edde4 Fix hand controller not able to select light/particle icons 2017-03-20 09:45:50 -07:00
Chris Collins
308c134119 Merge pull request #9686 from humbletim/21114-part3 
CR 21114 -- Implement modules/require support into hifi
 2017-03-20 06:22:35 -07:00
Thijs Wenker
a8740614e2 CR Fixes 2017-03-18 01:22:06 +01:00
Atlante45
eab2c314d8 Preload sitting animation 2017-03-17 17:17:05 -07:00
Atlante45
893a5b1b18 Only override inAir and flying animation roles 2017-03-17 17:16:58 -07:00
samcake
e1a0984fed Merge pull request #9906 from samcake/red 
Expose rendering in wireframe mode
 2017-03-17 17:09:44 -07:00
Atlante45
1ce4dcc6e5 Fix attempt for avatar stuck in geometry. 2017-03-17 16:11:47 -07:00
Atlante45
eccc9ff47c Prevent 2 avatars from staying seated in the same chair 2017-03-17 16:11:17 -07:00
Atlante45
4c75680877 Set teleport target to Cancel if seat in use 2017-03-17 16:10:15 -07:00
Thijs Wenker
febe25511b teleport.js - ignore entity support (for boxing gloves) 2017-03-17 21:10:06 +01:00
Atlante45
c1466c2dec Fix a couple sitting bugs 2017-03-17 10:45:13 -07:00
Atlante45
698791295a Expose DriveKeys enum to JS 2017-03-16 20:03:27 -07:00
Atlante45
42316e713d CR drive keys 2017-03-16 16:24:52 -07:00
Atlante45
3e9474e878 CR 2017-03-16 16:24:36 -07:00
Atlante45
35dd45ddf9 Capture drive keys while avatar is seated 2017-03-16 15:44:18 -07:00
Clément Brisset
21c5e7b0b2 Merge pull request #9880 from Atlante45/feat/sit 
Fix avatars stuck in the sitting position after a domain disconnect
 2017-03-16 15:42:29 -07:00
humbletim
758c07c7d4 Merge branch 'master' into 21114-part3 2017-03-16 14:29:17 -04:00
samcake
4ef7fc61f0 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2017-03-16 10:43:07 -07:00
Seth Alves
31e0cfe296 Merge pull request #9825 from thoys/record-fixes 
Avatar Recorder and Playback Fixes
 2017-03-16 07:27:42 -08:00
humbletim
52a571558c * changes per CR feedback 
* revert JSON content-type workaround
* add specific error check / advice for unanchored module ids
* update unit tests
 2017-03-16 01:23:23 -04:00
samcake
ea2f1359bc Expose rendering in wireframe mode 2017-03-15 12:23:44 -07:00
Stephen Birarda
d13752a7c6 use the correct property name for useAdvancedMovementControls 2017-03-15 10:34:43 -07:00
Stephen Birarda
bfc51d8222 use property not function for advanced movement controls 2017-03-15 10:25:06 -07:00