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
diff -r 6832dab555ae QTfrontend/CMakeLists.txt | |
--- a/QTfrontend/CMakeLists.txt Mon Aug 10 12:56:53 2020 +0300 | |
+++ b/QTfrontend/CMakeLists.txt Sun Aug 30 15:24:36 2020 +0300 | |
@@ -236,7 +236,7 @@ | |
if(WIN32 AND NOT UNIX) | |
if(NOT SDL2_LIBRARIES) | |
- list(APPEND HW_LINK_LIBS SDL2) | |
+ list(APPEND HW_LINK_LIBS SDL2::SDL2) | |
endif() |
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
diff -r f53bfe04065e hedgewars/uLandObjects.pas | |
--- a/hedgewars/uLandObjects.pas Fri Aug 16 20:46:10 2019 +0300 | |
+++ b/hedgewars/uLandObjects.pas Fri Aug 16 23:13:14 2019 +0300 | |
@@ -362,7 +362,10 @@ | |
end; | |
for y := 0 to Image^.h-1 do | |
+ begin | |
syncedPixelDigest:= Adler32Update(syncedPixelDigest, @PByteArray(Image^.pixels)^[y*Image^.pitch], Image^.w*4); | |
+ AddFileLog(IntToStr(syncedPixelDigest)); |
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
@echo off | |
::edit these variables if you need | |
set PASCAL_PATH= | |
set QT_PATH= | |
set MINGW_PATH= | |
set CMAKE_PATH= | |
set HASKELL_PATH= | |
set PATH=%HASKELL_PATH%;%MINGW_PATH%;%QT_PATH%;%PASCAL_PATH%;%CMAKE_PATH%;%PATH% |
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
diff -r b172a5d40eee rust/fpnum/src/lib.rs | |
--- a/rust/fpnum/src/lib.rs Fri Oct 12 22:18:38 2018 +0200 | |
+++ b/rust/fpnum/src/lib.rs Sat Oct 13 00:11:47 2018 +0300 | |
@@ -127,29 +127,15 @@ | |
impl Ord for FPNum { | |
#[inline] | |
fn cmp(&self, rhs: &Self) -> cmp::Ordering { | |
- if self.value == 0 && rhs.value == 0 { | |
- cmp::Ordering::Equal | |
- } else if self.is_negative != rhs.is_negative { |
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
int main() | |
{ | |
HANDLE token = 0; | |
DWORD size = 0; | |
CHAR data = 0; | |
OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); | |
BOOL result = GetUserProfileDirectoryA(token, &data, &size); | |
DWORD error = GetLastError(); | |
LPSTR buffer = nullptr; |
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
diff -r d1368c776a4f gameServer2/src/protocol/messages.rs | |
--- a/gameServer2/src/protocol/messages.rs Sun Jun 24 12:09:31 2018 -0400 | |
+++ b/gameServer2/src/protocol/messages.rs Mon Jun 25 16:55:58 2018 +0300 | |
@@ -91,6 +91,7 @@ | |
TeamAccepted(String), | |
TeamColor(String, u8), | |
HedgehogsNumber(String, u8), | |
+ ConfigEntry(String, Vec<String>), | |
ServerMessage(String), |
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
diff -r 8d7d48736184 gameServer2/src/protocol/messages.rs | |
--- a/gameServer2/src/protocol/messages.rs Tue Jun 19 19:14:33 2018 -0400 | |
+++ b/gameServer2/src/protocol/messages.rs Thu Jun 21 22:26:39 2018 +0300 | |
@@ -86,8 +86,13 @@ | |
RoomLeft(String, String), | |
RoomRemove(String), | |
RoomUpdated(String, Vec<String>), | |
+ TeamAdd(Vec<String>), | |
+ TeamRemove(String), | |
+ TeamAccepted(String), |
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
diff -r 0eedc17055a0 gameServer2/src/protocol/messages.rs | |
--- a/gameServer2/src/protocol/messages.rs Thu Jun 14 16:44:27 2018 -0400 | |
+++ b/gameServer2/src/protocol/messages.rs Mon Jun 18 02:24:28 2018 +0300 | |
@@ -24,7 +24,7 @@ | |
List, | |
Chat(String), | |
CreateRoom(String, Option<String>), | |
- Join(String, Option<String>), | |
+ JoinRoom(String, Option<String>), | |
Follow(String), |
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
diff -r 28b314ad566d gameServer2/src/server/network.rs | |
--- a/gameServer2/src/server/network.rs Thu Jun 14 12:31:15 2018 -0400 | |
+++ b/gameServer2/src/server/network.rs Thu Jun 14 22:49:29 2018 +0300 | |
@@ -3,7 +3,8 @@ | |
use std::{ | |
io, io::{Error, ErrorKind, Write}, | |
net::{SocketAddr, IpAddr, Ipv4Addr}, | |
- collections::VecDeque | |
+ collections::HashSet, | |
+ mem::swap |
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
diff -r 236cc4cf2448 gameServer2/src/main.rs | |
--- a/gameServer2/src/main.rs Sun Jun 10 19:01:50 2018 +0200 | |
+++ b/gameServer2/src/main.rs Tue Jun 12 00:28:14 2018 +0300 | |
@@ -22,6 +22,7 @@ | |
mod protocol; | |
use server::network::NetworkLayer; | |
+use std::time::Duration; | |
fn main() { |
NewerOlder