1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-30 18:55:28 +00:00
Commit graph

3134 commits

Author SHA1 Message Date
aap 4f3be49728
Merge pull request #868 from erorcun/miami
Frontend cleanup, .INI, CFO, scrollable pages
2020-12-12 10:43:06 +01:00
Nikolay Korolev 4197498e2d fixed garages + minor fixes 2020-12-12 12:24:55 +03: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 95fe5004c8 Fix 2020-12-09 06:36:51 +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 0dfa833610 Fix 2020-12-09 03:55:30 +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
aap c8b0f0bdf8 fix CObject::DeleteAllTempObjectsInArea 2020-12-08 23:16:38 +01:00
aap f6cc178a50 fix CObject::DeleteAllTempObjectsInArea 2020-12-08 23:15:59 +01:00
erorcun eaf32190ca Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-08 23:35:27 +03:00
erorcun fc6f07345e Red delete menu background 2020-12-08 23:33:51 +03:00
Walied K. Yassen a35c96c5ec
Fix DeleteAllTempObjectsInArea and bunch of random gen ranges 2020-12-08 21:22:05 +02:00
shfil 95094e45af
Merge pull request #873 from madebr/openal_static
audio: define openal extensions in re3 owned namespace
2020-12-08 16:40:57 +01: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 579efc05fc Fix bike's fInAirXRes 2020-12-08 05:26:48 +02:00
Sergeanur b13b26b5fb GenerateOneRandomCar cleanup 2020-12-08 03:33:56 +02:00
Sergeanur aae4f3319f Fixes 2020-12-08 03:29:08 +02:00
Sergeanur 8d3864a4e5 Fix CRecordDataForChase::ShouldThisPadBeLeftAlone 2020-12-08 02:56:20 +02:00
Sergeanur 84cc31fea3 Fix wrong define 2020-12-08 02:27:35 +02:00
Sergeanur 8844caf44d Fix vanilla font bug 2020-12-08 02:22:02 +02:00
aap 61c6b28237
Merge pull request #847 from waliedyassen/CObject-fixes
CObject fixes
2020-12-07 22:03:12 +01:00
Sergeanur 64049f0f81 Fix font bug 2020-12-07 22:56:22 +02:00
Anonymous Maarten 5a1ea7bcf5 audio: define openal extensions in re3 owned namespace 2020-12-07 19:05:58 +01:00
withmorten 7e11f639aa don't cast script param to uint8 2020-12-07 02:02:59 +01:00
withmorten 4c0744260d uint8 enums fixed 2020-12-07 01:59:17 +01:00
withmorten 912e71be53 int8 enums fixed 2020-12-07 01:30:38 +01:00
withmorten 16ed00aede uint16 enums fixed 2020-12-07 01:22:51 +01:00
withmorten e6a7a9353c uint32 enums fixed 2020-12-07 01:20:14 +01:00
withmorten 7ad86595e4 int32 enum fixed 2020-12-07 01:19:10 +01:00
withmorten 5e9a433b79 int32 enum fixed 2020-12-07 01:05:45 +01:00
withmorten 9e2ac26a1d uint32 enums fixed 2020-12-07 01:04:23 +01:00
withmorten b5ffea5c6e uint16 enums fixed 2020-12-07 00:57:34 +01:00
withmorten afdf8c25a0 int8 enums fixed 2020-12-07 00:56:12 +01:00
withmorten 4696e3f9c8 uint8 enums fixed 2020-12-07 00:36:40 +01:00
Walied K. Yassen 190bcf68f3
Implement DAMAGE_EFFECT_SMASH_VEGPALM and code style fixes 2020-12-07 01:11:40 +02:00
Anonymous Maarten 12d3893fe9 crossplatform is needed for casepath on non-Windows systems 2020-12-06 20:46:11 +01:00
Anonymous Maarten 3a66b17887 inttypes.h is part of the C++ standard, so prefix it 2020-12-06 20:46:11 +01:00
Nikolay Korolev 406f646949 pool stuff fix 2020-12-06 21:28:40 +03:00
Nikolay Korolev 17a939e38d quick fix 2020-12-06 19:34:43 +03:00
Nikolay Korolev fe918d41c2 garages revision + some fixes 2020-12-06 19:30:51 +03:00
Nikolay 14eb0cd286
fixed parenthesis 2020-12-06 15:27:42 +03:00
Nikolay efb28b888d
fixed ANCHOR_BOAT 2020-12-05 22:26:45 +03:00
aap 28a942735c fix pMemoryTop 2020-12-05 14:50:54 +01:00
Nikolay Korolev a82188ac07 lil fix 2020-12-05 12:12:56 +03:00
Nikolay Korolev 0bd373cd56 script from other platforms and unused commands 2020-12-05 02:49:32 +03:00
aap 466eee84e7 typo 2020-12-04 10:23:04 +01: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 a6c4d9b77c forgot to wrap in FIX_BUGS 2020-12-03 16:07:16 +01:00
aap 955698d2d3 kludge to prevent dodo unique jumps 2020-12-03 16:05:28 +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
aap 448ba9b7e8 bla 2020-12-02 13:08:30 +01:00
aap 50bf0f27a0 rpDefaultGeometryInstance 2020-12-02 12:58:29 +01: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 43d5831394 cAudioManager::ProcessPedOneShots + fixes 2020-12-01 23:38:36 +02: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 8de7072720
Merge pull request #857 from majesticCoding/miami
skimmer shadow
2020-12-01 11:24:24 +01:00
aap d545246bbf plane fix 2020-12-01 10:19:11 +01:00
aap d6fab1bc53 cam stuff 2020-12-01 10:12:42 +01:00
aap 6dcbc8f062
Merge pull request #856 from ZLau92/patch-2
Update Camera.cpp - Vehicle spawning on ultrawide aspect ratios
2020-12-01 10:00:58 +01:00
majestic cd23695116 skimmer shadow 2020-11-30 23:52:35 -08:00
Sergeanur 5a3a058ed3 Make texture conversion work a bit faster
# Conflicts:
#	src/core/config.h
2020-12-01 03:51:31 +02:00
Sergeanur 16abbad6b2 Add multisampling to librw
# Conflicts:
#	src/core/config.h
#	vendor/librw
2020-12-01 03:42:40 +02:00
withmorten b8d3d8f5e4 add -console cmdline arg instead of #if 0/1
# Conflicts:
#	src/skel/glfw/glfw.cpp
#	src/skel/win/win.cpp
2020-12-01 03:41:09 +02:00
erorcun 4ec60676e7
Merge pull request #846 from withmorten/ini
add -console cmdline arg instead of #if 0/1
2020-12-01 04:21:00 +03: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
Walied K. Yassen 1dcd7c5b14
Fix the code style issues 2020-11-30 08:36:06 +02:00
Walied K. Yassen ac7ea2b9fa
Implement the missing damage effects and fix the existing ones 2020-11-30 02:09:35 +02: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 5282696699 fix backface culling on vehicles 2020-11-29 11:36:26 +01:00
Walied K. Yassen a1ab82b188
Implement MI_BEACHBALL behaviours 2020-11-29 09:14:15 +02:00
Walied K. Yassen afe70003f4
Fix MI_RCBOMB gravity force and treat MI_PETROLPUMP2 as explosive 2020-11-29 08:53:54 +02:00
Walied K. Yassen 03ef438a72
Fix CObject::DeleteAllTempObjectsInArea not considering the given point 2020-11-29 04:20:28 +02:00
Nikolay Korolev 8cb3c07151 some nasty FIX_BUGS for SLIDE_OBJECT 2020-11-28 21:26:38 +03: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
withmorten b1a431a740 add -console cmdline arg instead of #if 0/1 2020-11-28 17:57:10 +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
Zach Charo b47c505438 Update Script.cpp
Case sensitivity fix. Causes compile issue on linux.
2020-11-28 13:36:38 +02:00
Nikolay Korolev f50a53e290 fix garages 2020-11-27 19:18:51 +03: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 88baa9ce5f implemented CMemoryHeap, not used or tested yet 2020-11-25 21:34:06 +01:00
Sergeanur 164f16c85b Some TODOs done in Peds code 2020-11-25 19:39:57 +02:00
Sergeanur 8f5e60f787 Original enum name 2020-11-24 17:16:39 +02: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
Sergeanur a35b3b4602 Script commands split to original files 2020-11-24 14:06:48 +02:00
Sergeanur bd3d09fef5 Script commands split to original files 2020-11-24 12:58:11 +02:00
erorcun b7783b19d2 Xbox message screen, disabled by default 2020-11-24 01:45:54 +03:00
Sergeanur 833bf4a619 Add some TODO stubs for unused code to be reversed 2020-11-23 18:59:50 +02:00
aap b2f9b3175b two unused functions 2020-11-23 11:06:16 +01:00
aap b6da31cfaa two unused functions 2020-11-23 09:38:51 +01:00
aap 9b4cfa618d
Merge pull request #827 from aap/master
finished cullzones
2020-11-22 22:49:22 +01:00
Sergeanur 103b8fb426 More audio fix 2020-11-22 23:24:38 +02:00
Sergeanur 3289bfaa87 Darkel done 2020-11-22 23:18:35 +02:00
Sergeanur 87e6edd554 Renderer fix 2020-11-22 23:16:21 +02:00
Nikolay 2b53f267a7 one more fix
# Conflicts:
#	src/control/Restart.cpp
2020-11-22 23:13:43 +02:00
Nikolay 6a6551f39b small improvement
# Conflicts:
#	src/control/Restart.cpp
2020-11-22 23:13:23 +02:00
Sergeanur c814a0a1a6 Renderer fix 2020-11-22 23:11:55 +02:00
Sergeanur f010777e58 Audio fixes 2020-11-22 23:10:41 +02:00
Nikolay 222e7f56ff
one more fix 2020-11-22 02:31:52 +03:00
Nikolay d24e1ee592
small improvement 2020-11-22 02:29:17 +03: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
aap a0a8bb8d92
Merge pull request #822 from aap/master
CPed review part1,2 re3
2020-11-19 15:20:53 +01:00
erorcun 808f7c46f1 Infamous XBOX subtitle outline 2020-11-19 02:09:04 +03:00