On Dante's old timeline, it said One Nation was recorded in May/June 1996.
It doesn't pinpoint the exact date of the Makaveli Recordings.
QDIII said that To Live & Die In La video was filmed the day after Pac made the song (Obviously exagerrating a little bit there). However, To Live & Die In LA was filme during the summer, most likwly Agugust (It looks hot as a motherfucker in that video). There were twov ideos filmed for Toss It Up, the OG with Pac on the beach, and the official one used in the Makaveli Album Commercial.
Toss It Up (Instrumental) was recorded way back before Dr. Dre left Death Row in February 1996. Suge kept a copy of the Instrumental. When Pac heard it he recorded the song. (The instumental was recorded before the Makaveli album, but the ctual lyrics were recorded DURING the Makaveli sessions).
The OG Toss It Up was likely Aaron Hall, Jodeci & Danny Boy with 1 Pac verse.
Then Dre used the beat for Blackstreet's No Diggity (Snoop was still on Death Row and he was close with Dre, he probably told Dre about Pac using his beat).
So now, Dre has used the beat for one of 2pac's future singles, Pac changes the beat, adds the 2nd verse to Toss It Up, adds the "Without gay ass dre" to Live & Die In La, all AFTER the album was recorded.
This also would explain why Pac and Snoop were fighting the last month Pac was alive (Also, Snoop said he would work with Bad Boy, Dre worked with Nas, etc.)
I believe Makaveli was recorded in early August, and 2pac went back and made some changes in Late August, Early September and filmed the 2 (3) videos for the album.
The only thing that doesnt fit with this theory is: Why was Friends cut, it disses Dre and Jay-Z?
Maybe 2pac didn't cut the album, maybe Suge took Friends off after Pac died. In all likelihood, Friends and Nigga Nature were recorded for the album but taken off by Suge at a later date.