Sergeanur
e38467ef3a
Merge remote-tracking branch 'origin/miami' into lcs
...
# Conflicts:
# .github/workflows/reLCS_msvc_amd64.yml
# .github/workflows/reLCS_msvc_x86.yml
# README.md
# gamefiles/TEXT/american.gxt
# gamefiles/TEXT/french.gxt
# gamefiles/TEXT/german.gxt
# gamefiles/TEXT/italian.gxt
# gamefiles/TEXT/spanish.gxt
# premake5.lua
# src/animation/AnimManager.cpp
# src/animation/AnimationId.h
# src/audio/MusicManager.cpp
# src/audio/audio_enums.h
# src/control/Script7.cpp
# src/core/FileLoader.cpp
# src/core/re3.cpp
# src/extras/custompipes_d3d9.cpp
# src/extras/custompipes_gl.cpp
# src/extras/postfx.cpp
# src/extras/shaders/colourfilterVC.frag
# src/extras/shaders/colourfilterVC_PS.hlsl
# src/extras/shaders/make_hlsl.cmd
# src/extras/shaders/obj/colourfilterVC_PS.cso
# src/extras/shaders/obj/colourfilterVC_PS.inc
# src/extras/shaders/obj/colourfilterVC_frag.inc
# src/peds/PedFight.cpp
# src/render/Font.cpp
# src/render/Hud.cpp
# src/render/Particle.cpp
# src/render/WaterCannon.cpp
# src/skel/win/gtavc.ico
# src/vehicles/Automobile.cpp
# utils/gxt/american.txt
# utils/gxt/french.txt
# utils/gxt/german.txt
# utils/gxt/italian.txt
# utils/gxt/spanish.txt
2021-02-16 18:08:19 +02:00
withmorten
2e37001881
fix UB and new renderer crashes
2021-01-31 01:19:25 +01:00
kusst
8a7c7efe85
ifdefs + fix progressbar being under dialogbox
2021-01-27 23:56:23 +01: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
cea8ad4b85
Fix check
2021-01-25 19:40:19 +02:00
Sergeanur
129d7333be
Fix function dupe
2021-01-25 19:38:13 +02:00
Sergeanur
9647901ba0
Merge branch 'miami' into lcs
...
# Conflicts:
# src/control/Script.h
# src/modelinfo/SimpleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.cpp
# src/rw/VisibilityPlugins.cpp
# src/rw/VisibilityPlugins.h
2021-01-25 19:35:03 +02:00
aap
453a16c978
modelinfo and visibility plg fixes
2021-01-24 23:25:12 +01:00
aap
ce7f166ba3
CVehicleModelInfo
2021-01-24 22:50:16 +01:00
aap
a1d6833bac
txd store
2021-01-23 19:23:38 +01:00
Sergeanur
904090cbb6
Merge remote-tracking branch 'origin/miami' into lcs
...
# Conflicts:
# src/modelinfo/BaseModelInfo.cpp
2021-01-23 15:14:15 +02:00
erorcun
f85b5e99ed
Includes overhaul, fix some compiler warnings
2021-01-23 03:23:16 +03:00
Sergeanur
cea6b20c09
Merge remote-tracking branch 'origin/miami' into lcs
...
# Conflicts:
# src/animation/CutsceneMgr.cpp
# src/control/CarCtrl.cpp
# src/control/Script.cpp
# src/control/Script2.cpp
# src/core/Frontend.cpp
# src/core/main.cpp
# src/entities/Physical.cpp
# src/peds/Ped.cpp
# src/peds/PedAI.cpp
# src/text/Messages.cpp
# src/vehicles/Cranes.cpp
# src/vehicles/Transmission.cpp
2021-01-22 15:04:09 +02:00
withmorten
feb993e751
get rid of most --MIAMI comments
2021-01-22 11:43:29 +01:00
Sergeanur
06d8860d42
Merge remote-tracking branch 'origin/miami' into lcs
...
* origin/miami:
fuck
bletch
fixed anisotropic filtering; updated librw
fix
2021-01-22 01:58:38 +02:00
aap
8520bbd2c7
higher wheel LOD dist
2021-01-22 00:40:46 +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
Sergeanur
ff057838ec
Merge branch 'miami' into lcs
...
* miami:
Fix backface culling of cutscene objects
more renames
anim velocity union
rename m_vehEnterType -> m_vehDoor
Port cmake improvements to miami
some loose ends
move TODO to Readme
Fix build without FIX_BUGS, divide to 0 fixes
2021-01-13 14:56:25 +02:00
erorcun
542a5393ac
Fix build without FIX_BUGS, divide to 0 fixes
2021-01-13 03:08:50 +03:00
aap
37a58a04f2
timecycle; some rendering
2021-01-08 13:34:49 +01:00
aap
ebdf08a514
first commit for LCS
2021-01-08 01:41:40 +01:00
Sergeanur
b9e97ab79d
Reorder CEntity functions into their original order
2020-12-29 13:55:26 +02:00
erorcun
57098a77ec
Backface cull. in INI, mouse sensitivity fix, aspect ratio auto as default
2020-12-26 12:10:04 +03:00
erorcun
a50244dc16
signed/unsigned fixes, and some other fixes
2020-12-25 12:54:41 +03:00
aap
fb97335d9f
push/pop memids
2020-12-21 12:34:29 +01:00
aap
2a51e1da04
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-12-19 17:27:01 +01:00
Nikolay Korolev
8d1996833b
merge attempt
2020-12-19 03:21:04 +03:00
aap
9982f1f21b
anim compression
2020-12-18 23:46:51 +01:00
aap
f3a356375e
added MemoryHeap from III, MemoryMgr
2020-12-18 14:19:03 +01:00
aap
9be5bfe75b
sync vis-plugins with miami
2020-12-13 12:58:15 +01:00
aap
35cac6b93b
some rendering things
2020-12-13 12:53:19 +01:00
aap
28a942735c
fix pMemoryTop
2020-12-05 14:50:54 +01:00
aap
466eee84e7
typo
2020-12-04 10:23:04 +01:00
aap
9714a37769
bit more GTA_VERSION and GTA_PS2
2020-12-04 01:12:58 +01:00
aap
448ba9b7e8
bla
2020-12-02 13:08:30 +01:00
aap
50bf0f27a0
rpDefaultGeometryInstance
2020-12-02 12:58:29 +01:00
Sergeanur
a259b6b8ab
TexturePools
...
# Conflicts:
# src/core/Game.cpp
# src/rw/RwHelper.cpp
2020-12-01 22:54:19 +02:00
Sergeanur
9461998304
TexturePools
2020-12-01 22:12:46 +02:00
aap
83bbb631d1
some more GTA_VERSIONs and CGame tidy-up (not much actual memory moving yet)
2020-12-01 17:42:18 +01:00
Sergeanur
5a3a058ed3
Make texture conversion work a bit faster
...
# Conflicts:
# src/core/config.h
2020-12-01 03:51:31 +02:00
aap
c57fee38ca
Merge pull request #841 from aap/master
...
start using CMemoryHeap; also some PS2 define cleanup
2020-11-28 18:52:44 +01:00
aap
a8035b6466
moved some stuff to MemoryMgr
2020-11-28 17:05:57 +01:00
Sergeanur
ad48b9cde0
Make texture conversion work a bit faster
2020-11-28 16:29:45 +02:00
aap
d857758c16
start using CMemoryHeap
2020-11-26 17:39:59 +01:00
aap
4ddc356341
memory heap starting to work
2020-11-25 22:49:50 +01:00
aap
88baa9ce5f
implemented CMemoryHeap, not used or tested yet
2020-11-25 21:34:06 +01:00
aap
b2f9b3175b
two unused functions
2020-11-23 11:06:16 +01:00
aap
b6da31cfaa
two unused functions
2020-11-23 09:38:51 +01:00