Alpha merge #632
Merged
Alpha merge #632
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ld with DIAGEN_TEST=ON
Fixed segmentation fault in the Barrier
apply c++ warning to only c++ compilation units, fixing warning on in…
Fixed KranX#525 + prevent error (warning as error) when trying to build wi…
Show commit information in error message
* Always use HD version on android
Better error message for I/O operations
Fix SEGFAULT (on android) in error handler
Move lang.cpp/lang.h to xtool to avoid linking problems
Dynamic aspect + window resize
Support android in CMakeLists.txt
Inital support for android
add -fsigned-char compile option
couple of surface/script mem leak fixes proposal.
ogg_stream memory leak fix.
chat fixes
Init window with resolution size
Fix KranX#605: center tabutask & ending texts
fix random chat closing
…ions differently; multiplayer world activity cycles fixed
Client net protocol version updated; server now handles protocol versions differently; multiplayer world activity cycles fixed
Fix KranX#158: incorrect flooding for initial portion of world player sees first
…from escave due to the multiplayer timer
Fixed shop videos leaving last frame on the screen after forced quit from escave due to the multiplayer timer
Fix KranX#621 (wrong reward for tabutask)
# Conflicts: # src/units/hobj.cpp # src/units/items.cpp
actions ffmpeg fix
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.