1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-18 04:57:46 +00:00
Commit graph

139 commits

Author SHA1 Message Date
shfil 35d7591def some SilentPatch fixes
# Conflicts:
#	src/core/Camera.cpp
#	src/weapons/Weapon.cpp
2020-09-30 02:14:10 +03:00
Nikolay Korolev b42d9e3e7c silentpatch fixes 2020-09-26 13:30:22 +03:00
Sergeanur 827b240078 Merge branch 'master' into miami
# Conflicts:
#	gamefiles/TEXT/american.gxt
#	src/control/Garages.cpp
#	src/control/Record.cpp
#	src/control/Script.cpp
#	src/core/Collision.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/Streaming.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/ModelInfo.cpp
#	src/render/Renderer.cpp
#	src/save/GenericGameStorage.cpp
#	utils/gxt/american.txt
2020-08-19 23:34:33 +03:00
Jack Powell db1e5a6ec4
Fix small logic mistake in CGarage::RemoveCarsBlockingDoorNotInside 2020-08-18 16:47:15 +01:00
Nikolay Korolev b03f13b30d fixed bugfix 2020-08-18 16:52:02 +03:00
eray orçunus 15918feb8e 90% fixes, 10% skel refactoring 2020-07-24 21:35:04 +03:00
eray orçunus ad6094ca1d 90% fixes, 10% skel refactoring 2020-07-24 21:02:55 +03:00
eray orçunus c483a044b5 Noskillx's PR + fix .set loading 2020-07-06 19:26:41 +03:00
eray orçunus ceb1defc4e fixes from master, menu helper text 2020-07-04 23:50:43 +03:00
eray orçunus 15548758ac Bettah car enter canceling, fix CFO crash, ped objs. renaming 2020-07-03 16:51:33 +03:00
Nikolay Korolev 48ebbb7292 ice cream attractor + bike respray 2020-07-03 11:08:19 +03:00
eray orçunus c4cd210ae0 Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixes 2020-07-02 16:01:42 +03:00
eray orçunus f3ed6659c3 CWanted, anim fix, ped objs renaming, remove III beta features 2020-06-22 04:20:56 +03:00
Nikolay Korolev e9e533b0cb bikes in garages + bugfix 2020-06-18 00:03:43 +03:00
Fire-Head 9c0adf6a8f Revert "FONT_BANK renamed to FONT_STANDARD"
This reverts commit 552205dfba.
2020-06-07 05:03:06 +03:00
Sergeanur 1c01899799 Merge branch 'master' into miami
# Conflicts:
#	src/control/Garages.cpp
#	src/core/Frontend.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Train.cpp
2020-06-07 04:15:10 +03:00
Sergeanur 552205dfba FONT_BANK renamed to FONT_STANDARD 2020-06-07 04:10:06 +03:00
Sergeanur 0ce2af7a0d Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h
2020-05-26 17:24:47 +03:00
Nikolay Korolev 5ca0d6c6cf fixed NE bug 2020-05-26 00:45:32 +03:00
Nikolay Korolev 8705562559 how did saving even work in original III? 2020-05-24 15:58:25 +03:00
Nikolay Korolev a5b84eb9fe full script basic support 2020-05-17 21:43:11 +03:00
Sergeanur 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
Filip Gawin c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
Nikolay Korolev 615bd1e878 garages fix 2020-05-12 20:22:35 +03:00
Nikolay Korolev ca6ed7f00f fix garages 2020-05-12 16:21:00 +03:00
Nikolay Korolev 4b566c26a3
fix garages 2020-05-12 14:08:42 +03:00
Nikolay Korolev 1afe36d0d0
fix garages 2020-05-12 14:07:47 +03:00
Nikolay Korolev 8fae2dcc26 garages + script 2020-05-11 21:04:35 +03:00
Nikolay Korolev 2f979a8cde some changes 2020-05-11 01:00:41 +03:00
Nikolay Korolev 00cdcef36a some updates for script 2020-05-10 17:54:13 +03:00
aap 05a1d64fbb VC vehicles just barely working now 2020-05-07 11:33:20 +02:00
aap 68d3ea9c42 getting the vice city map to work 2020-05-05 23:27:43 +02:00
Sergeanur ba8aa38654 Switching pad modes and cheats when player is switching between controller and kb&m 2020-05-02 19:39:36 +03:00
Sergeanur 52390062b3 SetPosition, part 2 2020-05-02 15:28:19 +03:00
Sergeanur d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +03:00
Sergeanur 7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
Sergeanur fe353a7cc9 Fixes 2020-04-27 22:41:09 +03:00
Sergeanur f0890b1112 Merge branch 'master' into MoreLanguages
# Conflicts:
#	src/core/Frontend.cpp
#	src/core/MenuScreens.h
#	src/render/Font.cpp
#	src/render/Font.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
2020-04-26 22:03:15 +03:00
Filip Gawin 370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
Sergeanur 599164006a Remove patches 2020-04-17 16:31:11 +03:00
eray orçunus 2c2da558ca Some refs removed, little fixes and teleport 2020-04-16 22:19:56 +03:00
Nikolay Korolev 5cb7e2e42a
Merge pull request #440 from Fire-Head/master
CWeapon done, fixes
2020-04-15 23:28:09 +03:00
eray orçunus 4da1879975 Many fixes and cleanup 2020-04-15 19:19:45 +03:00
Fire-Head daed13485e CWeapon done, ps2 cheats fix 2020-04-15 08:03:53 +03:00
Sergeanur e373d0526e Merge branch 'master' into MoreLanguages
# Conflicts:
#	src/core/Frontend.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Hud.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
2020-04-15 00:10:50 +03:00
Nikolay Korolev 906133d3be
fix garages 2020-04-13 22:43:41 +03:00
Nikolay Korolev 8e29a5ec88
bug fix 2020-04-08 14:06:27 +03:00
Nikolay Korolev 4f1d6123dd stats fix 2020-04-06 19:31:08 +03:00
Nikolay Korolev 7f8a78e5de Cranes done 2020-04-06 02:01:03 +03:00
Sergeanur 4fc2f9c359 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-05 17:03:59 +03:00
Nikolay Korolev 30b8d7300b shoreside garage fix 2020-04-05 12:44:58 +03:00
Sergeanur 2aace31b06 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-05 12:03:13 +03:00
Sergeanur c0c09f2720 Japanese 2020-04-05 12:02:51 +03:00
Nikolay Korolev 347f0a0e9c vehicles missing functions + fixes 2020-04-01 01:58:40 +03:00
Nikolay Korolev e34631adce review fixes 2020-04-01 00:07:09 +03:00
Nikolay Korolev 357d88a4a8 fix 2020-03-31 01:00:06 +03:00
Nikolay Korolev b3bfde0db0 added forgotten function 2020-03-31 00:53:51 +03:00
Nikolay Korolev 24e4ecf5bb bug fixes, reorganisation 2020-03-31 00:46:44 +03:00
Nikolay Korolev 50b43b680e finished garages 2020-03-31 00:01:03 +03:00
Nikolay Korolev 0db35f8275 more garages 2020-03-29 18:48:57 +03:00
Nikolay Korolev 38c2f8fbb0 fixes 2020-03-29 01:48:49 +03:00
Nikolay Korolev 93417853ed fixes 2020-03-28 23:41:37 +03:00
Nikolay Korolev 775bc3e666 garage update part 2 2020-03-28 20:52:25 +03:00
Nikolay Korolev 268f92bfbe garages part 1 2020-03-28 15:24:13 +03:00
eray orçunus d5a6e17079 ProcessButtonPresses and fixes 2020-03-21 14:58:54 +03:00
Wes Hampson 28342405d3 Add Load/Save functions 2020-03-10 20:26:07 -07:00
Nikolay Korolev 1337a9b603 script 1000-1154 2020-02-16 23:08:54 +03:00
Nikolay Korolev a361fc0ff5 sync with upstream 2020-02-15 14:54:46 +03:00
Nikolay Korolev 043efaf082 script 900-999 2020-02-15 14:53:42 +03:00
eray orçunus 03b995c6ef Some fixes and some cosmetic things 2020-02-02 16:58:52 +03:00
Nikolay Korolev 0723dade76 script 800-899 2020-01-03 19:48:13 +03:00
Nikolay Korolev 80453d3f4d some not fully tested stuff 2020-01-01 02:35:54 +03:00
Nikolay Korolev 5e77e9d0ea script 600-699 2019-10-27 12:51:09 +03:00
Nikolay Korolev 3dee880c29 merge 2019-10-26 17:20:31 +03:00
Nikolay Korolev d579ee1b64 script 500-599 plus bugfix 2019-10-22 00:39:59 +03:00
nmzik f56684d04e CGame::Process() && CGame::ReloadIPLs 2019-10-19 01:23:40 +03:00
Sergeanur 69963cea68 Full CGameLogic 2019-10-08 17:13:23 +03:00
Sergeanur dfe7edfad7 CGarages::PrintMessages drawing fixes 2019-10-06 17:33:07 +03:00
eray orçunus 0f9178568b Peds, a fix and a tad of VC 2019-09-17 23:22:34 +03:00
Filip Gawin 2fabbc3b4c More more more audio 2019-08-27 21:18:47 +02:00
Nikolay Korolev 14b945ba08 more CCarCtrl 2019-08-11 20:11:54 +03:00
Nikolay Korolev 345b8553a7 cargen + some script 2019-07-27 21:28:18 +03:00
aap 0f1fbf5e9a renamed some variables and added files; more CAutomobile::ProcessControl 2019-07-17 13:19:20 +02:00
_AG e765dfe90a Initial commit for Frontend.
Bug fixes:
fix #40, fix #39, fix #38, fix #37, fix #21.
Code organization and cleanup...
2019-06-25 02:36:26 +02:00
_AG f3c331ece6 Code clean up. 2019-06-20 15:18:19 +02:00
_AG 2ce7bcc405 Update CRadar.cpp, CHud.cpp, CDraw.cpp fixed bug in templates.h. 2019-06-20 02:32:36 +02:00
aap b5fba778c4 first part of CFileLoader 2019-06-17 22:40:15 +02:00
_AG f299e9ebd5 Update HUD stuff, bug and format fixes.
Added environment variables to premake5.lua.
Update README.md
2019-06-17 02:11:30 +02:00
aap 188aab4196 implemented some higher level functions; added lots of stubs; switched top and bottom in CRect 2019-05-30 21:24:47 +02:00
Renamed from src/Garages.cpp (Browse further)