erorcun
|
b7456c604d
|
Merge pull request #697 from erorcun/miami
CGame done, Peds, fixes
|
2020-08-30 23:24:39 +03:00 |
|
eray orçunus
|
3e549a7d44
|
CGame done, Peds, fixes
|
2020-08-30 12:40:30 +03:00 |
|
aap
|
e0f6459674
|
stupid zone load fix
|
2020-08-30 00:57:00 +02:00 |
|
Fire_Head
|
a8999bbf38
|
Merge pull request #1 from GTAmodding/miami
Miami
|
2020-08-27 20:35:14 +03:00 |
|
Fire-Head
|
a38702a7d2
|
weapons
|
2020-08-27 19:52:43 +03:00 |
|
eray orçunus
|
7658577260
|
CFO fixes
|
2020-08-25 03:27:38 +03:00 |
|
eray orçunus
|
082c4caecf
|
new frontend customization
|
2020-08-25 00:55:57 +03:00 |
|
aap
|
8e7989087d
|
Merge pull request #694 from Sergeanur/miami_CutsceneMgr
CutsceneMgr done
|
2020-08-24 22:46:17 +02:00 |
|
Sergeanur
|
963e85f047
|
Fix
|
2020-08-24 23:01:51 +03:00 |
|
eray orçunus
|
cb813bd1ab
|
Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun
|
2020-08-24 22:36:03 +03:00 |
|
Sergeanur
|
a3322f17d5
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/CutsceneMgr.cpp
# src/audio/AudioLogic.cpp
# src/audio/soundlist.h
# src/core/ControllerConfig.cpp
# src/core/ControllerConfig.h
# src/core/Streaming.cpp
# src/peds/PedChat.cpp
# src/render/Weather.cpp
# src/rw/TexRead.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/Boat.cpp
|
2020-08-24 21:59:32 +03:00 |
|
Sergeanur
|
bbcf3fd7d2
|
CutsceneMgr done
|
2020-08-24 21:52:16 +03:00 |
|
aap
|
56b80cb0ab
|
fixes to zones and vehicle comp rules
|
2020-08-24 17:21:45 +02:00 |
|
aap
|
6c63dfd86d
|
accidentally enabled extended stuff....
|
2020-08-23 13:30:54 +02:00 |
|
aap
|
771235d213
|
weather fixes
|
2020-08-23 13:30:21 +02:00 |
|
aap
|
38a01a59fa
|
CWeather done
|
2020-08-23 13:27:56 +02:00 |
|
aap
|
13c34b0863
|
finished cullzones
|
2020-08-21 13:28:33 +02:00 |
|
aap
|
cc2f13710d
|
fix streaming bug
|
2020-08-21 12:09:45 +02:00 |
|
aap
|
dace79c7c3
|
small streaming fixes
|
2020-08-20 23:45:45 +02:00 |
|
aap
|
a6fe606ce6
|
CStreaming done, hopefully
|
2020-08-20 23:44:40 +02:00 |
|
aap
|
857cef776d
|
Merge pull request #693 from majesticCoding/miami
stable CScriptPaths
|
2020-08-20 23:01:21 +02:00 |
|
Sergeanur
|
73dd29ea3a
|
Cleanup CControllerConfigManager deletion a bit
|
2020-08-20 19:56:02 +03:00 |
|
majestic
|
03c90b7c40
|
stable CScriptPaths
|
2020-08-20 09:44:26 -07:00 |
|
Sergeanur
|
b5ccc721ae
|
Add VEHICLE_FIREWEAPON (disabled by default)
|
2020-08-20 19:40:35 +03:00 |
|
aap
|
517e2ee9a5
|
small fixes
|
2020-08-20 12:55:41 +02:00 |
|
aap
|
764af8735c
|
rw stuff done & other small things
|
2020-08-20 12:53:17 +02:00 |
|
Sergeanur
|
9fd91e6250
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/core/Collision.cpp
# src/core/Streaming.cpp
# src/core/config.h
# src/core/main.cpp
# src/core/re3.cpp
# src/extras/custompipes.cpp
# src/extras/custompipes_d3d9.cpp
# src/extras/custompipes_gl.cpp
# src/extras/shaders/Makefile
# src/extras/shaders/colourfilterVC.frag
# src/extras/shaders/colourfilterVC_fs_gl3.inc
# src/modelinfo/ModelInfo.cpp
# src/modelinfo/PedModelInfo.cpp
# src/modelinfo/SimpleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.cpp
# src/render/Renderer.cpp
# src/rw/VisibilityPlugins.cpp
# src/save/GenericGameStorage.cpp
|
2020-08-19 23:44:08 +03:00 |
|
Sergeanur
|
dab6d6dd6d
|
Merge remote-tracking branch 'origin/miami' into miami
# Conflicts:
# src/core/config.h
|
2020-08-19 23:35:10 +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 |
|
aap
|
bb948904b6
|
small stuff
|
2020-08-19 21:58:00 +02:00 |
|
eray orçunus
|
be638a4973
|
Revert "remove CFO"
This reverts commit 0418ba597b.
|
2020-08-19 20:30:57 +03:00 |
|
aap
|
827ba62671
|
neo pipelines; postfx fix
|
2020-08-19 16:10:22 +02:00 |
|
aap
|
5ac83e4b4c
|
changing silly streaming memory limit
|
2020-08-19 14:58:43 +02:00 |
|
aap
|
76fe1247c8
|
Merge pull request #688 from aap/master
Neo pipelines
|
2020-08-19 14:36:38 +02:00 |
|
Sergeanur
|
4d1cfb7214
|
Island loading cleanup and fix
|
2020-08-19 03:31:42 +03: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 |
|
Nikolay Korolev
|
cc66df18ac
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-08-16 18:41:17 +03:00 |
|
Nikolay Korolev
|
d303c33c2e
|
CarCtrl finished, minor Script things
|
2020-08-16 18:39:11 +03:00 |
|
eray orçunus
|
0418ba597b
|
remove CFO
|
2020-08-16 17:58:40 +03:00 |
|
Sergeanur
|
732681db08
|
Island loading and PS2 alpha test added to options
|
2020-08-16 17:26:44 +03:00 |
|
eray orçunus
|
980dd1b5a1
|
2 new opcodes
|
2020-08-16 17:10:59 +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 |
|
erorcun
|
07038ce88e
|
Merge pull request #686 from erorcun/miami
Stats(except displaying) and PlayerInfo done, Frontend, marker fix
|
2020-08-15 02:28:17 +03:00 |
|
eray orçunus
|
8b3ca9564b
|
Continue to Frontend, fix savegame list bug
|
2020-08-14 22:44:12 +03:00 |
|
Sergeanur
|
e7945625b5
|
Original screen grabber
|
2020-08-14 18:57:23 +03:00 |
|
eray orçunus
|
f403a63a5c
|
Wheelie opcode
|
2020-08-14 18:54:01 +03:00 |
|
Sergeanur
|
28dc67dc86
|
Merge branch 'master' into miami
# Conflicts:
# src/core/Game.cpp
# src/core/re3.cpp
# src/extras/postfx.cpp
# src/extras/postfx.h
# src/extras/shaders/Makefile
# src/render/Clouds.cpp
# src/render/Hud.cpp
# src/render/MBlur.cpp
# src/render/Sprite2d.cpp
|
2020-08-14 13:52:10 +03:00 |
|
eray orçunus
|
b54bb62c94
|
Stats(except displaying), PlayerInfo, marker fix
|
2020-08-14 01:14:04 +03:00 |
|
aap
|
afed831aed
|
extended postfx and sniper hud fix
|
2020-08-13 18:14:24 +02:00 |
|
eray orçunus
|
2034d7b2ae
|
Register start button for real
|
2020-08-13 01:29:34 +03:00 |
|
aap
|
b468d010a8
|
implemented extended postfx
|
2020-08-11 18:40:04 +02:00 |
|
majestic
|
2d1b48267d
|
improved mission switcher
|
2020-08-10 14:04:33 -07: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 |
|
majestic
|
70029752f5
|
CWindModifiers
|
2020-08-09 21:42:12 -07:00 |
|
majestic
|
b73b6b8e13
|
CWindModifiers
|
2020-08-09 12:32:30 -07:00 |
|
aap
|
43bf854374
|
timecycle done
|
2020-08-09 19:11:44 +02:00 |
|
aap
|
0bb46f3f8c
|
rubbish done
|
2020-08-09 16:49:15 +02:00 |
|
aap
|
b02c7cdc44
|
coronas done
|
2020-08-09 13:17:48 +02:00 |
|
Fire-Head
|
d2e090317f
|
static shadows fix, cutscene shadows switches
|
2020-08-08 15:06:45 +03:00 |
|
erorcun
|
8428b99c0d
|
Merge pull request #678 from blingu/master
added support for FreeBSD
|
2020-08-08 14:58:42 +03:00 |
|
blingu
|
4b6cc0188b
|
Update CdStreamPosix.cpp
|
2020-08-07 17:51:15 +02:00 |
|
Sergeanur
|
7d8ffa9ebd
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/RoadBlocks.cpp
# src/core/Collision.h
# src/core/Pad.cpp
# src/core/SurfaceTable.h
# src/core/main.cpp
# src/core/re3.cpp
# src/peds/Population.cpp
# src/render/Fluff.cpp
# src/render/Shadows.cpp
# src/render/Shadows.h
# src/render/Sprite2d.cpp
# src/weapons/BulletInfo.cpp
|
2020-08-07 12:34:41 +03:00 |
|
aap
|
f14b1fba09
|
Merge pull request #675 from erorcun/master
Squeeze performance option, minor fixes
|
2020-08-07 10:18:46 +02:00 |
|
aap
|
0d7fa6df3c
|
Merge pull request #676 from aap/master
VU0 collision
|
2020-08-07 10:18:40 +02:00 |
|
aap
|
40185161b8
|
Merge pull request #670 from Fire-Head/miami
Miami Shadows
|
2020-08-07 10:18:35 +02:00 |
|
blingu
|
7a7b352793
|
added FreeBSD support
|
2020-08-05 14:32:37 +02:00 |
|
Sergeanur
|
456cb01f16
|
Enable PS2 Alpha test Emu in debug menu on RW
|
2020-08-05 13:36:07 +03:00 |
|
aap
|
d801167637
|
Merge pull request #668 from majesticCoding/miami
CEscalators done
|
2020-08-04 12:27:09 +02:00 |
|
majestic
|
394134f774
|
CEscalators done
|
2020-08-03 15:31:42 -07:00 |
|
aap
|
abb640c6b6
|
VU0 collision
|
2020-08-03 17:32:06 +02:00 |
|
eray orçunus
|
e14252914e
|
Squeeze performance option, minor fixes
Fixes are already in miami
|
2020-08-03 16:00:32 +03:00 |
|
Fire-Head
|
224fd77641
|
NULL -> nil
|
2020-07-31 21:21:58 +03:00 |
|
eray orçunus
|
eafa9cc107
|
new opcodes, buyable properties, minor fixes
|
2020-07-30 15:32:34 +03:00 |
|
Sergeanur
|
9df1d08348
|
Fixes after merge
|
2020-07-29 15:41:00 +03:00 |
|
Sergeanur
|
86cc86ac12
|
Merge remote-tracking branch 'origin/master' into miami
|
2020-07-29 15:35:25 +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 |
|
aap
|
e13d80a4eb
|
rename shit
|
2020-07-29 14:31:34 +02:00 |
|
Sergeanur
|
6b92e9e12b
|
Dual pass rendering for RW 3.3
|
2020-07-29 15:24:42 +03:00 |
|
Sergeanur
|
581cb5edfa
|
The real pickup reflection fix
|
2020-07-29 14:56:06 +03:00 |
|
Fire_Head
|
52e77c6634
|
Merge pull request #1 from GTAmodding/miami
Miami
|
2020-07-29 12:20:02 +03:00 |
|
Fire-Head
|
1803dcc873
|
miami shadows
|
2020-07-29 12:17:53 +03:00 |
|
aap
|
fb4de46626
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2020-07-29 09:34:28 +02:00 |
|
eray orçunus
|
c87b639a84
|
Fix casepath chaos
|
2020-07-28 17:56:47 +03:00 |
|
erorcun
|
e47eaa1425
|
Merge pull request #663 from erorcun/master
Fix casepath chaos
|
2020-07-28 17:41:49 +03:00 |
|
eray orçunus
|
eb8844fd11
|
Fix casepath chaos
|
2020-07-28 17:40:12 +03:00 |
|
eray orçunus
|
429f6b03c4
|
CCopPed, except spike traps
|
2020-07-28 17:04:34 +03:00 |
|
aap
|
c0eb3d10e2
|
CCollision done and fixes
|
2020-07-27 15:43:03 +02:00 |
|
aap
|
6b7a8f96a6
|
CCollision done and fixes
|
2020-07-27 15:38:46 +02:00 |
|
aap
|
2e8048d0fe
|
collision fixes
|
2020-07-27 15:38:12 +02:00 |
|
aap
|
90fdc4328b
|
CHeli and CRopes done
|
2020-07-27 14:06:23 +02:00 |
|
Filip Gawin
|
98ec7bdaf9
|
Provide more memory for casepath's arg
|
2020-07-26 00:11:13 +02:00 |
|
Filip Gawin
|
3856b932dd
|
Disable cache for openal for now
|
2020-07-25 20:25:34 +02:00 |
|
eray orçunus
|
199d57b16c
|
Fix/change some Windows define
|
2020-07-25 15:18:15 +03:00 |
|
aap
|
1c44368f0a
|
fixed hanim for 64 bit
|
2020-07-24 23:29:33 +02:00 |
|
aap
|
b5b64ca351
|
fixed hanim for 64 bit
|
2020-07-24 23:28:55 +02:00 |
|
eray orçunus
|
15918feb8e
|
90% fixes, 10% skel refactoring
|
2020-07-24 21:35:04 +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 |
|
Sergeanur
|
bcb2b7a534
|
Add ps2 audio paths
|
2020-07-23 16:15:36 +03:00 |
|
eray orçunus
|
7e32c603fc
|
New math wrappers
from miami
|
2020-07-23 00:31:06 +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 |
|
erorcun
|
b182fa4bb8
|
Merge pull request #656 from erorcun/miami
Peds, Hud, CFO 1/2, fixes - including zone names
|
2020-07-22 18:21:39 +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 |
|
aap
|
0fba76a565
|
made NPC heli rotors rotate
|
2020-07-21 09:58:53 +02:00 |
|
aap
|
5bedca7692
|
fixed COcclusion
|
2020-07-20 23:25:04 +02:00 |
|
eray orçunus
|
70df13f9d3
|
Fixes from miami
|
2020-07-20 22:47:41 +03:00 |
|
aap
|
ee2d0ffc14
|
Merge pull request #650 from majesticCoding/miami
COcclusion done, I hope
|
2020-07-20 19:56:18 +02:00 |
|
aap
|
2612c9f12c
|
CPlaneTrails and CPlaneBanners done
|
2020-07-20 19:50:20 +02:00 |
|
aap
|
efd49962d2
|
avoid UB
|
2020-07-20 19:32:20 +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
|
de8759eabd
|
Merge branch 'master' into miami
# Conflicts:
# src/control/Record.cpp
# src/vehicles/Automobile.cpp
|
2020-07-17 13:53:11 +03:00 |
|
Sergeanur
|
949d0c8853
|
Add audio cache for faster initialization
|
2020-07-17 13:48:25 +03:00 |
|
aap
|
4e3e1d0b87
|
make game load all platform dffs
|
2020-07-16 13:36:25 +02: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
|
841fa5155c
|
Rename LEVEL_NONE to LEVEL_GENERIC
|
2020-07-13 17:43:09 +03:00 |
|
Sergeanur
|
6eb8f6ae5a
|
Add cutscene borders switch to the menu
|
2020-07-11 12:04:26 +03:00 |
|
eray orçunus
|
00bba630f6
|
enable island loading for now
|
2020-07-10 12:28:00 +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
|
cf69f22a0c
|
Remove island loading
|
2020-07-09 19:18:42 +03:00 |
|
eray orçunus
|
67a3c7d2ee
|
VC fighting, Peds, many fixes including ghost bikes
|
2020-07-09 17:01:07 +03:00 |
|
eray orçunus
|
c483a044b5
|
Noskillx's PR + fix .set loading
|
2020-07-06 19:26:41 +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
|
ceb1defc4e
|
fixes from master, menu helper text
|
2020-07-04 23:50:43 +03:00 |
|
aap
|
0acade08ca
|
Merge pull request #647 from Fire-Head/miami
miami CParticleObject
|
2020-07-04 21:24:17 +02:00 |
|
eray orçunus
|
15548758ac
|
Bettah car enter canceling, fix CFO crash, ped objs. renaming
|
2020-07-03 16:51:33 +03:00 |
|
eray orçunus
|
ed036df3ce
|
Re-enable console for debugging frontend
|
2020-07-03 05:40:22 +03:00 |
|
Fire-Head
|
d4004805f5
|
miami pobj
|
2020-07-03 02:18:06 +03:00 |
|
Nikolay Korolev
|
01b15fe807
|
reenabled script logging
|
2020-07-03 01:28:41 +03:00 |
|
Filip Gawin
|
bf2624692c
|
Fix displaying stats
|
2020-07-03 00:04:49 +02:00 |
|
eray orçunus
|
c4cd210ae0
|
Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixes
|
2020-07-02 16:01:42 +03:00 |
|
aap
|
2141247e08
|
CBoat and friends
|
2020-07-01 18:04:02 +02:00 |
|
Nikolay Korolev
|
ade5dff217
|
script logging for miami
|
2020-07-01 15:43:19 +03:00 |
|
erorcun
|
eda50bc32b
|
Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)
|
2020-07-01 15:28:43 +03:00 |
|
Sergeanur
|
87fa69385c
|
remove TheText.Load() from CGame::Initialise
|
2020-06-30 07:48:09 +03:00 |
|
Sergeanur
|
6f81e84bd4
|
Restore original code of CControllerState::CheckForInput
|
2020-06-30 07:44:51 +03:00 |
|
Sergeanur
|
c80bdf3a2a
|
Rename IsAnyButtonPressed to CheckForInput
|
2020-06-30 07:43:55 +03:00 |
|
aap
|
94ce376a76
|
cleanup
|
2020-06-29 12:12:43 +02: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
|
63fdcf7e64
|
menu fixes
|
2020-06-29 10:29:02 +03:00 |
|
Fire_Head
|
860f75d66c
|
Merge branch 'master' into ps2menu
|
2020-06-29 09:37:53 +03:00 |
|
aap
|
3370ae04cb
|
renamed 2dfx shadowRange to Size
|
2020-06-28 12:08:46 +02:00 |
|
aap
|
418bee9c22
|
renamed 2dfx shadowRange to Size
|
2020-06-28 12:05:42 +02:00 |
|
Nikolay Korolev
|
d6e111bb67
|
script logging fixes
|
2020-06-28 11:59:20 +03:00 |
|
Fire-Head
|
b8f633de24
|
fixes
|
2020-06-28 01:57:01 +03:00 |
|