Commit Graph

1758 Commits

Author SHA1 Message Date
Monster Iestyn d7a216e192 Ignore all *.exe files and *.mo files (such as en.mo) in all bin/Mingw folders 2017-04-30 20:42:24 +01:00
Monster Iestyn 19ca1698d8 Combine all /objs/*/.gitignore files into /objs/.gitignore, make sure depend.ped is also ignored 2017-04-30 20:33:36 +01:00
Monster Iestyn 058ad4df88 Merge branch 'master' into next 2017-04-26 16:15:40 +01:00
Monster Iestyn c16ae57f91 Merge branch 'addfile-directories-fix' into 'next'
Addfile directories fix

This is a fix for this bug: https://mb.srb2.org/showthread.php?t=42279

See merge request !166
2017-04-24 20:46:38 -04:00
Monster Iestyn e03577d957 Merge branch 'falling-rocks-fix' into 'next'
Falling rocks fix

This fixes the rock spawners' rocks not being removed if they rolled down to the ground from a slope rather than bouncing (see https://mb.srb2.org/showthread.php?t=41963)

See merge request !162
2017-04-24 20:41:32 -04:00
Monster Iestyn 7658469c23 Merge branch 'drawfill-fix-2' into 'master'
DrawFill made not stupid

made it more consistent with other drawing 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)

See merge request !173
2017-04-24 12:43:10 -04:00
Monster Iestyn 7f7c7c58ab Use less-than, not less-than-or-equals, since deststop is off-screen 2017-04-24 17:41:50 +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 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
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
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
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
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
Alam Ed Arias 2823c7bffb build: fixup warnings from GCC 6.2.1 2017-03-12 17:23:56 -04:00
Monster Iestyn 0f014fe20a Merge branch 'master' into next 2017-03-04 17:16:33 +00:00
Monster Iestyn 5019077f82 Merge branch 'precip-overflow-fix' into 'master'
Precipitation sprite overflow fix

This fixes artifacts of rain/snow sprites appearing on-screen in levels that have rain/snow, if said sprites were high enough above the camera. This kind of thing was previously fixed for sprites of regular objects (and textures of FOFs?), but apparently the fix wasn't applied to sprites for precipitation as it turns out.

I found this most easily reproducable in SRB2TD's Stormy Streets level, because some of the invisible FOFs make raindrops continually splash right up at the sky ceiling itself. Position your camera underneath them right and ...voila, ghostly precip sprites apparently appearing. (You'll need to make a SOC to make the level playable in vanilla SRB2 mind)

See merge request !169
2017-03-04 08:40:37 -05:00
Monster Iestyn b0f4bbb44b Played TD's Stormy Streets enough to know precipitation sprites didn't get an overflow test of their own
(various large invisible blocks used in the level cause rain to make splashes high above the main level, high enough to make ghostly rain splash sprite artifacts appear sometimes in nearby areas)
2017-03-02 19:37:21 +00:00
Monster Iestyn c43b41815f Make "Enter Game" option use the big blue window notice if you cannot switch teams, instead of falling back on changeteam's own console notice 2017-03-02 14:28:52 +00:00