Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 05:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
52309 commits 25 branches 0 tags 1.1 GiB
Commit graph

2260 commits

Author SHA1 Message Date
Zach Fox
665b21f2f7 Checkpoint 2017-03-23 17:08:32 -07: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
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
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
samcake
e1a0984fed Merge pull request #9906 from samcake/red 
Expose rendering in wireframe mode
 2017-03-17 17:09:44 -07:00
Thijs Wenker
febe25511b teleport.js - ignore entity support (for boxing gloves) 2017-03-17 21:10:06 +01: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
Stephen Birarda
7ddb5ff770 use correct boolean when changing AMC 2017-03-14 18:09:17 -07:00
Stephen Birarda
188530590a add missing curly brace to script 2017-03-14 17:16:49 -07:00
Stephen Birarda
490cb83489 move advanced movement control changes to MyAvatar 2017-03-14 15:03:01 -07:00
Atlante45
b14a4faf61 Guard against script loading before avatar 2017-03-14 10:54:22 -08:00
Atlante45
9e6312ba0e Make sit script more stable. 2017-03-13 18:06:32 -08:00
Atlante45
f0d971fc6f Put avatar in front of chair on situp to avoid infinite collisions 2017-03-13 18:06:32 -08:00
Atlante45
1a375432e0 Only grab primary clicks 2017-03-13 18:06:32 -08:00
Atlante45
34889d38c9 Override all roles instead of just fly 2017-03-13 18:06:32 -08:00
Ryan Huffman
8246dbafab Update particle explorer to work outside of entity list 2017-03-13 15:15:36 -07:00
Stephen Birarda
0926b2df2a add LX snap turn to standard mapping 2017-03-13 15:14:20 -07:00
Ryan Huffman
9880d40cfb Update edit.js light icons to now use the name entityIcon 2017-03-13 14:38:56 -07:00
Brad Davis
3bef5ad528 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-13 14:30:25 -07:00
Ryan Huffman
d4ade8278c Fix js linting errors in entityIconOverlayManager.js 2017-03-13 11:27:12 -07:00
Ryan Huffman
b7783dcffe Update edit.js light/particle overlays to be clickable when behind something 2017-03-13 11:26:34 -07:00
Ryan Huffman
c2564800dc Add edit.js particle + light icons 2017-03-13 10:10:53 -07:00
Ryan Huffman
dbcd7fd9e9 Fix light icon overlay not updating to represent light type 2017-03-13 10:10:53 -07:00
Ryan Huffman
42d518fafb Remove debug log in entityIconOverlayManager 2017-03-13 10:10:53 -07:00
Ryan Huffman
86116aaad7 Update light/particel icons to be shown by default in edit mode 2017-03-13 10:10:53 -07:00
Ryan Huffman
ce5ee42961 Update LightOverlayManager to work with particles 2017-03-13 10:10:53 -07:00
Brad Hefta-Gaub
23e47f2fdc added icons to the audioScope app 2017-03-10 18:13:35 -08:00
Brad Hefta-Gaub
b8a2525f9e add auto pause/resume to the Audio Scope App 2017-03-10 17:38:00 -08:00
Brad Hefta-Gaub
5f3ee2e98f add a basic tablet app for the audio scope 2017-03-10 17:08:54 -08:00
Seth Alves
494b602d4c Merge pull request #9850 from druiz17/toolbar-MIA-afetr-snapshot 
toolbar becomes visible after taking a snapshot
 2017-03-10 10:20:01 -08:00
Seth Alves
cef4c988c4 Merge pull request #9835 from druiz17/toolbar-window-dont-close 
Close toolbar windows when reloading scripts
 2017-03-10 10:19:07 -08:00
Dante Ruiz
d54005b62e no more duplicate snapshot buttons after taking reloading scripts 2017-03-10 00:17:44 +00:00
Dante Ruiz
c6c0c6d382 toolbar becomes visible after taking a snapshot 2017-03-09 22:54:22 +00:00
druiz17
007ed9fe81 Merge pull request #9836 from druiz17/2-tablets-fix 
Fixed having more than one tablet when reloading scripts
 2017-03-09 09:13:14 -08:00