Commit Graph

14878 Commits

Author SHA1 Message Date
Menshin
eb707ea9b6 Prevent stacks multiplier href exploit 2014-10-14 18:34:53 +02:00
Chinsky
c4bc6c3075 Merge pull request #6707 from Mloc/bs12-overflow
fixes #6299
2014-10-14 01:15:03 +04:00
Chinsky
d4b7e2d84b Merge pull request #6709 from Mloc/bs12-server
testing fix for nui resources
2014-10-14 01:14:54 +04:00
Mloc
c6c691bfd9 fixes #6299
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-13 20:35:56 +01:00
Mloc-Argent
61839da570 testing fix for nui resources
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-10-13 20:01:54 +01:00
Zuhayr
72924e80a5 Merge pull request #6666 from GinjaNinja32/nanoui
Move NanoUI cache update to client/New()
2014-10-12 04:40:34 +10:30
GinjaNinja32
08b967c9e0 Move NanoUI cache update to client/New() 2014-10-11 18:40:09 +01:00
Chinsky
d3e19fb25a Merge pull request #6652 from PsiOmegaDelta/Centcom
Fixes #6648
2014-10-11 02:46:49 +04:00
Chinsky
3918518f5f Merge pull request #6653 from GinjaNinja32/sleeper
Fixes runtime caused by missing check in sleeper code
2014-10-11 02:46:44 +04:00
Chinsky
513df67d5f Merge pull request #6650 from mwerezak/grab
Fixes #6647
2014-10-11 02:44:59 +04:00
GinjaNinja32
1052c9a476 Fixes runtime caused by missing check in sleeper code 2014-10-10 15:53:11 +01:00
PsiOmega
b124644df4 Less relative paths. Less type checks. 2014-10-10 16:22:36 +02:00
mwerezak
7a81e116d2 Fixes #6647
grabbed_by assignment is now done in the grab constructor, instead of
leaking out all over the place.
2014-10-10 00:23:03 -04:00
Snapshot
e67e37b010 Merge pull request #6640 from Mloc/bs12-overflow
fixes #6200
2014-10-09 20:44:25 -07:00
Zuhayr
4223cc6596 Merge pull request #6642 from DeeUnderscore/fix-disposal-bin
Fix detached disposal bins never changing to attached
2014-10-10 09:31:28 +10:30
D Anzorge
7c8e810774 Fix detached disposal bins never changing to attached 2014-10-09 08:09:04 -04:00
Mloc
5b71ca0aeb fixes #6200
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-09 12:35:11 +01:00
PsiOmega
3560531d58 Silicons attempting to delete camera images no longer causes runtime errors 2014-10-09 08:21:07 +02:00
Chinsky
647568020a Merge pull request #6631 from Mloc/bs12-overflow
fixes #6301
2014-10-08 21:05:08 +04:00
Mloc
52d9004570 fixes #6301
fixes sdisability genes in general

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-08 10:21:36 +01:00
Zuhayr
a730561b76 Merge pull request #6621 from Raptor1628/master
Custom item fixes/adjustments
2014-10-08 00:30:24 +10:30
Zuhayr
51e7f95b72 Merge pull request #6610 from SparklySheep/patch-7
Replaces Vox telebaton with a stun baton
2014-10-08 00:30:02 +10:30
Mloc
0d27fd33cc fixes #4153
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-07 09:33:31 +01:00
Raptor1628
0314cbd8d1 Custom item fixes/adjustments
Polishes a few sprites and item defines.
2014-10-06 22:49:02 -04:00
Mloc
056fbd79d1 fixes #6599
also small improvements to the loadout system

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-06 09:57:01 +01:00
SparklySheep
9efc817896 Replaces Vox telebaton with a stun baton
Since the telebaton nerf, the vox lost their ability for stuns so this should give them the ability to whack folks and take prisoners again. As well, the telebaton was pretty worthless as a weapon.
2014-10-05 23:17:17 -05:00
GinjaNinja32
a1c12bdaab Fixes #6591 2014-10-04 18:23:29 +01:00
GinjaNinja32
24d43ef509 Fixes #6597 2014-10-04 18:15:13 +01:00
GinjaNinja32
9ac8f3ccef Fixes #6587 and #6590 2014-10-04 17:57:37 +01:00
Chinsky
06126c4f69 Merge pull request #6594 from mwerezak/runtime
Fixes #6592
2014-10-04 13:03:58 +04:00
mwerezak
d721673d8d Fixes #6592 2014-10-04 02:11:51 -04:00
Snapshot
9162a183eb Merge pull request #6586 from Mloc/bs12-fan
fixes #6035
2014-10-03 07:32:42 -07:00
Mloc
37b5aa1c50 fixes #6035
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-02 13:26:28 +01:00
Zuhayr
61c0f6e1b7 Merge pull request #6574 from Mloc/bs12-fan
more fixes
2014-10-02 19:04:07 +09:30
Zuhayr
c3c5c68890 Merge pull request #6576 from GinjaNinja32/anomaly
Changes Alden-Saraspova behaviour to wait for new results before outputting
2014-10-02 12:17:52 +09:30
Zuhayr
a0ad04f520 Merge pull request #6564 from TwistedAkai/master
Add round start check to Declare Ready
2014-10-02 11:44:07 +09:30
GinjaNinja32
2b16022ee0 Changes Alden-Saraspova counter behaviour to wait for new results before outputting 2014-10-01 22:32:45 +01:00
Mloc
2c750e49fd fixes #6572
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 19:57:14 +01:00
Mloc
58953a3d31 fixes #6499
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 17:48:21 +01:00
Mloc
dbff924849 fixes #6562
fixes #6571

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 17:48:17 +01:00
Akai Alonkai
4c5665d4fd Add round start check to Declare Ready
Added a check to 'declare ready' to prevent readying up after the round
started. Allowing this to happen caused a bug where the player would be
unable to change their character setup if they declared ready after the
round started, such as to look at the manifest to see which character
would be best to play, until after reconnecting.
2014-10-01 06:16:29 -04:00
Chinsky
dd9b3fe613 Merge pull request #6565 from Mloc/bs12-fan
small fixes 2
2014-10-01 13:39:35 +04:00
Chinsky
a3dba06c0e Merge pull request #6563 from mwerezak/cargo
Fixes supply shuttle state when returning
2014-10-01 13:39:29 +04:00
Zuhayr
c3e63b1ad0 Merge pull request #6560 from Mloc/bs12-efab
small fixes
2014-10-01 18:52:59 +09:30
Mloc
ee4eafa660 fixes #6090
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 10:17:55 +01:00
Mloc
d43dbaa7b5 resolves #6260
chance was being checked twice, for some reason.

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 10:13:15 +01:00
Mloc
39781326cc fix for artifact teleportation effect
will no longer teleport you inside random objects.

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 09:54:39 +01:00
Mloc
bb2953b283 re-port trange() from tg
was lost in the multiz update

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 08:50:28 +01:00
Chinsky
a26185dd9e Merge pull request #6553 from atlantiscze/android-roundstart-fix
Android roundstart fix
2014-10-01 10:01:39 +04:00
mwerezak
d81670edfb Fixes supply shuttle state when returning
When returning to centcom, the supply shuttle's state was not being set
to INTRANSIT.
2014-10-01 00:48:16 -04:00