Commit Graph

2287 Commits

Author SHA1 Message Date
aap
c498af29aa get rid of III code 2020-06-03 09:24:26 +02:00
aap
ad03d9543b Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-03 08:26:33 +02:00
aap
b73e42346e forgot the fucking file 2020-06-03 08:26:24 +02:00
Sergeanur
509ca11d76 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/control/GameLogic.cpp
#	src/control/PathFind.cpp
#	src/control/RoadBlocks.cpp
#	src/control/Script.cpp
#	src/control/Script.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/core/TempColModels.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.h
#	src/render/Skidmarks.h
#	src/render/WaterLevel.cpp
#	src/save/GenericGameStorage.h
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/DamageManager.cpp
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
2020-06-03 01:24:08 +03:00
aap
2ca3c50463 some CBike code; vehicle cleanup 2020-06-02 23:35:20 +02:00
aap
04a91761df some vehicle cleanup 2020-06-02 23:34:53 +02:00
aap
2e3cb77702 fixed radar rendering 2020-06-02 22:49:57 +02:00
aap
06c761e9ac few bike things 2020-06-02 15:26:11 +02:00
aap
575c5466df renamed a vehicle thing 2020-06-02 14:38:57 +02:00
aap
dbeaafbe99 initial CBike struct 2020-06-02 14:38:30 +02:00
erorcun
03d9525eb6
Merge pull request #611 from erorcun/miami
DrawStandardMenus, VC menu array and minor fixes
2020-06-02 00:21:07 +03:00
aap
bfd13d58e0 add freeroam; clean up debug menu 2020-06-01 22:02:22 +02:00
aap
fdf8f35049 CTimer fix 2020-06-01 20:51:18 +02:00
aap
c00f7a8d22 CTimer fix 2020-06-01 20:50:26 +02:00
aap
d8272b8812 hanim fix 2020-06-01 20:32:43 +02:00
aap
b7037e3cf7 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-01 20:32:32 +02:00
aap
21afcd8767
Merge pull request #602 from aap/miami
CAutomobile
2020-06-01 20:32:24 +02:00
aap
8bbb6a2a4a hanim fix 2020-06-01 20:28:04 +02:00
aap
25273485d9 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-01 18:05:24 +02:00
eray orçunus
abef04c637 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-01 18:35:04 +03:00
eray orçunus
d930a25d94 DrawStandardMenus, VC menu array and minor fixes 2020-06-01 18:32:34 +03:00
aap
7c7727e7da fixed timebar toggle 2020-06-01 13:21:19 +02:00
Nikolay Korolev
0803c821ae fixed roadblocks 2020-06-01 12:45:03 +03:00
aap
de1018d7a6 gravity 2020-06-01 10:56:15 +02:00
aap
f69313237e
Merge pull request #607 from rollschuh2282/master
Added toggles for the TimeBars and the "DebugStuffInRelease" to the Debug Menu
2020-06-01 10:44:45 +02:00
aap
6d3e54369c
Merge pull request #608 from Nick007J/miami
Roadblocks and GameLogic
2020-06-01 10:44:33 +02:00
aap
c8b93d0575 fixed bumper colmodel 2020-06-01 10:30:01 +02:00
aap
197c49d740 fixed bumper colmodel 2020-06-01 10:29:46 +02:00
aap
12cc0e4132 getting rid of strnicmp 2020-05-31 22:35:29 +02:00
Nikolay Korolev
0631bd9d89 fix 2020-05-31 23:16:24 +03:00
Nikolay Korolev
815d3e0f61 fix 2020-05-31 22:50:32 +03:00
Nikolay Korolev
f945dbc0fb dumb 2020-05-31 21:01:36 +03:00
Nikolay Korolev
c1c163d78c game logic 2020-05-31 20:59:01 +03:00
aap
bae3a3e72f fixed to CAutomobile and friends 2020-05-31 17:45:26 +02:00
aap
21ce0a4b28 CAutomobile done 2020-05-31 17:05:59 +02:00
aap
00dc86917e some more CAutomobile 2020-05-31 17:05:59 +02:00
aap
218772c296 gahhh 2020-05-31 17:05:59 +02:00
aap
c1e13177a1 some CAutomobile 2020-05-31 17:05:59 +02:00
Nikolay Korolev
49a897c3b3 better name 2020-05-30 20:09:58 +03:00
Nikolay Korolev
09c9e16cb1 roadblocks 2020-05-30 20:08:31 +03:00
Nikolay Korolev
e6b9c20131
fix 2020-05-30 18:07:01 +03:00
eray orçunus
dd162c3aa0 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-29 22:05:52 +03:00
eray orçunus
529cec5653 R to freeroam, idle anims, weapon and cam enum fix 2020-05-29 22:05:33 +03:00
eray orçunus
517f0b9189 fix fix fix 2020-05-29 21:31:06 +03:00
eray orçunus
e38f2a7fb2 fix fix 2020-05-29 21:06:08 +03:00
eray orçunus
6438244540 Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun 2020-05-29 20:29:52 +03:00
eray orçunus
9adde91b3a frontend options fix 2020-05-29 20:29:18 +03:00
Nikolay Korolev
627ffb0f82 fix 2020-05-29 16:52:02 +03:00
rollschuh2282
2d5f7d92e5
Add files via upload 2020-05-29 12:04:20 +02:00
rollschuh2282
20cacb18f0
Add files via upload 2020-05-29 12:03:32 +02:00