Commit Graph

188 Commits

Author SHA1 Message Date
Sergeanur
30bc51ae9e Pad2 fix 2021-01-02 13:42:49 +02:00
Sergeanur
42e4a068bb CVarConsole 2021-01-02 13:32:25 +02:00
aap
426364b961 fix custom pipes mem leak 2020-12-29 20:31:06 +01:00
erorcun
9afcc355ff Dynamically add pipelines options, only if neo.txd exists 2020-12-27 23:26:00 +03:00
aap
013e9b9992 fix backface culling 2020-12-27 19:53:10 +01:00
aap
688e277e89 fix mblur stencil 2020-12-26 13:02:30 +01:00
aap
fb97335d9f push/pop memids 2020-12-21 12:34:29 +01:00
aap
f60b450ee8 main.cpp mostly checked against ps2 now 2020-12-20 19:13:37 +01:00
aap
036263993e ps2 fixes 2020-12-20 17:35:46 +01:00
aap
fc312113d2 some PS2 things 2020-12-20 14:27:48 +01:00
Nikolay Korolev
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap
a7050458ae little cleanup and synch on templates and config 2020-12-18 13:50:26 +01:00
aap
cc5af26417 PreAllocateRwObjects 2020-12-17 12:47:00 +01:00
aap
e8fe09cf23 another fix for new renderer 2020-12-13 23:09:19 +01:00
aap
35cac6b93b some rendering things 2020-12-13 12:53:19 +01:00
erorcun
b473adcf80 Frontend cleanup, .INI, CFO, scrollable pages 2020-12-09 06:32:33 +03:00
erorcun
e1044a7947 AnimViewer fixes, commentary from miami 2020-12-09 05:10:57 +03:00
aap
9714a37769 bit more GTA_VERSION and GTA_PS2 2020-12-04 01:12:58 +01:00
erorcun
ab3e810a95 AnimViewer done, comment cleanup 2020-12-03 05:22:58 +03:00
Nikolay Korolev
fda58fb1df added GTA_SCENE_EDIT 2020-12-02 02:34:51 +03: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
aap
4b9fb631fc added a few registered pointers and memory debug 2020-11-30 23:44:58 +01: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
erorcun
b7783b19d2 Xbox message screen, disabled by default 2020-11-24 01:45:54 +03:00
aap
b9b7d5ac21
Merge pull request #825 from aap/miami
neo screen droplets
2020-11-22 00:12:31 +01:00
aap
07fe099b4e neo screen droplets 2020-11-19 19:07:32 +01:00
aap
02c7f8381b neo screen droplets 2020-11-19 16:23:52 +01:00
erorcun
54214dd2c4 Fix mouse lock/high-dpi 2020-11-18 17:42:21 +03:00
erorcun
3b1debaa0d Fix mouse lock/high-dpi 2020-11-16 15:28:10 +03:00
aap
ff44f29616 ped fix for new renderer 2020-11-11 14:42:02 +01:00
aap
546ed0ff07 changes to RW layer so loading foreign files works 2020-11-11 09:42:30 +01:00
erorcun
59f9c009ef Font: Hud: Use orig. text dimensions, fix right-align calculations 2020-11-10 01:50:34 +03:00
erorcun
f8367ebdef Revert "Font: Fix text dimensions"
This reverts commit 6729de49b1.
2020-11-08 21:11:55 +03:00
aap
092f32ba67 move stuff into define 2020-11-07 12:52:11 +01:00
aap
67c894cda9 more fixes to new renderer 2020-11-04 23:11:27 +01:00
aap
244b91ee80 fixed boats for new renderer 2020-11-04 16:22:15 +01:00
aap
3c5bb4e8f3 new LCS-style renderer 2020-11-03 20:33:07 +01:00
erorcun
770a1f8012
Merge pull request #789 from erorcun/master
rewrite CFO + postfx/pipeline options
2020-11-03 01:43:53 +03:00
aap
3665a82418 Merge pull request #792 from withmorten/master
fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ...
# Conflicts:
#	src/core/Frontend.cpp
2020-10-31 19:21:10 +02:00
withmorten
e95516032f fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL, add extra defines for menu and game version text 2020-10-29 19:18:46 +01:00
erorcun
922d06ab1f rewrite CFO + postfx/pipeline options 2020-10-28 15:05:04 +03:00
erorcun
6729de49b1 Font: Fix text dimensions 2020-10-25 20:57:24 +03:00
aap
537c0960fe clean up timebar ifdefs 2020-10-25 16:17:31 +01:00
aap
e3a1041a47 clean up timebar ifdefs 2020-10-25 16:17:30 +01:00
erorcun
08d78fb6ff Timer, main 2020-10-23 04:26:52 +03:00
Roman Masanin
881db86895 CSpecialFX and some other classes 2020-10-09 20:29:38 +03:00
Sergeanur
c3d7a73c0b Fix OpenGL Z-write
# Conflicts:
#	src/core/main.cpp
2020-09-26 00:26:43 +03:00
Sergeanur
0ce8082bda Fix OpenGL Z-write 2020-09-26 00:25:39 +03:00
eray orçunus
3e549a7d44 CGame done, Peds, fixes 2020-08-30 12:40:30 +03:00
aap
a6fe606ce6 CStreaming done, hopefully 2020-08-20 23:44:40 +02:00
aap
764af8735c rw stuff done & other small things 2020-08-20 12:53:17 +02:00
aap
827ba62671 neo pipelines; postfx fix 2020-08-19 16:10:22 +02:00
aap
e3405f4be4 Merge branch 'master' of github.com:gtamodding/re3 2020-08-18 11:09:50 +02:00
aap
c556cbbbe0 neo pipelines 2020-08-18 10:58:15 +02: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
aap
b02c7cdc44 coronas done 2020-08-09 13:17:48 +02:00
eray orçunus
e14252914e Squeeze performance option, minor fixes
Fixes are already in miami
2020-08-03 16:00:32 +03:00
eray orçunus
429f6b03c4 CCopPed, except spike traps 2020-07-28 17:04:34 +03:00
aap
ee2d0ffc14
Merge pull request #650 from majesticCoding/miami
COcclusion done, I hope
2020-07-20 19:56:18 +02:00
majestic
1ff27e3363 cosmetic fixes 2020-07-20 09:49:39 -07:00
Sergeanur
87eb96453a Add compatibility with RW 3.4 2020-07-18 13:30:51 +03:00
Sergeanur
d0f5464200 Merge branch 'master' into miami
# Conflicts:
#	src/control/CarAI.cpp
#	src/control/Phones.cpp
#	src/control/Phones.h
#	src/control/Record.cpp
#	src/control/Restart.cpp
#	src/control/Script.cpp
#	src/core/Collision.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.h
#	src/core/Streaming.cpp
#	src/core/TempColModels.cpp
#	src/core/Wanted.cpp
#	src/core/Zones.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/entities/Entity.cpp
#	src/entities/Physical.cpp
#	src/extras/frontendoption.cpp
#	src/modelinfo/ModelInfo.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/CivilianPed.cpp
#	src/peds/CopPed.cpp
#	src/peds/EmergencyPed.cpp
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/peds/Population.cpp
#	src/render/Renderer.cpp
#	src/save/GenericGameStorage.cpp
#	src/skel/win/win.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Boat.cpp
#	src/vehicles/Boat.h
#	src/vehicles/Vehicle.cpp
2020-07-13 18:10:17 +03:00
Sergeanur
6eb8f6ae5a Add cutscene borders switch to the menu 2020-07-11 12:04:26 +03:00
eray orçunus
aabf0f4c2c keep loading screen, but for a second 2020-07-09 21:48:43 +03:00
Sergeanur
c012e5a7ff Disable loading screen 2020-07-09 20:40:15 +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
860f75d66c
Merge branch 'master' into ps2menu 2020-06-29 09:37:53 +03:00
Fire-Head
1c11a8081f mips overdose 2020-06-28 00:01:51 +03:00
aap
d5515c9d0e cleaned up and updated animviewer; fixed animation bug 2020-06-08 13:01:23 +02:00
eray orçunus
e07b6fdce7 Message box, letterbox and ped attaching 2020-06-07 21:44:54 +03:00
Fire-Head
9c0adf6a8f Revert "FONT_BANK renamed to FONT_STANDARD"
This reverts commit 552205dfba.
2020-06-07 05:03:06 +03:00
Sergeanur
1c01899799 Merge branch 'master' into miami
# Conflicts:
#	src/control/Garages.cpp
#	src/core/Frontend.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Train.cpp
2020-06-07 04:15:10 +03:00
Sergeanur
552205dfba FONT_BANK renamed to FONT_STANDARD 2020-06-07 04:10:06 +03:00
Sergeanur
509ca11d76 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/control/GameLogic.cpp
#	src/control/PathFind.cpp
#	src/control/RoadBlocks.cpp
#	src/control/Script.cpp
#	src/control/Script.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/core/TempColModels.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.h
#	src/render/Skidmarks.h
#	src/render/WaterLevel.cpp
#	src/save/GenericGameStorage.h
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/DamageManager.cpp
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
2020-06-03 01:24:08 +03:00
aap
7c7727e7da fixed timebar toggle 2020-06-01 13:21:19 +02:00
rollschuh2282
20cacb18f0
Add files via upload 2020-05-29 12:03:32 +02:00
eray orçunus
329a387fdf Frontend customization functions, freecam toggle, minor things 2020-05-28 11:34:12 +03:00
Fire-Head
63d0bdc863 VC Water 2020-05-27 21:50:01 +03:00
eray orçunus
14755a4ff4 all my fixes live in exes 2020-05-24 16:41:29 +03:00
eray orçunus
4870d9a31b Menu borders and weapon fixes 2020-05-24 03:05:48 +03:00
aap
9313bfa155 skeleton typos 2020-05-23 11:34:48 +02:00
aap
e2d3ef449c skeleton typos 2020-05-23 11:34:40 +02:00
erorcun
8b82e9c40f
Merge pull request #574 from Xinerki/miami
many additions
2020-05-22 15:49:37 +03:00
eray orçunus
a5f23a0342 VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +03:00
Xinerki
1c00e3cf2c vehicle cheats and debug cheat string display 2020-05-21 17:28:03 +03:00
aap
13903d7c46 radar sprites 2020-05-17 22:21:39 +02:00
aap
a0703fd9e1 loading screens 2020-05-17 19:45:21 +02:00
Sergeanur
7c2b9478d5 Merge branch 'master' into miami
# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
2020-05-13 00:55:52 +03:00
Sergeanur
33dfaf7da1 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	premake5.lua
#	src/core/ZoneCull.cpp
#	src/core/Zones.cpp
#	src/objects/CutsceneHead.cpp
#	src/render/Clouds.cpp
2020-05-13 00:27:15 +03:00
Filip Gawin
c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
aap
bcd2f8c64c remove debug shit 2020-05-12 20:44:37 +02:00
aap
98a233da43 little fixes to CClouds; disabled object clipping for SA cam 2020-05-12 16:36:23 +02:00
eray orçunus
8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +03:00
aap
d4250fc2c7 CRenderer 2020-05-11 17:03:44 +02:00
Sergeanur
35c41208f5 Merge branch 'master' into miami
# Conflicts:
#	src/animation/AnimManager.cpp
#	src/control/CarCtrl.cpp
#	src/control/Curves.cpp
#	src/core/templates.h
2020-05-10 01:26:12 +03:00
Sergeanur
28103775ba Place debug menu under ifdef 2020-05-09 16:06:13 +03:00
aap
68d3ea9c42 getting the vice city map to work 2020-05-05 23:27:43 +02:00
aap
ac19de45b8 few fixes 2020-04-25 00:41:17 +02:00