Commit Graph

3299 Commits

Author SHA1 Message Date
Roman Masanin
55d94c99b8 Merge remote-tracking branch 'upstream/miami' into miami 2020-10-03 01:52:37 +03:00
majestic
3a2be9a4ed Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-02 13:43:29 -07:00
erorcun
fa65cf6017
Merge pull request #736 from Krutonium/master
Readme Adjustments
2020-10-02 21:35:47 +03:00
eray orçunus
3bd3330227 Load and write our settings in re3.ini & fixes 2020-10-02 21:18:34 +03:00
shfil
9d53b738cc
Merge pull request #737 from theR4K/miamiDev
just ProcessActiveQueues
2020-10-02 20:11:00 +02:00
Nikolay Korolev
8761763d95 fixed cargen check 2020-10-02 20:43:24 +03:00
Roman Masanin
1991f9b362 revert some changes and little fix 2020-10-02 20:35:16 +03:00
erorcun
72f342245d
Merge pull request #731 from erorcun/miami
Population done, mouse AUX buttons, Frontend, Hud, fixes
2020-10-02 17:39:15 +03:00
Roman Masanin
6ff138ca76 fix build(bcs func CheckForAnAudioFileOnCD not used anymore) 2020-10-02 05:03:29 +03:00
Roman Masanin
064f2e66e1 letter 'c' is done 2020-10-02 04:59:06 +03:00
Roman Masanin
e5a48faf89 merged from upstream 2020-10-02 04:03:17 +03:00
Roman Masanin
63e5faef11 rewieved some audio functions 2020-10-02 03:55:26 +03:00
Andrew Udvare
f6bc2b654c
CdStreamPosix: fix type issues 2020-10-01 20:45:38 -04:00
Andrew Udvare
34579ae9c3
premake5: Place macosx-amd64 after arm64
Fixes xcode4 project from Premake getting the wrong target (for now).
2020-10-01 20:44:33 -04:00
Roman Masanin
e54b540bd4 final processActiveQueues 2020-10-02 00:11:51 +03:00
Roman Masanin
311cffa901 second pass processActiveQueues 2020-10-01 23:48:35 +03:00
Roman Masanin
eb0e89d3ea half done processActiveQueues 2020-10-01 23:11:20 +03:00
Sergeanur
db8e7dbaff New gxt lines 2020-10-01 15:10:16 +03:00
majestic
2f9dd8bad9 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-01 05:02:53 -07:00
Andrew Udvare
bbb578c5b1
core/CdStreamPosix: switch to named semaphores to support macOS
macOS does not support unnamed semaphores. The functions return ENOSYS.
2020-10-01 03:21:06 -04:00
Roman Masanin
049c993ce0 fix ternary operator 2020-10-01 02:45:24 +03:00
Roman Masanin
fe46aa5cc2 better flying cars, some refractoring and fixes 2020-10-01 02:20:09 +03:00
Andrew Udvare
01ea7801fd
macOS support; thanks to @MrYadro
This should support ARM64 and x86-64.
-target flag based on information from
https://developer.apple.com/documentation/xcode/building_a_universal_macos_binary#3618377.
2020-09-30 15:40:28 -04:00
eray orçunus
ee3f5744f5 Merge branch 'master' of github.com:erorcun/re3 2020-09-30 20:54:42 +03:00
eray orçunus
595421da39 Fixes, mouse AUX buttons, joystick detect menu 2020-09-30 20:03:01 +03:00
Filip Gawin
4ec5e44b68 Mark audio code which is the same in re3 as done 2020-09-30 18:14:50 +02:00
Nikolay Korolev
1666995cd9 fixed bad bug 2020-09-30 16:29:39 +03:00
Nikolay Korolev
0a58e3e430 fixed bad bug 2020-09-30 16:25:21 +03:00
Nikolay Korolev
4c582b19eb Merge remote-tracking branch 'upstream/miami' into miami 2020-09-30 15:19:55 +03:00
Nikolay Korolev
6068188453 Merge remote-tracking branch 'upstream/miami' into miami 2020-09-30 15:19:37 +03:00
Krutonium
786ce15ab0 Separate Coding Style out into its own Document, and mention it from the Readme. 2020-09-30 06:54:57 -04:00
Roman Masanin
db0758690e new implementation for car fly enhancment 2020-09-30 13:37:43 +03:00
majestic
d4efd003bc Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-09-30 03:13:32 -07: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
Filip Gawin
73e4350320 Use Const instead of const (last commit) 2020-09-30 02:19:04 +03:00
Filip Gawin
6c59d97520 Fix warning ISO C++11 does not allow conversion from string literal to
'char *
2020-09-30 02:18:55 +03:00
Filip Gawin
855c6a3c05 Fix build (if -> ifdef) 2020-09-30 02:18:46 +03:00
Filip Gawin
ff2998bee3 Make frequency more consistent with vanilla 2020-09-30 02:18:38 +03:00
Sergeanur
2129cc2906 Fix arg types 2020-09-30 02:18:11 +03:00
Nikolay Korolev
9cce324316 fixed cargen
# Conflicts:
#	src/vehicles/CarGen.cpp
2020-09-30 02:18:03 +03:00
shfil
f35fd97c76 Merge pull request #722 from theR4K/master
fix for frequency miscalculation
2020-09-30 02:17:14 +03:00
Filip Gawin
35656fe0e8 Add target arm64
# Conflicts:
#	premake5.lua
2020-09-30 02:16:50 +03:00
shfil
35d7591def some SilentPatch fixes
# Conflicts:
#	src/core/Camera.cpp
#	src/weapons/Weapon.cpp
2020-09-30 02:14:10 +03:00
erorcun
f9dc00a458
Merge pull request #718 from Nick007J/miami
VC replays
2020-09-29 23:00:50 +03:00
erorcun
1fa852f118
Merge pull request #727 from erorcun/miami
Restore All Cars are Heli cheat
2020-09-29 22:42:08 +03:00
Filip Gawin
8235fe08d1 Fix more 2020-09-29 17:47:48 +02:00
Filip Gawin
e324f3dac0 Some more const 2020-09-29 17:43:34 +02:00
Filip Gawin
874b31d82b Use Const instead of const (last commit) 2020-09-29 17:27:36 +02:00