mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-11-09 05:54:52 +00:00
Code Issues Projects Releases Wiki Activity
4955 commits 3 branches 0 tags 56 MiB
Commit graph

4105 commits

Author SHA1 Message Date
withmorten fec39e87c0 Revert "always console for windows Debug builds" 
This reverts commit a826091dc9.
 2021-02-15 14:57:19 +01:00
withmorten a76c962aa3 always console for windows Debug builds 2021-02-15 14:27:35 +01:00
withmorten a826091dc9 always console for windows Debug builds 2021-02-15 14:24:07 +01:00
erorcun 5ce5000b14 Try to fix streams stop after a while 2 2021-02-15 05:09:46 +03:00
Steve Wills a666de46aa Fix seg fault when configuring controller 
Since controllerAction can be -2 (line 2105)
 2021-02-14 14:06:37 -05:00
erorcun be55085303 Try to fix streams stop after a while 2021-02-14 20:45:58 +03:00
Fire-Head 0681fe3eca cannon fix 2021-02-14 20:11:58 +03:00
Fire-Head 0b6e46b1e4 cannon fix 2021-02-14 20:11:23 +03:00
Nikolay Korolev 3d90a146d8 Merge remote-tracking branch 'upstream/miami' into miami 2021-02-14 20:09:16 +03:00
Nikolay Korolev 6ba0d2e6bd fail 2021-02-14 20:08:55 +03:00
erorcun 70b919137d (Test) Try to fix streams stop after a while 2021-02-14 18:07:21 +03:00
Sergeanur 9f6f9a7af3
Merge pull request #1024 from IlDucci/miami 
[Miami] Updating font widths.
 2021-02-14 07:53:45 +02:00
withmorten e5d5160492 glfw window icon 2021-02-13 17:09:12 +01:00
withmorten 8d27dba4cd glfw window icon 2021-02-13 17:01:47 +01:00
IlDucci ae8b2198e2 Redone the entire grouping to follow the textures, added ifdefs, added a small legend for the Pricedown characters in EFIGS font1 2021-02-13 16:50:28 +01:00
Sergeanur 02ac7c309e Disable RANDOMSPLASH only if loading screen is disabled 2021-02-13 16:16:02 +02:00
Sergeanur 4907c56231 Disable RANDOMSPLASH 2021-02-13 16:10:14 +02:00
aap 333530e260 new icon 2021-02-13 14:54:51 +01:00
aap 04345643a0 new icon 2021-02-13 14:54:44 +01:00
aap 65f9917b65 clean up debug menu 2021-02-13 14:22:34 +01:00
aap 9c7d83ebc1 dbg menu again 2021-02-13 14:22:11 +01:00
aap d0fbba19d1 debugmenu cleanup 2021-02-13 13:47:03 +01:00
aap 0f8614221b debugmenu cleanup 2021-02-13 00:00:02 +01:00
Fire-Head 291cdd4bfb iii icon fix 2021-02-13 01:35:48 +03:00
erorcun 035f0010d8 fix 2021-02-12 21:26:03 +03:00
erorcun 0ec16a5b0e Fix XInput hotplug 2021-02-12 21:10:52 +03:00
Filip Gawin 0c60ceeb33 Cmake version for hash 2021-02-12 21:09:46 +03:00
erorcun 2c784d979a Remove version text, add toggleable debug info(with commit hash!) 2021-02-12 21:09:23 +03:00
erorcun 6689b0be02 Fix XInput hotplug 2021-02-12 19:50:26 +03:00
Sergeanur e98164ec41 Sync aspect ratio setting with master 2021-02-12 18:00:20 +02:00
erorcun a44d7d86cb
Merge pull request #1029 from erorcun/master 
Remove version text, add toggleable debug info(with commit hash!)
 2021-02-12 18:15:51 +03:00
Filip Gawin 1b8d03f3aa Cmake version for hash 2021-02-12 16:38:03 +03:00
Sergeanur aadc39eccd Add missing rtpng.h 2021-02-12 08:46:32 +02:00
Sergeanur c5042dcdf6 Add english strings to translations as stubs, also translation notice 2021-02-12 08:14:10 +02:00
Sergeanur 9e22eaf798 Fix RW34 2021-02-12 08:06:34 +02:00
Sergeanur e7a4a3516f Add english strings to translations as stubs, also translation notice 2021-02-12 07:52:21 +02:00
Sergeanur 2c194df591 Fix RW33 2021-02-12 05:37:30 +02:00
erorcun 9e1c048e20 Remove version text, add toggleable debug info(with commit hash!) 2021-02-12 05:28:08 +03:00
aap 879838c9f2 enable screenshots with F12 2021-02-12 00:29:09 +01:00
aap f3bfdd7857 imrove readme; enable screenshots with F12 2021-02-12 00:06:54 +01:00
Sergeanur 998d88763d Fix RC cars detonation button 2021-02-11 18:03:47 +02:00
Sergeanur e4320c02cf Enable BIND_VEHICLE_FIREWEAPON 2021-02-11 17:16:01 +02:00
Sergeanur 579ad052ed Fix black screen during credits 2021-02-11 13:30:04 +02:00
Nikolay Korolev 7c74c01741 fixed attractors 2021-02-11 13:35:56 +03:00
Sergeanur 9d8e32d9b2
Merge pull request #1026 from Sergeanur/VC/ControllerMenu 
Controller menu
 2021-02-11 12:31:13 +02:00
Sergeanur 28f9160bca Fix crash when falling from bike while shooting 2021-02-11 12:13:03 +02:00
Sergeanur a6b56e6b7a Merge remote-tracking branch 'origin/master' 
* origin/master:
  startproject now depends on librw
  Ped jump teleport/kill fix
 2021-02-11 06:53:29 +02:00
Sergeanur c9f804486d Fix setup 4 texts 2021-02-11 06:53:00 +02:00
Sergeanur 4f27a28762 More fixes 2021-02-11 05:03:41 +02:00
Sergeanur 9f3f0ee2d2 Fix borders 2021-02-11 04:36:00 +02:00
erorcun a6d402e8fd Ped jump teleport/kill fix 2021-02-10 15:34:48 +03:00
erorcun 6d56fb41c6 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-02-10 15:27:04 +03:00
erorcun 775db94a96 Ped jump teleport/kill fix 2021-02-10 15:26:42 +03:00
Sergeanur 3c7a7bc8a7 Fixes 2021-02-10 13:42:59 +02:00
Sergeanur 5072c8b6f0 Merge branch 'miami' into VC/ControllerMenu 
* miami:
  Fix repeating pickup sound on revenue pickup
 2021-02-10 12:22:12 +02:00
Sergeanur ca85e44c9e Fix repeating pickup sound on revenue pickup 2021-02-10 12:21:21 +02:00
Sergeanur 5f3e68ec45 Save vibration setting 2021-02-10 09:16:04 +02:00
Sergeanur d6068c421d Add undef 2021-02-10 09:08:02 +02:00
Sergeanur b6af7393e8 Merge remote-tracking branch 'origin/miami' into VC/ControllerMenu 
* origin/miami:
  fix clouds
  Use our synonyms for attack anims again
  Detect joystick menu for XInput
  reorganize shaders; use modulate flag; update librw
  fix generic.txd crash
  Use original animation names from VCS

# Conflicts:
#	src/core/MenuScreensCustom.cpp
 2021-02-10 09:01:53 +02:00
Sergeanur 12330e38cb Controller menu 2021-02-10 08:57:51 +02:00
aap 26bbbe0037 fix clouds 2021-02-09 20:02:29 +01:00
aap 25703b04a2 fix clouds 2021-02-09 19:59:55 +01:00
erorcun d460c3863e Also check font textures for new languages 2021-02-08 18:21:00 +03:00
erorcun 94eed33940 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-02-08 13:24:49 +03:00
erorcun b464bb7fd4 Merge branch 'miami' of https://github.com/GTAmodding/re3 into VCSanim 2021-02-08 13:23:19 +03:00
erorcun 0eb1913713 Merge branch 'master' of https://github.com/GTAmodding/re3 2021-02-08 13:21:53 +03:00
erorcun 2cad49940e Use our synonyms for attack anims again 2021-02-07 21:13:54 +03:00
erorcun d224f8b7ee Don't show menu map and new languages if gamefiles isn't copied 2021-02-07 20:38:53 +03:00
erorcun 675aef29cf Detect joystick menu for XInput 2021-02-07 19:50:17 +03:00
aap 425f360363 reorganize shaders; use modulate flag; update librw 2021-02-06 16:49:52 +01:00
aap 6662e60b63 reorganize shaders; use modulate flag; update librw 2021-02-06 16:33:17 +01:00
aap cc435ea711 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2021-02-06 10:23:28 +01:00
erorcun c7ba01b034 Detect joystick menu for XInput 2021-02-05 18:23:50 +03:00
IlDucci b864103976 Restoring original sorting. 2021-02-05 13:53:24 +01:00
Nikolay Korolev 102d105e0a fix 2021-02-05 14:45:03 +03:00
IlDucci 86513cb2c9 [Miami] Updating font widths. 
- Fixing widths in SF Arborcrest for the characters ¡, Ñ, ñ, ¿.
 - Fixing the ¡ character width in Rage font.
 - Mapped the characters that are being affected by each width size.
 2021-02-05 12:44:41 +01:00
withmorten 2bd8be5872 Fix inverted vertical camera 2021-02-05 12:08:14 +01:00
aap 9125e604b9 fix generic.txd crash 2021-02-05 10:58:01 +01:00
aap 5385d004ec fix generic.txd crash 2021-02-05 10:51:12 +01:00
Nikolay Korolev 09de511c37 fixed plane AI 2021-02-05 11:31:54 +03:00
withmorten a78212ea80 fix MASTER crashes 2021-02-04 23:43:04 +01:00
withmorten bf299e5c17 fix MASTER crashes 2021-02-04 23:41:10 +01:00
withmorten 8553120fdb add missing ASCII_STRCMP stuff 2021-02-04 19:47:47 +01:00
withmorten 42342745f3 CHud::Draw fix 2021-02-04 18:29:47 +01:00
withmorten 7aaaaa953b CHud::Draw fix 2021-02-04 18:28:24 +01:00
withmorten 263a766d8e
revert Fix RW build 2021-02-04 01:40:45 +01:00
Sergeanur 61618389e1 Fix crash on changing anti aliasing 2021-02-04 01:52:57 +02:00
withmorten e6d86bfab5 fix VC_PED_PORTS build 2021-02-03 23:37:10 +01:00
Sergeanur e077a6bf28 Fix RW build 2021-02-03 22:21:16 +02:00
erorcun c002dd6cba MP3 player fixes 2021-02-03 23:12:55 +03:00
erorcun ca48ebcb6e MP3 player fixes 2021-02-03 23:03:00 +03:00
Nikolay Korolev ca65c76419 fix 2021-02-03 22:46:04 +03:00
Sergeanur 91c3bdfa15
Merge pull request #1019 from Sergeanur/ControllerMenu2 
Controller menu
 2021-02-03 21:43:25 +02:00
Nikolay Korolev aeccd8c166 Merge remote-tracking branch 'upstream/master' 2021-02-03 15:35:14 +03:00
Nikolay Korolev f6326606b7 fix 2021-02-03 15:35:06 +03:00
erorcun f541520040 Merge branch 'master' of https://github.com/gtamodding/re3 2021-02-03 15:12:24 +03:00
erorcun 7ff899bd22 OAL Loops, fixes 2021-02-03 15:10:27 +03:00
erorcun f42f785c78
Merge pull request #1020 from erorcun/master 
MusicManager fixes
 2021-02-03 14:22:33 +03:00
erorcun 1667ffdd8f MusicManager fixes 2021-02-03 14:08:28 +03:00
Sergeanur a7e11d134f Add undef 2021-02-03 02:53:54 +02:00
Sergeanur adf07aab47 Fix compilation 2021-02-03 02:47:45 +02:00
Sergeanur 91612eb45a Controller menu 2021-02-03 02:41:12 +02:00
Sergeanur b47a23ab79
Merge pull request #1001 from Sergeanur/animNames 
Use original animation names from VCS
 2021-02-03 02:14:48 +02:00
erorcun 713562685a OAL Loops, fixes 2021-02-02 22:30:13 +03:00
withmorten b65f8a3fe2 no advanced script log when log level is 0 2021-02-02 11:35:16 +01:00
withmorten 1b293a3cfb no advanced script log when log level is 0 2021-02-02 11:32:20 +01:00
withmorten 4281730b16 fix UB and potential crashes when doing ice cream 2021-02-02 11:27:30 +01:00
erorcun 1eb77c4d6d
Merge pull request #1016 from erorcun/miami 
Overhaul MusicManager - fix radio bugs, scroll to prev station, radio…
 2021-02-02 05:31:29 +03:00
erorcun 902e539c0d Overhaul MusicManager - fix radio bugs, scroll to prev station, radio off text 2021-02-01 14:18:17 +03:00
Sergeanur 4afa7b86ae Add radio off text 2021-01-31 23:44:30 +02:00
Filip Gawin 3d4791f291 Revert "First batch of fixes (CallAndMessage)" 
This reverts commit 7a3b80a9b7.
 2021-01-31 21:06:38 +01:00
Filip Gawin 7a3b80a9b7 First batch of fixes (CallAndMessage) 2021-01-31 20:44:39 +01:00
shfil 264d7d98d7
fix realloc 2021-01-31 15:01:46 +01:00
shfil 5de4e88d7a
fix realloc 2021-01-31 15:00:36 +01:00
Adrian Graber b60baf46f6 Only include sys/syscall.h when __linux__ is defined 2021-01-31 14:27:06 +01:00
Adrian Graber d76b58cc72 Add unnamed semaphore define toggle for CdStreamPosix 2021-01-31 14:27:00 +01:00
withmorten da378077f7 renderer fix from miami 2021-01-31 02:08:42 +01:00
withmorten 2e37001881 fix UB and new renderer crashes 2021-01-31 01:19:25 +01:00
Nikolay Korolev e5190481e4 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-31 01:46:33 +03:00
Nikolay Korolev 2420325c02 fix 2021-01-31 01:45:07 +03:00
withmorten 5dfe396af3 use macro for waterlevel z offset 2021-01-30 20:13:25 +01:00
Sergeanur c193ade58b Font fixes 2021-01-30 20:46:37 +02:00
Nikolay Korolev 8b08098d4e fix 2021-01-30 20:26:10 +03:00
Nikolay Korolev dbf5c06144 fixed bike bomb 2021-01-30 14:53:51 +03:00
withmorten 990637bf52 waterlevel: use macro for 400.0f 2021-01-29 17:57:51 +01:00
erorcun f61a91c97d Merge branch 'master' of https://github.com/GTAmodding/re3 2021-01-29 19:30:27 +03:00
erorcun d52b917c54 Some regular fixes and UB fixes 2021-01-29 19:23:02 +03:00
erorcun f5f153dbfd Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-29 19:16:40 +03:00
erorcun c4328afce7 Even more fixes & shorten quit screen 2021-01-29 19:16:26 +03:00
withmorten f7fc919d98 add NewRenderer ini read/write 2021-01-29 16:46:03 +01:00
withmorten 7db28f9f7f fix NewRender typo 2021-01-29 16:43:17 +01:00
withmorten 934aa92a9b add NewRenderer ini read/write, fix backfaceculling read 2021-01-29 16:41:34 +01:00
erorcun 2e7405b76c CdStreamPosix fixes 2021-01-29 16:31:13 +03:00
erorcun 982b024c5c CdStreamPosix fixes 2021-01-29 16:25:32 +03:00
aap 595a000f6a fix shutdown 2021-01-29 13:43:50 +01:00
withmorten 8482180706 waterlevel fix fix 2021-01-29 01:20:20 +01:00
withmorten 2fc6b542bc waterlevel fix 2021-01-29 01:18:32 +01:00
erorcun 810bad9fd8 Fix some UBs 2021-01-29 01:44:33 +03:00
Nikolay Korolev 7056f9954f fix 2021-01-28 23:25:15 +03:00
Nikolay Korolev 7c38e2db24 fix 2021-01-28 23:23:49 +03:00
aap 64a4ed6db6 fixed uninitialized nearclip 2021-01-28 17:40:15 +01:00
aap 9e3c192376 fix some little UB 2021-01-28 15:35:35 +01:00
aap ebb615d080 fix some little UB 2021-01-28 15:30:32 +01:00
erorcun e1e4be9017 Use previous naming & fix LineOfSightSectorList too 2021-01-28 03:57:12 +03:00
erorcun 2d0562412e Use previous naming & fix LineOfSightSectorList too 2021-01-28 03:49:50 +03:00
erorcun 2b269ff1c0 Fix some Collision NaN/inf's 2021-01-28 02:18:04 +03:00
erorcun 8150f55dbc
Merge pull request #1002 from kusst/miami 
Change text color in texture conversion dialog so it matches VC colors.
 2021-01-28 02:16:04 +03:00
kusst 8a7c7efe85
ifdefs + fix progressbar being under dialogbox 2021-01-27 23:56:23 +01:00
GaryOderNichts d2cf090ace Fix texture conversion box 2021-01-27 23:06:43 +01:00
erorcun be88a42bad Fix some Collision NaN/inf's 2021-01-28 00:51:43 +03:00
erorcun a216bb56ee Attempt to fix input delays on GLFW 2021-01-27 22:19:10 +03:00
erorcun ab939e059b Clean up POSIX streaming code 2021-01-27 22:19:00 +03:00
Sergeanur e8a10748a4 fix fix 2021-01-27 20:39:22 +02:00
Sergeanur 97cf189d15 Fix subtitle shadow 2021-01-27 20:19:22 +02:00
Sergeanur 97351ad2c2 Use original animation names from VCS 2021-01-27 18:50:24 +02:00
erorcun 8846f50cb7 Attempt to fix input delays on GLFW 2021-01-27 18:26:48 +03:00
erorcun 843dd9b5e1 Clean up POSIX streaming code 2021-01-27 18:26:08 +03:00
kusst e1e13d14a4
Also change progressbar color 2021-01-27 03:36:22 +01:00
kusst 30c26e5a9c
Change text color in texture conversion dialog... 
...so it matches VC style.
 2021-01-27 00:35:57 +01:00
Sergeanur 2d2625bf75 Fix anim id in replay 2021-01-26 19:39:05 +02:00
Sergeanur 0f623c2354 Use original animation names from VCS 2021-01-26 19:35:40 +02:00
Sergeanur f27e1ec818 Fix doubles in ZoneCull 2021-01-26 19:26:28 +02:00
erorcun 202ccd4c56 Support pads without L2-R2, add comments 2021-01-25 16:58:02 +03:00
erorcun cb34060f00 Support pads without L2-R2, add comments 2021-01-25 16:48:41 +03:00
withmorten 9d4053419b
Merge pull request #977 from withmorten/miami-cw 
make building with Codewarrior 7 possible
 2021-01-25 14:06:53 +01:00
aap 453a16c978 modelinfo and visibility plg fixes 2021-01-24 23:25:12 +01:00
aap 4564f7aeea modelinfo fixes 2021-01-24 23:24:41 +01:00
shfil 513d418771 Add cmake option for sanitizers 2021-01-24 21:35:53 +01:00
shfil 1d3b4d1e9a
Add cmake option for sanitizers 2021-01-24 21:34:53 +01:00
erorcun 071e503856 Ped: car enter anim. fix 2021-01-24 20:12:36 +03:00
erorcun 5336620f5c Ped: car enter anim. fix 2021-01-24 20:05:43 +03:00
erorcun a0bf47cfd2 Fix out of bound binding orders 2021-01-24 19:39:31 +03:00
withmorten 29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
erorcun b728f8de64 Fix out of bound binding orders 2021-01-24 19:08:07 +03:00
shfil ca1de3cd17
Fix CCollision::DistToLine 2021-01-24 12:35:45 +01:00
shfil 3e6bb267f3
Fix CCollision::DistToLine 2021-01-24 12:34:40 +01:00
withmorten 5183d7cf0f enable default resolution for vanilla defines 2021-01-23 23:18:05 +01:00
withmorten db6b7b473d whitespace fix 2021-01-23 23:02:22 +01:00
Nikolay Korolev 4e477a17b2 mission cleanup fix 2021-01-23 23:17:41 +03:00
Nikolay Korolev de32fbe75e another backport 2021-01-23 23:16:38 +03:00
Nikolay Korolev 6bdc0365ee another backport 2021-01-23 23:15:50 +03:00
Nikolay Korolev 4abebbe3b2 use ARRAY_SIZE 2021-01-23 23:12:25 +03:00
Nikolay Korolev 921ca7712e use ARRAY_SIZE 2021-01-23 23:10:59 +03:00
aap 4269e613a3
Merge pull request #983 from ZLau92/ZLau92-corrected-plane-pitch 
Fix plane / ccbb cheat flight pitch
 2021-01-23 21:06:33 +01:00
Zach Charo 77051ddc78
Update Vehicle.cpp 2021-01-23 13:38:45 -06:00
erorcun 770456d0c8 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-23 16:50:55 +03:00
erorcun 1b32840424 No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-23 16:18:19 +03:00
erorcun 45c2488e36 Migrate from old .ini to new .ini 2021-01-23 16:04:19 +03:00
erorcun 73f1340afb Store all settings in .INI 2021-01-23 15:59:38 +03:00
Nikolay Korolev b5c4866964 added some missing functions 2021-01-23 15:32:07 +03:00
Nikolay Korolev 35258b9b9c added some missing functions 2021-01-23 15:29:00 +03:00
aap f6fb473cf9 revert accident 2021-01-23 12:59:52 +01:00
aap 2814f2e8cf wrong path node array 2021-01-23 12:49:54 +01:00
withmorten 2650fa9a92 VANILLA_BUILD fixes 2021-01-23 02:17:28 +01:00
erorcun f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
withmorten 6f4e2ab491 get rid of unsupported LIBRW in config.h 2021-01-22 22:47:29 +01:00
withmorten 5988c0e95a fix tabs in crossplatform 2021-01-22 22:01:00 +01:00
erorcun 0ea72af60c Peds reporting to phone changes for GTA3D 2021-01-22 23:58:57 +03:00
erorcun 226e3b83da No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-22 23:43:49 +03:00
withmorten f6c846d27a fix 2021-01-22 21:27:18 +01:00
withmorten 3b4e79f073 small fix regarding codewarrior and AUDIO_MSS 2021-01-22 21:10:49 +01:00
withmorten d58f090198 fix RW33 build, undef ANISOTROPIC_FILTERING for vanilla build 2021-01-22 20:33:29 +01:00
Filip Gawin e9adf8162b fix 2021-01-22 19:59:27 +01:00
Filip Gawin 609cad506f Better output for validating size assert 2021-01-22 19:54:43 +01:00
withmorten cc6d5374d5 fix config.h 2021-01-22 18:41:58 +01:00
withmorten feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
withmorten d1317f8fa6 m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:20:51 +01:00
withmorten 497e0b801f m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:19:44 +01:00
withmorten a511d79bf0 free cam fixes 2021-01-21 23:21:03 +01:00
aap 69500eed56 how the hell did that happen? 2021-01-21 22:35:11 +01:00
aap c67273e92a fixed anisotropic filtering; updated librw 2021-01-21 22:30:20 +01:00
aap 1999427225 fuck 2021-01-21 22:26:44 +01:00
aap 94ff966994 bletch 2021-01-21 22:25:14 +01:00
aap e99589a3eb fixed anisotropic filtering; updated librw 2021-01-21 22:17:35 +01:00
Nikolay Korolev 50cde66067 fix 2021-01-22 00:14:30 +03:00
withmorten ef24783bff
Merge pull request #968 from withmorten/cw 
make building with Codewarrior 7 possible
 2021-01-21 21:55:33 +01:00
withmorten 034df61f3c codewarrior: finishing touches 2021-01-21 19:42:51 +01:00
Nikolay Korolev f0097ff733 fix 2021-01-21 16:09:58 +03:00
aap 24de9f92e8 enable screenshots for librw; update librw 2021-01-21 10:21:47 +01:00
aap 6df52f06b6 enable screenshots for librw 2021-01-21 10:19:01 +01:00
withmorten f2596b3759 Merge remote-tracking branch 'upstream/master' into cw 2021-01-21 03:20:31 +01:00
withmorten ac0f759b27 make building with Codewarrior 7 possible 2021-01-21 03:18:15 +01:00
Nikolay Korolev 8e825fa629 fixed saving 2021-01-20 22:16:11 +03:00
Sergeanur c7c7eff918 Get rid of bitfields in CPool 
# Conflicts:
#	src/core/templates.h
 2021-01-20 19:24:08 +02:00
Sergeanur 3b52b683e3 Sync matrix with master 2021-01-20 19:20:11 +02:00
Sergeanur c54f5c4b4f
Merge pull request #971 from Sergeanur/PoolFlags 
Get rid of bitfields in CPool
 2021-01-20 18:59:49 +02:00
Sergeanur 9b193a47a2
Merge pull request #966 from Sergeanur/matrix 
Get rid of RwMatrix in CMatrix
 2021-01-20 18:59:33 +02:00
withmorten 8590457d41 free cam inversion fix 2021-01-20 13:57:03 +01:00
Sergeanur 9b820cc0b6 Fix CFont::PrintStringFromBottom 2021-01-20 14:23:03 +02:00
aap 2c1c5debca pc radar fix 2021-01-19 21:35:25 +01:00
aap 505438cd90 Merge branch 'master' of github.com:GTAmodding/re3 2021-01-19 21:33:17 +01:00
aap bb66028e74 pc radar fix 2021-01-19 21:33:09 +01:00
Sergeanur a9b8d30ce0 Get rid of bitfields in CPool 2021-01-19 21:32:55 +02:00
Sergeanur e6ef164441 Get rid of VuVector 2021-01-19 18:38:10 +02:00
withmorten 25d3066eae fix RWLIBS build without GTA_PS2_STUFF 2021-01-19 12:05:38 +01:00
Nikolay Korolev 03cf1e7535 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-19 00:00:12 +03:00
Nikolay Korolev 8b80a8803b fix 2021-01-18 23:59:54 +03:00
Nikolay Korolev ef59c623fd Merge remote-tracking branch 'upstream/master' 2021-01-18 23:59:16 +03:00
Nikolay Korolev 8c1f4ba65d fix 2021-01-18 23:59:07 +03:00
Sergeanur 91093305d6 Get rid of RwMatrix in CMatrix 2021-01-18 21:06:59 +02:00
aap d01deec11d wrong ifdef 2021-01-18 20:03:30 +01:00
aap 7687ce84ed wrong ifdef 2021-01-18 20:03:24 +01:00
withmorten 20dabf0b49 fix 2021-01-18 17:30:18 +01:00
withmorten df4e22e3d0 some free cam fixes for controller 2021-01-18 17:25:31 +01:00
withmorten a6faa0384b fix common.h d3d includes 2021-01-17 22:10:04 +01:00
erorcun deaaf3d22f Migrate from old .ini to new .ini 2021-01-17 21:33:53 +01:00
erorcun 448e41ecaa Store all settings in .INI 2021-01-17 21:33:53 +01:00
erorcun 5a47379bf5 Includes overhaul, fix some compiler warnings 2021-01-17 21:32:54 +01:00
aap 2b4b00b388
Merge pull request #960 from withmorten/miami 
add the bad crack "features" behind SECUROM define
 2021-01-17 20:06:25 +01:00
aap 913a001375 vehicle fixes 2021-01-17 10:00:41 +01:00
aap 357b67e3f5 vehicle fixes 2021-01-17 10:00:34 +01:00
Nikolay Korolev 72b25cd3a8 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-16 20:04:41 +03:00
Nikolay Korolev df98d04d79 fix 2021-01-16 20:04:17 +03:00
Sergeanur 21a6ed247b Use of sized bool types for CFont 2021-01-16 16:06:11 +02:00
Sergeanur caa7d3177c Use of sized bool types for CFont 2021-01-16 16:05:27 +02:00
Nikolay Korolev 32ab01cd32 consistency fix 2021-01-16 13:42:04 +03:00
Nikolay Korolev 7ea77d8da4 more fix 2021-01-16 13:32:41 +03:00
Nikolay 193fb2a381
fix 2021-01-16 13:24:22 +03:00
Filip Gawin 6bebde8279 Port debug messagess for audio cache 2021-01-16 01:38:18 +01:00
Sergeanur 19749effce Fix Jumbo Sound reseting when walking 2021-01-15 17:54:21 +02:00
withmorten d5ce8b1ea3 add the bad crack "features" behind SECUROM define 2021-01-14 23:16:42 +01:00
Filip Gawin 7541fa7cb7 Revert extra checks before autolinking 2021-01-14 22:26:36 +01:00
Filip Gawin 5acbf9ef59 fix 2021-01-14 22:20:40 +01:00
Filip Gawin 1082b13830 RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINK 2021-01-14 22:15:36 +01:00
Filip Gawin a0a88b4663 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2021-01-14 22:06:43 +01:00
Filip Gawin c7b905c0ec More checks before autolinking 2021-01-14 22:06:27 +01:00
Nikolay Korolev 0b0d286f5c incoming "fuck" commit 2021-01-14 23:15:12 +03:00
Filip Gawin 70358d90b4 Backport fix from re3 2021-01-14 15:30:33 +01:00
Nikolay Korolev ad908f5dde fix 2021-01-14 00:16:55 +03:00
Nikolay Korolev 6a93cc49be fix 2021-01-14 00:15:45 +03:00
erorcun a844cbbc3d hud ammo fix 2021-01-13 23:16:25 +03:00
erorcun 13b52229be hud ammo fix 2021-01-13 23:07:12 +03:00
aap ab14a0bc61 foobar 2021-01-13 20:40:20 +01:00
aap 3a6935f126 fixed shoot through collision 2021-01-13 20:39:00 +01:00
aap 7994b80dcf fixed weapon LOS check 2021-01-13 20:10:04 +01:00
Nikolay Korolev 9f914dcd10 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-13 22:03:21 +03:00
Nikolay Korolev daf1de550c fix 2021-01-13 22:02:28 +03:00
erorcun 011a9cc775 Merge branch 'master' of https://github.com/GTAmodding/re3 2021-01-13 16:54:45 +03:00
erorcun 7f15e11b1b fix save loading, hopefully 2021-01-13 16:54:36 +03:00
aap 361808923a arrest cam fixes 2021-01-13 14:16:38 +01:00
Sergeanur 0e9a44dd43 Fix backface culling of cutscene objects 2021-01-13 14:55:55 +02:00
aap ac3ba5b4a6 more renames 2021-01-13 13:41:31 +01:00
aap 6aab948be2 more renames 2021-01-13 13:41:24 +01:00
aap 2804ad2363 anim velocity union 2021-01-13 13:06:38 +01:00
aap 083aa700e9 anim velocity union 2021-01-13 13:06:31 +01:00
aap e3a261d29c rename m_vehEnterType -> m_vehDoor 2021-01-13 13:01:20 +01:00
aap 7c3e43aa2e rename m_vehEnterType -> m_vehDoor 2021-01-13 13:01:11 +01:00
Filip Gawin 4741afd2cf Port cmake improvements to miami 2021-01-13 12:45:10 +01:00
aap 1b55a9956f some loose ends 2021-01-13 12:31:33 +01:00
erorcun 57201187de Fix build without FIX_BUGS, divide to 0 fixes 2021-01-13 14:22:31 +03:00
Filip Gawin 4097c20bdd Make cmake files more generic 2021-01-13 12:15:22 +01:00
aap fb1bd1a5bd fix !FREE_CAM build 2021-01-13 10:48:55 +01:00
erorcun 542a5393ac Fix build without FIX_BUGS, divide to 0 fixes 2021-01-13 03:08:50 +03:00
withmorten 5d4917a5d7
Merge pull request #956 from withmorten/miami 
more securom fixes
 2021-01-13 00:32:39 +01:00
withmorten e122a75dd2 more securom fixes 2021-01-13 00:28:51 +01:00
withmorten 6103677914 more securom fixes 2021-01-13 00:28:07 +01:00
withmorten 2b91af4493
Merge pull request #955 from withmorten/miami 
move stuff back into class; securom comments
 2021-01-13 00:22:51 +01:00
withmorten 232d990e6d move stuff back into class; securom comments 2021-01-13 00:18:58 +01:00
withmorten c210e1bae6 move stuff back into class; securom comments 2021-01-13 00:18:34 +01:00
Sergeanur 92b1e8ab75 More font fixes 2021-01-13 01:01:04 +02:00
Nikolay Korolev 4505b8795a fix 2021-01-13 01:37:25 +03:00
aap b407f6a011 fix CreateInstance virtual overload order 2021-01-12 23:32:45 +01:00
aap faab9f4aa4 escalator fix 2021-01-12 23:28:13 +01:00
withmorten 4a96c7c9f2 fix CreateInstance virtual overload order 2021-01-12 23:25:12 +01:00
aap 8858df2185 ProcessWheel bug 2021-01-12 22:58:50 +01:00
aap 0afa027ab4 bug of the decade 2021-01-12 21:28:13 +01:00
aap 48ce6151f9 fix building with PED_SKIN 2021-01-12 18:55:21 +01:00
Nikolay Korolev 6cfc61ac0e big oof 2021-01-12 20:54:52 +03:00
aap 99a6976f53 colmodel fix 2021-01-12 12:42:29 +01:00
Sergeanur 7e888a6379 Fix collective commands 2021-01-12 02:29:10 +02:00
Sergeanur be1e09aad4 Fix collective commands 2021-01-12 02:26:37 +02:00
aap afcb794d59
Merge pull request #947 from withmorten/miami 
fix CPed struct, GetWantedLevel
 2021-01-11 22:46:06 +01:00
Nikolay Korolev daf5cfe425 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-12 00:43:45 +03:00
Nikolay Korolev 42e4e7c063 fix 2021-01-12 00:43:26 +03:00
Fire-Head 06fbbaa43f fix explosion jet 2021-01-11 21:12:11 +03:00
Fire-Head f728c58383 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-11 21:10:28 +03:00
Fire-Head e2095bf70b fix explosion jet 2021-01-11 21:10:24 +03:00
Nikolay Korolev 31dd135075 fuck 2021-01-11 20:53:03 +03:00
Nikolay Korolev c7052b3d6f fuck 2021-01-11 20:51:18 +03:00
withmorten 4a8a1af885 fix CPed struct, GetWantedLevel 2021-01-11 18:43:04 +01:00
Nikolay Korolev 08e5c8e010 fixes 2021-01-11 17:22:07 +03:00
Nikolay Korolev 81b5e66dd4 fixes 2021-01-11 17:18:25 +03:00
Anonymous Maarten 3519cbd3e5 conan: build re3 + librw with RelWithDebInfo build_type 2021-01-11 11:24:25 +01:00
Anonymous Maarten 6b8374f391 cmake: install files ready for copying in game folder 2021-01-11 11:24:25 +01:00
Anonymous Maarten 96e2ba19f8 cmake: add resource (settings windows icon) 2021-01-11 11:24:25 +01:00
Anonymous Maarten b375e20c75 cmake: opus is now optional + libsndfile only when using openal 2021-01-11 11:24:25 +01:00
Anonymous Maarten e9adfd8663 cmake: search for miles import library 2021-01-11 11:24:25 +01:00
Anonymous Maarten 8d0b4ede68 cmake: use openal/opusfile/mpg123/libsndfile correctly 2021-01-11 11:24:25 +01:00
Anonymous Maarten 9707eeb8cb audio: only use #pragma comment(lib, "xxx.lib") on MSVC 2021-01-11 11:24:25 +01:00
Anonymous Maarten 2f48d0c828 cmake: null audio is not possible + add cmake opus support 2021-01-11 11:24:25 +01:00
Anonymous Maarten 2ff9270279 cmake: make librw non-vendorable + rename Findmpg123 + create targets for dependencies 2021-01-11 11:24:25 +01:00
Anonymous Maarten 8a157eee0a audio: only use #pragma comment(lib, xxx.lib) on MSVC 2021-01-11 01:12:44 +01:00
erorcun 8aaa3c4884 Automobile: fix 2021-01-10 23:52:37 +01:00
erorcun b5711b21dc Automobile: fix 2021-01-11 01:10:24 +03:00
Sergeanur 585300cd33 More font fix 2021-01-10 22:37:11 +02:00
Fire-Head adc7127055 fix pickup coronas 2021-01-10 22:24:21 +03:00
aap ebca91e0d0 update librw 2021-01-10 18:43:44 +01:00
aap cc2cebffb6 update librw 2021-01-10 18:43:11 +01:00
Seemann c2265e29d2 Update command definitions 2021-01-09 23:59:47 -05:00
aap e906a807f1 moved new renderer 2021-01-09 18:22:09 +01:00
aap 4bb6740bf4 moved new renderer, fixed a bug 2021-01-09 18:22:02 +01:00
aap 434bc01f0b fix fix 2021-01-09 16:17:47 +01:00
aap f6f0cb708e boat fix 2021-01-09 16:13:38 +01:00
aap 9693184cea boat fix 2021-01-09 16:13:33 +01:00
Sergeanur 322d93ab0c Fix font 2021-01-09 16:55:45 +02:00
aap 822f0bd40b cam sector fix 2021-01-09 12:11:52 +01:00
aap e473d234fd cam sector fix 2021-01-09 12:11:34 +01:00
Fire-Head 6b78bab99a Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-09 03:38:39 +03:00
Fire-Head 8e7cce0634 useless fix 2021-01-09 03:37:59 +03:00
Nikolay b7f9bfda4a
fail 2021-01-09 02:41:27 +03:00
Fire-Head 91c6389754 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-09 01:02:17 +03:00
Fire-Head 7a3ee349da sync with re3 
-radardisc shadow fix
-fix for the dimension where moon is round
-correct radar based on the early gta 3 screenshot
-proper scaling based on ps2 gta 3
-ini and debugmenu options
 2021-01-09 01:01:41 +03:00
Fire-Head 02f6ed7da3 fix last commit, debugmenu options 2021-01-08 23:55:13 +03:00
Fire-Head 39a121351d Merge branch 'master' of https://github.com/GTAmodding/re3 2021-01-08 23:30:35 +03:00
Fire-Head 00d23c61d9 .ini for scaling, radar, sprites 2021-01-08 23:30:30 +03:00
Sergeanur faa9e6441b Use original names 2021-01-08 21:53:11 +02:00
Sergeanur 8eed6ae179 Use original names 2021-01-08 21:50:59 +02:00
Sergeanur 68e8c1ce04 Add multisampling 2021-01-08 20:22:08 +02:00
Fire_Head 6e42c791cf
Merge pull request #909 from Fire-Head/master 
Sprite Scaling Option
 2021-01-08 19:43:31 +03:00
Fire-Head 368d2f3279 bb .ini hello defines 2021-01-08 19:31:48 +03:00
Sergeanur c6c55d0130 Train anims in enum 2021-01-08 18:24:53 +02:00
Nikolay Korolev e92666d988 wtf 2021-01-08 18:57:59 +03:00
Nikolay c594d89dc5
Merge pull request #930 from Nick007J/master 
PS2 combinations for our cheats
 2021-01-08 18:52:37 +03:00
aap 223b49e3be little fixes 2021-01-08 13:51:50 +01:00
aap 8be0567924 little fixes 2021-01-08 13:51:42 +01:00
Nikolay Korolev 824ca7599c wtf 2021-01-08 13:07:36 +03:00
Nikolay Korolev f8569a74cb fix 2021-01-08 12:59:51 +03:00
aap d820df0dbe small cleanup 2021-01-08 01:44:19 +01:00
aap ec61964bce unused var 2021-01-08 01:44:08 +01:00
Sergeanur 556b9ae574 Fix gOneShotCol 2021-01-08 00:47:21 +02:00
Sergeanur 24d73aeb71 Fix garage messages position 2021-01-08 00:04:38 +02:00
Sergeanur debf39fe64 Fix font on green screen counter 2021-01-07 23:47:17 +02:00
Sergeanur c423c59365 Add MPG123_QUIET to mp3 files 2021-01-07 22:15:55 +02:00
Sergeanur d8a04c9e43 Add MPG123_QUIET to mp3 files 2021-01-07 22:15:30 +02:00
Sergeanur ef13866af6 Make opus available alongside other formats 2021-01-07 22:13:46 +02:00
Sergeanur 6b0fa20b8b Make opus available alongside other formats 2021-01-07 22:01:44 +02:00
Sergeanur 0428b5b694 Fix pickup text 2021-01-07 21:55:41 +02:00
Sergeanur c2672bd630 Fix char in stats 2021-01-07 21:00:20 +02:00
Nikolay Korolev 168d3d7ddb PS2 combinations for our cheats 2021-01-07 19:30:12 +03:00
Nikolay Korolev 2173ceae95 missing changes 2021-01-07 18:36:02 +03:00
Nikolay Korolev 9d6db921bd fail 2021-01-07 18:31:54 +03:00
Nikolay Korolev db1bdfd62d minor refactoring 2021-01-07 18:30:35 +03:00
Nikolay Korolev 416a898943 minor refactoring 2021-01-07 16:33:42 +03:00
Sergeanur 0845abf640 Fix 16KHz track 2021-01-07 15:16:24 +02:00
Nikolay 08ddef6a93
Merge pull request #929 from majesticCoding/miami 
GET_WHEELIE_STATS fix
 2021-01-06 23:04:39 +03:00
majestic f61e2d04f1 GET_WHEELIE_STATS fix 2021-01-06 11:56:13 -08:00
Sergeanur 0b73b13b9a Cleanup and fixes for new decoders 2021-01-06 20:23:30 +02:00
Sergeanur 02a28996f4 Cleanup and fixes for new decoders 2021-01-06 20:22:09 +02:00
Filip Gawin ff9d6e4fd6 Fixes for CVbFile 2021-01-06 18:15:32 +01:00
Filip Gawin 36996af82b Fixes for CVbFile 2021-01-06 18:14:44 +01:00
Filip Gawin 2bcb2a40e4 Small fixes for new wav decoder 2021-01-06 17:57:43 +01:00
Filip Gawin 145bd243e8 Small fixes for new wav decoder 2021-01-06 17:56:23 +01:00
Fire-Head 148383ff53 upd 2021-01-06 18:56:13 +03:00
Sergeanur a51757429e Implementing our own WAV decoder to replace SndFile 2021-01-06 15:52:12 +02:00
Sergeanur 493f6cb578 Implementing our own WAV decoder to replace SndFile 2021-01-06 15:46:59 +02:00
aap a6409fb445 fix 2021-01-05 20:58:39 +01:00
Sergeanur d94e8e8faf duh 2021-01-05 21:31:49 +02:00
Sergeanur fd4c2172f5 Add support of PS2 audio streams to OpenAL 2021-01-05 21:23:27 +02:00
Sergeanur bc363a74f5 Add support of PS2 audio streams to OpenAL 2021-01-05 21:06:17 +02:00
erorcun bafaa6acc6 sand fix 2021-01-05 18:53:00 +03:00