withmorten
|
feb993e751
|
get rid of most --MIAMI comments
|
2021-01-22 11:43:29 +01:00 |
|
aap
|
24de9f92e8
|
enable screenshots for librw; update librw
|
2021-01-21 10:21:47 +01:00 |
|
Filip Gawin
|
7541fa7cb7
|
Revert extra checks before autolinking
|
2021-01-14 22:26:36 +01:00 |
|
|
Filip Gawin
|
1082b13830
|
RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINK
|
2021-01-14 22:15:36 +01:00 |
|
|
Filip Gawin
|
c7b905c0ec
|
More checks before autolinking
|
2021-01-14 22:06:27 +01:00 |
|
Nikolay Korolev
|
8d1996833b
|
merge attempt
|
2020-12-19 03:21:04 +03:00 |
|
erorcun
|
e1044a7947
|
AnimViewer fixes, commentary from miami
|
2020-12-09 05:10:57 +03:00 |
|
|
erorcun
|
ab3e810a95
|
AnimViewer done, comment cleanup
|
2020-12-03 05:22:58 +03:00 |
|
|
withmorten
|
b8d3d8f5e4
|
add -console cmdline arg instead of #if 0/1
# Conflicts:
# src/skel/glfw/glfw.cpp
# src/skel/win/win.cpp
|
2020-12-01 03:41:09 +02:00 |
|
erorcun
|
4ec60676e7
|
Merge pull request #846 from withmorten/ini
add -console cmdline arg instead of #if 0/1
|
2020-12-01 04:21:00 +03:00 |
|
|
aap
|
d5bc382cb5
|
GTA_VERSION define and some config.h cleanup
|
2020-11-29 21:29:48 +01:00 |
|
|
withmorten
|
b1a431a740
|
add -console cmdline arg instead of #if 0/1
|
2020-11-28 17:57:10 +01:00 |
|
|
aap
|
a8035b6466
|
moved some stuff to MemoryMgr
|
2020-11-28 17:05:57 +01:00 |
|
|
aap
|
4ddc356341
|
memory heap starting to work
|
2020-11-25 22:49:50 +01:00 |
|
|
erorcun
|
a6aa782d6d
|
Fixes and style changes from miami
|
2020-10-18 19:16:37 +03:00 |
|
|
eray orçunus
|
f60e3d667a
|
Minor things
|
2020-10-18 13:53:17 +03:00 |
|
|
eray orçunus
|
b98864d134
|
Radar, WaterCannon, win/glfw skels
|
2020-10-17 17:35:26 +03: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 |
|
|
eray orçunus
|
3bd3330227
|
Load and write our settings in re3.ini & fixes
|
2020-10-02 21:18:34 +03:00 |
|
|
eray orçunus
|
f740588780
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2020-09-30 02:44:02 +03:00 |
|
|
eray orçunus
|
f71953077d
|
Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes
|
2020-09-30 02:41:42 +03:00 |
|
|
Sergeanur
|
fae4c73ad3
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# premake5.lua
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.h
# src/audio/MusicManager.cpp
# src/audio/sampman.h
# src/audio/sampman_oal.cpp
# src/control/CarCtrl.cpp
# src/control/Replay.cpp
# src/control/Script.cpp
# src/core/Camera.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.cpp
# src/core/MenuScreens.cpp
# src/core/config.h
# src/core/main.cpp
# src/core/re3.cpp
# src/math/Matrix.cpp
# src/math/Matrix.h
# src/math/Vector2D.h
# src/peds/Ped.cpp
# src/render/Credits.cpp
# src/render/Hud.cpp
# src/render/Skidmarks.cpp
# src/weapons/Weapon.cpp
|
2020-09-30 02:25:30 +03:00 |
|
|
shfil
|
35d7591def
|
some SilentPatch fixes
# Conflicts:
# src/core/Camera.cpp
# src/weapons/Weapon.cpp
|
2020-09-30 02:14:10 +03:00 |
|
|
eray orçunus
|
70aac0f460
|
Fixes: PS2/PS2-like menu, Hud, new sliding text found
|
2020-09-27 19:22:21 +03:00 |
|
|
Nikolay Korolev
|
b42d9e3e7c
|
silentpatch fixes
|
2020-09-26 13:30:22 +03:00 |
|
|
Sergeanur
|
827b240078
|
Merge branch 'master' into miami
# Conflicts:
# gamefiles/TEXT/american.gxt
# src/control/Garages.cpp
# src/control/Record.cpp
# src/control/Script.cpp
# src/core/Collision.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.cpp
# src/core/MenuScreens.cpp
# src/core/Streaming.cpp
# src/core/config.h
# src/core/re3.cpp
# src/modelinfo/ModelInfo.cpp
# src/render/Renderer.cpp
# src/save/GenericGameStorage.cpp
# utils/gxt/american.txt
|
2020-08-19 23:34:33 +03:00 |
|
|
Sergeanur
|
a728a542be
|
Graphics menu + MSAA
|
2020-08-16 01:37:09 +03:00 |
|
|
Sergeanur
|
9956b27767
|
Merge branch 'master' into miami
# Conflicts:
# src/control/Darkel.cpp
# src/core/main.cpp
|
2020-08-15 15:13:46 +03:00 |
|
|
Sergeanur
|
e7945625b5
|
Original screen grabber
|
2020-08-14 18:57:23 +03:00 |
|
|
Sergeanur
|
1c1fa25e6c
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# premake5.lua
# src/render/Coronas.cpp
# src/render/Timecycle.cpp
# src/render/Timecycle.h
|
2020-08-10 19:15:51 +03:00 |
|
|
withmorten
|
24a1644b2a
|
don't CoUninitialize for NO_MOVIES
|
2020-08-08 17:12:23 +02:00 |
|
|
withmorten
|
ce0633a0c2
|
remove CoUninitialize calls for FIX_BUGS (fixes PIX crash) and don't check return value for CoInitialize
|
2020-08-07 18:52:33 +02:00 |
|
|
Sergeanur
|
9df1d08348
|
Fixes after merge
|
2020-07-29 15:41:00 +03:00 |
|
|
Sergeanur
|
acdc52116e
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/RpAnimBlend.cpp
# src/audio/oal/stream.cpp
# src/audio/sampman.h
# src/control/Pickups.cpp
# src/core/Collision.cpp
# src/core/Collision.h
# src/core/FileLoader.cpp
# src/core/FileMgr.cpp
# src/core/FileMgr.h
# src/core/Streaming.cpp
# src/core/Streaming.h
# src/core/SurfaceTable.h
# src/modelinfo/VehicleModelInfo.h
# src/peds/Ped.cpp
# src/rw/RwHelper.cpp
# src/rw/RwHelper.h
# src/skel/glfw/glfw.cpp
# src/skel/platform.h
# src/text/Text.cpp
# src/text/Text.h
# src/vehicles/CarGen.cpp
# src/vehicles/Heli.cpp
|
2020-07-29 15:34:57 +03:00 |
|
|
eray orçunus
|
7fea567eb2
|
Fix/change some Windows define
|
2020-07-25 15:24:24 +03:00 |
|
|
eray orçunus
|
199d57b16c
|
Fix/change some Windows define
|
2020-07-25 15:18:15 +03:00 |
|
|
eray orçunus
|
ad6094ca1d
|
90% fixes, 10% skel refactoring
|
2020-07-24 21:02:55 +03:00 |
|
|
eray orçunus
|
732b760829
|
64-bit on Windows
|
2020-07-24 20:26:33 +03:00 |
|
|
eray orçunus
|
1dc6fbda1f
|
64-bit on Windows
|
2020-07-22 18:51:28 +03:00 |
|
|
Sergeanur
|
f882586eb8
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# README.md
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/peds/Ped.cpp
# src/peds/Ped.h
# src/render/Renderer.cpp
# src/vehicles/Plane.cpp
|
2020-07-22 18:29:17 +03:00 |
|
|
eray orçunus
|
f40f44b14e
|
Peds, Hud, CFO 1/2, fixes - including zone names
|
2020-07-22 15:19:22 +03:00 |
|
|
Sergeanur
|
7d51995640
|
Remove hacky way of injecting PS2 matfx on RW 3.3, remove static patcher
|
2020-07-22 03:32:46 +03:00 |
|
|
Sergeanur
|
30384bb4ef
|
Merge branch 'master' into miami
# Conflicts:
# src/render/Credits.cpp
|
2020-07-17 21:15:47 +03:00 |
|
|
Sergeanur
|
e8ded77e27
|
Add fix/workaround for black screen at startup
|
2020-07-17 21:14:48 +03:00 |
|
|
eray orçunus
|
70fa4ab79c
|
Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixes
|
2020-07-06 16:38:00 +03:00 |
|
|
eray orçunus
|
1cea84d2b1
|
Remove console and fix sth
|
2020-07-04 16:01:07 +03:00 |
|
|
eray orçunus
|
ed036df3ce
|
Re-enable console for debugging frontend
|
2020-07-03 05:40:22 +03:00 |
|
|
Sergeanur
|
b26eec5daf
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/soundlist.h
# src/control/Script.cpp
# src/control/ScriptCommands.h
# src/core/Cam.cpp
# src/core/Camera.cpp
# src/core/Camera.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.cpp
# src/core/MenuScreens.cpp
# src/core/Pad.cpp
# src/core/Pad.h
# src/core/config.h
# src/entities/Entity.cpp
# src/render/Credits.cpp
# src/render/Fluff.cpp
# src/render/Hud.cpp
# src/render/MBlur.cpp
# src/render/Timecycle.cpp
# src/skel/glfw/glfw.cpp
# src/skel/win/win.cpp
# src/text/Text.cpp
|
2020-06-29 12:56:50 +03:00 |
|
Fire-Head
|
d9cb9583bf
|
update glfw.cpp
|
2020-06-29 11:04:30 +03:00 |
|
|
Fire-Head
|
63fdcf7e64
|
menu fixes
|
2020-06-29 10:29:02 +03:00 |
|