Commit graph

2121 commits

Author SHA1 Message Date
ZTsukei 911508e262 1.3.01
------
Friction now correctly ignores FoFs over the sector (idk if it'll work on FoFs themselves yet)
Friction reduces speed to 1/3, was 1/2.
2017-04-16 16:17:22 -04:00
Sryder ba2cf198bf Make sure it actually compiles 2017-04-16 19:55:21 +01:00
Sryder 82a392079d Update version to 1.3.0 2017-04-16 19:19:29 +01:00
Sryder 56153bbac0 Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value.
This reverts commit aff9a78d76.

# Conflicts:
#	src/d_player.h
#	src/g_game.c
#	src/k_kart.c
2017-04-16 19:01:32 +01:00
Inuyasha 5e4f960f3a fixed drawfill to be more consistent w/ other functions
doesn't draw off of the sides, and doesn't ignore snapping or widths for reasons that don't make sense
(for instance: the green bar in MI's test script showed *above* the blue one in non-green resolutions in 2.1.17)
2017-04-12 15:34:13 -07:00
Monster Iestyn 586d2e1bde Merge branch 'next' into public_next 2017-04-05 21:05:33 +01:00
Monster Iestyn 81c3d6820e Merge branch 'commandline_skinselect' into 'next'
Command-line skin selecting fix

Fixed http://mb.srb2.org/showthread.php?t=42312.

Also, fixed being able to change your skin colour during credits/cutscenes in singleplayer.

See merge request !158
2017-04-04 16:49:55 -04:00
Alam Ed Arias 4fa188cf01 build: fix 64-bit builds 2017-04-01 17:22:24 -04:00
Inuyasha 6b9ba5d790 Merge branch 'luascript-linedef-fix' into 'next'
Linedef type 443 (Call Lua Function) fix

Fix for https://mb.srb2.org/showthread.php?t=42491

Note that the crash reported occurs only if Lua has been initialized (by having a Lua script loaded) and a LinedefExecute hook function has been added.

See merge request !171
2017-04-01 17:08:49 -04:00
Monster Iestyn bf29b5c6d1 Print warning message in console if line->next is NULL 2017-04-01 20:16:48 +01:00
Monster Iestyn f473118b09 Merge branch 'next' into public_next 2017-03-30 21:48:50 +01:00
Alam Ed Arias 8f25dc62cc Merge branch 'master' into next 2017-03-30 08:11:26 -04:00
Monster Iestyn 362c573567 Merge branch 'screenshot-slots-fix' into 'master'
Screenshot slots fix

Fix for this bug: https://mb.srb2.org/showthread.php?t=42508

The game should now print an error saying all 10000 slots have been used up. It was already there funnily enough, just someone goofed up in the code for finding the next screenshot name to use.

See merge request !170
2017-03-30 06:57:03 -04:00
Alam Ed Arias 4c992845e7 Merge branch 'next' into allowteamchange-fix 2017-03-29 17:03:03 -04:00
Alam Ed Arias 70677817bb Merge branch 'next' into admin-ban-fix 2017-03-29 17:01:47 -04:00
Alam Ed Arias 114d295f89 Merge branch 'next' into addfile-directories-fix 2017-03-29 17:00:42 -04:00
Alam Ed Arias 0ffc0f1974 Merge branch 'next' into falling-rocks-fix 2017-03-29 16:59:30 -04:00
Alam Ed Arias 74db3b51ac Merge branch 'next' into commandline_skinselect 2017-03-29 16:58:19 -04:00
Alam Ed Arias 108b0c2732 Merge branch 'master' into disable_gettext 2017-03-29 16:56:44 -04:00
Alam Ed Arias 5feccaad2a Merge branch 'next' into touching_fixes 2017-03-29 16:55:06 -04:00
Monster Iestyn 48777e60ed check i not add, silly 2017-03-29 21:27:44 +01:00
Alam Ed Arias 2d68cb77b9 Merge branch 'master' into next 2017-03-24 09:19:23 -04:00
Alam Ed Arias 52a79754d3 CircleCI: keep build cache with checksum of depend.dep 2017-03-24 09:12:00 -04:00
Alam Ed Arias 03ecb0d164 CircleCI: add upx 2017-03-24 09:10:18 -04:00
Alam Ed Arias 29c19b62ef CircleCi: Ubuntu docker image is broken 2017-03-24 08:33:14 -04:00
Alam Ed Arias ac75267ef2 CircleCI: build on Ubuntu as well 2017-03-24 08:29:54 -04:00
Alam Ed Arias 99b2c88821 README: add CircleCI's Status badge 2017-03-24 08:28:31 -04:00
Alam Ed Arias c85c277a48 CircleCI: move GCC49 check to debian's env 2017-03-24 08:27:41 -04:00
Alam Ed Arias 8f4f8c6e77 Merge branch 'master' into next 2017-03-24 00:14:14 -04:00
Alam Ed Arias aaaab40f6c CircleCI: cache APT and ccache 2017-03-23 23:42:28 -04:00
Alam Ed Arias ade354c27d CircleCI: error on warnings 2017-03-23 23:19:25 -04:00
Alam Ed Arias c5d15ad597 CircleCI: force -Wno-unsuffixed-float-constants 2017-03-23 23:15:01 -04:00
Alam Ed Arias 59d91e0793 build: r_bsp.c:213:23: warning: inlining failed in call to 'R_DoorClosed': call is unlikely and code size would grow [-Winline] 2017-03-23 23:13:31 -04:00
Alam Ed Arias b29193aa98 CircleCI: first try 2017-03-23 22:49:17 -04:00
Monster Iestyn f40e1dc069 Merge branch 'next' into public_next 2017-03-13 18:24:50 +00:00
Sryder b702a8c121 Slightly buff mini turbo timer 2017-03-13 03:54:31 +00:00
Sryder 55e9df2865 Nerf mini-turbos to be more acceptable 2017-03-13 03:28:54 +00:00
Sryder e122908cb1 renamed mphspeed console var to speedometer
has 4 options, off, Kilometers, miles, and fracunits
2017-03-13 02:44:31 +00:00
Alam Arias 7d25ab361a Merge branch 'next' into allowteamchange-fix 2017-03-12 21:50:31 -04:00
Alam Ed Arias cb98c2d972 Merge branch 'master' into next 2017-03-12 21:34:19 -04:00
Alam Ed Arias 538eac7a47 appveyor: disable command output 2017-03-12 21:17:07 -04:00
Alam Ed Arias 4e8972cd24 build: no warning or error about logical-ip or tautological-compare 2017-03-12 21:16:37 -04:00
Alam Ed Arias 9cac1e9e62 build: fixup WFALGS/WFLAGS mistake 2017-03-12 21:09:06 -04:00
Alam Ed Arias 6bb7a636dc appveyor: output commands passed to GCCwq 2017-03-12 21:02:05 -04:00
Alam Ed Arias 81fe46213d build: do not overwrite the -Wno-error switchs 2017-03-12 20:51:45 -04:00
Alam Ed Arias 42ecca817d build: disable tautological-compare and logical-op 2017-03-12 20:43:35 -04:00
Alam Ed Arias b01d5da60f build: fixup GCC54 endif 2017-03-12 20:23:30 -04:00
Sryder 4e062ed22a Nerf slope push because of stronger gravity 2017-03-13 00:10:38 +00:00
Alam Ed Arias e0b2a4a779 build: add suport for GCC 6.3 2017-03-12 17:45:18 -04:00
Alam Ed Arias b22417bcfa appveyor: buildbot now using GCC 6.3, not 5.3 2017-03-12 17:26:37 -04:00