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
57659 commits 29 branches 0 tags 1.1 GiB
Commit graph

57659 commits

This branch
This branch
All branches
Author SHA1 Message Date
Midnight
9185e1d80d code style. 2017-08-21 14:48:10 -07:00
Midnight
6892cdb57d Consolidate Clear Prox Code, Add Clear Prox to collisionWithEntity. 2017-08-18 19:20:34 -07:00
Midnight
9ff68ce10c Remove particleTrailEntity from every prox check, the trail no longer needs to be updated each check. 2017-08-18 18:51:44 -07:00
Midnight
37ee2a31d4 Remove particleTrailEntity from every prox check, the trail no longer needs to be updated each check. 2017-08-18 18:50:03 -07:00
Midnight
397d2a6853 Minor Code Cleanup. 2017-08-18 16:12:56 -07:00
Midnight
7da4bc04d3 Add DodgeBall. 2017-08-18 13:36:07 -07:00
druiz17
6680be2a03 Merge pull request #11103 from vladest/fix_toolbar_apps_switch 
Fix toolbar apps switch
 2017-08-02 12:59:31 -07:00
anshuman64
f3a9481123 Merge pull request #11104 from vladest/audio_mute_mouseover 
Audio mic bar show only rectangle on mouse over
 2017-08-02 12:32:15 -07:00
vladest
638eeede43 Merge conflict 2017-08-02 20:07:06 +02:00
vladest
7d361c69c2 Audio mic bar show only rectangle on mouse over 2017-08-02 19:52:47 +02:00
Seth Alves
728e7fb253 Merge pull request #11099 from druiz17/bug-blank-tablet-switch 
fix blank tablet when switching between HMD and Desktop mode quickly
 2017-08-02 10:09:56 -07:00
Seth Alves
2319006868 Merge pull request #11100 from hyperlogic/bug-fix/teleport-crash 
Fix for crash when attempting to teleport while avatar was loading
 2017-08-02 10:00:13 -07:00
Dante Ruiz
8d69cd8999 Merge branch 'master' of github.com:highfidelity/hifi into bug-blank-tablet-switch 2017-08-02 16:36:17 +01:00
Dante Ruiz
05f1caab01 better solution to help and blank tablet issues 2017-08-02 16:35:58 +01:00
vladest
2d4396ac8e Merge branch 'master' into fix_toolbar_apps_switch 2017-08-02 16:34:49 +02:00
vladest
4330e31212 Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create 2017-08-02 16:32:09 +02:00
Seth Alves
baad9f1af4 Merge pull request #11097 from druiz17/bug-entity-crash2 
Lock the script engine in EntityEditPacketSender
 2017-08-02 06:40:41 -07:00
Anthony J. Thibault
1b6feb63c8 Fix for crash when attempting to teleport while avatar was loading 
The fix had two parts.
  * Make Avatar::getAbsoluteDefaultJointXXXInObjectFrame thread safe
  * Make teleport.js handle a zero foot offset more gracefully, to prevent the avatar from teleporting into the floor.
 2017-08-01 18:40:43 -07:00
Melissa Brown
c83caaacf5 Merge pull request #11062 from rabelaiis/21479 
Make Xylophone mallets equipable, make the mallets provide haptic fee…
 2017-08-01 17:05:23 -07:00
Anthony Thibault
8a87ebd2a8 Merge pull request #11036 from AndrewMeadows/walkabout 
fix bugs preventing avatar from walking on spherical planet
 2017-08-01 16:36:35 -07:00
Dante Ruiz
cca29e849b fix issue of tablet begin blank when switching between HMD and Desktop mode 2017-08-01 23:18:42 +01:00
Seth Alves
b9456ab7b6 Merge pull request #11081 from Menithal/21464 
Fixed Particle Editor Update event
 2017-08-01 15:11:33 -07:00
Seth Alves
184c3d855d Merge pull request #11061 from TurnMeUp-OG/21470 
Fix tablet focus issue when property menu is open and field is selected
 2017-08-01 15:10:26 -07:00
anshuman64
9bf4977e09 Merge pull request #11096 from humbletim/21487 
WL 21487: Fix Camera behavior in Mirror mode
 2017-08-01 14:59:06 -07:00
Brad Hefta-Gaub
0f374b5aa0 Merge pull request #11094 from marko8904/installer/nsis-compression 
switching from LZMA (default) to BZIP2 for NSIS compression
 2017-08-01 12:34:18 -07:00
Dante Ruiz
c22e08f3e8 loacked script engine in EntityEditPacketSender 2017-08-01 19:58:23 +01:00
anshuman64
97b4fd4032 Merge pull request #11071 from vladest/fix_menu_landscape 
Fix Landscape mode, when menu pushed in Create mode
 2017-08-01 11:29:15 -07:00
humbletim
3a9b8c02a6 * disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" 
* restore access to "View > Mirror" from HMD mode
 2017-08-01 13:41:28 -04:00
rabelaiis
f1d7ef76e7 Add the mallet js file 2017-08-01 23:41:16 +07:00
Scromie@turnmeupgames.com
9b28d546e0 Test plan 2017-08-01 12:32:27 +03:00
Marko Kudjerski
6855dcbacf use bzip2 compression only for PR builds (so that we internally benefit from faster builds) 2017-07-31 17:17:11 -07:00
Marko Kudjerski
46966b1132 switching from LZMA (default) to BZIP2 for NSIS compression 2017-07-31 16:19:34 -07:00
Menithal
6020154867 Removed some whitespaces to trigger new build 2017-07-31 22:49:11 +03:00
Chris Collins
5bdaa4daa1 Merge pull request #11087 from jherico/crash_null_entity_element 
Fix potential nullptr access in EntityTreeElement
 2017-07-31 09:15:52 -07:00
rabelaiis
1f6b92a519 Vibrate only the controller that hits the key and decrease timeout so that the xylophone can be played faster 2017-07-31 17:27:49 +07:00
Matti Lahtinen
5fab6c37a3 Removed stray variable test 2017-07-31 08:56:04 +03:00
Brad Hefta-Gaub
7785c11ee8 Merge pull request #11080 from jherico/fix_web_touch_emulation 
Fix web touch emulation
 2017-07-30 09:14:54 -07:00
Brad Hefta-Gaub
c88e5d1053 Merge pull request #11084 from jherico/fix_paths_warning 
Fix log warnings from non-notifiable properties
 2017-07-30 08:51:47 -07:00
Brad Davis
861b33a845 Fix potential nullptr access in EntityTreeElement 2017-07-29 17:22:25 -07:00
Brad Hefta-Gaub
3bd2464a01 Merge pull request #11086 from highfidelity/revert-11079-disable_web_touch_emulation 
Revert "Disable touch event emulation for tablet until we fix crash"
 2017-07-29 13:11:32 -07:00
Brad Hefta-Gaub
af2452eb64 Revert "Disable touch event emulation for tablet until we fix crash" 2017-07-29 13:06:07 -07:00
Brad Davis
17b06e8e12 Fix log warnings from non-notifiable properties 2017-07-29 11:54:39 -07:00
Brad Davis
7d18d2e017 Restore corrected touch event simulation 2017-07-29 08:51:51 -07:00
Brad Hefta-Gaub
52bebf621d Merge pull request #11079 from jherico/disable_web_touch_emulation 
Disable touch event emulation for tablet until we fix crash
 2017-07-29 08:28:37 -07:00
Menithal
734330dc06 Fixed Particle Editor Update event 
Particle Editor was agressively refreshing when ever a particle was be
ing up dated

Added a flag check to make sure the particle was always using the latest
version
 2017-07-29 15:48:31 +03:00
vladest
3c9ab36416 Remove already already implemented fix 2017-07-29 12:00:41 +02:00
vladest
0333849aa8 Merge branch 'master' into fix_menu_landscape 2017-07-29 11:44:58 +02:00
Brad Davis
5946a965da Disable touch event emulation for tablet until we fix crash 2017-07-28 18:54:16 -07:00
Chris Collins
cfd9f8b64e Merge pull request #11077 from jherico/overlay_event_crashes 
Fix overlay event handling thread issues
 2017-07-28 15:56:09 -07:00
anshuman64
e11388f7f7 Merge pull request #11068 from ctrlaltdavid/dominant-hand-signal 
Add a "dominant hand changed" signal
 2017-07-28 15:17:50 -07:00