a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-07-01 08:53:47 +00:00
Code Issues Projects Releases Wiki Activity
3159 commits 4 branches 2 tags 50 MiB
Commit graph

2624 commits

Author SHA1 Message Date
Roman Masanin 07143ee73b SpecialFX fixes 2020-10-15 15:52:37 +03:00
Roman Masanin 34b4efe242 fix bullet traces rener and some renaming 2020-10-15 15:42:10 +03:00
Fire-Head e4ac934dbf Miami Glass 2020-10-15 00:33:57 +03:00
Sergeanur a96146c87b Pickup fix 2020-10-14 03:29:25 +03:00
erorcun 971b7cba65
Merge pull request #761 from erorcun/SampleMan 
SampleManager
 2020-10-13 13:18:49 +03:00
shfil 3b40e003ab
Fix typo in fire.cpp 2020-10-12 22:51:49 +02:00
Fire-Head 1e068aea73 fix AskForObjectToBeRenderedInGlass 2020-10-12 23:10:08 +03:00
Sergeanur 6450fd2692 Fix zone saving on 64 bit 2020-10-12 22:54:46 +03:00
erorcun 1e11c1eac6
Merge pull request #762 from Nick007J/miami 
Control update
 2020-10-12 21:52:59 +03:00
erorcun 4e07297503
Update sampman_miles.cpp 2020-10-12 20:51:52 +03:00
eray orçunus 342da2430b Merge branch 'miami' of https://github.com/GTAmodding/re3 into new 2020-10-12 20:47:34 +03:00
eray orçunus 3772be32bf Streaming and cross-platform fixes 2020-10-12 20:41:13 +03:00
eray orçunus be6b97b5d8 Streaming and cross-platform fixes 2020-10-12 20:30:49 +03:00
eray orçunus d18a55f429 SampleManager 2020-10-12 20:22:39 +03:00
Roman Masanin 417646819c Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-12 13:42:57 +03:00
Roman Masanin 56bb7d721a mark file and fix screen offset 2020-10-12 13:41:57 +03:00
Roman Masanin e6a1ea9d4f CBrightLight::render 2020-10-12 13:28:06 +03:00
erorcun 96f36d16ae
Merge pull request #753 from majesticCoding/miami 
CWaterCreatures
 2020-10-12 12:37:47 +03:00
eray orçunus 40020f4e1e Fix forgotten wanted/busted text 2020-10-12 12:36:15 +03:00
eray orçunus b1e235535c Cutscene aspect ratio fix 2020-10-12 12:16:24 +03:00
Nikolay Korolev 49c48f2ec2 sync with upstream 2020-10-12 12:11:53 +03:00
erorcun 9e0b23f065
Merge pull request #758 from erorcun/miami 
Hud, Fire, OnscreenBlaBla
 2020-10-12 11:13:46 +03:00
eray orçunus 8a622a0e72 Hud, Fire, OnscreenBlaBla 2020-10-12 06:42:54 +03:00
Sergeanur 239e09ad07
Merge pull request #759 from Sergeanur/VC/ZoneSaveLoad 
Zones saving and loading
 2020-10-12 04:16:30 +03:00
Roman Masanin ca1d899413 final step 2020-10-11 22:29:49 +03:00
Roman Masanin 7a3e1ef19a SpecialFX almost done 2020-10-11 21:40:11 +03:00
Nikolay Korolev 28b47b601f fix 2020-10-11 18:14:35 +03:00
Nikolay Korolev 91a274da2b small fix 2020-10-11 13:11:25 +03:00
Nikolay Korolev 68779a4dac small fix 2020-10-11 13:05:41 +03:00
Nikolay Korolev 49ad471b2d removed extra header 2020-10-11 12:58:23 +03:00
Nikolay Korolev 552f308e9e sync with upstream 2020-10-11 12:58:11 +03:00
Nikolay Korolev c4d4821327 Control updates 2020-10-11 12:56:33 +03:00
Sergeanur b0becb5a2d UnicodeMakeUpperCase move + arg fix 2020-10-11 10:39:04 +03:00
Sergeanur 9dba2386bb Merge branch 'master' into VC/TextFinish 
# Conflicts:
#	src/text/Text.cpp
 2020-10-11 10:34:47 +03:00
Sergeanur 43af5d9c1f Merge branch 'miami' into VC/TextFinish 2020-10-11 10:33:56 +03:00
Sergeanur e26e85deb8 Some unicode funcs belong to Font.cpp + small fix 2020-10-11 10:33:02 +03:00
majestic e7ef45a606 CWaterCreatures 2020-10-10 17:49:54 -07:00
Sergeanur f1bb09826d Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	gamefiles/TEXT/american.gxt
#	premake5.lua
#	src/audio/MusicManager.cpp
#	src/control/Darkel.cpp
#	src/control/Script.cpp
#	src/core/FileLoader.cpp
#	src/core/Frontend.cpp
#	src/core/Game.cpp
#	src/core/Streaming.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/extras/frontendoption.cpp
#	src/extras/frontendoption.h
#	src/render/Hud.cpp
#	src/skel/glfw/glfw.cpp
#	src/vehicles/CarGen.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/WeaponInfo.cpp
#	utils/gxt/american.txt
 2020-10-11 01:18:08 +03:00
Sergeanur 6fe6d0cb9a Finish Text stuff 2020-10-11 00:56:16 +03:00
Sergeanur dd039677a0 Zones saving and loading 2020-10-10 23:50:00 +03:00
Nikolay 63611408b1
bug fix 2020-10-10 18:19:49 +03:00
Roman Masanin 881db86895 CSpecialFX and some other classes 2020-10-09 20:29:38 +03:00
eray orçunus a01b14f301 Fix sniper and water creatures bug, mark some files 2020-10-09 12:24:21 +03:00
majestic c091a5c11a CWaterCreatures 2020-10-08 19:28:31 -07:00
eray orçunus 22c9e8b581 Fix POSIX streaming 2020-10-09 02:22:02 +03:00
eray orçunus ed82c55475 Fix POSIX streaming 2020-10-09 02:19:49 +03:00
eray orçunus 570ccb7db1 Merge branch 'miami' of https://github.com/GTAmodding/re3 into new 2020-10-08 22:45:37 +03:00
eray orçunus 73a3e9d5bb Fixes, some thanks to ASan 2020-10-08 22:41:51 +03:00
erorcun b97f86deea
Merge pull request #750 from erorcun/miami 
Pad, BulletInfo, ProjectileInfo, fixes
 2020-10-08 21:39:11 +03:00
Roman Masanin e52c5ca1bb fix for wheelie cras 2020-10-08 20:34:59 +03:00
majestic 9a10501698 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-08 09:31:57 -07:00
Filip Gawin 6bae5a6031 Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size) 2020-10-08 18:45:07 +03:00
eray orçunus fec01aeff1 Fix some sanitizer errors, improve POSIX streamer 2020-10-08 17:58:18 +03:00
Andrew Udvare 1a3e254b6c CdStreamPosix: fix type issues 2020-10-08 17:53:32 +03:00
Andrew Udvare 2bb29a50b7 core/CdStreamPosix: switch to named semaphores to support macOS 
macOS does not support unnamed semaphores. The functions return ENOSYS.
 2020-10-08 17:52:12 +03:00
Andrew Udvare d590fdddf6 macOS support; thanks to @MrYadro 
This should support ARM64 and x86-64.
-target flag based on information from
https://developer.apple.com/documentation/xcode/building_a_universal_macos_binary#3618377.
 2020-10-08 17:51:43 +03:00
erorcun 3435d6656c
Merge pull request #748 from theR4K/miamiUpstream 
CExplosion and some audio
 2020-10-08 16:15:18 +03:00
majestic 7861992fe6 CWaterCreatures 2020-10-08 05:59:08 -07:00
erorcun fa373c7fdb
Merge branch 'miami' into miami 2020-10-08 01:29:35 +03:00
eray orçunus 0409907438 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-10-08 01:26:34 +03:00
eray orçunus 07cdd06373 little renamings & librw update 2020-10-08 01:17:19 +03:00
erorcun 8b7bf76260
Merge pull request #735 from theR4K/miami 
car fly cheat enhancement
 2020-10-08 00:59:10 +03:00
eray orçunus da39624f1c Pad, BulletInfo, ProjectileInfo, fixes 2020-10-08 00:26:24 +03:00
eray orçunus 556dbdcdd6 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-10-05 22:18:51 +03:00
Roman Masanin a6a1de5006 rename var 2020-10-05 19:05:13 +03:00
Filip Gawin e3571510ae Fix build on clang 2020-10-05 17:40:44 +02:00
Roman Masanin 4fd93fea51 fix mistakes 2020-10-05 17:24:57 +03:00
Roman Masanin e3273d7268 CExplosion done 2020-10-05 16:14:48 +03:00
Nikolay Korolev 6853be36c8 Merge remote-tracking branch 'upstream/master' 2020-10-05 16:10:26 +03:00
Nikolay Korolev 2bfb54b192 fixed darkel/replay 2020-10-05 16:09:44 +03:00
eray orçunus c5a61b3d3b Merge branch 'master' of https://github.com/GTAmodding/re3 2020-10-05 14:26:42 +03:00
eray orçunus 9db0d7bba1 Merge branch 'master' of https://github.com/GTAmodding/re3 into audioFix 2020-10-05 14:24:45 +03:00
eray orçunus ee27cae732 Fix Linux audio path 2020-10-05 14:23:37 +03:00
eray orçunus 1a0b71bd47 Fix Audio 2020-10-05 14:23:12 +03:00
eray orçunus 6f3f581d8a Fix Audio 2020-10-05 13:59:40 +03:00
Roman Masanin 4867d9949d some audio and part of CExplosion 2020-10-05 03:04:35 +03:00
eray orçunus 49ae7da5ce Fix Linux audio path 2020-10-05 01:25:56 +03:00
shfil c31e3e6823
Merge pull request #741 from ShFil119/fix/make_space 
Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size)
 2020-10-04 22:02:28 +02:00
eray orçunus 8c170a62ee Fix some sanitizer errors, improve POSIX streamer 2020-10-04 22:39:54 +03:00
erorcun fae97f29c4
Merge branch 'master' into master 2020-10-04 22:12:57 +03:00
Roman Masanin 1b3144f978 back to the future style wheels on flying 2020-10-04 19:03:34 +03:00
Filip Gawin 0ac2be0093 Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size) 2020-10-04 13:18:24 +02:00
Nikolay Korolev 39678ba5ca small fix 2020-10-03 16:16:46 +03:00
erorcun a8c19dfed8
Merge pull request #734 from Tatsh/macos 
macOS support
 2020-10-03 13:22:08 +03:00
Roman Masanin 063a80ecfb now BETTER_ALLCARSDODO_CHEAT tweak original cheat to be useful. 2020-10-03 02:26:49 +03:00
Roman Masanin 55d94c99b8 Merge remote-tracking branch 'upstream/miami' into miami 2020-10-03 01:52:37 +03:00
eray orçunus 3bd3330227 Load and write our settings in re3.ini & fixes 2020-10-02 21:18:34 +03:00
shfil 9d53b738cc
Merge pull request #737 from theR4K/miamiDev 
just ProcessActiveQueues
 2020-10-02 20:11:00 +02:00
Nikolay Korolev 8761763d95 fixed cargen check 2020-10-02 20:43:24 +03:00
Roman Masanin 1991f9b362 revert some changes and little fix 2020-10-02 20:35:16 +03:00
erorcun 72f342245d
Merge pull request #731 from erorcun/miami 
Population done, mouse AUX buttons, Frontend, Hud, fixes
 2020-10-02 17:39:15 +03:00
Roman Masanin 6ff138ca76 fix build(bcs func CheckForAnAudioFileOnCD not used anymore) 2020-10-02 05:03:29 +03:00
Roman Masanin 064f2e66e1 letter 'c' is done 2020-10-02 04:59:06 +03:00
Roman Masanin e5a48faf89 merged from upstream 2020-10-02 04:03:17 +03:00
Roman Masanin 63e5faef11 rewieved some audio functions 2020-10-02 03:55:26 +03:00
Andrew Udvare f6bc2b654c
CdStreamPosix: fix type issues 2020-10-01 20:45:38 -04:00
Roman Masanin e54b540bd4 final processActiveQueues 2020-10-02 00:11:51 +03:00
Roman Masanin 311cffa901 second pass processActiveQueues 2020-10-01 23:48:35 +03:00
Roman Masanin eb0e89d3ea half done processActiveQueues 2020-10-01 23:11:20 +03:00
Andrew Udvare bbb578c5b1
core/CdStreamPosix: switch to named semaphores to support macOS 
macOS does not support unnamed semaphores. The functions return ENOSYS.
 2020-10-01 03:21:06 -04:00