f6910d35f7
Merge branch 'miami' into lcs
...
# Conflicts:
# README.md
# premake5.lua
# src/audio/MusicManager.cpp
# src/core/main.cpp
# src/core/re3.cpp
# src/extras/postfx.cpp
# src/render/Font.cpp
2021-02-26 11:07:32 +02:00
946be081b0
Get keyboard input from X11 on Linux
2021-02-19 00:23:14 +03:00
037c332158
Merge remote-tracking branch 'origin/miami' into lcs
2021-02-18 02:38:12 +01:00
0810abd294
update librw; get rid of glew
2021-02-17 13:14:26 +01:00
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
80e4b3db55
Fix sha1 on premake linux
2021-02-12 21:10:39 +03:00
0c60ceeb33
Cmake version for hash
2021-02-12 21:09:46 +03:00
2c784d979a
Remove version text, add toggleable debug info(with commit hash!)
2021-02-12 21:09:23 +03:00
84ede57205
startproject now depends on librw
2021-02-10 18:48:43 +01:00
1525b105e2
reduce warnings in msvc librw build
2021-02-03 23:29:25 +01:00
ef28d12d85
fix gcc/clang build by adding -fpermssive and -Wno-address-of-temporary
2021-02-02 14:27:21 +01:00
3948a1f726
add Vanilla config to premake and premake CI
2021-01-26 11:30:46 +01:00
c884edd923
cSmallHeap
2021-01-23 00:03:12 +02:00
ba0b06f268
small premake fix
2021-01-22 16:40:17 +01:00
1d3e84b712
small premake fix
2021-01-22 16:39:28 +01:00
4bd7bafd7c
Merge branch 'miami' into lcs
...
# Conflicts:
# .github/workflows/reLCS_msvc_amd64.yml
# .github/workflows/reLCS_msvc_x86.yml
# premake5.lua
# src/control/Script2.cpp
# src/control/Script8.cpp
2021-01-15 17:57:35 +02:00
d1b2dd2831
remove scriptspath from premake
2021-01-13 14:59:30 +01:00
dacd389799
remove scriptspath from premake
2021-01-13 14:49:21 +01:00
cb4b4d584c
Merge branch 'miami' into lcs
...
# Conflicts:
# src/control/Script.cpp
# src/control/Script3.cpp
# src/extras/custompipes_d3d9.cpp
# src/extras/custompipes_gl.cpp
2021-01-12 12:55:07 +02:00
75367e714a
premake: add startrpoject; add lto option; fix copying of binary to gamedir; update premake5.exe
...
# Conflicts:
# premake5.lua
2021-01-12 12:43:42 +02:00
ead2a1a606
MemoryManager of base::
2021-01-08 16:47:41 +02:00
0e2af13656
Merge branch 'miami' into lcs
...
* miami:
wtf
fix
small cleanup
Fix gOneShotCol
Fix garage messages position
Fix font on green screen counter
Add MPG123_QUIET to mp3 files
Make opus available alongside other formats
Fix pickup text
Fix char in stats
Add missing GXT line
fail
minor refactoring
Fix 16KHz track
GET_WHEELIE_STATS fix
Cleanup and fixes for new decoders
Fixes for CVbFile
Small fixes for new wav decoder
Remove fastmath from premake's config
Implementing our own WAV decoder to replace SndFile
2021-01-08 14:47:37 +02:00
ebdf08a514
first commit for LCS
2021-01-08 01:41:40 +01:00
d9e2b1f0de
Remove fastmath from premake's config
2021-01-06 17:24:22 +01:00
3a59d9075f
Move mss dummy headers into vendor
2020-12-29 19:20:36 +01:00
be92b57b54
buildings directory
...
# Conflicts:
# premake5.lua
2020-12-20 12:40:59 +02:00
b9b7d5ac21
Merge pull request #825 from aap/miami
...
neo screen droplets
2020-11-22 00:12:31 +01:00
07fe099b4e
neo screen droplets
2020-11-19 19:07:32 +01:00
4091d00057
Add non-amd64 architectures for bsd
2020-11-18 17:12:57 +03:00
9bb8ebaa10
Make collision code placement more like original (+ small fixes)
...
# Conflicts:
# premake5.lua
# src/CMakeLists.txt
# src/collision/Collision.cpp
# src/core/Collision.h
2020-11-16 00:36:54 +02:00
0d55b6182a
Merge pull request #795 from withmorten/master
...
enable static runtime for all windows builds; fast floating point for x86/x64 builds; no sized dealloc for windows builds
# Conflicts:
# premake5.lua
# src/core/config.h
2020-11-05 16:38:02 +02:00
a25005a84c
Add option to enable asan
...
# Conflicts:
# premake5.lua
2020-10-28 10:10:44 +02:00
b98864d134
Radar, WaterCannon, win/glfw skels
2020-10-17 17:35:26 +03:00
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
ef9455c324
premake5: Place macosx-amd64 after arm64
...
Fixes xcode4 project from Premake getting the wrong target (for now).
2020-10-08 17:53:14 +03:00
d590fdddf6
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-10-08 17:51:43 +03:00
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
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
35656fe0e8
Add target arm64
...
# Conflicts:
# premake5.lua
2020-09-30 02:16:50 +03:00
6cfac662a1
Add target arm64
2020-09-27 00:32:14 +02:00
0ae41be16b
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# librw
2020-08-14 14:35:54 +03:00
e1ca6c6b79
Move stuff to vendor
2020-08-14 14:22:50 +03:00
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
c50160a992
fixed line formatting
2020-08-08 13:07:55 +02:00
2af22cfabc
Update premake5.lua
2020-08-08 12:49:38 +02:00
47b7d4a53a
Update premake5.lua
2020-08-05 14:40:56 +02:00
99d8e12207
added partial bsd support (FreeBSD)
2020-08-05 14:28:12 +02:00
3e24ae8812
Merge branch 'master' into miami
...
# Conflicts:
# premake5.lua
# sdk/rwsdk/include/d3d8/baaplylt.c
# sdk/rwsdk/include/d3d8/rpstereo.h
# sdk/rwsdk/include/d3d8/rpstereo.rpe
# sdk/rwsdk/include/d3d8/rtintel.h
# sdk/rwsdk/include/d3d8/rtintel.rpe
# src/audio/oal/stream.cpp
2020-08-02 19:49:12 +03:00
a786dd45a4
Move sdk and eax
2020-08-02 19:36:50 +03:00
0009558fcb
Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun
2020-07-29 19:32:37 +03:00
