Switched to branch 'master' Your branch is up-to-date with 'origin/master'. Removing src/build/.cache/ Removing src/build/checklto/test Removing src/build/cpucount Removing src/build/ld Removing src/build/wcversion Removing src/mod/quirks/mingw-w64/strtok_r.o Removing src/vcpp/mingw.res From github.com:tpoechtrager/wc-ng 457f67b..87f0477 master -> origin/master 2d623a7..c107fb3 sdl2 -> origin/sdl2 Updating 457f67b..87f0477 Fast-forward README.md | 2 +- src/Makefile | 691 ++++++++++++++++-------------- src/engine/serverbrowser.cpp | 4 +- src/fpsgame/fps.cpp | 453 -------------------- src/lib/darwin/llvm-lto/libpng16.a | Bin 1067328 -> 1068048 bytes src/lib/darwin/native/libpng16.a | Bin 573144 -> 539496 bytes src/lib/freebsd/amd64/llvm-lto/libpng16.a | Bin 535082 -> 535078 bytes src/lib/freebsd/amd64/native/libpng16.a | Bin 346694 -> 346998 bytes src/lib/linux/i686/llvm-lto/libpng16.a | Bin 471050 -> 471166 bytes src/lib/linux/i686/native/libpng16.a | Bin 306716 -> 306820 bytes src/lib/linux/x86_64/llvm-lto/libpng16.a | Bin 532830 -> 532822 bytes src/lib/linux/x86_64/native/libpng16.a | Bin 320990 -> 321014 bytes src/lib/win/i686/llvm-lto/libpng16.a | Bin 473180 -> 473292 bytes src/lib/win/i686/native/libpng16.a | Bin 222776 -> 222796 bytes src/lib/win/x86_64/llvm-lto/libpng16.a | Bin 534574 -> 534558 bytes src/lib/win/x86_64/native/libpng16.a | Bin 246760 -> 246722 bytes src/mod/extinfo-playerpreview.cpp | 465 ++++++++++++++++++++ src/mod/extinfo.cpp | 24 +- src/mod/extinfo.h | 8 + src/objects.mk | 2 +- src/readme_source.txt | 4 +- src/shared/igame.h | 5 - 22 files changed, 867 insertions(+), 791 deletions(-) create mode 100644 src/mod/extinfo-playerpreview.cpp Switched to branch 'sdl2' Your branch is behind 'origin/sdl2' by 7 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Removing src/build/.cache/ Removing src/build/checklto/test Removing src/build/cpucount Removing src/build/ld Removing src/build/wcversion Removing src/mod/quirks/mingw-w64/strtok_r.o Removing src/vcpp/mingw.res From github.com:tpoechtrager/wc-ng * branch sdl2 -> FETCH_HEAD c107fb3..bea81e7 sdl2 -> origin/sdl2 Updating 2d623a7..bea81e7 Fast-forward README.md | 2 +- src/Makefile | 691 ++++++++++++++------------- src/engine/serverbrowser.cpp | 4 +- src/fpsgame/fps.cpp | 453 ------------------ src/lib/darwin/llvm-lto/libpng16.a | Bin 1067328 -> 1068048 bytes src/lib/darwin/native/libpng16.a | Bin 573144 -> 539496 bytes src/lib/freebsd/amd64/llvm-lto/libpng16.a | Bin 535082 -> 535078 bytes src/lib/freebsd/amd64/native/libpng16.a | Bin 346694 -> 346998 bytes src/lib/linux/i686/llvm-lto/libpng16.a | Bin 471050 -> 471166 bytes src/lib/linux/i686/native/libpng16.a | Bin 306716 -> 306820 bytes src/lib/linux/x86_64/llvm-lto/libpng16.a | Bin 532830 -> 532822 bytes src/lib/linux/x86_64/native/libpng16.a | Bin 320990 -> 321014 bytes src/lib/win/i686/llvm-lto/libpng16.a | Bin 473180 -> 473292 bytes src/lib/win/i686/native/libpng16.a | Bin 222776 -> 222796 bytes src/lib/win/x86_64/llvm-lto/libpng16.a | Bin 534574 -> 534558 bytes src/lib/win/x86_64/native/libpng16.a | Bin 246760 -> 246722 bytes src/mod/chat-ca-certs.h | 2 +- src/mod/chat.cpp | 2 +- src/mod/chat.h | 2 +- src/mod/chatserver/chatserver.cpp | 2 +- src/mod/chatserver/sfree.h | 2 +- src/mod/compat.h | 2 +- src/mod/compiler.h | 2 +- src/mod/crypto.cpp | 2 +- src/mod/crypto.h | 2 +- src/mod/cubescript.cpp | 2 +- src/mod/cubescript.h | 2 +- src/mod/demorecorder.cpp | 2 +- src/mod/demorecorder.h | 2 +- src/mod/events.cpp | 2 +- src/mod/events.h | 2 +- src/mod/extinfo-playerpreview.cpp | 486 +++++++++++++++++++ src/mod/extinfo.cpp | 26 +- src/mod/extinfo.h | 10 +- src/mod/gamemod.cpp | 2 +- src/mod/gamemod.h | 2 +- src/mod/geoip.cpp | 2 +- src/mod/geoip.h | 2 +- src/mod/http.cpp | 2 +- src/mod/http.h | 2 +- src/mod/hwdisplay.cpp | 2 +- src/mod/ipbuf.h | 2 +- src/mod/ipignore.cpp | 2 +- src/mod/ipignore.h | 2 +- src/mod/mod.cpp | 2 +- src/mod/mod.h | 2 +- src/mod/playerdisplay.cpp | 2 +- src/mod/plugin.cpp | 2 +- src/mod/plugin.h | 2 +- src/mod/quirks/glibc/compat.c | 2 +- src/mod/strtool.cpp | 2 +- src/mod/strtool.h | 2 +- src/mod/thread.h | 2 +- src/objects.mk | 2 +- src/plugins/g15lcd/g15lcd.cpp | 2 +- src/plugins/g15lcd/g15sdkwrapper.h | 2 +- src/plugins/g15lcd/g15sdkwrapper_linux.cpp | 2 +- src/plugins/g15lcd/g15sdkwrapper_windows.cpp | 2 +- src/plugins/hwtemp/hwtemp.cpp | 2 +- src/plugins/hwtemp/hwtemp.h | 2 +- src/plugins/hwtemp/linux.cpp | 2 +- src/plugins/hwtemp/nvapi_wrapper_windows.cpp | 2 +- src/plugins/hwtemp/nvapi_wrapper_windows.h | 2 +- src/plugins/hwtemp/osx.cpp | 2 +- src/plugins/hwtemp/windows.cpp | 2 +- src/readme_source.txt | 4 +- src/shared/igame.h | 5 - 67 files changed, 935 insertions(+), 838 deletions(-) create mode 100644 src/mod/extinfo-playerpreview.cpp