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

3662 commits

Author SHA1 Message Date
Sergeanur ecdd751ec3 PC controls and icon 2021-01-08 16:57:22 +02:00
Sergeanur ead2a1a606 MemoryManager of base:: 2021-01-08 16:47:41 +02:00
Sergeanur d68ffc2da6 Original GXT support 2021-01-08 15:34:21 +02:00
aap 8be0567924 little fixes 2021-01-08 13:51:42 +01:00
aap a99457ee29 fix phones 2021-01-08 13:51:31 +01:00
Sergeanur 0e2af13656 Merge branch 'miami' into lcs 
* miami:
  wtf
  fix
  small cleanup
  Fix gOneShotCol
  Fix garage messages position
  Fix font on green screen counter
  Add MPG123_QUIET to mp3 files
  Make opus available alongside other formats
  Fix pickup text
  Fix char in stats
  Add missing GXT line
  fail
  minor refactoring
  Fix 16KHz track
  GET_WHEELIE_STATS fix
  Cleanup and fixes for new decoders
  Fixes for CVbFile
  Small fixes for new wav decoder
  Remove fastmath from premake's config
  Implementing our own WAV decoder to replace SndFile
 2021-01-08 14:47:37 +02:00
aap 37a58a04f2 timecycle; some rendering 2021-01-08 13:34:49 +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
Nikolay Korolev 236b3b1c2b more stuff 2021-01-08 12:41:39 +03:00
aap d820df0dbe small cleanup 2021-01-08 01:44:19 +01:00
aap ebdf08a514 first commit for LCS 2021-01-08 01:41:40 +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 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 5e10f1fe6a sync with upstream 2021-01-07 18:38:40 +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
Sergeanur 0845abf640 Fix 16KHz track 2021-01-07 15:16:24 +02:00
Nikolay Korolev 69d30f2204 some lcs stuff 2021-01-07 15:21:35 +03: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
Filip Gawin ff9d6e4fd6 Fixes for CVbFile 2021-01-06 18:15:32 +01:00
Filip Gawin 2bcb2a40e4 Small fixes for new wav decoder 2021-01-06 17:57:43 +01:00
Sergeanur a51757429e Implementing our own WAV decoder to replace SndFile 2021-01-06 15:52:12 +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
Sergeanur f639aae2ae Fix chainsaw sound 2021-01-05 13:04:42 +02:00
erorcun 0d3e6a3dce Vehicle: Automobile: more pointless fixes 2021-01-05 04:41:24 +03:00
Sergeanur 32d3ea0a2d Audio fixes 2021-01-05 00:31:31 +02:00
aap 33fd33b03a fix to !PC_PLAYER_CONTROLS 2021-01-04 23:29:23 +01:00
aap 8026bba723 pop boot fix 2021-01-04 22:59:55 +01:00
Nikolay Korolev a6680e38d5 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-05 00:48:40 +03:00
Nikolay Korolev 6fa081e004 fix 2021-01-05 00:48:25 +03:00
Sergeanur 6753d39dd0 Fix uninitialized filed in cAudioManager 2021-01-04 23:11:31 +02:00
Sergeanur 09c213738b Fix CEntity::UpdateRwFrame 2021-01-04 22:27:51 +02:00
Sergeanur a346461ea8 Increase number of stream buffers, plus ALStreamSources fix 2021-01-04 22:27:32 +02:00
Sergeanur 4f9bfb4387 Fix missing ifdef 2021-01-04 21:55:41 +02:00
Sergeanur 7adac51152 Handle stereo panning in OAL manually for streams 2021-01-04 20:11:04 +02:00
Nikolay Korolev 601f77b5c8 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-04 21:03:31 +03:00
Nikolay Korolev 2d072325ad fix 2021-01-04 21:03:19 +03:00
Sergeanur 2db0d7cfa1 Double the volume for mission audio in OAL + small fix 2021-01-04 15:08:02 +02:00
erorcun ae388c48d0 cfo fix 2021-01-04 16:05:49 +03:00
aap 362f2b5ec4
Merge pull request #924 from erorcun/miami 
Entity/Physical proof-read 1
 2021-01-04 12:45:56 +01:00
erorcun 22e8202d27 Entity/Physical proof-read 1 2021-01-04 13:41:41 +03:00
Sergeanur 1efbd7ead2 Fix unlimited rotation in Phnom Penh '86 2021-01-04 10:58:12 +02:00
Nikolay Korolev 33f467453e dumb 2021-01-03 23:36:32 +03:00
Nikolay Korolev bec8f6b86c reorder 2021-01-03 22:29:16 +03:00
erorcun 5b081398b5 Frontend: disable windowed mode selector while in game 2021-01-03 22:00:25 +03:00
Nikolay Korolev 21e151cadd hud fix 2021-01-03 20:06:29 +03:00
Nikolay Korolev 0392145512 obsolete comment 2021-01-03 19:03:13 +03:00
aap 6579645934
Merge pull request #916 from Sergeanur/VC/VarConsole 
CVarConsole
 2021-01-03 17:01:17 +01:00
aap 12a869c62a
Merge pull request #921 from TheOfficialFloW/patch-2 
Fix typo in ProcessMissionAudioSlot.
 2021-01-03 17:00:08 +01:00
TheOfficialFloW 0c2ea268d1
Fix typo in ProcessMissionAudioSlot. 2021-01-03 16:56:12 +01:00
Nikolay Korolev 06fd054eb3 fixed intro text line defaults 2021-01-03 18:56:05 +03:00
Sergeanur 2e06e4b6b8 Fix speed of sound 2021-01-03 16:43:58 +02:00
erorcun c4479a0185 Ped: PlayerPed: fixes 2021-01-03 17:33:50 +03:00
TheOfficialFloW e46b06491c Fix nFramesForPretendPlaying. 2021-01-03 14:59:16 +01:00
Nikolay Korolev 5e019ed9f8 fixed array size 2021-01-03 13:57:27 +03:00
Nikolay Korolev 29e0cfa98b fix 2021-01-03 12:52:26 +03:00
Sergeanur 9ae3fac08e Fix ServiceTrack 2021-01-03 00:52:30 +02:00
Sergeanur 1169437ec6 Fix uninitialized RadioStaticCounter 2021-01-03 00:15:33 +02:00
aap 57677b7b55 slightly better variable name 2021-01-02 20:30:16 +01:00
aap ec1e8b6c86 "clarification" of handling code 2021-01-02 20:15:07 +01:00
aap e58acce9e4 old line was better (until we know whats going on) 2021-01-02 13:00:23 +01:00
Sergeanur 30bc51ae9e Pad2 fix 2021-01-02 13:42:49 +02:00
erorcun 2268365c3b Vehicle: Automobile: fixes and style things 2021-01-02 14:41:53 +03:00
Sergeanur 42e4a068bb CVarConsole 2021-01-02 13:32:25 +02:00
Sergeanur e7c46ac658 Partial controller buttons support 2021-01-02 12:51:09 +02:00
aap 3fffcb47d9 increase screen droplet splash dist 2021-01-01 23:33:29 +01:00
Filip Gawin 55af046c92 Encode files to UTF-8 2021-01-01 21:07:39 +01:00
Nikolay Korolev a7f053776a Merge remote-tracking branch 'upstream/miami' into miami 2021-01-01 23:06:44 +03:00
Nikolay Korolev c75c4603fc bad stuff 2021-01-01 23:06:20 +03:00
Nikolay Korolev 29b76fc4f5 small thing 2021-01-01 22:57:17 +03:00
aap ec00a1eb0d rain fix 2021-01-01 18:37:17 +01:00
Sergeanur c3f49386ca Fix wrong sound when bumping peds 2021-01-01 15:11:12 +02:00
aap 60197c2d7e Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2021-01-01 14:02:05 +01:00
aap 0127d7eb8b wrong bike fall off anim 2021-01-01 14:02:02 +01:00
Nikolay Korolev b4b9f9601b Merge branch 'miami' into lcs-dev 2021-01-01 14:55:00 +03:00
Nikolay Korolev 4604b45852 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-01 14:53:37 +03:00
Nikolay Korolev 9fd93e8e57 merge master to miami 2021-01-01 14:53:20 +03:00
Sergeanur 4f3e4cd542 Restore some marker code 2021-01-01 12:58:14 +02:00
Sergeanur ccf6232039 small CWorld fixes 2021-01-01 12:47:22 +02:00
Nikolay Korolev 2f05c64470 actual struct name 2021-01-01 13:35:23 +03:00
Nikolay Korolev 575845772f Merge branch 'miami' into lcs-dev 2021-01-01 13:21:42 +03:00
aap c74c7ce1d4 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2021-01-01 00:03:16 +01:00
aap 4d1305efb2 some CAutomobile fixes 2020-12-31 23:59:45 +01:00
Filip Gawin e9288dd005 CMoneyMessages::RegisterOne v2 2020-12-31 22:09:25 +01:00
Filip Gawin 9d29b33ff4 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-31 22:06:55 +01:00
Filip Gawin a0a3a095ac CMoneyMessages::RegisterOne v2 2020-12-31 22:06:39 +01:00
aap 14eb16d5d4 remove superfluous CWorld:: 2020-12-31 22:03:42 +01:00
aap 31000fb4f0 remove superfluous CWorld:: 2020-12-31 22:03:37 +01:00
aap 4e7c2b90f7 mult -> div 2020-12-31 21:58:03 +01:00
aap 613bb72eb7 fix explosion 2020-12-31 21:57:52 +01:00
Filip Gawin ed9c288db8 Fix CMoneyMessages::RegisterOne 2020-12-31 21:46:16 +01:00
Filip Gawin ff665fe27f Fix CMoneyMessages::RegisterOne 2020-12-31 21:43:53 +01:00
Nikolay Korolev a9bf0fa97e Merge remote-tracking branch 'upstream/miami' into miami 2020-12-31 19:30:11 +03:00
Nikolay Korolev 56ea1c7be7 fixed some bugs (saves might be broken though) 2020-12-31 19:29:13 +03:00
shfil d11325cf0f
Fix UB in ProjectileInfo.cpp 2020-12-31 16:34:50 +01:00
shfil 9938d04ca7
Fix UB in ProjectileInfo.cpp 2020-12-31 16:33:34 +01:00
aap d89d3db126 fix UB 2020-12-31 16:14:51 +01:00
aap 1a8a1c91cb fix UB 2020-12-31 16:14:46 +01:00
aap 80d15d142d fix use of LoadFile 2020-12-30 15:08:18 +01:00
aap 77884e0a57 fix use of LoadFile 2020-12-30 15:08:10 +01:00
aap 2e38b51e1c foobar! 2020-12-29 20:32:37 +01:00
aap 426364b961 fix custom pipes mem leak 2020-12-29 20:31:06 +01:00
aap 14f7dbade8 fix custom pipes mem leak 2020-12-29 20:30:57 +01:00
Sergeanur 2bc843fdcd More menu error sound fix 2020-12-29 14:03:59 +02:00
Sergeanur b9e97ab79d Reorder CEntity functions into their original order 2020-12-29 13:55:26 +02:00
Sergeanur f75460fc1d Reorder CEntity functions into their original order 2020-12-29 13:55:15 +02:00
Sergeanur c1caf380de
Merge pull request #904 from Sergeanur/bvf 
Enable BIND_VEHICLE_FIREWEAPON with gta3.set size check
 2020-12-29 08:49:39 +02:00
Sergeanur 06df781bca Fix error sound in when entering load/save menu 2020-12-29 08:31:38 +02:00
aap c93fb5e443 fix neo screendroplet moving 2020-12-28 21:58:21 +01:00
aap f7e52d7a21 fix neo screendroplet moving 2020-12-28 21:58:16 +01:00
Fire-Head ad560ffaf9 multiple instances sema fix 2020-12-28 23:13:20 +03:00
Fire-Head 8af298c668 multiple instances sema fix 2020-12-28 23:08:47 +03:00
Sergeanur 5ebcef2718 Use enum in frontend 2020-12-28 20:48:30 +02:00
Sergeanur 6b52fb5fb6 Add shadow to subtitles with cutscene borders off 2020-12-28 15:04:07 +02:00
erorcun 5780200ba3 Fix original wanted stars position 2020-12-28 15:29:21 +03:00
Sergeanur 9c2f1b0833 More bike leftovers 2020-12-28 14:00:44 +02:00
Sergeanur 7eb96d5373 Add bike leftovers 2020-12-28 13:44:20 +02:00
Sergeanur b9747de5d6 Enable BIND_VEHICLE_FIREWEAPON with gta3.set size check 2020-12-28 08:36:21 +02:00
erorcun dc96a49dfd Ped: WeaponInfo: little fixes and renamings 2020-12-28 04:02:24 +03:00
erorcun 7b2f17826a Ped: Real weapon fix 2020-12-28 03:52:23 +03:00
erorcun d3f2f4f6ac Ped: WeaponInfo: little fixes and renamings 2020-12-28 03:25:26 +03:00
erorcun 498d3a49ac just toggle waypoint 2020-12-28 00:15:05 +03:00
erorcun 38a1fef5c1 move cfo populate func. 2020-12-27 23:56:36 +03:00
erorcun cd24936ca9 Dynamically add pipelines options, only if neo.txd exists 2020-12-27 23:55:13 +03:00
erorcun 2dbe3d5b83 fix 2020-12-27 23:54:21 +03:00
erorcun 9e7cb046b3 move cfo populate func. 2020-12-27 23:46:15 +03:00
erorcun 9afcc355ff Dynamically add pipelines options, only if neo.txd exists 2020-12-27 23:26:00 +03:00
aap beb0ec673c rename unused field 2020-12-27 20:38:05 +01:00
aap 637cff3180 rename unused field 2020-12-27 20:38:03 +01:00
aap d33f1071ae handling unit conversion 2020-12-27 20:34:19 +01:00
aap ab80ff7132 handling unit conversion 2020-12-27 20:34:12 +01:00
aap 013e9b9992 fix backface culling 2020-12-27 19:53:10 +01:00
aap 00da91b73f tiny rendering fixes 2020-12-27 18:22:11 +01:00
aap 4d2105bf55 tiny rendering fix 2020-12-27 18:22:04 +01:00
Sergeanur 7959b7fd1f NO_ISLAND_LOADING ported from re3 2020-12-27 18:26:30 +02:00
aap 76e744bb7b switch vehicle pipe default 2020-12-27 16:28:32 +01:00
aap 5a74495d7b little hack to make new postfx not crash 2020-12-27 16:09:01 +01:00
erorcun 904746054c Fix peds running to see dead peds in water 2020-12-27 17:33:32 +03:00
erorcun 8b9e9a07a0 Fix peds running to see dead peds in water 2020-12-27 17:05:37 +03:00
Sergeanur 759f91ce91 Fix drive-by machine gun sound 2020-12-27 10:58:33 +02:00
erorcun a4ec3cdf0b trivial fix 2020-12-27 06:03:38 +03:00
erorcun 0b59eeb2bf Fix default mouse invert setting, vert. mouse sensitivity, set aspect ratio auto as default 2020-12-27 05:59:51 +03:00
erorcun 36e64dbd22 signed/unsigned fixes, and some other fixes 2020-12-27 05:23:37 +03:00
aap 0f020127f3 fixed some bike bugs 2020-12-26 16:00:06 +01:00
aap 9d62bed9f3 fix a struct init 2020-12-26 15:42:05 +01:00
aap c5010d443c fix a struct init 2020-12-26 15:41:57 +01:00
aap 075650b9f3 ffs 2020-12-26 15:22:23 +01:00
aap e9d0a1d015 ffs 2020-12-26 15:22:16 +01:00
aap 7cdec23ef2 include case 2020-12-26 15:19:27 +01:00
aap 17640302bf include case 2020-12-26 15:19:19 +01:00
aap 7613528e7e make screendrops independent of neo.txd; enable new rendering by default 2020-12-26 14:48:55 +01:00
aap b21ca72c8b make screendrops independent of neo.txd; enable new rendering by default 2020-12-26 14:48:47 +01:00
aap b41f93fcd6 garage cam fix 2020-12-26 13:45:53 +01:00
Sergeanur c9c447e7a9 Weapon flags changed from bit fields to bit mask (R* vision) 2020-12-26 14:22:02 +02:00
Sergeanur d459ef8820 Weapon flags changed from bit fields to bit mask (R* vision) 2020-12-26 14:21:45 +02:00
aap 688e277e89 fix mblur stencil 2020-12-26 13:02:30 +01:00
aap 8737a1d76a unfix particle bug 2020-12-26 11:43:57 +01:00
aap 612470cb3f unfix particle bug 2020-12-26 11:43:43 +01:00
Nikolay Korolev f6fe5c96c9 Merge remote-tracking branch 'upstream/miami' into miami 2020-12-26 12:56:34 +03:00
Nikolay Korolev 149aef929d fixed replay 2020-12-26 12:56:20 +03:00
Sergeanur 3b2558bb9e Add optimize off to fix compiler bug CBike::ProcessControl 2020-12-26 11:54:35 +02:00
erorcun 57098a77ec Backface cull. in INI, mouse sensitivity fix, aspect ratio auto as default 2020-12-26 12:10:04 +03:00
Sergeanur 99a3fe0a13 Fix not being able to hit lying peds with melee weapon 2020-12-26 10:04:26 +02:00
Sergeanur 441b3864f3 cPedParams ctor 2020-12-26 07:53:30 +02:00
Sergeanur 18bea3cfa5 Fix weapon pickup sound 2020-12-26 07:31:53 +02:00
Sergeanur 783d1edaf1 cVehicleParams ctor 2020-12-25 20:27:37 +02:00
Sergeanur 2b96be0418 cVehicleParams ctor 2020-12-25 20:22:43 +02:00
Sergeanur 7a7061ea92 Use intensity in ProcessBoatEngine 2020-12-25 20:00:12 +02:00
Sergeanur 90ef1d2d31 cAudioManager::ProcessBoatEngine 2020-12-25 19:59:45 +02:00
Sergeanur 03c3eeb937 cAudioManager::ProcessBoatEngine fixes 2020-12-25 19:57:09 +02:00
Sergeanur 9345efbafb cPedParams fixes 2020-12-25 17:42:40 +02:00
Sergeanur b8bf3cb790 cPedParams fixes 2020-12-25 17:39:49 +02:00
Sergeanur fa6eb3a64f cAudioManager::ProcessOneShotScriptObject 2020-12-25 17:22:18 +02:00
Sergeanur 587c788ce3 Fix 2020-12-25 17:20:57 +02:00
Sergeanur 356f101078 Fix cAudioManager::ProcessPedOneShots crash 2020-12-25 16:24:20 +02:00
Sergeanur e00b8a93bf Fix use of strncmp 2020-12-25 15:18:48 +02:00
Sergeanur b12eef1d56 Fix use of strncmp 2020-12-25 15:18:13 +02:00
shfil dc72729a40
Merge pull request #895 from ShFil119/miami_audio 
More audio
 2020-12-25 14:02:47 +01:00
Filip Gawin cf8799d116 More audio enums 2020-12-25 13:51:09 +01:00
Sergeanur c0be4a3f7d Fix cMusicManager::SetRadioChannelByScript 2020-12-25 12:06:08 +02:00
erorcun 3b85457020
Merge pull request #894 from erorcun/miami 
signed/unsigned fixes, and some other fixes
 2020-12-25 12:56:31 +03:00
erorcun a50244dc16 signed/unsigned fixes, and some other fixes 2020-12-25 12:54:41 +03:00
Nikolay Korolev 5f98b4fdca Merge remote-tracking branch 'upstream/miami' into miami 2020-12-25 12:12:09 +03:00
Sergeanur 4846564c78 cMusicManager::ServiceGameMode fix 2020-12-25 11:11:37 +02:00
Nikolay Korolev 86f04884de fix garage 2020-12-25 12:11:22 +03:00
Sergeanur bf52620175 Fix debug menu memory leak 2020-12-25 10:57:39 +02:00
Sergeanur 687ff4bdbb Fix debug menu memory leak 2020-12-25 10:57:19 +02:00
Sergeanur e14ed9c7dd Restore original Cheat_strncmp 2020-12-25 10:44:20 +02:00
Sergeanur 74276ae878 More type fix 2020-12-25 09:29:23 +02:00
Sergeanur 1cc8a1d247 Small audio code fix 2020-12-25 09:13:01 +02:00
Sergeanur 6d75374c41 Fix cAudioManager::ProcessSpecial 2020-12-25 09:06:49 +02:00
Sergeanur 6a2edcea46 Small type use fixes 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/vehicles/Cranes.cpp
 2020-12-25 09:03:13 +02:00
Sergeanur de31bdc89f Small type use fixes 2020-12-25 08:59:32 +02:00
Sergeanur 0768026938 Fix chainsaw sounds lol 2020-12-25 08:33:43 +02:00
Filip Gawin 19cc1d7854 fixes 2020-12-25 01:29:18 +01:00
erorcun f9cbe29c50
Merge pull request #886 from erorcun/master 
Radio scroll to prev. station & radio off text
 2020-12-24 20:47:26 +03:00
Nikolay Korolev 8cc3f867a6 fixed double explosion 2020-12-24 17:44:59 +03:00
Nikolay c995bdcdaf
Merge pull request #893 from Nick007J/master 
Collective implementation in script
 2020-12-24 17:22:28 +03:00
aap 70a279febc make screen droplets not crash without neo.txd 2020-12-24 09:41:35 +01:00
aap 450cd17d16 make screen droplets not crash without neo.txd 2020-12-24 09:41:18 +01:00
Filip Gawin 35473e653d More audio 2020-12-22 14:53:45 +01:00
aap aefaa17a84 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-21 20:49:03 +01:00
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 adcfb30d7d fix name shadowing 2020-12-21 13:29:09 +01:00
aap e696d770be botched last commit 2020-12-21 12:38:02 +01:00
aap 934c967825 core/FileLoader.cpp 2020-12-21 12:35:06 +01:00
aap f251803f55 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-21 12:34:36 +01:00
aap fb97335d9f push/pop memids 2020-12-21 12:34:29 +01:00
erorcun 6b33765891 Car entering cancel test 2020-12-21 02:44:12 +03:00
erorcun 05fb47bdb0 Fix wrong call on free cam (now it's faster) 2020-12-21 02:36:09 +03:00
erorcun 9b9545b92a Car entering cancel test 2020-12-21 02:06:00 +03:00
erorcun 26aed6611e fix auto duck cancel bug 2020-12-21 01:15:40 +03:00
erorcun ca4602d788 Fix free cam aiming 2 2020-12-20 21:53:06 +03: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
Nikolay Korolev dcb28bfd53 fix 2020-12-20 17:12:34 +03:00
Nikolay Korolev db012aa9e0 Merge remote-tracking branch 'upstream/master' 2020-12-20 17:08:21 +03:00
Nikolay Korolev fc72ff24d0 implemented collectives in script 2020-12-20 17:07:58 +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
Sergeanur be92b57b54 buildings directory 
# Conflicts:
#	premake5.lua
 2020-12-20 12:40:59 +02:00
Sergeanur affd3c6baa buildings directory 2020-12-20 12:39:44 +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
erorcun 4c46d24983
style change 2020-12-19 20:39:42 +03:00
aap 2a51e1da04 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-19 17:27:01 +01:00
Nikolay Korolev b6298915dd fixed cmakelists 2020-12-19 16:21:33 +03:00
Nikolay Korolev 196a13b1cc removed renderer stuff 2020-12-19 14:52:32 +03: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 e3aac6263f Merge remote-tracking branch 'upstream/miami' into miami 2020-12-19 03:21:32 +03:00
Nikolay Korolev 8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap df5bafc80c anim fixes 2020-12-18 23:47:38 +01:00
aap 9982f1f21b anim compression 2020-12-18 23:46:51 +01:00
aap 73d080bcc8 silly mistake 2020-12-18 23:39:59 +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
aap db752d141b
Merge pull request #889 from aap/miami 
CMBlur FX
 2020-12-18 13:31:24 +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
Sergeanur 2903ebe296 Fix placement of some script functions 
# Conflicts:
#	src/control/Script5.cpp
 2020-12-16 23:29:17 +02:00
Sergeanur 9a9b1e7574 Fix placement of some script functions 2020-12-16 23:28:06 +02:00
aap 1af5065df7 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-16 21:54:01 +01:00
aap e9df32a983 finished CMBlur 2020-12-16 21:53:47 +01: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
aap 9200810f60 update librw with stencil states 2020-12-16 15:49:22 +01:00
aap 7d89e955fe ;end of fucking waterlevel 2020-12-16 13:38:09 +01:00
aap c42463bf4e more tidy water sync 2020-12-16 13:32:13 +01:00
aap 78c7459b3a more tiny water sync 2020-12-16 13:32:03 +01:00
aap 0d97a31ce9 tiny water sync 2020-12-16 13:25:45 +01:00
aap c4c92c357f tidy water sync 2020-12-16 13:25:23 +01:00
erorcun 23b5e664dc Sync Frontend with miami 3/3 2020-12-16 00:38:26 +03:00
withmorten ce9eafcd51 sync WaterLevelInit with master, and other small fixes 2020-12-15 21:55:04 +01:00
Walied K. Yassen 55414f7ef2
Few bug fixes in CAutomobile 2020-12-15 18:05:37 +02:00
erorcun b834d92585 radio scroll fix 2020-12-15 18:37:21 +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
aap 6d3adf57e8 fixed water.dat code 2020-12-15 14:36:30 +01:00
aap e594f1d81d
Merge pull request #883 from withmorten/waterlevel 
add dev build code for generating waterpro.dat
 2020-12-15 11:43:29 +01:00
Walied K. Yassen 37d3188ce7
Few bug fixes in CAutomobile 2020-12-15 12:20:55 +02:00
Sergeanur 8f2abc6750 fix 2020-12-15 05:11:45 +02: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
Sergeanur e970e5f246 Use SetMoveState 2020-12-15 04:25:12 +02:00
Sergeanur ac95138c18 More fixes 2020-12-15 04:16:29 +02:00
Sergeanur ab3e258f19 SetPedState fixes 2020-12-15 03:25:05 +02:00
withmorten 7be7845db0 add dev build code for generating waterpro.dat 2020-12-15 00:05:02 +01:00
shfil 3b8ac474a2
Implement COMMAND_IS_CAR_PASSENGER_SEAT_FREE 
Fixes 881
 2020-12-14 15:33:16 +01:00
Seemann 0563478de0 Fix some formatting issues 2020-12-14 11:18:46 +02:00
Sergeanur f42a01f653 CPed::SetWeaponLockOnTarget 2020-12-14 09:47:07 +02:00
erorcun c0652b8203 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-14 02:52:14 +03:00
erorcun 0448ae662f Fix language initialization call order 2020-12-14 02:50:34 +03:00
erorcun 0f5893ed60 Fix language initialization call order 2020-12-14 02:46:55 +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 9be5bfe75b sync vis-plugins with miami 2020-12-13 12:58:15 +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 8fb461b873 removed obsolete ifdef (since we have GTA_REPLAY) 2020-12-13 00:20:44 +03:00
Nikolay Korolev 6d61f9d2e1 fixed replay bugs 2020-12-12 23:17:16 +03:00
Nikolay Korolev f5330990b1 Merge remote-tracking branch 'upstream/master' 2020-12-12 23:05:47 +03:00
Nikolay Korolev 01c95378e1 fixed some replay bugs 2020-12-12 23:05:12 +03:00
Nikolay Korolev bfe382c315 better fix 2020-12-12 21:06:14 +03:00
erorcun b3f97cdce4 style change 2020-12-12 20:39:34 +03:00
Nikolay Korolev 229b8f304a fixed a bug 2020-12-12 20:37:26 +03:00
erorcun 347e1da364 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-12 20:37:12 +03:00
erorcun c74f03b180 Kill obj. fix & style change 2020-12-12 20:36:58 +03:00
Nikolay Korolev 82c40b73ca fixed a bug 2020-12-12 20:35:17 +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
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