Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Slideshow Fixes #2040

Merged
merged 6 commits into from
Aug 8, 2015
Merged

Slideshow Fixes #2040

merged 6 commits into from
Aug 8, 2015

Conversation

jonpas
Copy link
Member

@jonpas jonpas commented Aug 6, 2015

Needs testing. Fixes #1945, fixes #2037.

@jonpas
Copy link
Member Author

jonpas commented Aug 7, 2015

Ready for merge, tested on dedicated server, thanks @jokoho48 for help.

There is an issue which I added to documentation and mission-tools which renders non-PBOed missions incompatible with the Slideshow module due to not broadcasting the correct path (only when setObjectTextureGlobal is used on the server and is referencing a .paa from a non-PBOed mission) as explained in the BI feedback tracker ticket.

@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Aug 7, 2015
@thojkooi
Copy link
Contributor

thojkooi commented Aug 8, 2015

This has merge conflicts

@thojkooi thojkooi added this to the 3.3.0 milestone Aug 8, 2015
Conflicts:
	addons/slideshow/functions/fnc_createSlideshow.sqf
@jonpas
Copy link
Member Author

jonpas commented Aug 8, 2015

@Glowbal Conflicts resolved

thojkooi added a commit that referenced this pull request Aug 8, 2015
@thojkooi thojkooi merged commit 60b6540 into acemod:master Aug 8, 2015
@jonpas jonpas deleted the slideshowFixes branch August 8, 2015 11:50
@Knight1981
Copy link

Thank you for fixing this and for your fantastic work. Hope it will work in the next version :)

Do you have any information when the next release will be available? I want to test it. :D

@jonpas
Copy link
Member Author

jonpas commented Aug 18, 2015

When it'll be ready. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Slideshow does not work on dedicated server Slideshow should have failsafes when interaction is not present
4 participants