Sergeanur f1bb09826d Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # gamefiles/TEXT/american.gxt # premake5.lua # src/audio/MusicManager.cpp # src/control/Darkel.cpp # src/control/Script.cpp # src/core/FileLoader.cpp # src/core/Frontend.cpp # src/core/Game.cpp # src/core/Streaming.cpp # src/core/config.h # src/core/re3.cpp # src/extras/frontendoption.cpp # src/extras/frontendoption.h # src/render/Hud.cpp # src/skel/glfw/glfw.cpp # src/vehicles/CarGen.cpp # src/vehicles/Vehicle.cpp # src/weapons/WeaponInfo.cpp # utils/gxt/american.txt		2020-10-11 01:18:08 +03:00
..
glfw	Merge remote-tracking branch 'origin/master' into miami	2020-10-11 01:18:08 +03:00
win	Merge remote-tracking branch 'origin/master' into miami	2020-10-11 01:18:08 +03:00
crossplatform.cpp	Load and write our settings in re3.ini & fixes	2020-10-02 21:18:34 +03:00
crossplatform.h	Fixes, mouse AUX buttons, joystick detect menu	2020-09-30 20:03:01 +03:00
events.cpp	Pad, BulletInfo, ProjectileInfo, fixes	2020-10-08 00:26:24 +03:00
events.h	rw skeleton	2019-05-31 20:02:26 +03:00
platform.h	Merge branch 'master' into miami	2020-08-15 15:13:46 +03:00
skeleton.cpp	Merge branch 'master' into miami	2020-08-15 15:13:46 +03:00
skeleton.h	Original screen grabber	2020-08-14 18:57:23 +03:00