Commit Graph

54 Commits

Author SHA1 Message Date
99574ebfc6 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-19 17:46:18 +03:00
a6972714b7 Melee weapons(half-working), Ped and Hud bits 2020-05-19 17:43:16 +03:00
d5d2f6a822 sync with upstream 2020-05-17 21:48:21 +03:00
3cc20d7962 sync with upstream 2020-05-17 21:48:12 +03:00
a5b84eb9fe full script basic support 2020-05-17 21:43:11 +03:00
84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
b587d835e8 more script stuff 2020-05-16 23:06:33 +03:00
7c2b9478d5 Merge branch 'master' into miami
# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
2020-05-13 00:55:52 +03:00
33dfaf7da1 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	premake5.lua
#	src/core/ZoneCull.cpp
#	src/core/Zones.cpp
#	src/objects/CutsceneHead.cpp
#	src/render/Clouds.cpp
2020-05-13 00:27:15 +03:00
c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
3e64274f6b more script 2020-05-12 01:59:35 +03:00
8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +03:00
e9b334d7bf More use of GetModelIndex 2020-05-05 14:48:35 +03:00
52390062b3 SetPosition, part 2 2020-05-02 15:28:19 +03:00
d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +03:00
c9920b6a2d Merge pull request #480 from Fire-Head/master
camerapickup ps2 code
2020-04-20 08:21:27 +03:00
556a6df401 camerapickup ps2 code 2020-04-20 08:17:08 +03:00
8e9c9fa445 Fix CPickups::GenerateNewOne loop 2020-04-20 00:14:48 +03:00
1ffc37735e Struct cleanup, various fixes, enable PS2 rand 2020-04-19 16:44:35 +03:00
599164006a Remove patches 2020-04-17 16:31:11 +03:00
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
304b574eba added missing break 2020-04-13 22:25:24 +03:00
d8be75ac46 Fix compilation error 2020-04-13 15:21:26 +03:00
741c9405d0 CPacManPickups 2020-04-13 12:07:07 +03:00
a8f7bf0bec CObject complete 2020-04-10 16:44:08 +05:00
aap
34349c4df2 normalized line endings to LF 2020-04-09 20:50:24 +02:00
347f0a0e9c vehicles missing functions + fixes 2020-04-01 01:58:40 +03:00
112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
337924c794 Cleanup audio code + fixes for review 2020-03-22 17:30:54 +01:00
c88c2115e2 Remove unneeded double to float casts 2020-03-22 17:30:54 +01:00
8f01eab5ab Fixes for Serge's review 2020-03-22 17:30:54 +01:00
80453d3f4d some not fully tested stuff 2020-01-01 02:35:54 +03:00
cce3aac4c3 Audio fixes 2019-10-27 19:04:13 +02:00
4844b3a3f8 Merge pull request #246 from Sergeanur/Pools
Some CPool and CPools funcs, restoring original logic of pool lookup loops
2019-10-21 16:09:44 +03:00
f56684d04e CGame::Process() && CGame::ReloadIPLs 2019-10-19 01:23:40 +03:00
3ba57c5f6a Gangs save and missed sound enums 2019-10-17 13:21:31 +03:00
5b1ffb0912 Some CPool and CPools funcs, restoring original logic of pool lookup loops 2019-10-17 00:53:25 +03:00
1fed8e9482 Fixed floating package pickups 2019-10-12 22:03:44 +03:00
2977164918 Typo fix 2019-10-12 12:05:38 +03:00
0408b30a9f Merge pull request #229 from Sergeanur/SaveLoadTemplates
Added read/write template functions for save data
2019-10-11 01:51:25 +03:00
ffed52b94f CMoneyMessages moved to SpecialFX.cpp 2019-10-10 19:17:35 +03:00
101192dd32 Added read/write template functions for save data, small Load/Save arguments unification 2019-10-08 23:07:11 +03:00
cf0edb3eb7 Fix warnings 2019-10-04 02:18:23 +03:00
47e6cbe65e Fix formatting mistakes 2019-10-03 23:38:21 +03:00
999765aadd Fixed some formatting 2019-10-03 23:34:02 +03:00
679f7bbcfa Checks rewritten 2019-10-03 23:32:31 +03:00
2cf94348f5 Drop w's 2019-10-03 22:51:38 +03:00
72e12f6aae CPickups 2019-10-03 22:37:13 +03:00
ebbcd92de2 RunningScript, part 4, plus some fixes 2019-08-03 16:01:13 +03:00
875cdd845d The Peds 2019-08-02 01:30:40 +03:00