Skip to content
This repository has been archived by the owner. It is now read-only.

Merge miami into lcs #1088

Merged
merged 136 commits into from Feb 16, 2021
Merged
Changes from 1 commit
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
3948a1f
add Vanilla config to premake and premake CI
withmorten Jan 24, 2021
30c26e5
Change text color in texture conversion dialog...
kusst Jan 26, 2021
e1e13d1
Also change progressbar color
kusst Jan 27, 2021
97351ad
Use original animation names from VCS
Sergeanur Jan 27, 2021
97cf189
Fix subtitle shadow
Sergeanur Jan 27, 2021
e8a1074
fix fix
Sergeanur Jan 27, 2021
ab939e0
Clean up POSIX streaming code
erorcun Jan 27, 2021
a216bb5
Attempt to fix input delays on GLFW
erorcun Jan 27, 2021
9c2f067
Change joystick DB with latest offical one
erorcun Jan 27, 2021
be88a42
Fix some Collision NaN/inf's
erorcun Jan 27, 2021
8a7c7ef
ifdefs + fix progressbar being under dialogbox
kusst Jan 27, 2021
8150f55
Merge pull request #1002 from kusst/miami
erorcun Jan 27, 2021
0d7e0d3
Merge pull request #1000 from withmorten/miami-vanilla
erorcun Jan 27, 2021
e1e4be9
Use previous naming & fix LineOfSightSectorList too
erorcun Jan 28, 2021
9e3c192
fix some little UB
aap Jan 28, 2021
7056f99
fix
Nick007J Jan 28, 2021
810bad9
Fix some UBs
erorcun Jan 28, 2021
2fc6b54
waterlevel fix
withmorten Jan 29, 2021
8482180
waterlevel fix fix
withmorten Jan 29, 2021
595a000
fix shutdown
aap Jan 29, 2021
982b024
CdStreamPosix fixes
erorcun Jan 29, 2021
934aa92
add NewRenderer ini read/write, fix backfaceculling read
withmorten Jan 29, 2021
7db28f9
fix NewRender typo
withmorten Jan 29, 2021
c4328af
Even more fixes & shorten quit screen
erorcun Jan 29, 2021
f5f153d
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
erorcun Jan 29, 2021
990637b
waterlevel: use macro for 400.0f
withmorten Jan 29, 2021
dbf5c06
fixed bike bomb
Nick007J Jan 30, 2021
8b08098
fix
Nick007J Jan 30, 2021
c193ade
Font fixes
Sergeanur Jan 30, 2021
5dfe396
use macro for waterlevel z offset
withmorten Jan 30, 2021
2420325
fix
Nick007J Jan 30, 2021
e519048
Merge remote-tracking branch 'upstream/miami' into miami
Nick007J Jan 30, 2021
2e37001
fix UB and new renderer crashes
withmorten Jan 31, 2021
264d7d9
fix realloc
Jan 31, 2021
3e0dbf4
Add radio off text
Sergeanur Jan 31, 2021
902e539
Overhaul MusicManager - fix radio bugs, scroll to prev station, radio…
erorcun Jan 30, 2021
1eb77c4
Merge pull request #1016 from erorcun/miami
erorcun Feb 2, 2021
4281730
fix UB and potential crashes when doing ice cream
withmorten Feb 2, 2021
1b293a3
no advanced script log when log level is 0
withmorten Feb 2, 2021
7135626
OAL Loops, fixes
erorcun Feb 2, 2021
2ea365e
Merge pull request #1018 from erorcun/miami
erorcun Feb 2, 2021
1ffa9bb
Adding strings to re3's GXT, recompiling GXT files
IlDucci Feb 3, 2021
edc3c48
add gamefiles and dlls to premake workflows
withmorten Feb 3, 2021
2e7726c
Merge pull request #1022 from IlDucci/miami
Sergeanur Feb 3, 2021
ca65c76
fix
Nick007J Feb 3, 2021
ca48ebc
MP3 player fixes
erorcun Feb 3, 2021
bba01a4
sync readme with master
withmorten Feb 3, 2021
1525b10
reduce warnings in msvc librw build
withmorten Feb 3, 2021
958c828
readme fix
withmorten Feb 4, 2021
4234274
CHud::Draw fix
withmorten Feb 4, 2021
8553120
add missing ASCII_STRCMP stuff
withmorten Feb 4, 2021
a78212e
fix MASTER crashes
withmorten Feb 4, 2021
09de511
fixed plane AI
Nick007J Feb 5, 2021
9125e60
fix generic.txd crash
aap Feb 5, 2021
86513cb
[Miami] Updating font widths.
IlDucci Feb 5, 2021
102d105
fix
Nick007J Feb 5, 2021
b864103
Restoring original sorting.
IlDucci Feb 5, 2021
cc435ea
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
aap Feb 6, 2021
425f360
reorganize shaders; use modulate flag; update librw
aap Feb 6, 2021
675aef2
Detect joystick menu for XInput
erorcun Feb 5, 2021
2cad499
Use our synonyms for attack anims again
erorcun Feb 7, 2021
b464bb7
Merge branch 'miami' of https://github.com/GTAmodding/re3 into VCSanim
erorcun Feb 8, 2021
94eed33
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
erorcun Feb 8, 2021
26bbbe0
fix clouds
aap Feb 9, 2021
12330e3
Controller menu
Sergeanur Feb 10, 2021
b6af739
Merge remote-tracking branch 'origin/miami' into VC/ControllerMenu
Sergeanur Feb 10, 2021
bf86875
Add textures
Sergeanur Feb 10, 2021
d6068c4
Add undef
Sergeanur Feb 10, 2021
5f3e68e
Save vibration setting
Sergeanur Feb 10, 2021
ca85e44
Fix repeating pickup sound on revenue pickup
Sergeanur Feb 10, 2021
5072c8b
Merge branch 'miami' into VC/ControllerMenu
Sergeanur Feb 10, 2021
3c7a7bc
Fixes
Sergeanur Feb 10, 2021
775db94
Ped jump teleport/kill fix
erorcun Feb 10, 2021
6d56fb4
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
erorcun Feb 10, 2021
84ede57
startproject now depends on librw
withmorten Feb 10, 2021
7c48556
Translated string fix
Sergeanur Feb 11, 2021
9f3f0ee
Fix borders
Sergeanur Feb 11, 2021
4f27a28
More fixes
Sergeanur Feb 11, 2021
28f9160
Fix crash when falling from bike while shooting
Sergeanur Feb 11, 2021
9d8e32d
Merge pull request #1026 from Sergeanur/VC/ControllerMenu
Sergeanur Feb 11, 2021
7c74c01
fixed attractors
Nick007J Feb 11, 2021
579ad05
Fix black screen during credits
Sergeanur Feb 11, 2021
e4320c0
Enable BIND_VEHICLE_FIREWEAPON
Sergeanur Feb 11, 2021
998d887
Fix RC cars detonation button
Sergeanur Feb 11, 2021
4382774
Use VEHICLE_FIREWEAPON in GXTs
Sergeanur Feb 11, 2021
46e229c
use better quality button textures, add generic.txd
withmorten Feb 11, 2021
031195f
better controller menu txds
withmorten Feb 11, 2021
879838c
enable screenshots with F12
aap Feb 11, 2021
c5db1e6
improved readme
aap Feb 11, 2021
c3ced58
improved readme
aap Feb 11, 2021
9e22eaf
Fix RW34
Sergeanur Feb 12, 2021
c5042dc
Add english strings to translations as stubs, also translation notice
Sergeanur Feb 12, 2021
aadc39e
Add missing rtpng.h
Sergeanur Feb 12, 2021
df336f5
Convert TXDs to VC version, delete unused controller shadows
Sergeanur Feb 12, 2021
b169894
Update TXDs
Sergeanur Feb 12, 2021
e98164e
Sync aspect ratio setting with master
Sergeanur Feb 12, 2021
2c784d9
Remove version text, add toggleable debug info(with commit hash!)
erorcun Feb 11, 2021
0c60cee
Cmake version for hash
Feb 12, 2021
80e4b3d
Fix sha1 on premake linux
erorcun Feb 12, 2021
0ec16a5
Fix XInput hotplug
erorcun Feb 12, 2021
035f001
fix
erorcun Feb 12, 2021
0916971
update librw
aap Feb 12, 2021
9df19cb
license information
aap Feb 12, 2021
3db0e82
add history section to readme
aap Feb 12, 2021
65f9917
clean up debug menu
aap Feb 13, 2021
333530e
new icon
aap Feb 13, 2021
ddcc19d
readme fixes
withmorten Feb 13, 2021
ae8b219
Redone the entire grouping to follow the textures, added ifdefs, adde…
IlDucci Feb 13, 2021
e5d5160
glfw window icon
withmorten Feb 13, 2021
44511e2
more readme fixes
withmorten Feb 13, 2021
83fdad7
Update invite link
Sergeanur Feb 13, 2021
f5fdb91
reVC logo
Fire-Head Feb 13, 2021
49d9aa8
even more readme fixes
withmorten Feb 14, 2021
9f6f9a7
Merge pull request #1024 from IlDucci/miami
Sergeanur Feb 14, 2021
d0afa69
optimize performance -> readme to-do
aap Feb 14, 2021
d6fbfab
update invite link
withmorten Feb 14, 2021
70b9191
(Test) Try to fix streams stop after a while
erorcun Feb 14, 2021
6ba0d2e
fail
Nick007J Feb 14, 2021
3d90a14
Merge remote-tracking branch 'upstream/miami' into miami
Nick007J Feb 14, 2021
0681fe3
cannon fix
Fire-Head Feb 14, 2021
e604be6
More compatible she-bang line
erorcun Feb 14, 2021
6fcea14
readme update
Fire-Head Feb 14, 2021
5ce5000
Try to fix streams stop after a while 2
erorcun Feb 15, 2021
a76c962
always console for windows Debug builds
withmorten Feb 15, 2021
a58d76d
Revert "always console for windows Debug builds"
withmorten Feb 15, 2021
adf6886
removed some f suffixes from shaders
aap Feb 15, 2021
63e5afd
fix mailbox particle
Fire-Head Feb 15, 2021
7c382c8
Add PR rules to Readme
erorcun Feb 16, 2021
b451be6
PR rules
erorcun Feb 16, 2021
4368841
Fix rare stream deadlock on Windows
erorcun Feb 16, 2021
48227bd
Add unnamed semaphore define toggle for CdStreamPosix
AGraber Jan 24, 2021
ee287f6
Only include sys/syscall.h when __linux__ is defined
AGraber Jan 24, 2021
1bfd7c0
Fix FindClose->closedir
erorcun Feb 16, 2021
e38467e
Merge remote-tracking branch 'origin/miami' into lcs
Sergeanur Feb 16, 2021
2127835
Merge remote-tracking branch 'origin/miami' into lcs
Sergeanur Feb 16, 2021
0f46c89
Fix
Sergeanur Feb 16, 2021
File filter
Filter file types
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.

Always

Just for now

Use previous naming & fix LineOfSightSectorList too
  • Loading branch information
erorcun committed Jan 28, 2021
commit e1e4be9017246cc6b4d14d5b5d346c5c142941c0
@@ -367,7 +367,7 @@ CWorld::ProcessLineOfSightSectorList(CPtrList &list, const CColLine &line, CColP
} else if(e->bUsesCollision)
colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();

if(colmodel && CCollision::ProcessLineOfSight(line, e->GetMatrix(), *colmodel, point, dist,
if(colmodel && CCollision::ProcessLineOfSight(line, e->GetMatrix(), *colmodel, point, mindist,
ignoreSeeThrough, ignoreShootThrough))
entity = e;
if(carTyres && ((CVehicle*)e)->SetUpWheelColModel(&tyreCol) && CCollision::ProcessLineOfSight(line, e->GetMatrix(), tyreCol, tyreColPoint, tyreDist, false, ignoreShootThrough)){
@@ -452,10 +452,10 @@ CWorld::ProcessVerticalLineSector(CSector &sector, const CColLine &line, CColPoi
}

bool
CWorld::ProcessVerticalLineSectorList(CPtrList &list, const CColLine &line, CColPoint &point, float &mindist,
CWorld::ProcessVerticalLineSectorList(CPtrList &list, const CColLine &line, CColPoint &point, float &dist,
CEntity *&entity, bool ignoreSeeThrough, CStoredCollPoly *poly)
{
float dist = mindist;
float mindist = dist;
CPtrNode *node;
CEntity *e;
CColModel *colmodel;
@@ -466,14 +466,14 @@ CWorld::ProcessVerticalLineSectorList(CPtrList &list, const CColLine &line, CCol
e->m_scanCode = GetCurrentScanCode();

colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
if(CCollision::ProcessVerticalLine(line, e->GetMatrix(), *colmodel, point, dist,
if(CCollision::ProcessVerticalLine(line, e->GetMatrix(), *colmodel, point, mindist,
ignoreSeeThrough, false, poly))
entity = e;
}
}

if(dist < mindist) {
mindist = dist;
if(mindist < dist) {
dist = mindist;
return true;
} else
return false;