Commit Graph

381 Commits

Author SHA1 Message Date
quaK
a11193d7bb Fix crash
Co-Authored-By: fed <58637860+fedddddd@users.noreply.github.com>
2021-03-22 22:04:31 +02:00
Maurice Heumann
a911e74366
Merge pull request #44 from XLabsProject/dependabot/submodules/deps/asmjit-a4dd0b2
Bump deps/asmjit from `e7a7280` to `a4dd0b2`
2021-03-22 20:40:13 +01:00
quaK
c4e2eec77a Merge branch 'feature/scripting' of https://github.com/XLabsProject/s1x-client into feature/scripting 2021-03-22 19:35:20 +02:00
quaK
c02c41b882
Merge pull request #42 from fedddddd/scripting
Player killed/damage callbacks
2021-03-22 18:48:06 +02:00
dependabot-preview[bot]
296851a00a
Bump deps/asmjit from e7a7280 to a4dd0b2
Bumps [deps/asmjit](https://github.com/asmjit/asmjit) from `e7a7280` to `a4dd0b2`.
- [Release notes](https://github.com/asmjit/asmjit/releases)
- [Commits](e7a728018e...a4dd0b2d8b)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-22 07:02:56 +00:00
Federico Cecchetto
af0b3040a9 Fix address 2021-03-21 22:15:34 +01:00
Federico Cecchetto
18f3bd707a Fix 2021-03-21 22:02:21 +01:00
Federico Cecchetto
9dfdd67767 Fix 2021-03-21 19:26:45 +01:00
Federico Cecchetto
a59e072387 Add player killed/damage callbacks 2021-03-21 19:12:11 +01:00
quaK
90b7884024 Merge branch 'develop' into feature/scripting 2021-03-21 17:58:28 +02:00
Maurice Heumann
07f0c89ee3
Merge pull request #41 from sortileges/new-assets
Uploading new artworks + resources
2021-03-21 16:45:35 +01:00
Sass
7d3930e256
Add files via upload 2021-03-21 16:42:22 +01:00
Maurice Heumann
bb485252a3
Merge pull request #40 from Joelrau/feature/quaK
Minor fixes
2021-03-21 14:33:27 +01:00
quaK
212d9a58b6 Minor fixes
- fixes /map command on the same map disconnecting
- fixes disconnect with virtuallobby on
2021-03-21 15:24:17 +02:00
Maurice Heumann
d19b30aa1d Update readme 2021-03-21 12:14:30 +01:00
m
3ed6f202ae
1 line instead of 2 nasty ones 2021-03-21 06:11:17 -05:00
m
dbdc57ed41
added "Firing Range" state. pretty cool 2021-03-21 06:10:58 -05:00
m
23bb31f7ed
using wrong functions. map & gametype display now 2021-03-21 06:10:31 -05:00
Maurice Heumann
09395ace59 Update asmjit 2021-03-21 12:05:58 +01:00
Maurice Heumann
a71b8a97b4 Remove patch_common check
This should fix #39
2021-03-21 11:25:17 +01:00
quaK
9eabca0617 Revert "Ignore G_FindConfigstringIndex: overflow"
This reverts commit 993a0ce70e.
2021-03-17 06:42:08 +02:00
quaK
63473b92c5 Merge branch 'develop' into feature/scripting 2021-03-15 20:05:14 +02:00
quaK
d362a8ade3 Fixes
fix lua crashes.

Co-Authored-By: fed <58637860+fedddddd@users.noreply.github.com>
2021-03-15 04:33:26 +02:00
quaK
993a0ce70e Ignore G_FindConfigstringIndex: overflow
hud:settext("text") will give an error in at least map mp_zombie_brg. The error can be ignored and everything works fine.
2021-03-15 03:36:42 +02:00
Maurice Heumann
206e015463
Merge pull request #37 from fedddddd/scripting
Chat notifies
2021-03-14 18:47:14 +01:00
Federico Cecchetto
9a3197e97e Chat notifies 2021-03-14 18:34:29 +01:00
m
d883651154
temp image 2/2 + image text 2021-03-13 22:25:55 -06:00
m
58cfa86fed
no partySize as of now (cgArray) 2021-03-13 22:25:25 -06:00
m
93d31f905d
temp image 1/2 2021-03-13 22:24:43 -06:00
m
086a54987d
change the checks for main menu 2021-03-13 22:24:22 -06:00
Maurice Heumann
c02bc0f1b8 Use concurrency container 2021-03-14 00:23:15 +01:00
momo5502
e4ba21f752 Get updates from server 2021-03-14 00:05:17 +01:00
Maurice Heumann
d01ab885f4
Merge pull request #32 from iAmThatMichael/changes
Add listassetpool, consoleList, fix various problems
2021-03-13 19:48:56 +01:00
Michael Akopyan
107907f003 make listassetpool use game function to iterate specified asset pool
Co-Authored-By: Maurice Heumann <MauriceHeumann@gmail.com>
2021-03-13 10:35:18 -08:00
m
e2e1a9b2de
assign temp values for partySize + state 2021-03-13 10:03:59 -06:00
m
a2ab4a01d7
add discord presence 2021-03-13 09:55:43 -06:00
quaK
9edebe817c
Merge pull request #34 from fedddddd/scripting
More custom fields support
2021-03-13 16:07:29 +02:00
Federico Cecchetto
ea733bba53 More custom fields support 2021-03-13 15:02:31 +01:00
Maurice Heumann
315c159a1b
Merge pull request #33 from Joelrau/develop
Allow kbam while gamepad is enabled & Logger stuff
2021-03-13 10:50:31 +01:00
quaK
3659fbeaee Fix scripting array
Co-Authored-By: fed <58637860+fedddddd@users.noreply.github.com>
2021-03-13 02:45:04 +02:00
quaK
aa0b29c56e Add scripting array support 2 2021-03-13 02:36:37 +02:00
quaK
3957ad2ce9 Add scripting array support 2021-03-13 02:35:59 +02:00
quaK
9292c857aa Add more logging stuff 2021-03-13 00:58:24 +02:00
quaK
3b238d8363 Allow kbam input when gamepad is enabled 2021-03-13 00:57:47 +02:00
quaK
d04a8fd19e Add custom field support 2021-03-13 00:48:41 +02:00
quaK
51f0742ef8 Fix load_game_constants 2021-03-13 00:42:41 +02:00
Michael Akopyan
46406fac62 simplify listassetpool, move core logic to its own function 2021-03-11 23:34:01 -08:00
Michael Akopyan
789690d981 requested formatting changes 2021-03-11 23:01:53 -08:00
Michael Akopyan
13bdb043f6 modify consoleList to use game_console functionality
- also move game_console find_matches & match_compare out of anon namespace
2021-03-11 22:58:11 -08:00
Michael Akopyan
8663a927cd remove unnecessary captured variable
- move vector lower to where matches is used
- auto stuff
2021-03-11 18:13:15 -08:00