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

67261 commits

This branch
This branch
All branches
Author SHA1 Message Date
Clement
e1c5eb9bda Fix wizard wording 2018-05-02 17:17:19 -07:00
John Conklin II
f43b9ee7e8
Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw 
Added items to the developer menu for debugging physics
 2018-05-02 14:25:09 -07:00
Sam Gondelman
7d19586b53
Merge pull request #12693 from gcalero/android_goto_splash 
Android goto splash
 2018-05-02 16:12:02 -04:00
Gabriel Calero
4dce62cc2e Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 16:27:41 -03:00
John Conklin II
7a5fce4315
Merge pull request #12991 from luiscuenca/avatarScript 
Avatar Scripts
 2018-05-02 12:23:13 -07:00
luiscuenca
689fbd2da0 added requested changes 2018-05-02 11:09:17 -07:00
Anthony J. Thibault
4fa9af5534 Added items to the developer menu for debugging physics 
Hooked up Bullet's internal debug draw functionality to our client.
Under the Developer > Physics Menu there are five new items:

  * Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes.
  * Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes.
  * Show Bullet Contact Points - will draw all contact points where two or more objects are colliding.
  * Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together.
  * Show Bullet Constraint Limits - will render the joint limits for each constraint.
 2018-05-02 10:51:00 -07:00
Gabriel Calero
c15ef56d90 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 14:38:10 -03:00
John Conklin II
83d370f1af
Merge pull request #12872 from huffman/fix/vertex-colors-fbx 
Fix FBX vertex colors not being read correctly
 2018-05-02 10:22:01 -07:00
John Conklin II
49dbc73cd5
Merge pull request #13073 from ctrlaltdavid/21861 
Fix entity not highlighted in list after creating or undoing delete
 2018-05-02 10:19:09 -07:00
Sam Gateau
22e5465767
Merge pull request #13013 from AndrewMeadows/avoid-update-flood 
fix bug: interface sends too many updates on settle
 2018-05-02 08:52:58 -07:00
Ken Cooke
a4105f1081
Merge pull request #13052 from kitely/fix-gcc-warnings 
Eliminated warnings in gcc
 2018-05-02 06:43:32 -07:00
Oren Hurvitz
26ffb3213c Changed "[[gnu::fallthrough]]" to "// FALLTHRU" 2018-05-02 07:06:47 +01:00
David Rowe
1b99946c5f Fix entity not highlighted in list after creating or undoing delete 2018-05-02 12:38:29 +12:00
Stephen Birarda
12f7dd93dc
Merge pull request #13068 from birarda/67-to-master 
merge RC67 back to master
 2018-05-01 17:24:46 -07:00
Stephen Birarda
0838381e4c
Merge pull request #13070 from SimonWalton-HiFi/getdomainlocalid-assert 
Prevent call of getDomainLocalID() by domain server itself more robustly
 2018-05-01 15:45:37 -07:00
Simon Walton
bbcb07d9ab Brute force it with isDomainServer() 2018-05-01 15:07:44 -07:00
Simon Walton
0627099667 In packetSourceAndHashMatchAndTrackBandwidth() check LocalID after check for DS source 
Makes check more robust in case domain server itself reaches this point,
since LimitedNodeList::getDomainLocalID() debug-asserts.
 2018-05-01 14:33:48 -07:00
Stephen Birarda
f5441c05b3 Merge branch 'master' of github.com:highfidelity/hifi into 67-to-master 2018-05-01 14:18:24 -07:00
Stephen Birarda
cad63ad107 Revert "Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"" 
This reverts commit acb21cc96a.
 2018-05-01 14:15:12 -07:00
John Conklin II
382802375d
Merge pull request #13057 from misslivirose/fix/edit-create-grabbable 
Remove 'Create Items as Grabbable' Menu item in cleanup for edit
 2018-05-01 13:15:27 -07:00
John Conklin II
a5753c6d94
Merge pull request #13064 from birarda/66-2-to-67 
merge changes in 66.2 to 67
 2018-05-01 12:50:01 -07:00
John Conklin II
250aa3ab43
Merge pull request #13027 from jherico/fix/web_crash2 
Some fixes for QML surfaces
 2018-05-01 12:39:46 -07:00
MiladNazeri
3bb09024ec
Merge pull request #13058 from ctrlaltdavid/21856-e 
Fix LODManager JSDoc
 2018-05-01 12:25:37 -07:00
Zach Fox
c42b13134f
Merge pull request #13063 from zfox23/preventImageProviderCrash 
Fix a crash in Image Provider when logging in or reloading all scripts
 2018-05-01 11:55:15 -07:00
John Conklin II
c3e531dda1
Merge pull request #13062 from sethalves/fix-physics-crash-on-exit 
fix physics related crash-on-exit
 2018-05-01 11:04:50 -07:00
Stephen Birarda
24dc1c930e Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67 2018-05-01 10:54:35 -07:00
Brad Hefta-Gaub
2d2980c8f2
Merge pull request #13061 from ctrlaltdavid/21856-f 
JSDoc Entity preload, unload, startFarTrigger, etc.
 2018-05-01 10:08:04 -07:00
Zach Fox
cd76336e6a Actually fix 2018-05-01 09:54:23 -07:00
luiscuenca
2ac7fcadd2 load scripts once on rigReady 2018-05-01 09:37:01 -07:00
Seth Alves
f1e1c6a348 fix physics related crash-on-exit 2018-05-01 09:15:44 -07:00
David Rowe
2482da3c25 Miscellaneous JSDoc fixes noticed in passing 2018-05-01 21:55:45 +12:00
David Rowe
65f5915372 Add JSDoc for startFarTrigger etc. calls on entity scripts 2018-05-01 21:55:27 +12:00
David Rowe
a1fc1c4810 Add JSDoc for Entity preload and unload signals 2018-05-01 21:55:14 +12:00
Brad Hefta-Gaub
30e808e133
Merge pull request #13056 from birarda/bug/local-ID-missed-erase 
RC67: add a missing unsafe_erase for local node ID map
 2018-04-30 19:12:03 -07:00
Zach Fox
f69ee41074 Prevent crash in ImageProvider when tablet isn't yet initialized 2018-04-30 17:13:44 -07:00
Ken Cooke
09ef338baf
Merge pull request #13050 from sethalves/fix-linux-debug-build 
fix Linux debug builds
 2018-04-30 16:49:28 -07:00
David Rowe
f9bda6df15 Fix LODManager JSDoc 2018-05-01 11:36:37 +12:00
luiscuenca
50ca09b3b4 minor fixes 2018-04-30 16:26:04 -07:00
Liv Erickson
7db07db9e2 remove menu item at cleanup 2018-04-30 13:55:01 -07:00
Stephen Birarda
ed47cd8458 add a missing unsafe_erase for local node ID map 2018-04-30 12:35:48 -07:00
luiscuenca
2de982a5a2 Added script types and better script reload 2018-04-30 12:04:35 -07:00
Zach Fox
9b80c500e3
Merge pull request #13039 from zfox23/sideloadAppJson 
Enable sideloading .app.json Apps from local disk
 2018-04-30 11:14:24 -07:00
John Conklin II
bc7b0ca0a9
Merge pull request #13029 from birarda/bug/revert-12969-in-67 
Fix missed revert of PR 12969 for RC67
 2018-04-30 11:11:38 -07:00
MiladNazeri
a2e2b2cb8c
Merge pull request #13047 from ctrlaltdavid/21856-b 
Fix JSDoc for Entities.findEntitiesByName
 2018-04-30 11:00:35 -07:00
Anthony Thibault
f520abc6f9
Merge pull request #13048 from ctrlaltdavid/21856-c 
Fix and reorder custom JSDoc tags
 2018-04-30 10:22:37 -07:00
John Conklin II
83d2edc1d5
Merge pull request #13043 from dback2/RC67 
RC67: Desktop equip - ignore right clicks
 2018-04-30 10:16:09 -07:00
John Conklin II
47f68364d2
Merge pull request #13012 from misslivirose/fix/particle-prop-caps 
Limits for alpha sliders in particle explorer
 2018-04-30 10:13:05 -07:00
John Conklin II
ed39b4f63e
Merge pull request #13014 from druiz17/fix-localhost-port 
hide default port from addresses, fix localhost scheme
 2018-04-30 10:10:06 -07:00
John Conklin II
b6afaccdf3
Merge pull request #13041 from RebeccaStankus/newModelDialog-Fix 
New model dialog fix
 2018-04-30 10:08:54 -07:00