a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-06 05:45:55 +00:00
Code Issues Projects Releases Wiki Activity
4042 commits 4 branches 2 tags 50 MiB
Commit graph

1444 commits

Author SHA1 Message Date
aap 40b90618ef Merge branch 'master' of github.com:GTAmodding/re3 2020-12-21 20:48:48 +01:00
aap 309a4613a4 option for PC controls 2020-12-21 20:48:40 +01:00
aap 88b0134e72 option for PC controls 2020-12-21 20:48:28 +01:00
shfil c0260b4167
Fix char encoding 2020-12-21 14:53:45 +01:00
shfil 752fc0381a
Fix character encoding 2020-12-21 14:51:47 +01:00
aap 1d7bdce0ef fix sizeof 2020-12-21 13:33:54 +01:00
aap b574996334 fix sizeof 2020-12-21 13:33:35 +01:00
aap e696d770be botched last commit 2020-12-21 12:38:02 +01:00
aap fb97335d9f push/pop memids 2020-12-21 12:34:29 +01:00
aap 43b4c8dd33 some more little ps2 fixes 2020-12-20 19:13:58 +01:00
aap f60b450ee8 main.cpp mostly checked against ps2 now 2020-12-20 19:13:37 +01:00
aap 84a9ca0524 Merge branch 'master' of github.com:GTAmodding/re3 2020-12-20 17:35:59 +01:00
aap 036263993e ps2 fixes 2020-12-20 17:35:46 +01:00
aap bfb749d842 ps2 fixes 2020-12-20 17:35:37 +01:00
erorcun 9e1e5d200a disabled PS2_HUD by default 2020-12-20 18:16:56 +03:00
aap 30c8f870eb little ps2 fixes 2020-12-20 14:28:09 +01:00
aap b48445cc7e Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-20 14:27:56 +01:00
aap fc312113d2 some PS2 things 2020-12-20 14:27:48 +01:00
Sergeanur 2e90ce9cc5 uncomment InitRadioStationPositionList 2020-12-20 13:41:29 +02:00
erorcun ae7cb92437 fixes to last HUD commits 2020-12-20 05:49:55 +03:00
Fire-Head 0bea6d039b Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-19 22:33:17 +03:00
Fire-Head 4d4758bc1e scaling 2020-12-19 22:31:54 +03:00
Fire-Head 140fa2a21c restore original code, fixes, ps2 font 2020-12-19 21:25:45 +03:00
aap 2a51e1da04 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-19 17:27:01 +01:00
Nikolay Korolev 76a564df2e fixed review stuff 2020-12-19 14:33:22 +03:00
Nikolay Korolev 17efc38e35 removed cullzones stuff from renderer 2020-12-19 12:27:16 +03:00
Nikolay Korolev bf90fed2b7 fixes 2020-12-19 11:49:19 +03:00
Nikolay Korolev 8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap 9982f1f21b anim compression 2020-12-18 23:46:51 +01:00
aap c17ccc50ab get rid of all PED_SKIN defines 2020-12-18 17:27:18 +01:00
aap 75a9976cbc memorymgr fix 2020-12-18 14:33:54 +01:00
aap f3a356375e added MemoryHeap from III, MemoryMgr 2020-12-18 14:19:03 +01:00
aap a080fbfbd4 little cleanup of templates 2020-12-18 13:58:59 +01:00
aap 55cf1a37cb Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-18 13:50:37 +01:00
aap a7050458ae little cleanup and synch on templates and config 2020-12-18 13:50:26 +01:00
Sergeanur cfda5eb148 PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes 2020-12-18 02:58:09 +02:00
Sergeanur e9a5670348 PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes 2020-12-18 02:57:54 +02:00
aap cc5af26417 PreAllocateRwObjects 2020-12-17 12:47:00 +01:00
erorcun dd579c4080 Fix 2020-12-17 02:47:48 +03:00
erorcun 8e45439205 Use scrolling if GRAPHICS_MENU_OPTIONS not defined, like miami 2020-12-16 23:45:18 +03:00
erorcun 12d16ddc06 Fixes and style changes 2020-12-16 23:28:25 +03:00
erorcun 23b5e664dc Sync Frontend with miami 3/3 2020-12-16 00:38:26 +03:00
erorcun cac7516d39 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-15 17:55:33 +03:00
erorcun 64b509af52 Make free cam collision code readable by aap, fixes 2020-12-15 17:49:43 +03:00
erorcun 970f84514a Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-15 17:45:06 +03:00
erorcun 59caa98c43 Make free cam collision code readable by aap, fixes 2020-12-15 17:33:51 +03:00
Sergeanur f76dfaee82 Use SetPedState 2020-12-15 05:11:02 +02:00
erorcun 984b8efccc Radio scroll to prev. station & radio off text 2020-12-15 05:51:53 +03:00
erorcun 91902a031e Enable our Linux joystick handling 2020-12-14 02:43:07 +03:00
aap e8fe09cf23 another fix for new renderer 2020-12-13 23:09:19 +01:00
aap e3616c1ce1 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-13 12:53:27 +01:00
aap 35cac6b93b some rendering things 2020-12-13 12:53:19 +01:00
Nikolay Korolev 6d61f9d2e1 fixed replay bugs 2020-12-12 23:17:16 +03:00
Nikolay Korolev 01c95378e1 fixed some replay bugs 2020-12-12 23:05:12 +03:00
erorcun 3038fba9ca Sync Frontend, Peds with miami 2 2020-12-12 18:20:21 +03:00
Nikolay Korolev 78718700f9 quick fix 2020-12-12 13:00:40 +03:00
aap 4f3be49728
Merge pull request #868 from erorcun/miami 
Frontend cleanup, .INI, CFO, scrollable pages
 2020-12-12 10:43:06 +01:00
erorcun fc3cdf3b3b Sync Frontend with miami 1 2020-12-09 21:43:58 +03:00
erorcun 1caf5d087a Sync Stats page style with miami - and a little veh. cam. fix 2020-12-09 15:39:14 +03:00
aap ccbbde549e
Merge pull request #869 from Nick007J/miami 
garages revision + fixes
 2020-12-09 09:55:50 +01:00
erorcun c504cf02e4 Vehicle cam object collision fix 2020-12-09 07:15:04 +03:00
erorcun cf4aedd97c Use SDL gamepad mapping in environment by @ZLau92, implement @Sergeanur 's idea to use PPSSPP's DB if available, disable DEV() messages by default 2020-12-09 06:36:28 +03:00
erorcun ba0c9e8b29 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-12-09 06:34:04 +03:00
erorcun b473adcf80 Frontend cleanup, .INI, CFO, scrollable pages 2020-12-09 06:32:33 +03:00
erorcun 33e1f28239 Vehicle cam fixes 
- @ZLau92 's idea to remove 3rd person check on num 2/8.
  It was meaningless on III, probably not on VC tho.
- @Nick007J pointed out that camera wasn't checking objects,
  which was something done by someone to prevent camera to
  collide with traffic lights. Instead I enabled object check again,
  and comparing the result if it's a traffic light after the test.
 2020-12-09 06:09:48 +03:00
erorcun e1044a7947 AnimViewer fixes, commentary from miami 2020-12-09 05:10:57 +03:00
erorcun 122c7aa40d Use SDL gamepad mapping in environment by @ZLau92, implement @Sergeanur 's idea to use PPSSPP's DB if available, disable DEV() messages by default 2020-12-09 03:41:45 +03:00
erorcun ac3484b82e
Merge pull request #872 from withmorten/sized-enums-miami 
Get rid of sized enums 2: Electric Boogaloo
 2020-12-09 03:31:03 +03:00
erorcun 6b654094a5
Merge pull request #871 from withmorten/sized-enums 
Get rid of sized enums
 2020-12-09 03:15:20 +03:00
erorcun fc6f07345e Red delete menu background 2020-12-08 23:33:51 +03:00
Nikolay Korolev 016ff5b4aa sync with upstream 2020-12-08 12:00:24 +03:00
Sergeanur f3e9c82432 Pool fixes from master 2020-12-08 07:52:03 +02:00
Sergeanur 778d1381bb Add NUM_LEVELS 2020-12-08 07:50:29 +02:00
Sergeanur aae4f3319f Fixes 2020-12-08 03:29:08 +02:00
Fire-Head 87bca997a4 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-07 21:50:18 +03:00
Fire-Head c5fbb594a5 ps2 hud, restore original code 2020-12-07 21:12:13 +03:00
withmorten 4c0744260d uint8 enums fixed 2020-12-07 01:59:17 +01:00
withmorten 4696e3f9c8 uint8 enums fixed 2020-12-07 00:36:40 +01:00
Nikolay Korolev fe918d41c2 garages revision + some fixes 2020-12-06 19:30:51 +03:00
Nikolay Korolev 0bd373cd56 script from other platforms and unused commands 2020-12-05 02:49:32 +03:00
aap 9714a37769 bit more GTA_VERSION and GTA_PS2 2020-12-04 01:12:58 +01:00
aap 43fb7fe342 one more original name 2020-12-03 19:11:57 +01:00
aap 5bed7afd79 forgot some junk 2020-12-03 16:56:32 +01:00
aap 13cefd3293 more PS2 stuff; memory movement done 2020-12-03 16:04:59 +01:00
aap 0d166081ad animviewer fixes 2020-12-03 11:30:46 +01:00
aap 3c24505990 little fixes for animviewer 2020-12-03 09:34:09 +01:00
erorcun ab3e810a95 AnimViewer done, comment cleanup 2020-12-03 05:22:58 +03:00
erorcun 8b47774aee Stats page 2020-12-03 02:09:35 +03:00
erorcun 774aa1570f
Merge pull request #853 from erorcun/miami 
PlayerPed and "Redefine controls" menu done, fixes
 2020-12-02 14:35:06 +03:00
erorcun bd8b907d13 PlayerPed and "Redefine controls" menu done, fixes 2020-12-02 14:21:46 +03:00
aap 1172056833 cam lod dist fix 2020-12-02 10:39:23 +01:00
aap f576311814 Merge branch 'master' of github.com:GTAmodding/re3 2020-12-02 10:38:39 +01:00
aap fba657ff0c better cam lod dist fix 2020-12-02 10:38:27 +01:00
Nikolay Korolev 4b9f1680a3 fast fix 2020-12-02 02:41:05 +03:00
Nikolay Korolev fda58fb1df added GTA_SCENE_EDIT 2020-12-02 02:34:51 +03:00
Sergeanur a259b6b8ab TexturePools 
# Conflicts:
#	src/core/Game.cpp
#	src/rw/RwHelper.cpp
 2020-12-01 22:54:19 +02:00
Sergeanur 24b5406a1d Add GTA_REPLAY 
# Conflicts:
#	src/control/Replay.cpp
#	src/control/Replay.h
 2020-12-01 22:53:09 +02:00
Sergeanur 0b20fd7e77 Remove ifndef GTA_PS2 around replays 2020-12-01 22:35:53 +02:00
Sergeanur 9461998304 TexturePools 2020-12-01 22:12:46 +02:00
Sergeanur e33ab44b7d Add GTA_REPLAY 2020-12-01 22:08:05 +02:00
aap 83bbb631d1 some more GTA_VERSIONs and CGame tidy-up (not much actual memory moving yet) 2020-12-01 17:42:18 +01:00
aap b8bc54640d fix cam-fix 2020-12-01 17:24:56 +01:00
aap 56c471d02e
Merge pull request #854 from Nick007J/master 
small garages + templates revision
 2020-12-01 11:25:02 +01:00
aap d6fab1bc53 cam stuff 2020-12-01 10:12:42 +01:00
Sergeanur 5a3a058ed3 Make texture conversion work a bit faster 
# Conflicts:
#	src/core/config.h
 2020-12-01 03:51:31 +02:00
Zach Charo 6eb0fd52d7
Update Camera.cpp 
camdist multiplier is consitently between 1 and 1.4 on 16:9 aspect ratio
On ultrawide, the cam dist multiplier jumps to anywhere between 2 and 3
The preferred distance generator for car objects is the cam dist multiplier * 120. Which puts cars that it's trying to generate outside of the allowed gen/draw distance for new car objects when on ultrawide. This means no new cars can spawn.
This change caps the scaling for the generation distance a bit above what it would be for 16:9 and does not affect the LOD multiplier.
 2020-11-30 19:08:15 -06:00
aap 2c59e1c894 some more GTA_VERSION 2020-12-01 00:22:57 +01:00
aap 4b9fb631fc added a few registered pointers and memory debug 2020-11-30 23:44:58 +01:00
Nikolay Korolev a3b83a5d2f Merge remote-tracking branch 'upstream/master' 2020-11-30 02:15:35 +03:00
Nikolay Korolev 8f05ccd6c4 small garages revision + small template stuff 2020-11-30 02:15:03 +03:00
aap d5bc382cb5 GTA_VERSION define and some config.h cleanup 2020-11-29 21:29:48 +01:00
aap 566282057a add debug script hotkey 2020-11-29 11:37:06 +01:00
aap c57fee38ca
Merge pull request #841 from aap/master 
start using CMemoryHeap; also some PS2 define cleanup
 2020-11-28 18:52:44 +01:00
aap a8035b6466 moved some stuff to MemoryMgr 2020-11-28 17:05:57 +01:00
aap b23bda6e45 Merge branch 'master' of github.com:GTAmodding/re3 2020-11-28 16:02:21 +01:00
Sergeanur ad48b9cde0 Make texture conversion work a bit faster 2020-11-28 16:29:45 +02:00
Sergeanur 18d0fd2e48 Add multisampling to librw 2020-11-28 15:13:06 +02:00
aap d857758c16 start using CMemoryHeap 2020-11-26 17:39:59 +01:00
Sergeanur 491274f188 CStreaming::PrintStreamingBufferState 2020-11-26 18:11:55 +02:00
aap 4ddc356341 memory heap starting to work 2020-11-25 22:49:50 +01:00
aap 70d8bdc087 rename badly named camera variable 2020-11-24 15:20:41 +01:00
aap 1906a08f72 cam fix; forgot some shaders 2020-11-24 15:18:39 +01:00
erorcun b7783b19d2 Xbox message screen, disabled by default 2020-11-24 01:45:54 +03:00
aap 9b4cfa618d
Merge pull request #827 from aap/master 
finished cullzones
 2020-11-22 22:49:22 +01:00
aap 07303c62d1 finished cullzones 2020-11-22 00:13:07 +01:00
aap 15ae9e2a3e
Merge pull request #823 from aap/master 
Neo screen droplets
 2020-11-22 00:12:34 +01:00
aap b9b7d5ac21
Merge pull request #825 from aap/miami 
neo screen droplets
 2020-11-22 00:12:31 +01:00
Nikolay 6b6b600cee
no script logging 2020-11-21 21:12:47 +03:00
Sergeanur fe40f65703 Reorganize CPed functions into their original cpp files 2020-11-20 01:18:37 +02:00
Sergeanur 9e45feb4fa Reorganize CPed functions into their original cpp files 2020-11-19 21:12:20 +02:00
aap 07fe099b4e neo screen droplets 2020-11-19 19:07:32 +01:00
aap 02c7f8381b neo screen droplets 2020-11-19 16:23:52 +01:00
erorcun 808f7c46f1 Infamous XBOX subtitle outline 2020-11-19 02:09:04 +03:00
erorcun 54214dd2c4 Fix mouse lock/high-dpi 2020-11-18 17:42:21 +03:00
erorcun 1d600c640a
Merge pull request #816 from erorcun/miami 
Frontend: Stats, Map, Audio inputs, Radio selector
 2020-11-18 01:45:28 +03:00
erorcun b58a54527e
Merge pull request #820 from withmorten/mission-switcher 
add mission switcher from miami
 2020-11-18 01:45:12 +03:00
erorcun c6f53d25b0 Frontend: Stats, Map, Audio inputs, Radio selector 2020-11-18 00:33:45 +03:00
aap 46253fbf7d Merge branch 'master' of github.com:GTAmodding/re3 2020-11-16 22:43:35 +01:00
aap 3564b85b4e animation compression from PS2 2020-11-16 22:43:15 +01:00
Nikolay Korolev b9b9dabd75 lcs car ctrl 2 2020-11-16 22:20:56 +03:00
erorcun f33ed2892a Fix mouse lock/high-dpi 2 2020-11-16 15:49:00 +03:00
erorcun 3b1debaa0d Fix mouse lock/high-dpi 2020-11-16 15:28:10 +03:00
Sergeanur cdd30f4da5 Move ColStore to collision 2020-11-16 12:49:23 +02:00
aap 6804ad62c6 little fix to ps2 CPad 2020-11-16 09:48:15 +01:00
aap 5335b46cbb little fix to ps2 CPad 2020-11-16 09:48:02 +01:00
withmorten abcda2ce29 add mission switcher from miami 2020-11-16 00:41:03 +01:00
withmorten 207f8576d8 move config.h define to CUSTOM_FRONTEND_OPTIONS 2020-11-16 00:21:04 +01:00
withmorten f0071c094a remove unneeded ifdef 2020-11-16 00:07:27 +01:00
Sergeanur 9bb8ebaa10 Make collision code placement more like original (+ small fixes) 
# Conflicts:
#	premake5.lua
#	src/CMakeLists.txt
#	src/collision/Collision.cpp
#	src/core/Collision.h
 2020-11-16 00:36:54 +02:00
withmorten ac29ae6e23 add CFO for invertlook4pad; update american.gxt 2020-11-15 23:06:29 +01:00