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

Population done, mouse AUX buttons, Frontend, Hud, fixes #731

Merged
merged 2 commits into from Oct 2, 2020

Conversation

@erorcun
Copy link
Collaborator

@erorcun erorcun commented Sep 29, 2020

No description provided.

src/core/Frontend.cpp Outdated Show resolved Hide resolved
src/peds/Population.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@Nick007J Nick007J left a comment

lgtm except notes

@erorcun erorcun force-pushed the erorcun:miami branch 2 times, most recently from c116eba to 24cb57c Sep 29, 2020
@parkerlreed
Copy link

@parkerlreed parkerlreed commented Sep 29, 2020

Does the miami branch not have arm64 configs? Was going to test the changes

I see arm, x86, and amd64 but no arm64

EDIT: Yeah miami is missing the premake changes from master

https://github.com/GTAmodding/re3/blob/miami/premake5.lua#L45

https://github.com/GTAmodding/re3/blob/master/premake5.lua#L50

@parkerlreed
Copy link

@parkerlreed parkerlreed commented Sep 29, 2020

Ok now I'm just extra confused. Is miami a different game mode or just a name for the dev branch?

Both miami here and on the PR repo reference a file that's not in the Steam GTA3

[DBG]: Initialising CPedStats...
[DBG]: Loading pedstats data...
[DBG]: CPedStats ready
[DBG]: Intialising CTimeCycle...
[DBG]: CTimeCycle ready
[DEV]: release_existing()
[DEV]: set_new_provider()
[DEV]: EFX
casepath couldn't find dir/file "WILD.ADF", full path was AUDIO\WILD.ADF
[DEV]: Stream ./audio/WILD.ADF
Segmentation fault (core dumped)

@withmorten
Copy link
Contributor

@withmorten withmorten commented Sep 29, 2020

@parkerlreed miami is the branch for Vice City! It was added after 3 was done.

@parkerlreed
Copy link

@parkerlreed parkerlreed commented Sep 29, 2020

Oh haha! Thanks. I feel stupid now.

@ghost
ghost approved these changes Sep 29, 2020
Copy link

@ghost ghost left a comment

looks ok, but you need to rebase

@erorcun erorcun force-pushed the erorcun:miami branch from 24cb57c to f740588 Sep 29, 2020
@erorcun erorcun merged commit 72f3422 into GTAmodding:miami Oct 2, 2020
14 checks passed
14 checks passed
@github-actions
build (win-amd64-librw_d3d9-oal, Debug)
Details
@github-actions
build (win-x86-librw_d3d9-mss, Debug)
Details
@github-actions
build (win-amd64-librw_d3d9-oal, Release)
Details
@github-actions
build (win-x86-librw_d3d9-mss, Release)
Details
@github-actions
build (win-amd64-librw_gl3_glfw-oal, Debug)
Details
@github-actions
build (win-x86-librw_gl3_glfw-mss, Debug)
Details
@github-actions
build (win-amd64-librw_gl3_glfw-oal, Release)
Details
@github-actions
build (win-x86-librw_gl3_glfw-mss, Release)
Details
@github-actions
build (win-x86-librw_d3d9-oal, Debug)
Details
@github-actions
build (win-x86-librw_d3d9-oal, Release)
Details
@github-actions
build (win-x86-librw_gl3_glfw-oal, Debug)
Details
@github-actions
build (win-x86-librw_gl3_glfw-oal, Release)
Details
@appveyor
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants