Commit Graph

1026 Commits

Author SHA1 Message Date
eray orçunus
70df13f9d3 Fixes from miami 2020-07-20 22:47:41 +03:00
aap
efd49962d2 avoid UB 2020-07-20 19:32:20 +02:00
Sergeanur
949d0c8853 Add audio cache for faster initialization 2020-07-17 13:48:25 +03:00
Sergeanur
841fa5155c Rename LEVEL_NONE to LEVEL_GENERIC 2020-07-13 17:43:09 +03:00
Sergeanur
6eb8f6ae5a Add cutscene borders switch to the menu 2020-07-11 12:04:26 +03:00
eray orçunus
00bba630f6 enable island loading for now 2020-07-10 12:28:00 +03:00
eray orçunus
aabf0f4c2c keep loading screen, but for a second 2020-07-09 21:48:43 +03:00
Sergeanur
c012e5a7ff Disable loading screen 2020-07-09 20:40:15 +03:00
Sergeanur
cf69f22a0c Remove island loading 2020-07-09 19:18:42 +03:00
eray orçunus
15548758ac Bettah car enter canceling, fix CFO crash, ped objs. renaming 2020-07-03 16:51:33 +03:00
eray orçunus
ed036df3ce Re-enable console for debugging frontend 2020-07-03 05:40:22 +03:00
Nikolay Korolev
01b15fe807
reenabled script logging 2020-07-03 01:28:41 +03:00
Filip Gawin
bf2624692c Fix displaying stats 2020-07-03 00:04:49 +02: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
erorcun
eda50bc32b
Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639) 2020-07-01 15:28:43 +03:00
Sergeanur
c80bdf3a2a Rename IsAnyButtonPressed to CheckForInput 2020-06-30 07:43:55 +03:00
Fire-Head
63fdcf7e64 menu fixes 2020-06-29 10:29:02 +03:00
Fire_Head
860f75d66c
Merge branch 'master' into ps2menu 2020-06-29 09:37:53 +03:00
aap
418bee9c22 renamed 2dfx shadowRange to Size 2020-06-28 12:05:42 +02:00
Nikolay Korolev
d6e111bb67 script logging fixes 2020-06-28 11:59:20 +03:00
Fire-Head
b8f633de24 fixes 2020-06-28 01:57:01 +03:00
Fire-Head
233792e2b8 fixfixfix 2020-06-28 00:31:45 +03:00
Fire-Head
1c11a8081f mips overdose 2020-06-28 00:01:51 +03:00
aap
cafe4d6f0c rename attractor flag to type 2020-06-25 15:13:08 +02:00
Nikolay Korolev
043f09f3fb
Merge pull request #637 from Nick007J/master
script logging
2020-06-22 13:27:25 +03:00
Nikolay Korolev
7a71a47f74 updated player control names 2020-06-21 16:00:17 +03:00
aap
98baa36f1a FOV fix 2020-06-21 14:50:00 +02:00
Nikolay Korolev
08af34bc99 Merge remote-tracking branch 'upstream/master' 2020-06-21 15:49:30 +03:00
aap
3859efff42 ps2 cam transitions done (hopefully) 2020-06-21 14:41:39 +02:00
Nikolay Korolev
f5cba0ce89 script logging 2020-06-21 13:46:23 +03:00
aap
586e8a2ab4 tried to reconstruct bills cam 2020-06-21 11:03:20 +02:00
aap
e1c58131c4 PS2 cam transition mostly working 2020-06-21 00:40:07 +02:00
aap
5ad739f096 some PS2 cam code; fix for arrest cam 2020-06-20 14:38:21 +02:00
aap
4cd4f91e57 ccamera cleanup 2020-06-19 09:15:23 +02:00
aap
5f3eb76cff CCam fixes yet again 2020-06-16 13:50:29 +02:00
aap
e6d2b49121 more cleanup 2020-06-14 23:16:22 +02:00
aap
3fe282fbe4 a few cam fixes 2020-06-13 23:39:35 +02:00
aap
41dac0773f little CCam cleanup; fix in CWorld sphere test 2020-06-12 21:53:39 +02:00
aap
5a961d0284 some cam cleanup; unused PS2 train cams 2020-06-10 23:50:27 +02:00
aap
94e5b24fc8 cleaned up and fixed animviewer 2020-06-08 13:01:20 +02:00
Fire-Head
9c0adf6a8f Revert "FONT_BANK renamed to FONT_STANDARD"
This reverts commit 552205dfba.
2020-06-07 05:03:06 +03:00
Sergeanur
552205dfba FONT_BANK renamed to FONT_STANDARD 2020-06-07 04:10:06 +03:00
Nikolay Korolev
408f47fc9d fixed linux saving 2020-06-06 12:58:10 +03:00
eray orçunus
016ebc0b00 fixes, mostly from miami 2020-06-04 06:03:12 +03:00
Sergeanur
12717917cc Restore original logic of CPed::WanderRange 2020-06-04 04:31:04 +03:00
Sergeanur
2df44208dd Range2D and Range3D 2020-06-03 04:45:25 +03:00
aap
04a91761df some vehicle cleanup 2020-06-02 23:34:53 +02:00
aap
c00f7a8d22 CTimer fix 2020-06-01 20:50:26 +02:00
aap
8bbb6a2a4a hanim fix 2020-06-01 20:28:04 +02:00
aap
7c7727e7da fixed timebar toggle 2020-06-01 13:21:19 +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
c8b93d0575 fixed bumper colmodel 2020-06-01 10:30:01 +02:00
aap
bae3a3e72f fixed to CAutomobile and friends 2020-05-31 17:45:26 +02: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
rollschuh2282
20cacb18f0
Add files via upload 2020-05-29 12:03:32 +02:00
erorcun
e65a09ea09
Merge pull request #604 from erorcun/master
Frontend customization functions, freecam toggle and minor things
2020-05-28 22:06:50 +03:00
eray orçunus
9acf27fc53 remove inlining attempts + reload frontend options for real 2020-05-28 17:42:40 +03:00
Nikolay Korolev
111d23beab fix 2020-05-28 17:21:00 +03:00
eray orçunus
a61736c51b theoretically fix linux build 2020-05-28 13:08:21 +03:00
eray orçunus
e6401bce18 Detect R and start game on menu 2020-05-28 12:46:51 +03:00
eray orçunus
98a97a32fa config reorganization 2020-05-28 11:49:58 +03:00
eray orçunus
98fec63ca7 Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun 2020-05-28 11:40:56 +03:00
eray orçunus
329a387fdf Frontend customization functions, freecam toggle, minor things 2020-05-28 11:34:12 +03:00
Nikolay Korolev
9673ecddad Merge remote-tracking branch 'upstream/master' 2020-05-27 00:25:33 +03:00
Nikolay Korolev
ec1d14971c mission replay 2020-05-27 00:25:12 +03:00
aap
0ac3477035 fix UB shit 2020-05-26 18:50:27 +02:00
aap
7e5dde1f1a eSurfaceType 2020-05-26 11:37:46 +02:00
Nikolay Korolev
ad8e8f4341 switch collision with debug menu 2020-05-25 23:59:55 +03:00
aap
3c3b1aadc0 small fixes 2020-05-25 20:36:23 +02:00
eray orçunus
14755a4ff4 all my fixes live in exes 2020-05-24 16:41:29 +03:00
aap
e2d3ef449c skeleton typos 2020-05-23 11:34:40 +02:00
Sergeanur
e858314a9f OpenAL configs 2020-05-22 18:01:09 +03:00
aap
21071edbfe fixes for CPhysical and friends 2020-05-22 14:34:44 +02:00
aap
0b0ba49abc small fixes 2020-05-19 21:42:55 +02:00
aap
0d0f4da27a little cleanup of handlingmgr 2020-05-19 13:09:20 +02:00
aap
d4a429d986 little cleanup on radar 2020-05-17 22:24:23 +02:00
shfil
7036e80fc6
Fix calloc in CdStreamPosix 2020-05-13 17:48:07 +02:00
Sergeanur
7aeac06fdb Redoing some pool reading for better alignment 2020-05-13 05:31:14 +03:00
Sergeanur
4ac53960f5 Changing save/load for CPlayerInfo because of alignment crap 2020-05-13 03:43:20 +03:00
Filip Gawin
a0b3117ee4 Revert to memcpy 2020-05-13 02:01:42 +02:00
Filip Gawin
c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
aap
bcd2f8c64c remove debug shit 2020-05-12 20:44:37 +02:00
aap
98a233da43 little fixes to CClouds; disabled object clipping for SA cam 2020-05-12 16:36:23 +02:00
erorcun
5f40f06bf0
Merge pull request #533 from erorcun/master
Linux build support
2020-05-12 00:33:13 +03:00
eray orçunus
8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +03:00
aap
95920d54f2 random fixes 2020-05-11 17:04:08 +02:00
aap
b11715608f few fixes 2020-05-11 09:18:41 +02:00
erorcun
c66c45f4c8
Merge pull request #509 from Fire-Head/master
OpenAL update
2020-05-11 03:23:36 +03:00
bigbossbro08
bd302ecca1 Merge remote-tracking branch 'upstream/master' 2020-05-10 22:05:45 +06:00
bigbossbro08
b4abb6ddd8 fixed few more typos 2020-05-10 22:04:36 +06:00
bigbossbro08
c798e1bacd Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
aap
5b605c1271 some fixes and cosmetic changes 2020-05-10 17:09:57 +02:00
bigbossbro08
af6e132b37 defined out asserts. 2020-05-10 19:54:37 +06:00
Sergeanur
d9a3533438 Small unification 2020-05-10 01:14:00 +03:00
Sergeanur
28103775ba Place debug menu under ifdef 2020-05-09 16:06:13 +03:00
erorcun
ce4996b09c
Merge pull request #527 from erorcun/erorcun
Menu map fixes and resizable window on GLFW
2020-05-09 13:44:43 +03:00
eray orçunus
f754da272f Menu map fixes and resizable window on GLFW 2020-05-09 13:43:08 +03:00
Sergeanur
d686f587cc Merge remote-tracking branch 'origin/master' 2020-05-09 02:51:40 +03:00
Sergeanur
e917cd1f46 Fix corona scaling 2020-05-09 02:50:48 +03:00
aap
10cade9f60 Merge branch 'master' of github.com:GTAmodding/re3 2020-05-08 20:58:48 +02:00
aap
f12e76fa13 more small fixes 2020-05-08 20:58:40 +02:00
Sergeanur
e0b3418e65 Fix water UV on high FPS and inverted free camera 2020-05-08 14:34:21 +03:00
aap
a8f1505517 small fixes 2020-05-07 21:56:09 +02:00
aap
5c30b3a188 got rid of superfluous enum; update librw 2020-05-07 12:48:57 +02:00
Fire-Head
12a3499ca3 oal wav/mp3 stream update 2020-05-07 09:26:16 +03:00
Nikolay Korolev
a24b65cbde IsStatic 2020-05-06 19:17:47 +03:00
aap
13522259b8 fix for radar 2020-05-06 15:41:40 +02:00
aap
7c356b08e6 little cworld bugfix 2020-05-06 14:27:41 +02:00
aap
cbfc45b3f7 some work on zones 2020-05-06 12:23:26 +02:00
Sergeanur
1eb817de77 Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL 2020-05-05 18:32:46 +03:00
Sergeanur
0163a7bc46 Remove ColStore 2020-05-05 18:13:46 +03:00
Sergeanur
9960c41193 Remove Miami stuff 2020-05-05 18:04:18 +03:00
Sergeanur
dfe0642195
Merge pull request #512 from Nick007J/master
MIAMI CAutoPilot + CCarAI + multiple fixes
2020-05-05 17:14:13 +03:00
aap
b3b9be5e8c merged master 2020-05-05 14:21:13 +02:00
Sergeanur
4cc1bb92e7 Make CBaseModelInfo fields protected 2020-05-05 15:06:55 +03:00
aap
fd462c9b55 implemented most of streamed collisions and big buildings 2020-05-05 14:00:20 +02:00
Sergeanur
e9b334d7bf More use of GetModelIndex 2020-05-05 14:48:35 +03:00
Nikolay Korolev
ee261c996b Merge remote-tracking branch 'upstream/master' 2020-05-05 14:40:56 +03:00
Nikolay Korolev
ae0c83fa01 CAutoPilot + CCarAI + fixes 2020-05-05 14:40:35 +03:00
aap
b44df26d3e implemented most of streamed collisions and big buildings 2020-05-05 13:02:42 +02:00
Sergeanur
84c9484e55 SetPosition, final part 2020-05-05 04:45:18 +03:00
Fire-Head
0abd0c659b openal-soft added 2020-05-04 21:06:14 +03:00
Fire-Head
8aac6060d3 oal upd 2020-05-04 20:33:48 +03:00
aap
a073dda5ec GTA_ZONECULL define 2020-05-03 17:44:10 +02:00
aap
67467f15d1 GTA_BRIDGE and GTA_TRAIN defines 2020-05-03 17:28:54 +02:00
aap
702da55ec9 implemented most of vice city path system 2020-05-03 16:09:37 +02:00
Sergeanur
ff4af35292 Fix pad Y axis 2020-05-03 01:42:05 +03:00
Sergeanur
7fc33d85f7
Merge pull request #504 from Sergeanur/PadInputSwitch
Switching pad modes and cheats when player is switching between controller and kb&m
2020-05-03 00:12:54 +03:00
Sergeanur
d2712afc78 Add CURMODE macro 2020-05-03 00:11:02 +03:00
Sergeanur
9d600802fa Revert "Disable PED_SKIN for now"
This reverts commit d51bf48dcd.
2020-05-02 23:52:41 +03:00
Nikolay Korolev
b095bc1b5a Merge remote-tracking branch 'upstream/master' 2020-05-02 21:31:41 +03:00
Sergeanur
52a13e3301 Fix number of unique jumps in stat menu 2020-05-02 21:28:44 +03: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
d51bf48dcd Disable PED_SKIN for now 2020-05-02 19:13:51 +03:00
Nikolay Korolev
7d067684ff Merge remote-tracking branch 'upstream/master' 2020-05-02 18:02:45 +03:00
Nikolay Korolev
f372ce156d changed saving compatibility 2020-05-02 18:02:17 +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
rollschuh2282
ccf7ebca9a
fixed the CIRCLE_BACK_BUTTON define. 2020-05-02 12:58:12 +02:00
Nikolay Korolev
5a916c16b7 Merge remote-tracking branch 'upstream/master' 2020-05-02 11:26:26 +03:00
aap
339365806a update librw (vsynch) 2020-05-02 10:08:58 +02:00
Nikolay Korolev
026ed72bfc Merge remote-tracking branch 'upstream/master' 2020-05-01 21:23:09 +03:00
eray orçunus
97b288c1e4 Screen mode selector and persistent map target fix 2020-05-01 21:16:02 +03:00
Nikolay Korolev
79d66b7910 Merge remote-tracking branch 'upstream/master' 2020-05-01 13:46:36 +03:00
aap
56cb586f15
Merge pull request #499 from aap/master
Better handling of video modes, windowed mode, fixes to glfw
2020-05-01 08:43:35 +02:00
Nikolay Korolev
063bf51bf1 updated get/set 2020-04-30 22:04:07 +03:00
Nikolay Korolev
dc12718fc2 Merge remote-tracking branch 'upstream/master' 2020-04-30 21:41:20 +03:00
Sergeanur
94acee8580 Fix MakeSureSlotInObjectPoolIsEmpty 2020-04-30 16:52:37 +03:00
Sergeanur
7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
aap
9950d105f7 Merge branch 'master' of github.com:gtamodding/re3 2020-04-30 10:17:26 +02:00
Sergeanur
080689589c Jap fixes 2020-04-30 02:27:15 +03:00
Nikolay Korolev
38655693f5 Merge remote-tracking branch 'upstream/master' 2020-04-29 21:56:25 +03:00
aap
3580e31ce0 Merge branch 'master' of github.com:gtamodding/re3 2020-04-29 20:53:54 +02:00
aap
804b022e67 implemented improved video modes for win.cpp 2020-04-29 18:24:25 +02:00
eray orçunus
fdb1580e15 Mouse wheel fix 2020-04-29 18:53:05 +03:00
Nikolay Korolev
1e78278b5a Merge remote-tracking branch 'upstream/master' 2020-04-29 11:44:33 +03:00
aap
4e630a1a38
Merge pull request #495 from Sergeanur/MoreLanguages
Japanese support
2020-04-29 10:26:36 +02:00
Nikolay Korolev
d8371dcf80 Merge remote-tracking branch 'upstream/master' 2020-04-28 12:16:50 +03:00
Nikolay Korolev
d921871a88
Allow keyboard controls for flying cheats 2020-04-28 12:05:52 +03:00
Nikolay Korolev
fcf9011601 Merge remote-tracking branch 'upstream/master' 2020-04-28 00:47:47 +03:00
Sergeanur
fe353a7cc9 Fixes 2020-04-27 22:41:09 +03:00
aap
f399fd1050 little support for gl3 textures; txd.img enabled again 2020-04-27 20:56:44 +02:00
Nikolay Korolev
a38a867cc5 sync with upstream 2020-04-27 00:55:22 +03:00
Nikolay Korolev
74fde1397e pools compatibility 2020-04-27 00:54:43 +03:00
Nikolay Korolev
68bf239868
Merge pull request #489 from Nick007J/master
1.1 patch stuff + flying controls
2020-04-27 00:53:54 +03:00
aap
e467cb08b8 Merge branch 'master' of github.com:gtamodding/re3 2020-04-26 21:51:11 +02:00
aap
1b5616688e tried to fix some half-pixel bugs 2020-04-26 21:50:52 +02: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
Sergeanur
4dc2f30791 Remove little hack 2020-04-26 21:58:12 +03:00
Sergeanur
b7ee3792df Remove struct workaround in CControllerConfigManager 2020-04-26 20:11:19 +03:00
Sergeanur
1a44bcccd5 A few fixes 2020-04-26 14:18:34 +03:00
eray orçunus
6c1a1f7cd2 Initial GLFW support 2020-04-26 13:29:50 +03:00
Nikolay Korolev
ae8deff131 helis done + cheats 2020-04-25 21:25:14 +03:00
Nikolay Korolev
7ddfc40675 Merge remote-tracking branch 'upstream/master' 2020-04-25 16:48:03 +03:00
aap
f15a5ac0f9 using librw GS alpha test emulation 2020-04-25 12:16:50 +02:00
Nikolay Korolev
bb14d9689f Merge remote-tracking branch 'upstream/master' 2020-04-25 12:26:37 +03:00
Nikolay Korolev
2be2899034 Merge remote-tracking branch 'upstream/master' 2020-04-25 12:25:40 +03:00
Nikolay Korolev
34ef766c67 Merge remote-tracking branch 'upstream/master' 2020-04-25 12:15:29 +03:00
aap
ac19de45b8 few fixes 2020-04-25 00:41:17 +02:00
aap
5bb4e99926 implemented debugmenu 2020-04-24 14:08:06 +02:00
aap
f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
aap
6467e2003a Merge branch 'master' of github.com:gtamodding/re3 2020-04-23 22:10:46 +02:00
Nikolay Korolev
05ddc80ea2 Merge remote-tracking branch 'upstream/master' 2020-04-23 19:12:20 +03:00
Fire_Head
ff46dc1c6c
Merge branch 'master' into master 2020-04-23 11:50:06 +03:00
Fire-Head
75acd78190 ps2 particles, sampman oal started 2020-04-23 11:24:03 +03:00
eray orçunus
c80403a2e0 Crossplatform work continues 2020-04-22 05:24:02 +03:00
aap
959f84ff95 fixed extra directory issues 2020-04-21 13:56:33 +02:00
Nikolay Korolev
7cc3410846 Merge remote-tracking branch 'upstream/master' 2020-04-21 11:55:39 +03:00
shfil
7794cca429
Merge pull request #477 from ShFil119/mingw
Try to make code working on more platforms
2020-04-20 19:50:12 +02:00
Nikolay Korolev
35a7f89f73 Merge remote-tracking branch 'upstream/master' 2020-04-20 19:41:49 +03:00
Filip Gawin
370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
aap
98fc8ecef0 update librw (matfx) 2020-04-20 16:05:39 +02:00
Fire-Head
556a6df401 camerapickup ps2 code 2020-04-20 08:17:08 +03:00
Fire-Head
83810168ee beta OddJob(unique jump etc) sliding text 2020-04-20 07:45:17 +03:00
Nikolay Korolev
b8c34f6654 Merge remote-tracking branch 'upstream/master' 2020-04-20 01:05:20 +03:00
Nikolay Korolev
7e4c683824 fixes 2020-04-20 01:04:57 +03:00
Fire-Head
36f08269a5 MenuScreens.h fix 2020-04-19 22:38:02 +03:00
Fire-Head
4c5edda82e MenuScreens.h fix 2020-04-19 22:37:20 +03:00
Fire-Head
2308321805 Add polish lang support 2020-04-19 22:32:59 +03:00
Nikolay Korolev
df376a13ea sync with master 2020-04-19 17:38:48 +03:00
Nikolay Korolev
9e65eb34ec 1.1 patch stuff 2020-04-19 17:38:10 +03:00
erorcun
0f07a323c9
Merge pull request #474 from Nick007J/master
Bug fixes, mostly replay; added RegisterReference for player ped pointer
2020-04-19 16:56:39 +03:00
eray orçunus
1ffc37735e Struct cleanup, various fixes, enable PS2 rand 2020-04-19 16:44:35 +03:00
Nikolay Korolev
4c133a95bd Merge remote-tracking branch 'upstream/master' 2020-04-18 23:50:58 +03:00
Nikolay Korolev
c4cd45d47c replays bug fix 2020-04-18 23:50:37 +03:00
eray orçunus
9bfcaff849 slider fix 2020-04-18 22:56:49 +03:00
erorcun
6e24cb28ad
Merge pull request #472 from gennariarmando/master
Hide Vehicle/Zone name during Wasted/Busted...
2020-04-18 21:38:33 +03:00
eray orçunus
2f63e5e751 Vc ped ports and Frontend fixes 2020-04-18 21:30:03 +03:00
gennariarmando
ffe5dce7f5 Hide Vehicle/Zone name during Wasted/Busted...
Fixed little mistake in my latest commit.
2020-04-18 18:14:38 +02:00
gennariarmando
522d14814f Changed extraOffset value. 2020-04-18 16:14:48 +03:00
erorcun
70ccd4c187
Merge pull request #464 from gennariarmando/master
Fixed menu radio icons.
2020-04-18 16:14:26 +03:00
Nikolay Korolev
89688843ec bug fixes 2020-04-18 13:56:21 +03:00
Filip Gawin
d6314f9564 Revert "Part one"
This reverts commit 63951d9b95.
2020-04-18 12:29:28 +02:00
Filip Gawin
2b1570de70 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-04-18 12:08:38 +02:00
Sergeanur
eadb5a16aa Zones save/load 2020-04-18 12:24:44 +03:00
Sergeanur
555f933780 Remove padding fields 2020-04-18 11:31:53 +03:00
gennariarmando
e41c32df43 Fixed menu radio icons. 2020-04-18 05:52:33 +02:00
eray orçunus
812b9e7eda Various fixes 2020-04-18 05:58:43 +03:00
Filip Gawin
63951d9b95 Part one 2020-04-17 19:30:57 +02:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
Sergeanur
c8af08330a Merge remote-tracking branch 'samler/world' into Standalone 2020-04-17 15:06:49 +03:00
saml1er
ac61da3feb Fix CWorld::FindObjectsOfTypeInRangeSectorList bug 2020-04-17 17:04:09 +05:00
Sergeanur
4ecf56a2d7 Merge remote-tracking branches 'origin/master' and 'samler/world' into Standalone 2020-04-17 15:03:00 +03:00
saml1er
2a4717fa41 Apply clang format to CWorld 2020-04-17 16:14:59 +05:00
saml1er
ce7d6848ba CWorld fixes 2020-04-17 16:13:55 +05:00
Sergeanur
b9c8ce0d37 Merge remote-tracking branch 'Fire-Head/master' into Standalone
# Conflicts:
#	src/render/Coronas.cpp
2020-04-17 10:17:38 +03:00
Sergeanur
881d61f811 Merge remote-tracking branch 'samler/world' into Standalone 2020-04-17 10:16:30 +03:00
Fire-Head
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
eray orçunus
425395ad25 Ped fixes and ref removal 2020-04-17 07:01:54 +03:00
saml1er
e777f24064 More CWorld fixes 2020-04-17 05:38:05 +05:00
saml1er
03247ce98f Fix CWorld::RepositionOneObject bugs 2020-04-17 03:54:22 +05:00
saml1er
6b1093f1c8 CWorld complete 2020-04-17 03:20:34 +05:00
eray orçunus
2c2da558ca Some refs removed, little fixes and teleport 2020-04-16 22:19:56 +03:00
saml1er
e52a02fb9e Merge branch 'master' into world
# Conflicts:
#	src/core/World.cpp
#	src/core/World.h
2020-04-17 00:01:53 +05:00
saml1er
52d0d811b7 Reverse CWorld 2020-04-16 23:46:08 +05:00
Sergeanur
83cbe4e39e More refs removed 2020-04-16 15:30:47 +03:00
Sergeanur
69c32376fe Increase alpha entity list capacity for wide screen 2020-04-16 12:44:04 +03:00
Sergeanur
b1fc7bc533 More refs removed 2020-04-16 11:50:45 +03:00
aap
4b602940eb first fake RW implementation working 2020-04-16 10:26:16 +02:00
aap
89b7085353 Merge branch 'master' of github.com:gtamodding/re3 2020-04-16 09:23:31 +02:00
eray orçunus
c22e59abab Various fixes 2020-04-16 05:07:32 +03:00
Sergeanur
d455cd8a62 Default native resolution mode and small camera fixes 2020-04-16 00:46:09 +03:00
Sergeanur
3e460d94ac More japanese 2020-04-16 00:24:49 +03:00
aap
afce2e1bb3 Merge branch 'master' of github.com:gtamodding/re3 2020-04-15 22:36:21 +02:00
Nikolay Korolev
5cb7e2e42a
Merge pull request #440 from Fire-Head/master
CWeapon done, fixes
2020-04-15 23:28:09 +03:00
Nikolay Korolev
a43ca86542
Merge pull request #429 from Nick007J/master
Scene edit
2020-04-15 23:27:23 +03:00
eray orçunus
4da1879975 Many fixes and cleanup 2020-04-15 19:19:45 +03:00
aap
90be379bed implemented most of librw wrapper 2020-04-15 14:05:40 +02: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
fbed2c4530 fix debug stuff 2020-04-14 20:12:26 +03:00
Nikolay Korolev
f2c78e4bfb Merge branch 'master' into game_dev 2020-04-14 20:10:39 +03:00
Sergeanur
7f8a4b4867 Debug font and CProfiles 2020-04-14 10:31:37 +03:00
erorcun
313f547860
Some cleanup 2020-04-14 03:21:16 +03:00
Nikolay Korolev
f54c83c0b5 Merge branch 'master' into game_dev 2020-04-14 01:18:53 +03:00
Nikolay Korolev
1c592c26f9 review fix 2020-04-13 21:57:13 +03:00
Nikolay Korolev
3b0cd93f89 Merge remote-tracking branch 'upstream/master' 2020-04-13 21:54:25 +03:00
Nikolay Korolev
cb85091d34 scene edit 2020-04-13 21:50:56 +03:00
erorcun
0e056a8e01
Merge pull request #412 from whampson/save-stuff
GenericLoad() done
2020-04-13 21:49:57 +03:00
Wes Hampson
a19d5dbee1 Fixes 2020-04-13 11:20:57 -07:00
erorcun
e2fb0578b5
Merge pull request #413 from erorcun/erorcun
CFileLoader last funcs and Frontend cleanup
2020-04-13 15:36:05 +03:00
erorcun
c008eb2431
Merge pull request #410 from Sergeanur/PacManPickups
CPacManPickups
2020-04-13 12:51:30 +03:00
Sergeanur
741c9405d0 CPacManPickups 2020-04-13 12:07:07 +03:00
eray orçunus
60c412149d CFileLoader last funcs and Frontend cleanup 2020-04-13 05:42:02 +03:00
aap
3aae52d220 finished CBoat 2020-04-13 00:20:44 +02:00
erorcun
a622c9e877
Merge pull request #409 from erorcun/erorcun
Frontend fixes + triangle for back as default
2020-04-12 20:24:57 +03:00
eray orçunus
8b2138f7bd Frontend fixes + triangle for back as default 2020-04-12 20:22:28 +03:00
Nikolay Korolev
e71b000cc5 Merge branch 'master' into game_dev 2020-04-12 12:13:32 +03:00
Nikolay Korolev
1732f9b5c6 obviously forgot about it 2020-04-12 12:10:25 +03:00
Nikolay Korolev
cbb298c8dd sync with master 2020-04-12 12:08:30 +03:00
Nikolay Korolev
04c9affe2e scene init 2020-04-12 12:06:33 +03:00
Nikolay Korolev
fa0f5542cc
Merge pull request #402 from Nick007J/master
Record
2020-04-12 12:06:12 +03:00
eray orçunus
1932d98482 CDebug fix 2020-04-12 01:33:04 +03:00
erorcun
207aebc46c
Merge pull request #400 from erorcun/erorcun
CMenuManager done and CHud fixes
2020-04-12 00:57:46 +03:00
eray orçunus
f2995640bd CMenuManager done and CHud fixes 2020-04-12 00:56:27 +03:00
Sergeanur
daceee593b Link with RW libs 2020-04-11 23:37:04 +03:00
Nikolay Korolev
d010f6255a Merge branch 'master' into garages_dev 2020-04-11 21:02:31 +03:00
Nikolay Korolev
fbb1bc5b0d Merge remote-tracking branch 'upstream/master' 2020-04-11 21:02:04 +03:00
Nikolay Korolev
38dee74a5a CPools 2020-04-11 21:01:39 +03:00
Sergeanur
0ddc04743c Fix cutscene camera latency 2020-04-11 13:21:21 +03:00
Nikolay Korolev
c8ac25ebfd Merge branch 'master' into garages_dev 2020-04-11 02:04:56 +03:00
Nikolay Korolev
92b6d775d6 Record 2020-04-11 02:03:42 +03:00
Sergeanur
f1413c4776 fixing r* visioned leak 2020-04-11 00:36:11 +03:00
Nikolay Korolev
be260b49b1 Merge branch 'master' into garages_dev 2020-04-10 21:17:00 +03:00
aap
c5d61392ea implemented CTrafficLights 2020-04-10 18:36:39 +02:00
Sergeanur
b76172e2dd PlayerSkin small cleanup 2020-04-10 11:41:48 +03:00
Sergeanur
8917567508 Fixing mixed IsCutsceneProcessing and IsRunning 2020-04-10 11:23:35 +03:00
Nikolay Korolev
917fa80c18 record init 2020-04-10 11:03:38 +03:00
Sergeanur
6647312660 Fix sprite vertical scale 2020-04-10 10:52:47 +03:00
aap
34349c4df2 normalized line endings to LF 2020-04-09 20:50:24 +02:00
Sergeanur
a5239b554f Merge remote-tracking branch 'Fire-Head/master'
# Conflicts:
#	src/core/Radar.cpp
2020-04-09 21:40:46 +03:00
aap
5b5de5d2f3
Merge pull request #393 from Sergeanur/txdimg
txd.img creator
2020-04-09 20:37:53 +02:00
aap
d8cf6258b7
Merge pull request #395 from aap/master
fixed questionable RW usage; changed radar mask to PS2 technique
2020-04-09 20:35:04 +02:00
Sergeanur
6cfc31510d CStats finished 2020-04-09 20:15:45 +03:00
aap
6225e50723 fixed questionable RW usage; changed radar mask to PS2 techinque 2020-04-09 17:45:05 +02:00
aap
6297a9da11
Merge pull request #391 from Sergeanur/Cheats
Cheats
2020-04-09 12:30:23 +02:00
aap
a6d449a2f4
Merge pull request #390 from Sergeanur/Explosion
Finished CExplosion
2020-04-09 12:30:13 +02:00
aap
ee057cb427
Merge pull request #389 from Nick007J/master
Weather
2020-04-09 12:30:02 +02:00
Sergeanur
cb262c791e Finished CExplosion 2020-04-09 13:28:17 +03:00
Sergeanur
fd2152923c txd.img creator 2020-04-09 10:28:50 +03:00
Fire-Head
590ff32469 PS2 Cheats, restored R*names 2020-04-09 06:20:44 +03:00
Fire-Head
c97ff5b31a cleanup 2020-04-09 03:06:43 +03:00
Fire-Head
3769170113 (PS2) TheGame/main/GameInit/SystemInit, ProcessSlowMode 2020-04-09 02:52:38 +03:00
Sergeanur
e6476bafff Cheats 2020-04-09 00:17:14 +03:00
aap
9176aef1b2 Merge branch 'master' of github.com:gtamodding/re3 2020-04-08 18:45:55 +02:00
aap
6288d36f34 implemented CSkidmarks 2020-04-08 16:35:23 +02:00
Nikolay Korolev
b075b0fccf Merge branch 'master' into garages_dev 2020-04-08 14:26:07 +03:00
Sergeanur
7439d6482f Reverting tabs back to spaces for aap 2020-04-08 10:26:31 +03:00
Sergeanur
7eee938de2 Reverting tabs back to spaces for aap 2020-04-08 10:22:34 +03:00
aap
f89df29001
Merge pull request #385 from aap/master
implemented CRubbish, CShinyTexts, CBrightLights, CMotionBlurStreaks, CSpecialFX
2020-04-08 09:12:49 +02:00
Sergeanur
560fc65538 Small camera fixes 2020-04-08 09:58:08 +03:00
Nikolay Korolev
e556ffd3f6 fixes 2020-04-08 01:52:08 +03:00
aap
daaf443cfa finished CMotionBlurStreaks, CSpecialFX 2020-04-07 22:26:01 +02:00
eray orçunus
cf8249fa05 Menu map changes
- new texture by AG
- map now centers when zoomed out too much
- background darkened a bit
- mouse wheel up/down switched
- cross add target on gamepad
- LeftStickY inverted
2020-04-07 23:20:23 +03:00
eray orçunus
1f8e073c0a Menu map 2020-04-07 20:18:24 +03:00
aap
51512db006 implemented CRubbish 2020-04-07 17:16:58 +02:00
aap
1207c2ce6f implemented CShinyTexts 2020-04-07 12:33:14 +02:00
aap
f192d7052e finished CCollision 2020-04-06 20:32:44 +02:00
aap
de706d1471 fixed typo 2020-04-06 18:49:51 +02:00
aap
f2b3be5da2
Merge pull request #379 from erorcun/erorcun
Frontend (last-3)
2020-04-06 18:37:17 +02:00
aap
f8465e0f66
Merge pull request #381 from aap/master
PS2 Frontend Controls
2020-04-06 18:36:19 +02:00
Nikolay Korolev
4f1d6123dd stats fix 2020-04-06 19:31:08 +03:00
Nikolay Korolev
cf804dee91 Merge remote-tracking branch 'upstream/master' 2020-04-06 19:28:04 +03:00
Nikolay Korolev
b991fd9766
Merge branch 'master' into master 2020-04-06 19:26:04 +03:00
Nikolay Korolev
7dc6815903 Merge branch 'master' into garages_dev 2020-04-06 02:01:45 +03:00
aap
cbbe722b70 PS2 Frontend Controls 2020-04-05 21:21:53 +02:00
Sergeanur
4fc2f9c359 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-05 17:03:59 +03:00
aap
27f95d905c fixed look behind bug 2020-04-05 15:27:30 +02:00
aap
5e9ae94298
Merge pull request #378 from aap/master
finished CCamera
2020-04-05 14:30:28 +02:00
Nikolay Korolev
9436b5a8a5 Merge branch 'master' into garages_dev 2020-04-05 12:47:27 +03:00
Nikolay Korolev
057b28e39b cranes init 2020-04-05 12:35:51 +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
eray orçunus
bd7a59e58e Frontend (last-3) 2020-04-04 14:49:19 +03:00
aap
3b315fec26 Merge branch 'master' of github.com:gtamodding/re3 2020-04-03 11:49:33 +02:00
aap
f56909d8b7
Merge pull request #377 from Fire-Head/master
Glass
2020-04-03 11:49:08 +02:00
aap
7ff5a3a65c CCamera fixes 2020-04-03 09:26:10 +02:00
Sergeanur
6e6912b613 fixes 2020-04-02 09:20:45 +03:00
Fire-Head
13fb853fd8 Glass done 2020-04-02 00:04:56 +03:00
Sergeanur
409663adb8 timebars 2020-03-31 16:11:45 +03:00
aap
a57d9b6797
Merge pull request #373 from erorcun/erorcun
Mouse free cam for peds&cars (under FREE_CAM)
2020-03-31 10:29:35 +02:00
eray orçunus
5e2fe749bd Mouse free cam for peds&cars (under FREE_CAM) 2020-03-31 06:05:49 +03:00
Sergeanur
2607a91d87 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-03-30 20:10:12 +03:00
Sergeanur
bb8868eba7 Add russian lang support 2020-03-30 14:50:14 +03:00
aap
8e3ee096e2
Merge pull request #366 from Nick007J/master
Garage part 1
2020-03-29 19:12:53 +02:00
erorcun
6704a62b32
Merge pull request #369 from erorcun/erorcun
CShotInfo, CWanted done, Frontend fix
2020-03-29 19:03:59 +03:00
eray orçunus
a3b519ea64 CShotInfo, CWanted done, Frontend fix 2020-03-29 19:02:26 +03:00
Nikolay Korolev
3a4e2275de fixed PS2 build 2020-03-29 18:53:58 +03:00
Nikolay Korolev
24b8c7819c merge with upstream 2020-03-29 18:51:18 +03:00
Fire_Head
a0b077574e
Merge branch 'master' into master 2020-03-29 18:39:47 +03:00
aap
82dcc34296
Merge pull request #367 from Sergeanur/wrappers_cleanup
Wrappers cleanup
2020-03-29 16:27:42 +02:00
Fire-Head
7b95dcc219 style & cosmetic fixes 2020-03-29 16:35:50 +03:00
Fire-Head
d53c151ffc style & cosmetic fixes 2020-03-29 16:32:11 +03:00
aap
ac097e6fc7 rotating FollowPed cam (disabled by default for now) 2020-03-29 14:07:38 +02:00
Sergeanur
97ffa1a658 Wrappers cleanup 2020-03-29 08:58:08 +03:00
Sergeanur
db92864fe2 Fire and PlayerSkin fix 2020-03-29 08:51:30 +03:00
Fire-Head
194ddc5f40 CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* names 2020-03-28 23:55:23 +03:00
Nikolay Korolev
92edf92570 Merge branch 'master' into garages_dev 2020-03-28 23:42:11 +03:00
aap
8623bc9752
Merge pull request #360 from ShFil119/impr/assembly
Cleanup patching system
2020-03-28 20:01:18 +01:00
Filip Gawin
b235c35834 Cleanup patching system 2020-03-28 19:46:09 +01:00
Nikolay Korolev
101c21e064 merge with master 2020-03-28 20:55:15 +03:00
Nikolay Korolev
775bc3e666 garage update part 2 2020-03-28 20:52:25 +03:00
erorcun
c056871e07
Merge pull request #363 from erorcun/erorcun
CCopPed done and #include cleanup
2020-03-28 19:12:22 +03:00
eray orçunus
112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
aap
2833a08b96 CCam fix 2020-03-28 16:29:34 +01:00
Nikolay Korolev
9fb101fdd9 Merge branch 'master' into garages_dev 2020-03-28 15:24:55 +03:00
Nikolay Korolev
268f92bfbe garages part 1 2020-03-28 15:24:13 +03:00
aap
739e80614d remove include <new> from common.h 2020-03-28 09:37:04 +01:00
aap
6a14457614 Merge branch 'master' of github.com:gtamodding/re3 2020-03-28 09:34:25 +01:00
aap
f5195ca185 CCam fix 2020-03-28 09:34:04 +01:00
Sergeanur
c953230237 Set Xinput version to 9.1.0 + vibration set 2020-03-28 04:53:42 +02:00
Filip Gawin
184a80cc3b Remove assembly from patcher.h 2020-03-27 21:25:39 +01:00
aap
e7c18fc17f removed windows.h for most .cpps 2020-03-27 20:53:47 +01:00
Sergeanur
43b092033c XInput 2020-03-27 21:20:57 +02:00
aap
29f69f6216
Merge pull request #357 from aap/master
Finished CCam; various smaller things
2020-03-27 18:41:22 +01:00
aap
22e022cc9f implemented some unused PS2 cams 2020-03-27 18:21:46 +01:00
aap
f0dfaac838 Finished CCam; various smaller things 2020-03-27 10:04:45 +01:00
erorcun
9e49e5c2bd
Merge pull request #356 from blingu/master
CFire and CFireManager classes nearly done
2020-03-26 19:30:34 +03:00
blingu
79822e3f7c
Update Fire.cpp 2020-03-26 17:11:04 +01:00
blingu
853b2d0c78
Update Fire.cpp 2020-03-26 17:05:01 +01:00
blingu
edc92a7bcc
Update Fire.cpp 2020-03-26 17:00:58 +01:00
eray orçunus
0fe55eb543 CCopPed 2 and fixes 2020-03-26 18:54:03 +03:00
blingu
a66db9efcb
Update Fire.cpp 2020-03-25 23:01:22 +01:00
blingu
09af0bcaf8
Update Fire.cpp 2020-03-25 22:54:14 +01:00
blingu
c3841fe5b4
m_snTimeInMilliseconds to GetTimeInMilliseconds() 2020-03-25 21:24:32 +01:00
blingu
96802f9b95
Update Fire.cpp 2020-03-25 21:13:06 +01:00
blingu
08e1c869a4
renamed field_24 to m_nNextTimeToAddFlames 2020-03-25 21:09:27 +01:00
blingu
e22ce9404c
Update Fire.cpp 2020-03-25 21:07:07 +01:00
blingu
0605e704ca
Update Fire.h 2020-03-25 21:01:38 +01:00
blingu
834f4f6d4c
Update Fire.h 2020-03-25 21:01:10 +01:00
blingu
ea9e45fcda
Update Fire.cpp 2020-03-25 21:00:38 +01:00
PerikiyoXD
1622973ffa Implement Init for Stats 2020-03-24 19:50:08 +01:00
blingu
c03bae46ea
Update Fire.cpp 2020-03-24 18:12:53 +01:00
blingu
1680d11dae
Update Fire.h 2020-03-24 17:25:14 +01:00
blingu
43fb59e356
Update Fire.h 2020-03-24 17:24:47 +01:00
Sergeanur
a12c01e10a obrstr + Debug 2020-03-24 09:56:37 +02:00
Nikolay Korolev
861506d048 merge with upstream 2020-03-22 19:47:14 +03:00