Compare commits

...
1577 Commits
Author SHA1 Message Date
Alug 1bd901cee0 Merge remote-tracking branch 'origin/lugstuff' into neo-kart 2024-03-04 04:13:18 +01:00
Alug bf35469684 Revert "Fix players constantly JUSTHITFLOOR at the top of slopes"
This reverts commit 5b7720fe65.
2024-03-04 04:08:29 +01:00
Alug 60f29edbca turn it off completely when your gpu cant use it 2024-03-04 02:51:12 +01:00
Alug 60cffe1ed1 unhack framebuffer functions a little 2024-03-04 02:47:42 +01:00
Alug e77e7d1643 o 2024-03-04 01:13:23 +01:00
Alug 5dc22f502e dont need this 2024-03-04 00:45:14 +01:00
Alug 7a309c1175 when the ;; 2024-03-04 00:13:21 +01:00
Alug 9ce5baad9e fix ogl freelook breaking with shearing enabled
also removed uneeded stuff
2024-03-03 08:40:24 +01:00
Alug a4aa9a76f2 should only do that when rendering stuff 2024-03-03 07:57:46 +01:00
Alug befa25de5c add missing interpolators in mapload 2024-03-03 07:50:02 +01:00
Alug 83175d5c09 bruh
im going insane
2024-03-03 06:45:37 +01:00
Alug d8df8e8778 Revert "Revert "we have functions for that dont check for slopes everywhere""
This reverts commit 09957d0279.
2024-03-03 05:51:35 +01:00
Alug 09957d0279 Revert "we have functions for that dont check for slopes everywhere"
This reverts commit 46da9bf98b.
2024-03-03 05:34:01 +01:00
Alug 9e44985f56 Do not reload every texture when adding a wad
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1725?commit_id=37add34b9c729b21e624e22d64159073c9258e25
2024-03-03 05:18:37 +01:00
Alug b657a84699 Split R_LoadTextures 2024-03-03 04:53:15 +01:00
Alug 5ec7835556 Merge branch 'lugstuff' of https://github.com/Indev450/SRB2Kart-Saturn into lugstuff 2024-03-03 04:34:59 +01:00
Alug 03a864156d fix conflict 2024-03-03 04:34:53 +01:00
Alug c823bf3320 Revert "multithread exec command and some filesearch/add stuff"
This reverts commit 0d7025f714cbef34ca6e92e683561df411fa149a.
2024-03-03 04:32:13 +01:00
Alug 4f4d2f1f4c clean up r_segs 2024-03-03 03:13:46 +01:00
Alug 1bb389052d fix this 2024-03-02 23:36:48 +01:00
Alug 31fdc5bbc1 dont need to check if we dont use it 2024-03-02 22:56:26 +01:00
Alug db3833430d we have functions for that dont check for slopes everywhere
the functions already do it for us anyways
2024-03-02 22:33:34 +01:00
Alug 6d2212d259 move sprite mobj checks first 2024-03-02 21:56:39 +01:00
Alug 83b62e7f53 remove more unused stuff 2024-03-02 18:57:44 +01:00
Alug e5b5b53ede bruh 2024-03-02 18:57:40 +01:00
Alug 912c0e7fc4 check for those i guess 2024-03-02 18:36:34 +01:00
Alug 43d232819a forgor screenspace clipping 2024-03-02 18:25:13 +01:00
Alug 302eaf60b5 GetScreenCoord lua parity 2024-03-02 17:36:59 +01:00
Alug 84535faa90 remove more unused stuff 2024-03-02 15:57:25 +01:00
Alug 8c55d3c705 bruh 2024-03-02 13:23:50 +01:00
Alug 75b4b10caa only players get cylinders 2024-03-02 04:24:23 +01:00
Alug 1732e927c1 Merge remote-tracking branch 'origin/lugstuff' into neo-kart 2024-03-02 04:12:36 +01:00
Alug ec11b9268f did not mean to commit this lul 2024-03-02 03:33:26 +01:00
Alug a45af4a80c i 2024-03-02 03:18:27 +01:00
Alug df627b6830 a 2024-03-02 03:11:06 +01:00
Alug dfbeaf30ad m 2024-03-02 03:10:47 +01:00
Alug a03f74b125 add this 2024-03-02 03:05:36 +01:00
Alug 1a01f1299c fix compiler complains
those were for coronas code which we dont even have
2024-03-02 02:43:53 +01:00
Alug fc5cab4b62 was worth a shot 2024-03-02 02:33:22 +01:00
Alug c7fcf814ef Merge remote-tracking branch 'origin/lugstuff' into neo-kart 2024-03-02 02:32:41 +01:00
Alug 91f0cdbaca unhack palrendering screentex stuff 2024-03-02 02:15:28 +01:00
Alug e50bd4125d e 2024-03-02 02:07:54 +01:00
Alug ded2c8a7c8 a 2024-03-02 02:03:22 +01:00
Alug 88ce9fc0a6 more stuffs 2024-03-02 02:02:03 +01:00
Alug 3c713248b3 more shader stuff 2024-03-02 01:53:11 +01:00
Alug 75f3edcd92 shader stuffs 2024-03-02 01:50:35 +01:00
Alug 081a7779a6 make netvars red 2024-03-02 01:32:12 +01:00
Alug 6e995207a6 smh 2024-03-02 01:15:03 +01:00
Alug 3492b77aa0 we dont have IT_CV_FLOATSLIDER so dont even need to check for float 2024-03-02 01:14:36 +01:00
Alug e864901035 Options Menu for custom console variables
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2380#9cc73f4b99ff925448389969b0ade6ba3947fc31
2024-03-02 01:09:10 +01:00
Alug 7ee6de6b6a software sdl windows scaling quality setting 2024-03-01 23:12:23 +01:00
Alug 914fed4a1a grow chads 2024-03-01 22:46:34 +01:00
Alug 6b1e9751a6 expose some stuff to lua
P_IsLocalPlayer
P_ResetCamera
M_MapNumber
P_ButteredSlope
R_PointInSubsector
2024-03-01 21:25:33 +01:00
Alug afa41fa88e Do not attempt to disconnect when a packet checksum is invalid 2024-03-01 21:14:23 +01:00
Alug 53010deb8b reset pmomz after applying to momz 2024-03-01 20:47:16 +01:00
Alug 785c33f5a8 netsync pmomz 2024-03-01 20:45:54 +01:00
Alug dbdbe95164 netsync crumblestate 2024-03-01 20:44:47 +01:00
Alug 5b7720fe65 Fix players constantly JUSTHITFLOOR at the top of slopes 2024-03-01 20:29:18 +01:00
Alug 332369a910 Move player friction reset after movement code 2024-03-01 20:23:10 +01:00
Alug b92d3dd7ae Update mobj floorz/ceilingz after a bustable FOF is destroyed 2024-03-01 20:21:12 +01:00
Alug 91c943263e P_CeilingzAtPos 2024-03-01 20:21:02 +01:00
Alug 3a0419703d use boxonlineside for non player mobjs 2024-03-01 20:11:51 +01:00
Alug 47011c8e07 cylindrical mobj hitboxes 2024-03-01 20:03:17 +01:00
Alug a0035f6258 port R_IsPointInSector
for optimized mobj z positions
2024-03-01 20:03:14 +01:00
Alug 528ae085e6 increment_move radius clamps from Ring Racers 2024-03-01 20:03:11 +01:00
Alug 553b8ccf6b Revert "i am in pain"
This reverts commit e0e75eac33.
2024-03-01 15:26:57 +01:00
Alug bceef0b861 Fix nametag offsets with reverse gravity and flipcam 2024-03-01 15:24:04 +01:00
Alug 53cce6c6bb this does not exist 2024-03-01 02:31:55 +01:00
Alug b95047d09f fix vertical flip driftgauge
and make non flipcam behave like the sg lua version
2024-03-01 01:53:17 +01:00
Alug c6cb4375f5 fix shearing offset with flipcam in K_GetScreenCoords 2024-03-01 01:03:03 +01:00
Alug a07e2b8eda only check for stplayer flipcam
until i figure out a better way to check all of this crap
2024-02-29 23:08:24 +01:00
Alug 98e7002167 z 2024-02-29 16:22:07 +01:00
Alug 3428dde3c6 test 2024-02-29 05:37:21 +01:00
Alug 13d48f982b just make it like this 2024-02-29 00:27:37 +01:00
Alug b2e4dc27e4 give me a little more info on vanilla scoreboard but a bit ugly lul 2024-02-29 00:22:50 +01:00
Alug deddeab049 stimky ugly 2024-02-28 22:31:06 +01:00
Alug c3a6410822 Revert "dont need SEENAMES"
This reverts commit 01172bca77.
2024-02-28 22:06:02 +01:00
Alug c5915091aa kill have_blua 2024-02-28 21:53:59 +01:00
Alug 4401f0659e kill delfile 2024-02-28 18:58:04 +01:00
Alug a0c72d32e8 kill weighted recycling 2024-02-28 18:38:54 +01:00
Alug 1493045ec4 this doesent even exist anymore lmao 2024-02-28 18:33:12 +01:00
Alug 210efb2be7 kill eslope_typeshim 2024-02-28 18:26:54 +01:00
Alug a02fc1de63 kill GL_SHADERS 2024-02-28 18:19:11 +01:00
Alug 7755bfc861 Zzz... 2024-02-28 18:05:24 +01:00
Alug 01172bca77 dont need SEENAMES
esp when we get nametags its obsolete
2024-02-28 17:58:06 +01:00
Alug 143cbc8587 kill polyobjects ifdef 2024-02-28 17:55:47 +01:00
Alug b65f655a8a update libcurl to 7.69.0 2024-02-28 15:23:54 +01:00
Alug ed04c86369 u 2024-02-28 04:53:42 +01:00
Alug c0eaa17eb3 e 2024-02-28 04:51:13 +01:00
Alug 6383a55038 kill hw_trick 2024-02-28 04:47:55 +01:00
Alug 574df60d58 kill eslope 2024-02-28 04:40:03 +01:00
Alug 61ee575cd3 forgor this 2024-02-28 04:11:39 +01:00
Alug bdd963081e OpenGL: Fix linedef type 10 not culling FOFs 2024-02-28 03:50:43 +01:00
Alug 6b908d7a14 missed those 2024-02-27 22:16:52 +01:00
Alug 7d0d70c094 oopsie 2024-02-27 22:11:32 +01:00
Alug e75c5a9248 delete half of srb2 2024-02-27 21:49:31 +01:00
Alug b8ed5f4f1a dont need this anymore 2024-02-27 21:36:57 +01:00
GenericHeroGuy 660d7060e4 Don't return aggregates 2024-02-27 20:24:46 +01:00
Alug 79c5f57714 Merge remote-tracking branch 'origin/joinrefusemessage' into lugstuff 2024-02-27 20:03:47 +01:00
Alug 606d8fbe55 optimize gif palette creation 2024-02-27 20:01:56 +01:00
Alug edfa116a40 a 2024-02-27 18:38:28 +01:00
indev 0ef51011d4 Change default value for joinrefusemessage because cvars don't support newline characters 2024-02-27 20:26:18 +03:00
indev 0b6796cad9 Add cvar joinrefusemessage for custom messages when allowjoin is Off 2024-02-27 20:18:10 +03:00
Alug 55ca0c712f add dynamic gif delay
fixes issues with low framerates, uncapped and stutters
2024-02-27 17:41:40 +01:00
Alug 2d160cfc89 Toggle for R_Pointtoangle Ex or 64
Ex may perform better on 32bit clients and some cpus so lets just make it toggable
2024-02-27 15:53:00 +01:00
Alug 16bef488ee no idea how that ever got there 2024-02-27 15:52:50 +01:00
Alug 82d784d9f8 Toggle for R_Pointtoangle Ex or 64
Ex may perform better on 32bit clients and some cpus so lets just make it toggable
2024-02-27 15:52:34 +01:00
indev 103fb2dfc1 Don't return NULL when creating MT_NULL mobj, since it is needed in some parts of game 2024-02-27 13:29:20 +01:00
Alug bba3e1810b add this 2024-02-27 05:14:05 +01:00
Alug af5333f63e fix P_PlayerInPain 2024-02-27 05:07:44 +01:00
Alug ea77a5fb53 Fix con_hudlines being off by one, Fix con_hudtime overflow 2024-02-27 05:07:11 +01:00
Alug 562f3cf611 Merge pull request #107 from Indev450/interpoptimisations
Small Interpolation Optimizations
2024-02-27 00:06:38 +01:00
Alug a4aef0894b fix compile for qt 2024-02-26 23:48:47 +01:00
Alug bab7972518 Put HTTP downloading on a background thread
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2322
2024-02-26 23:37:54 +01:00
Alug 88853a7aee make the menus a little prettier 2024-02-26 22:01:11 +01:00
Alug d3339df853 toggle for showing nametags during spectating 2024-02-26 22:00:53 +01:00
Alug 385614b448 add toggle for showing nametags after you finished a race
off by default to match sg nametags
2024-02-26 21:19:59 +01:00
Alug 50023b0021 replace SCR_FPSflags with V_LocalTransFlag
so we can actually display hud transparency stuff before the hud appears, since that doesent work with V_HUDTRANS
2024-02-26 20:59:06 +01:00
Alug c47ba80f5d death 2024-02-26 20:58:58 +01:00
Alug 6de0700f49 use V_LocalTransFlag for driftgauge 2024-02-26 20:58:50 +01:00
Alug d9fe52b1a1 use V_LocalTransFlag for nametags 2024-02-26 20:58:39 +01:00
Alug ccfc476ec0 replace SCR_FPSflags with V_LocalTransFlag
so we can actually display hud transparency stuff before the hud appears, since that doesent work with V_HUDTRANS
2024-02-26 20:58:18 +01:00
Alug f518b3c48b e 2024-02-26 20:04:12 +01:00
Alug 05195f4116 Revert "connect loadingscreen should clear menus"
This reverts commit 6b41cf676c.
2024-02-26 01:29:31 +01:00
Alug 81d52db722 Revert "connect loadingscreen should clear menus"
This reverts commit 6b41cf676c.
2024-02-25 23:42:30 +01:00
Alug df9973da99 fix tagsdisplayed counter 2024-02-25 21:32:25 +01:00
Alug 612bde4e9a dont quit addon downloading with the mousewheel lmao 2024-02-25 19:49:57 +01:00
Alug 6b41cf676c connect loadingscreen should clear menus 2024-02-25 19:49:13 +01:00
Alug ca4c779c66 dont quit addon downloading with the mousewheel lmao 2024-02-25 19:47:52 +01:00
Alug 7897352175 connect loadingscreen should clear menus 2024-02-25 19:42:21 +01:00
Alug e0e75eac33 i am in pain 2024-02-25 19:06:32 +01:00
Alug 31d83dd26e disable driftgauge by default 2024-02-25 18:35:00 +01:00
Alug 698a0b811f disable nametag by default 2024-02-25 18:34:46 +01:00
Alug f69609b403 Merge branch 'lugstuff' of https://github.com/Indev450/SRB2Kart-Saturn into lugstuff 2024-02-25 18:21:12 +01:00
Alug 56259e3476 lua hud disable option for driftgauge 2024-02-25 18:21:03 +01:00
Alug f3dfa53f31 lua hud disable option for nametags 2024-02-25 18:21:03 +01:00
Alug e10d60c08e hud disable option for driftgauge 2024-02-25 18:20:32 +01:00
Alug ad4037351f hud disable option for nametags 2024-02-25 18:20:19 +01:00
NepDisk f9e1da8c9f Add coloring to large numbers 2024-02-25 17:34:12 +01:00
NepDisk 2f05137af7 Fix fillbar 2024-02-25 17:34:08 +01:00
Alug c305e31c2e fix first person splitscreen driftgauge stuff a 2024-02-25 12:21:57 +01:00
Alug a55fabe4f9 k... 2024-02-25 12:12:18 +01:00
Alug c58848b298 add splitscreen to screencoords and fix splitscreen for driftgauge 2024-02-25 12:10:23 +01:00
Alug ede644d3c4 use SleepEX on windows and set the min sleep duration to 16ms 2024-02-25 04:08:25 +01:00
Alug 4ff98e62a9 actually disable it for splitscreen for now
its botched and needs fixing
2024-02-24 20:32:15 +01:00
Alug e87fd2fff6 dont draw driftgauge when not using chasecam 2024-02-24 20:14:52 +01:00
indev 33e8b10579 Don't need for long there, fixed_t is big enough 2024-02-24 20:05:12 +01:00
Alug d11780f62d add -1 check for driftgauge too 2024-02-24 20:05:07 +01:00
Alug 6db95fc37b fix conflict 2024-02-24 17:23:47 +01:00
Alug bd2c8969f1 Revert "Refactor Batching code"
This reverts commit 3dcf4f6f64.
2024-02-24 17:23:41 +01:00
Alug 7706aa0bf0 fix conflict 2024-02-24 16:56:28 +01:00
Alug cf96e10552 Revert "Refactor Batching code"
This reverts commit 8d737c96c9.
2024-02-24 16:49:04 +01:00
Alug 1d01e1e6cd Revert "Optimize polygon sorting on batch renderer"
This reverts commit 1687fb9120.
2024-02-24 16:48:14 +01:00
Alug a5c4759662 disable driftgauge in record attack
it actually gives you an advantage over using other clients
record attack should be fair and even
2024-02-24 15:58:47 +01:00
Alug e7ff1d693b fix K_GetScreenCoords y clipping 2024-02-24 15:38:32 +01:00
Alug 9b4354a057 rename all of those to not conflict with mods 2024-02-24 14:46:13 +01:00
Alug 9b4f051312 this aswell 2024-02-23 01:35:56 +01:00
Alug 51a46ba92c this aswell 2024-02-23 01:35:49 +01:00
Alug bcc15011b2 forgor those aswell 2024-02-23 01:28:10 +01:00
Alug 31c4e0d59f forgor those aswell 2024-02-23 01:27:52 +01:00
Alug 6b246548c3 raise compile time significantly 2024-02-22 23:58:28 +01:00
Alug 57dda3843a use the current not old state
also add dont interp precip angle if it doesent change
2024-02-22 23:45:56 +01:00
Alug b04ac14751 remove redundant check 2024-02-22 23:45:53 +01:00
Alug 339aab8540 use the current not old state
also add dont interp precip angle if it doesent change
2024-02-22 23:45:26 +01:00
Alug bee72c4646 remove redundant check 2024-02-22 23:40:30 +01:00
Alug 029597b2c2 Merge pull request #95 from Indev450/gl-noencore-effect-fix
Fix some things regarding Opengl encore visuals
2024-02-22 23:35:00 +01:00
Alug 0b1add2988 one more 2024-02-22 23:27:26 +01:00
Alug cd239b0f35 fix conflicts 2024-02-22 23:26:18 +01:00
Alug eaace5bf74 Merge branch 'Saturn-Next' into gl-noencore-effect-fix 2024-02-22 23:16:54 +01:00
Alug 5ad8497db2 those too 2024-02-22 22:53:10 +01:00
Alug b96fe0a022 those too 2024-02-22 22:53:04 +01:00
Alug 672f07a5ee forgor those 2024-02-22 22:46:58 +01:00
Alug c6e0701581 forgor those 2024-02-22 22:46:51 +01:00
Alug aceffafc4e fix ternary hell for palette rendering lightlevels 2024-02-22 21:42:28 +01:00
Alug 65cb5b265c fix ternary hell for palette rendering lightlevels 2024-02-22 21:41:53 +01:00
Alug 1e50ecb2cd fix ternary hell for palette rendering lightlevels 2024-02-22 21:41:44 +01:00
Alug 1a91060573 dont interpolate unchanging things + remove unused dynslope interp code 2024-02-22 21:04:35 +01:00
Alug 40593f59cf Merge branch 'Saturn-Next' into interpoptimisations 2024-02-22 21:04:12 +01:00
Alug 891b3183ed dont interpolate unchanging things + remove unused dynslope interp code 2024-02-22 19:55:45 +01:00
Alug 26dd066280 fix conflicts 2024-02-22 01:43:54 +01:00
Alug 157ebdb5fe Merge remote-tracking branch 'ghg/lua-hudstuff' into lugstuff 2024-02-22 01:39:34 +01:00
GenericHeroGuy 5d215ea633 Add enums for drawinfo and offsets 2024-02-22 01:19:37 +01:00
GenericHeroGuy e6adc50e2b Replace draw functions with v.getColorHudPatch
More flexible, more extensible
2024-02-22 00:27:51 +01:00
GenericHeroGuy 913b374f9b Lua functions for colorization, offsets, drawing HUD items
Introduce drawinfo_t to pass coords/flags to both hardcode and Lua

* v.getDrawInfo: return X/Y/flags for the given HUD item
* v.drawItemBox: draw the item box, with support for all effects
* v.drawItemMul: draw multi sticker, for convenience
* v.getHudColor: return HUD color
* v.useColorHud: return true if colorization is enabled
* hud.getOffsets: return xoffset/yoffset for the given HUD item
2024-02-21 22:27:17 +01:00
GenericHeroGuy 9362d5abd4 Add stplyrnum, move to st_stuff 2024-02-21 22:27:17 +01:00
GenericHeroGuy 2fb75f7739 Fix V_SPLITSCREEN on OpenGL
Now matches v_video.c
2024-02-21 22:27:11 +01:00
Alug 1a18839f82 remove R_PointToAngleEx
R_PointToAngle64 does its job better anyways
2024-02-20 21:10:04 +01:00
Alug 8387a00b75 remove R_PointToAngleEx
R_PointToAngle64 does its job better anyways
2024-02-20 21:07:36 +01:00
Alug e7f8e7628f I HATE MENUS I HATE MENUS 2024-02-20 18:42:37 +01:00
Alug 07190571a1 lol 2024-02-20 18:40:01 +01:00
Alug f04d922fca fix warning 2024-02-20 18:17:25 +01:00
Alug 7fa382d4e9 rename driftgauge cvar and fix nametag rendering bug 2024-02-20 18:12:17 +01:00
Alug 072bb75504 oop 2024-02-20 18:06:13 +01:00
Alug 7deff2bfaa set currenttex to null if it gets an invalid texture id 2024-02-20 18:06:10 +01:00
Alug b02f0fc771 die 2024-02-20 18:05:34 +01:00
Alug 97766710c0 e 2024-02-20 17:37:29 +01:00
Alug 994ee060a7 a 2024-02-20 17:36:05 +01:00
NepDisk 589c27fdcf Driftgauge flipcam 2024-02-20 17:35:01 +01:00
NepDisk 37a018fda4 Give these tooltips 2024-02-20 17:34:58 +01:00
NepDisk f49381d1c5 Forgot this lol 2024-02-20 17:34:54 +01:00
Alug 573095bbad Driftgauge 2024-02-20 17:34:49 +01:00
Alug 0fdcc8e288 some fixes 2024-02-20 17:33:24 +01:00
Alug 03d7e26c3d oop 2024-02-20 13:18:23 +01:00
Alug 3a5cd835ad Fix tint equation shader 2024-02-20 13:17:46 +01:00
Alug 47a8f081e9 set currenttex to null if it gets an invalid texture id 2024-02-20 13:17:35 +01:00
Alug ad8d691c11 kill this 2024-02-20 13:16:50 +01:00
NepDisk 8186696e62 Nametag sightofline fix 2024-02-19 20:35:38 +01:00
Alug 183ec22923 Revert "Revert "Linked list for textures""
This reverts commit fe0dabb177.
2024-02-19 20:26:59 +01:00
Alug 5376995350 add max cap to nametagmaxplayers 2024-02-19 19:02:54 +01:00
Alug acb6e30fad dont apply this for players 2024-02-19 18:20:11 +01:00
Alug fe0dabb177 Revert "Linked list for textures"
This reverts commit 7eec58a834.
2024-02-19 12:15:12 +01:00
NepDisk 194ae46ce8 Remove unused functions that were originally added for nametags 2024-02-19 11:14:49 +01:00
NepDisk 2e9f1bfe90 Fix nametag weight offset for small and minimal 2024-02-19 11:14:46 +01:00
Alug a82adc4948 Fix nametag limit 2024-02-19 11:14:41 +01:00
Alug 6440c70a38 Zzz... 2024-02-19 01:57:42 +01:00
Alug 748eb07c9a forgor 2024-02-19 01:57:04 +01:00
Alug 5be2f591d2 ok so this needs to be done for the scaling stuff cool 2024-02-19 01:49:20 +01:00
Alug f2e4950e89 die 2024-02-19 01:26:01 +01:00
Alug 7444c5b826 remove hpmod stuffs since its not netsafe 2024-02-19 01:02:39 +01:00
Alug 5f6cca68cc Nametags Rewrites 2
contains netunsafe stuff but easy to remove
2024-02-19 00:44:07 +01:00
Alug 3d33e5351b bruh 2024-02-19 00:13:42 +01:00
Alug c6e245450d those are not server commands
idk why i threw them there in the first place but those are not needed at all (or even usefull for that matter) for dedicated servers
also moves some stuff to its group
2024-02-19 00:12:11 +01:00
Alug 7e6d5db0f2 those are not server commands
idk why i threw them there in the first place but those are not needed at all (or even usefull for that matter) for dedicated servers
also moves some stuff to its group
2024-02-19 00:11:13 +01:00
Alug 36854a16b7 Revert "Clean up cvar stuff a little"
This reverts commit 6fe87ab05a.
2024-02-19 00:04:25 +01:00
Alug b4ee8229ee Revert "more stuff"
This reverts commit 150c695979.
2024-02-19 00:03:27 +01:00
Alug cf0a3841e8 Revert "those need to be here for some reason"
This reverts commit 2efaebcf89.
2024-02-19 00:03:16 +01:00
Alug 0f36c7db1a Merge branch 'Saturn-Next' into interpoptimisations 2024-02-18 23:52:32 +01:00
Alug 3ebd2257f8 ok i dont want to the new gamma system
it looks off honestly
2024-02-18 23:47:42 +01:00
Alug 844d1967cc i wanna try the new gamma stuff 2024-02-18 22:29:24 +01:00
Alug dac37f8938 revert those 2024-02-18 22:29:12 +01:00
Alug dd74bc7c2b fuckit make the scale even smoler 2024-02-18 22:29:05 +01:00
Alug 7eec58a834 Linked list for textures 2024-02-18 22:28:52 +01:00
Alug 3085df1432 fix up colour cube/saturation/gamma
cleans up things, and fixes it not being applied to 3D models and colourmapped sectors when not in palette rendering mode
also adds a new way of handling gamma which can be used if wanted
2024-02-18 20:47:30 +01:00
Alug 418be50ce1 clean up patch drawers a little
esp for software
also Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column)
2024-02-18 20:47:25 +01:00
Alug da81998c71 fix up colour cube/saturation/gamma
cleans up things, and fixes it not being applied to 3D models and colourmapped sectors when not in palette rendering mode
also adds a new way of handling gamma which can be used if wanted
2024-02-18 20:43:40 +01:00
Alug d1552e7b71 clean up patch drawers a little
esp for software
2024-02-18 19:45:17 +01:00
Alug c64e10083b Optimize R_StoreWallRange
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2336?commit_id=a04bef7d39f71cfda1fe85b2ca3a820f95612b06
2024-02-17 22:52:12 +01:00
Alug 43e2be58da Revert "add an error message here"
This reverts commit 44b8a8a0d8.
2024-02-17 17:31:14 +01:00
Alug df79e484d8 those too 2024-02-17 16:11:39 +01:00
Alug 63b60d2546 those too 2024-02-17 16:11:32 +01:00
Alug 46cffe748e forgor 2024-02-17 16:09:50 +01:00
Alug 91ddc709eb forgor 2024-02-17 16:09:39 +01:00
Alug e761bbe361 remove bloat from windows libs + move dlls into dlls folder
+ remove msvc project files since they dont work anyways
2024-02-17 16:04:03 +01:00
Alug 1bcb67ffb9 remove bloat from windows libs + move dlls into dlls folder
+ remove msvc project files since they dont work anyways
2024-02-17 15:59:16 +01:00
Alug 976177c244 Revert "Revert "fix the dumbass compiler warning""
This reverts commit 69d47a5e53.
2024-02-17 11:13:07 +01:00
Alug a37c81a142 Revert "Revert "fix some issues with framebuffer""
This reverts commit 6457847633.
2024-02-17 11:13:04 +01:00
Alug 58de3a35a0 Revert "Revert "Implement framebuffer and renderbuffer objects""
This reverts commit b0f5f4338f.
2024-02-17 11:13:00 +01:00
Alug 44b8a8a0d8 add an error message here
dunno if we can prevent it from crashing, but atleast its a little more informative
2024-02-17 10:42:16 +01:00
Alug b0f5f4338f Revert "Implement framebuffer and renderbuffer objects"
This reverts commit d6d70e1525.
2024-02-17 09:57:38 +01:00
Alug 6457847633 Revert "fix some issues with framebuffer"
This reverts commit fcc810f703.
2024-02-17 09:57:25 +01:00
Alug 69d47a5e53 Revert "fix the dumbass compiler warning"
This reverts commit d0b7f6203c.
2024-02-17 09:57:12 +01:00
NepDisk 02177a7794 Nametags Rewrites 2024-02-17 09:11:27 +01:00
Alug 65c15126f1 larger console buffer for high res 2024-02-17 09:10:24 +01:00
Alug 76c78b8e63 remove all this crap 2024-02-16 15:30:18 +01:00
Alug f63342ff0f lol 2024-02-16 13:35:30 +01:00
Alug e3410cf34c move this 2024-02-16 13:35:25 +01:00
Alug 7a129047e7 i will play this in 8k yes 2024-02-16 09:36:51 +01:00
Alug 2b1d192edd make this save 2024-02-15 20:22:27 +01:00
Alug aa84cc8184 Merge branch 'Saturn-Next' into interpoptimisations 2024-02-15 20:22:20 +01:00
Alug 343716b7da make this save 2024-02-15 20:22:05 +01:00
Alug 1687fb9120 Optimize polygon sorting on batch renderer 2024-02-14 21:39:31 +01:00
Alug 3e89057c23 Fix dangling pointer in mapthing after removing mobj 2024-02-14 21:39:20 +01:00
Alug 774587efa6 fix inline warnings 2024-02-14 19:43:44 +01:00
Alug 2dc8bf321e do this again 2024-02-14 19:27:25 +01:00
Alug 992813d770 Revert "remove mobj realscales"
This reverts commit 9f45dabd9c.
2024-02-14 19:27:21 +01:00
Alug 46882dee93 Revert "move this, remove interp things, and add some comments"
This reverts commit 47c90f63a8.
2024-02-14 19:27:18 +01:00
Alug 8bbb7b540f Revert "forgor"
This reverts commit e4ec7484aa.
2024-02-14 19:27:14 +01:00
Alug 30d63b7c01 do this again 2024-02-14 17:40:17 +01:00
Alug 59bc9d4814 Revert "remove mobj realscales"
This reverts commit 9f45dabd9c.
2024-02-14 17:36:13 +01:00
Alug ab4fe830fa Revert "move this, remove interp things, and add some comments"
This reverts commit 47c90f63a8.
2024-02-14 17:36:09 +01:00
Alug 065e22adae Revert "forgor"
This reverts commit e4ec7484aa.
2024-02-14 17:36:05 +01:00
Alug f5f1ab036d Fix segfault when removing mobjs while iterating thinglist 2024-02-14 15:31:06 +01:00
Alug f15d556c05 fix segfaults when damaging mobj with no painstate and when removing source from ShouldDamage 2024-02-14 15:27:15 +01:00
Alug d4f2202906 Use po2 patches to fix mipmaps 2024-02-14 12:57:50 +01:00
Alug 570a664db8 Use po2 patches to fix mipmaps 2024-02-14 12:50:40 +01:00
Alug 52f69324d9 better savegame errors 2024-02-14 12:19:38 +01:00
Alug e4ec7484aa forgor 2024-02-14 12:00:38 +01:00
Alug 47c90f63a8 move this, remove interp things, and add some comments 2024-02-14 12:00:36 +01:00
Alug 9f45dabd9c remove mobj realscales
idk those just seem absolutely useless its literally just an alias for mobj scale
2024-02-14 12:00:33 +01:00
Alug ea6016b1ba forgor 2024-02-14 12:00:25 +01:00
Alug 30fcffd63c move this, remove interp things, and add some comments 2024-02-14 11:44:14 +01:00
Alug 50446bbde4 remove mobj realscales
idk those just seem absolutely useless its literally just an alias for mobj scale
2024-02-14 11:42:51 +01:00
Alug 52d9f7fd06 a? 2024-02-14 11:02:43 +01:00
Alug b307033aab a? 2024-02-14 05:58:04 +01:00
Alug 3ad62e328b Snap to software lightlevel values when using Paletter renderer
bye bye smooth fades, here i come 32 light levels
2024-02-13 16:53:49 +01:00
Alug 3e5985833c Snap to software lightlevel values when using Paletter renderer
bye bye smooth fades, here i come 32 light levels
2024-02-13 16:35:10 +01:00
Alug 8421f02aab e 2024-02-13 12:44:34 +01:00
Alug b6daafec17 Realloc software lookups for current screen res instead of MAXVID define
so the thing just allocs what it needs, so it can perform as good as it can on any resolution
2024-02-13 12:44:05 +01:00
Alug d2edcc1170 better comment 2024-02-13 11:16:08 +01:00
Alug fc058b669e better comment 2024-02-13 11:16:00 +01:00
Alug d6ed90b2b9 set this to 1440p
also made a new define for use in the png limits so that can stay at 4k. but having both maxvids allocate things for 4k is not a good thing for software renderer, not that anyone would ever want to run it at 4k anyways
2024-02-13 11:15:28 +01:00
Alug 99214b98b9 set this to 1440p
also made a new define for use in the png limits so that can stay at 4k. but having both maxvids allocate things for 4k is not a good thing for software renderer, not that anyone would ever want to run it at 4k anyways
2024-02-13 11:15:14 +01:00
Alug ab35a44ed9 more revert 2024-02-13 10:57:36 +01:00
Alug 125b82a5bb forgor 2024-02-13 10:53:38 +01:00
Alug f294ea157f more things 2024-02-13 10:50:11 +01:00
Alug 486ae052ef this stuff too 2024-02-13 10:42:03 +01:00
Alug 53b5442dad bruh 2024-02-13 10:40:42 +01:00
Alug 507c5f75bd revert a few things 2024-02-13 10:39:27 +01:00
Alug 0fb72c579e forgor 2024-02-13 06:16:38 +01:00
Alug c5d6ac63c5 remove pseudoangle 2024-02-13 06:12:32 +01:00
Alug a934c76263 revert this 2024-02-12 14:38:47 +01:00
Alug 23426b82f1 update SDL2 to v2.30.0 2024-02-12 14:35:13 +01:00
Alug cef9d96a52 update zlib to v1.3.1
update zlib to v1.3.1
2024-02-12 14:34:55 +01:00
Alug 0098c3bbc0 update SDL2 to v2.30.0 2024-02-12 14:29:49 +01:00
Alug f3eedc03e6 Add common I_GetSysName function
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2308
2024-02-12 14:23:09 +01:00
Alug 17c71a2528 Change from double to INT64 2024-02-12 14:19:25 +01:00
Alug d2ecbd7c6e Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-02-12 14:14:49 +01:00
Alug 5a5738c162 Merge pull request #103 from Indev450/Saturn-Next-EnumLib
Lua globals library / GLib
2024-02-12 07:37:03 +01:00
Alug 03be5e8118 Merge pull request #102 from Indev450/fix-battle-ending-music
Fix battle playing wrong ending music sometimes
2024-02-12 07:34:32 +01:00
Alug 9079db1a71 Merge pull request #101 from Indev450/ierror-crash-log
If have libbacktrace, write crash reports from I_Error
2024-02-12 07:33:48 +01:00
Alug c1fbd3971d Merge pull request #97 from Indev450/texthings
Texture Related things
2024-02-12 07:33:34 +01:00
indev 1638212ab2 Add transparency flag to record attack input display 2024-02-12 02:15:18 +03:00
Alug 2ce7dc0c37 update zlib to v1.3.1
update zlib to v1.3.1
2024-02-11 16:43:19 +01:00
Alug 2ebb71fb6c add stuff to menu 2024-02-11 15:21:26 +01:00
Alug b648424c18 add stuff to menu 2024-02-11 15:21:20 +01:00
Alug 242df89d0e forgor 2024-02-11 15:10:23 +01:00
Alug 301754c857 forgor 2024-02-11 15:10:16 +01:00
Alug 088426a654 only interpolate those if we use the stuff that uses them 2024-02-11 15:06:08 +01:00
Alug c9a3c4c9b8 only interpolate those if we use the stuff that uses them 2024-02-11 15:05:58 +01:00
Alug 8ba926550c only interpolate pitch, roll, slopepitch and sloperoll when using sprite rotation 2024-02-11 14:53:27 +01:00
Alug 4732f95782 toggable mobj subsector interpolation
honestly couldnt spot any difference at all
but R_PointinSubsector is quite expensive so making a toggle seems cool
2024-02-11 14:53:22 +01:00
Alug b0f3b515d2 Add cvar gr_maxinterpdist, which allows to control max distance on which mobjs will be interpolated 2024-02-11 14:53:16 +01:00
Alug ce0c8b363a only interpolate pitch, roll, slopepitch and sloperoll when using sprite rotation 2024-02-11 14:51:44 +01:00
Alug 9d6c38004c toggable mobj subsector interpolation
honestly couldnt spot any difference at all
but R_PointinSubsector is quite expensive so making a toggle seems cool
2024-02-11 14:51:14 +01:00
Alug f175735366 mobj interp optimization 2024-02-11 14:19:24 +01:00
Alug 19a58cc8c6 mobj interp optimization 2024-02-11 14:19:08 +01:00
Alug d855c39da2 a 2024-02-11 13:45:48 +01:00
Alug 03f4bfecc1 Dont need this
I_GetPrecise Precision already gets the high res windows time anyways
2024-02-11 13:42:12 +01:00
Alug c8d9e4c7b3 add thiis 2024-02-11 09:22:59 +01:00
Alug cb2b8f2e7c add it here too 2024-02-11 06:38:45 +01:00
Alug 0272dd4c24 oops 2024-02-11 06:29:28 +01:00
Alug 3b327937c2 use Windows High Precision Timer on Windows builds
lul may help with frametime and other stuff
2024-02-11 06:16:45 +01:00
indev 53a7a9fa1f Merge branch 'Saturn-Next-EnumLib' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next-EnumLib 2024-02-09 20:40:09 +03:00
indev c6ba2ee0a7 Fix warnings related to boolean glib getters/setters 2024-02-09 20:39:11 +03:00
Alug f8f2f17184 Merge remote-tracking branch 'origin/cvarcleanup' into lugstuff 2024-02-09 15:18:17 +01:00
Alug 2efaebcf89 those need to be here for some reason
game complains
2024-02-09 15:12:41 +01:00
Alug 150c695979 more stuff 2024-02-09 15:05:23 +01:00
Alug 6fe87ab05a Clean up cvar stuff a little 2024-02-09 14:42:55 +01:00
Alug f6613a5555 proper check for colourized speedometer patches 2024-02-09 12:35:48 +01:00
Alug 947d5c2739 add achiiro speedometer stuffs 2024-02-09 12:07:34 +01:00
Alug a984476bfc Merge remote-tracking branch 'origin/Saturn-Next' into Saturn-Next-EnumLib 2024-02-09 10:20:46 +01:00
Alug 1544706ff4 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-02-09 10:20:21 +01:00
Alug e121d1a8a1 proper POST request to curl 2024-02-09 10:19:35 +01:00
Alug badbdbf03f Clipping and portal stuff
idk this actually does not break ante station for some reason
2024-02-09 10:19:18 +01:00
Alug 35851483d4 Merge pull request #100 from GenericHeroGuy/ms-startup-crash
Fix master server thread segfaulting on startup
2024-02-09 10:06:55 +01:00
GenericHeroGuy f87efad86b Fix master server thread segfaulting on startup with OpenGL 2024-02-08 18:49:51 +01:00
Alug 3b5495b53a brap 2024-02-07 11:52:04 +01:00
Alug 545027ae64 use this stuff 2024-02-07 11:40:05 +01:00
Alug 91896433f8 fix menu updating + add default to switch 2024-02-07 11:01:53 +01:00
Alug a60074fc8a fix menu stuff 2024-02-07 10:49:04 +01:00
Alug eb82aa14bb option for small nametags 2024-02-07 10:35:16 +01:00
Alug cb4b640730 why add the same thing twice? 2024-02-07 09:42:16 +01:00
Alug 266d9a3c71 also turn this off 2024-02-07 09:37:01 +01:00
Alug 7a5a704a15 forgor to comment this out 2024-02-07 09:36:37 +01:00
Alug d3a4dacb6c fix for opengl sprite shadow colour 2024-02-07 09:35:26 +01:00
Alug 29ed8de935 Nametags from Chaoskart
https://gitlab.com/Fafabis/kart-chaotic/-/commit/8b4a12e144fbff587ee70c30e7f461900d839650#025e5c90ea9aeb6187b4fe002e0fbb277ef4b33d_7024_7035
2024-02-07 09:35:14 +01:00
Alug 3418cab5de switchable native keyboard input
taken from chaoskart this is completely non invasive
2024-02-07 09:20:36 +01:00
Alug e2ce015d49 fix for opengl sprite shadow colour 2024-02-07 09:15:17 +01:00
Alug 567e168a3c split cache functions
seems to fix a few stutters
2024-02-04 23:56:51 +01:00
Alug 0a7f18efe0 Merge branch 'Saturn-Next' into texthings 2024-02-04 23:56:33 +01:00
indev 0d0ab3f414 If have libbacktrace, write crash reports from I_Error 2024-02-04 19:08:33 +01:00
indev f90a069754 If have libbacktrace, write crash reports from I_Error 2024-02-04 16:12:14 +03:00
Alug 22b5bcc7e1 split cache functions
seems to fix a few stutters
2024-02-04 09:21:45 +01:00
indev 34d5d73d7e Fix battle playing wrong ending music sometimes 2024-02-04 08:31:10 +01:00
Alug 7ae4441731 Add cvar gr_maxinterpdist, which allows to control max distance on which mobjs will be interpolated 2024-02-04 08:26:54 +01:00
Alug d0b7f6203c fix the dumbass compiler warning 2024-02-04 07:56:55 +01:00
Alug e9f8400210 smol cleanup 2024-02-04 07:48:17 +01:00
Alug 7bafdc577b Zzz... 2024-02-04 07:48:12 +01:00
Alug 9a71d806b7 little portal cleanup 2024-02-04 07:47:55 +01:00
Alug 3757f3ae57 smol cleanup 2024-02-04 07:46:25 +01:00
Alug 8f9366da5a Zzz... 2024-02-04 07:12:26 +01:00
Alug b8e55f87a9 little portal cleanup 2024-02-04 06:48:58 +01:00
Alug b469f70e02 experimental fast sprite sorting 2024-02-04 06:28:07 +01:00
Alug 6df69b24db Revert "DSDADoom shenanigans"
This reverts commit c7931ca69c.
2024-02-02 16:49:08 +01:00
Alug 0133a5eb23 Revert "do this"
This reverts commit 7f93bc305d.
2024-02-02 16:48:26 +01:00
Alug 86712c2c48 fix compiler warning 2024-02-02 02:59:08 +01:00
Alug 5195caa3c6 Remove Build2DMipmaps and GLU library stuff
gluBuild2DMipmaps is just broken anyways
and it was the only thing used from the GLU library aswell so can remove things in favor of better solutions
having a pc with opengl 1.4 should be a given by now
2024-02-01 22:26:06 +01:00
Alug 6a3b5cac83 Remove Build2DMipmaps and GLU library stuff
gluBuild2DMipmaps is just broken anyways
and it was the only thing used from the GLU library aswell so can remove things in favor of better solutions
having a pc with opengl 1.4 should be a given by now
2024-02-01 22:24:36 +01:00
Alug 668b99c7f9 add an I_Error for when opengl is started on unsupported hardware or driver 2024-02-01 19:57:32 +01:00
Alug 684ad38d4b add an I_Error for when opengl is started on unsupported hardware or driver 2024-02-01 19:57:23 +01:00
Alug c6d292a3d7 e 2024-02-01 04:47:55 +01:00
Alug b2b65651d4 move that where it belongs 2024-02-01 04:42:42 +01:00
Alug 246414a735 move that where it belongs 2024-02-01 04:42:28 +01:00
Alug 5ae85b005a dont need to extra check for this actually 2024-02-01 03:48:23 +01:00
Alug 429bcffaf8 dont need to extra check for this actually 2024-02-01 03:48:17 +01:00
Alug 8a8d997fad fix sprite roll angles in software for sprites with one rotation frame
ofc only when the rotation stuff is set to rotate everything not just the player
also changes that the shadows only rotate on that setting unless someone wants it and wants really dumb checks for it
2024-02-01 03:46:26 +01:00
Alug d92e7b138c fix sprite roll angles in software for sprites with one rotation frame
ofc only when the rotation stuff is set to rotate everything not just the player
also changes that the shadows only rotate on that setting unless someone wants it and wants really dumb checks for it
2024-02-01 03:46:15 +01:00
Alug dacf9eb7ab remove non working fisheye lens code
remnants of birdhouse, this was never finished nor does it work
2024-02-01 03:26:49 +01:00
Alug 4d75e05002 fix software shadow rotation in the worst way possible kek 2024-02-01 03:26:45 +01:00
Alug cd51ad2a25 remove non working fisheye lens code
remnants of birdhouse, this was never finished nor does it work
2024-02-01 03:26:33 +01:00
Alug 8732825404 fix software shadow rotation in the worst way possible kek 2024-02-01 03:25:58 +01:00
Alug fc37cdcc95 use it for camang 2024-02-01 02:39:27 +01:00
Alug 2435ec9515 Revert "batch this stuff too for portals"
This reverts commit 2df4738af2.
2024-02-01 02:11:21 +01:00
Alug 6bae725077 make this a little neater 2024-02-01 02:05:55 +01:00
Alug 66961b1097 Buffer API is OpenGL 1.5, so can be used in STATIC_OPENGL
https://git.do.srb2.org/STJr/SRB2/-/commit/623629b04ab72071e6ea4f0c4a3245e6cde72e2c
2024-02-01 02:05:50 +01:00
Alug 623fab8ea8 Revert "clean this up a little"
This reverts commit 99c9d921e3ab3ee3fde3dcf141e20323e064902a.
2024-02-01 02:03:23 +01:00
Alug e063345c4b Revert "oops"
This reverts commit 59b6987bf2e9f00bfdf50b268f0ec61e735dfe0e.
2024-02-01 02:03:10 +01:00
Alug 27533a1dcd Revert "replace check"
This reverts commit 36eaaee202c4d1f7e86dd2b24dcfe5573ac2f280.
2024-02-01 02:03:00 +01:00
Alug d232e0e2c6 oops 2024-02-01 01:55:04 +01:00
Alug 580912c335 rotating shadows
uuuuhhh
2024-02-01 01:07:32 +01:00
Alug d581d48714 Merge pull request #96 from Indev450/morenewpalshader
More Palette Rendering things
2024-02-01 00:57:31 +01:00
Alug 0475489e24 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-31 16:58:09 +01:00
indev 05aec1cd94 When connecting to server via -connect flag, save ip into lastserver cvar 2024-01-31 18:51:37 +03:00
Alug 34b35db27f Interpolate polyobjects properly for the software renderer
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2284/
2024-01-31 03:28:00 +01:00
Alug b47bc12e48 change x scale a little 2024-01-30 21:43:44 +01:00
Alug 4d102dcf68 similar scale to old speedo 2024-01-29 23:08:19 +01:00
Alug a8c9663200 ok i can just do it like this lol
now its good finally
2024-01-29 22:23:04 +01:00
Alug 57660cc5af fix 1 pixel gap
i hate maths
2024-01-29 22:13:54 +01:00
Alug c459e918af prep some speedometer stuff 2024-01-29 22:01:16 +01:00
Alug 962abba1b2 Buffer API is OpenGL 1.5, so can be used in STATIC_OPENGL
https://git.do.srb2.org/STJr/SRB2/-/commit/623629b04ab72071e6ea4f0c4a3245e6cde72e2c
2024-01-29 18:19:01 +01:00
Alug 53a10d7cba update libopenmpt libs 2024-01-29 18:11:46 +01:00
Alug 5297d18f92 ugh whyyyy 2024-01-29 18:08:18 +01:00
Alug 7853e48a6f update libopenmpt libs 2024-01-29 18:07:35 +01:00
Alug 303d87f69d update libgme 2024-01-29 15:59:48 +01:00
Alug 9dcdc9500d Revert "bruh wtf"
This reverts commit 493091cd66.
2024-01-29 14:43:12 +01:00
Alug 7723bafff6 replace check 2024-01-29 04:38:26 +01:00
Alug d74a89c6c1 oops 2024-01-29 04:11:21 +01:00
Alug cce443be0b clean this up a little 2024-01-29 04:08:14 +01:00
Alug 9b9620a560 uuuuuuuhhh 2024-01-29 03:56:52 +01:00
Alug 81fa3d27bf uuuuuuuhhh 2024-01-29 03:56:43 +01:00
Alug 493091cd66 bruh wtf 2024-01-28 22:07:49 +01:00
Alug c75f5ee961 use this for portal clipping too 2024-01-28 19:33:45 +01:00
Alug 083e0ca2e0 dont need this anymore 2024-01-28 19:19:16 +01:00
Alug 79bd89016c dont need it as an extra file 2024-01-28 19:16:04 +01:00
Alug eca7e38763 Zzz... 2024-01-28 19:15:14 +01:00
Alug b5cbfb970f forgor 2024-01-28 18:58:52 +01:00
Alug 74e1cafd9d this too 2024-01-28 18:57:19 +01:00
Alug ee7381b67d revert this 2024-01-28 18:56:10 +01:00
Alug 7f93bc305d do this 2024-01-26 02:44:37 +01:00
Alug c7931ca69c DSDADoom shenanigans
R_PointToPseudoAngle seems rather promising
2024-01-26 02:28:07 +01:00
Alug 90f06a3289 a little better solution still bad lmao 2024-01-26 00:04:42 +01:00
Alug 0e344a7e02 screw it ill just do this 2024-01-25 23:40:37 +01:00
Alug 3f91a4e908 i want a small hud 2024-01-25 23:04:21 +01:00
Alug 7d92b839aa add "Reset All" button to hud offset menu 2024-01-25 23:02:09 +01:00
Alug fb443c58ab add "Reset All" button to hud offset menu 2024-01-25 23:02:01 +01:00
Alug b233514b58 more offset 2024-01-25 16:48:16 +01:00
Alug 325c452313 remove this since its not needed anymore 2024-01-25 15:15:58 +01:00
Alug 38c9cbc15b more cleanup 2024-01-25 15:14:42 +01:00
Alug 7476dea308 Texture buffer for non RGBA to RGBA conversion 2024-01-25 15:14:15 +01:00
Alug 79be487833 fix merge conflict 2024-01-25 15:14:03 +01:00
Alug 7c368ebc51 Remove 3Dfx and glide things
gr_rounddown toggle did nothing instead the game always resized textures, now it wont, seems like this makes stutters on mapload less
2024-01-25 15:13:53 +01:00
Alug c63142c813 add hw_shaders to cmakelist 2024-01-25 15:06:26 +01:00
Alug 0588442ae2 change this 2024-01-25 15:06:17 +01:00
Alug 79b0b160cb add toggle for custom shaders
it seems better like this, atleast thats how hannu set it up
2024-01-25 15:06:04 +01:00
Alug ce13d4f818 shaderstate should be set here 2024-01-25 15:05:58 +01:00
Alug 51699bfdb5 split hw_shader files 2024-01-25 15:05:52 +01:00
Alug 32d4d288bc OpenGL shader code rearrangement and shader pre-preprocessor
https://git.do.srb2.org/STJr/SRB2/-/commit/de37df1be04e9d1dfb11083a9585eb6ac1761633?merge_request_iid=1516
wew
2024-01-25 15:05:42 +01:00
Alug 11615171d1 Revert "Optimize polygon sorting on batch renderer"
This reverts commit ad86e7f34a.
2024-01-25 14:57:49 +01:00
Alug 2df4738af2 batch this stuff too for portals 2024-01-25 04:06:54 +01:00
Alug 9e62f5bd52 make the ripple thing toggable for now 2024-01-25 03:46:26 +01:00
Alug 80349ae8ee a 2024-01-25 03:24:32 +01:00
Alug 06d51f2648 only apply fog if it is water only
ugh
2024-01-25 02:59:30 +01:00
Alug fcc810f703 fix some issues with framebuffer 2024-01-25 00:35:31 +01:00
Alug d6d70e1525 Implement framebuffer and renderbuffer objects
wew https://git.do.srb2.org/Lactozilla/SRB2/-/commit/211c3720de8dda8e2a896b6887eb4bbbd991ebbf
2024-01-24 22:35:30 +01:00
Alug e5f79e061c rotating shadows
uuuuhhh
2024-01-24 18:13:50 +01:00
Alug ad3c0a1ffd attempt at fixing some issues
it fixed some things but broke the underwater ripple if the water is on a fof
2024-01-24 17:09:15 +01:00
Alug 2ef935198a more pronounced ripple
eeeh kinda close ig
2024-01-24 03:41:02 +01:00
Alug dc3b9c648a make this a little neater 2024-01-24 03:09:09 +01:00
Alug 2d610d40b6 add better check for colormap stuff
so it only gets applied where it should (i hope)
works on tiled byway tho
2024-01-24 03:00:31 +01:00
Alug d2c686f48b attempt at making ogl water ripple better
well all it does is ripple the floor below the water fof lmao no idea how i would implement this for the walls too
2024-01-24 02:43:27 +01:00
Alug 5cafec3262 uuuh oops dont do it for non transparent fofs 2024-01-24 00:26:36 +01:00
Alug 580c42d167 more offset ugh 2024-01-23 21:33:15 +01:00
Alug dcfec35e57 remove this since its not needed anymore 2024-01-23 21:24:18 +01:00
Alug 701bac6e11 alr add more offset
kinda dumb way but itll do for now until i figure out smth better
2024-01-23 21:21:03 +01:00
Alug 0c46d593d8 attempt at making colormapped translucent fofs more accurate 2024-01-23 18:55:19 +01:00
Alug b867de0667 Zzz... 2024-01-23 15:50:51 +01:00
Alug e207b75c7a Revert "add pMasterPalette"
This reverts commit dfb05b9d39.
2024-01-23 15:49:00 +01:00
Alug fc3df5bfe4 Revert "attempt at unmangling lighttables and colormaps"
This reverts commit 19702daecd.
2024-01-23 06:41:25 +01:00
Alug dfb05b9d39 add pMasterPalette 2024-01-23 05:33:04 +01:00
Alug 19702daecd attempt at unmangling lighttables and colormaps
ugh i hope this doesent break
2024-01-22 23:28:34 +01:00
Alug dde4b4df3b merge conflict moment 2024-01-22 21:32:38 +01:00
Alug c070930a8c Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-22 21:31:04 +01:00
indev b305759212 Move autoloading to run after everything else is initialized 2024-01-22 23:24:19 +03:00
indev b78d3bb0a8 Force postload for autoloaded character addons 2024-01-22 23:18:53 +03:00
Alug d36b5f7c59 add hw_shaders to cmakelist 2024-01-22 18:41:00 +01:00
Alug 0e517907ce change this 2024-01-22 18:32:13 +01:00
Alug 739e9716ab add toggle for custom shaders
it seems better like this, atleast thats how hannu set it up
2024-01-22 18:25:51 +01:00
Alug 0e5972d895 shaderstate should be set here 2024-01-22 18:15:53 +01:00
Alug 71975658ca split hw_shader files 2024-01-22 18:14:14 +01:00
Alug 6572e29a64 OpenGL shader code rearrangement and shader pre-preprocessor
https://git.do.srb2.org/STJr/SRB2/-/commit/de37df1be04e9d1dfb11083a9585eb6ac1761633?merge_request_iid=1516
wew
2024-01-22 16:57:47 +01:00
indev 41b21c2a0c Fix sound, music, and midi music toggles 2024-01-22 13:48:13 +01:00
Alug 2b19d2e6de Revert "revert this"
This reverts commit 5bce9d5abf.
2024-01-22 13:48:10 +01:00
Alug f99aa3459c e 2024-01-22 13:48:00 +01:00
indev a064a9e88e Fix sound, music, and midi music toggles 2024-01-22 10:52:54 +03:00
Alug 5bce9d5abf revert this
this caused sound and music to alyways toggle themselves on after a restart + other issues
2024-01-22 02:55:40 +01:00
Alug e2c52c0d14 forgor 2024-01-22 02:52:50 +01:00
Alug abe102649e forgor 2024-01-22 02:52:33 +01:00
Alug 424fcdc63a change some memfree names 2024-01-22 02:46:59 +01:00
Alug a3fd451c74 3D model texture Z_tag 2024-01-22 02:43:55 +01:00
Alug 731fd113d2 more cleanup 2024-01-22 02:34:07 +01:00
Alug c9ca1bda5c Texture buffer for non RGBA to RGBA conversion 2024-01-22 02:09:55 +01:00
Alug 58ea822050 Remove 3Dfx and glide things
gr_rounddown toggle did nothing instead the game always resized textures, now it wont, seems like this makes stutters on mapload less
2024-01-22 01:03:48 +01:00
Alug 6ab1b09aa8 fix merge conflict 2024-01-21 16:44:36 +01:00
Alug 2b38cb2f1c simplify this uuh 2024-01-21 16:44:13 +01:00
Alug 4c6964590d i hate this so i just make it a boolean
confused the heck outta me so just do it like this lmao
2024-01-21 16:44:06 +01:00
Alug 671484d6f9 fix merge conflict 2024-01-21 16:41:38 +01:00
Alug e6e74194bc Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-21 16:40:12 +01:00
indev 7984f57b73 Remove debug print 2024-01-21 17:45:09 +03:00
indev b79a05f25b Fix freeing sounds that aren't actually replaced 2024-01-21 17:44:51 +03:00
Alug 04432c8368 simplify this uuh 2024-01-21 15:43:46 +01:00
Alug 6782876c0c i hate this so i just make it a boolean
confused the heck outta me so just do it like this lmao
2024-01-21 15:31:07 +01:00
Alug 7dfad132dd grr 2024-01-20 17:24:20 +01:00
Alug 4b09e92d7c grr 2024-01-20 17:24:11 +01:00
Alug 193248b71c oops 2024-01-20 17:03:12 +01:00
Alug 3266f64fb9 oops 2024-01-20 17:03:05 +01:00
Alug db5ada9fa0 cleanup s_sound a little + fix onchanges 2024-01-20 17:01:56 +01:00
Alug 2a9886e698 cleanup s_sound a little + fix onchanges 2024-01-20 17:01:48 +01:00
Alug f41d7e9e97 make NO_MIDI=0 compile 2024-01-20 16:52:54 +01:00
Alug 1319e3a811 make NO_MIDI=0 compile 2024-01-20 16:52:46 +01:00
Alug 8d43f6144a make some things static + remove cdmusic leftovers 2024-01-20 15:45:01 +01:00
Alug 442c8e59a1 make sound precaching useful at all
so it also precaches addon sounds and all
thx indev for help <3
2024-01-20 15:44:58 +01:00
Alug 6cbb40f874 make some things static + remove cdmusic leftovers 2024-01-20 15:43:42 +01:00
Alug 07fd6a3ad4 make sound precaching useful at all
so it also precaches addon sounds and all
thx indev for help <3
2024-01-20 15:39:25 +01:00
Alug ef08db8d89 fix issues with sound precaching
adds a check if sounds have been previously loaded already

also makes it useful at all by not freeing soundsfx data on each mapload when its enabled

also adds an onchange so toggling it either caches all sounds again or frees them
2024-01-20 13:58:24 +01:00
Alug 8891869013 fix issues with sound precaching
adds a check if sounds have been previously loaded already

also makes it useful at all by not freeing soundsfx data on each mapload when its enabled

also adds an onchange so toggling it either caches all sounds again or frees them
2024-01-20 13:58:11 +01:00
Alug 1d5c635556 Merge branch 'Saturn-Next' into morenewpalshader 2024-01-19 19:59:32 +01:00
Alug 04fc735e12 Merge remote-tracking branch 'origin/morenewpalshader' into lugstuff 2024-01-19 19:37:07 +01:00
Alug 27c8f3a8b4 change gr_shadersavailible
hopefully a little safer + remove killshader call since that function is empty and does nothing
2024-01-19 19:37:00 +01:00
Alug 7b9860f1be Merge remote-tracking branch 'origin/morenewpalshader' into lugstuff 2024-01-19 19:25:24 +01:00
Alug 9725a9d9a5 Fix blackscreen on start + some other changes
move a few things around in HWR_Startup so they only get called on startup
2024-01-19 19:23:49 +01:00
Alug 38f26a2bd8 simplify setpalette 2024-01-19 18:07:32 +01:00
Alug a9750f8cff Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-19 12:29:20 +01:00
indev 89b1c316e2 Merge branch 'Saturn-Next' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2024-01-19 13:03:00 +03:00
hayaunderscore 88b51c9901 Fix dumb saturn credits crash 2024-01-19 13:02:44 +03:00
Alug ad86e7f34a Optimize polygon sorting on batch renderer
again
2024-01-19 02:14:20 +01:00
Alug 496435ef3b dont check for precip in sprite sorting + smol cleanup 2024-01-19 02:14:04 +01:00
Alug a79a5db793 smol stuffs 2024-01-19 00:39:32 +01:00
Alug 5275b31e7e smol stuffs 2024-01-19 00:39:07 +01:00
Alug d0d2a3d0a1 Add toggle for horizonlines 2024-01-18 20:54:59 +01:00
Alug fc2a0846cb Add toggle for horizonlines 2024-01-18 20:54:10 +01:00
Alug e341991703 Add toggle for horizonlines 2024-01-18 20:53:59 +01:00
Alug 00dbd08641 remove the extra screentex and apply palshader directly to finaltex
theres basically barely any difference, even in the fades theres very little, and it just cost so freaking much performance

however, ill keep the revamped screentex setup as this it allows us to keep the better fadescreen background for menus
2024-01-18 17:03:16 +01:00
Alug e77a4d4690 readd oldpal
for performance reasons its better
2024-01-18 17:03:12 +01:00
Alug d370b59777 do this a little better 2024-01-18 17:03:05 +01:00
Alug 241108abc2 ensure consistent shader state 2024-01-18 17:03:00 +01:00
Alug d7fe3272e2 Light table support for HWR_FadeScreenMenuBack 2024-01-18 17:02:47 +01:00
Alug cc317cb28e remove gr_oldpal for now 2024-01-18 17:02:39 +01:00
Alug 2a0e2f76f1 paletterenderer screentex stuff again
this didnt really work like it shouldve
so ill keep it here for now
2024-01-18 17:02:34 +01:00
Alug 5cec34e8d9 fix lighttable batching for new batching and palshader code 2024-01-18 16:56:59 +01:00
Alug 8c1febd1b9 Merge branch 'Saturn-Next' into batching-stuff 2024-01-18 16:53:40 +01:00
Alug 1ff9bae55c use fudges from newer paletter shader 2024-01-18 16:49:44 +01:00
Alug fb65496507 use fudges from newer paletter shader 2024-01-18 16:49:10 +01:00
indev db7ffbff41 Merge pull request #92 from Indev450/planestuff2
Software Plane cleanup + support of tilted water ripple
2024-01-18 18:46:12 +03:00
indev 9e78fb88b7 Merge pull request #88 from Indev450/gammastuff
Rework of Gamma stuff + Addition of the Colour Cube and Advanced Colour Settings
2024-01-18 18:41:03 +03:00
indev fd1177b6e5 Merge branch 'Saturn-Next' into gammastuff 2024-01-18 18:40:51 +03:00
indev d14b1ee4a6 Merge pull request #86 from Indev450/newpalshader
Rework Palette Rendering
2024-01-18 18:28:19 +03:00
Alug 9a8d6efcd7 make thundershield follow player offset
this allows the to stay on the player when saltyhopping etc.
2024-01-18 15:34:19 +01:00
Alug abe52ba440 make thundershield follow player offset
this allows the to stay on the player when saltyhopping etc.
2024-01-18 15:21:20 +01:00
Alug ee5d097201 Prevent FOF alpha from wrapping around in OpenGL 2024-01-18 15:07:29 +01:00
Alug 0ea182d04f change this 2024-01-18 14:12:27 +01:00
Alug 3dcf4f6f64 Refactor Batching code
from Hannu Hanhi
https://git.do.srb2.org/STJr/SRB2/-/commit/707687beea50a2bfcc14638e923ac516195351b1?merge_request_iid=1774
2024-01-17 18:31:36 +01:00
Alug 8d737c96c9 Refactor Batching code
from Hannu Hanhi
https://git.do.srb2.org/STJr/SRB2/-/commit/707687beea50a2bfcc14638e923ac516195351b1?merge_request_iid=1774
2024-01-17 18:30:53 +01:00
Alug 5c93b90c2e Merge remote-tracking branch 'origin/batching-stuff' into lugstuff 2024-01-17 18:16:06 +01:00
Alug d071f52707 fix typo 2024-01-17 18:15:54 +01:00
Alug 41bee850da Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-17 14:59:21 +01:00
indev 7a0adbc30b Merge pull request #93 from Indev450/crash-log-mention
Mention the crashlog.txt on the crash window
2024-01-17 16:50:19 +03:00
indev 6d642b124a Fix typo 2024-01-17 16:48:11 +03:00
Alug 416c2a9e9d Merge remote-tracking branch 'origin/planestuff2' into lugstuff 2024-01-17 12:42:59 +01:00
Alug 8fa9fccc79 Revert "use malloc here"
This reverts commit 75d1076bbe.
2024-01-17 12:42:56 +01:00
Alug c5a4071a06 Revert "Move water ripple spanfunc out of r_plane + tilted water support"
This reverts commit 139d937c86.
2024-01-17 12:42:48 +01:00
Alug 930e48ad39 Revert "Plane optimization and cleanup"
This reverts commit db61bfb568.
2024-01-17 12:42:39 +01:00
Alug 868678f321 Revert "Revert "Revert "Fix vibing slope planes"""
This reverts commit 8530b6512c.
2024-01-17 12:42:34 +01:00
Alug 7d9510b315 Fix vibing slope planes 2024-01-17 12:37:09 +01:00
Alug c80c754f45 Plane optimization and cleanup
sned help

https://git.do.srb2.org/STJr/SRB2/-/commit/c07c80fd9e626f15b4d84d1766f8963e089d295a
2024-01-17 12:37:05 +01:00
Alug 0b1c3f2f67 Move water ripple spanfunc out of r_plane + tilted water support
idk man
2024-01-17 12:36:58 +01:00
Alug 69c1f9164b use malloc here 2024-01-17 12:36:54 +01:00
Alug 8530b6512c Revert "Revert "Fix vibing slope planes""
This reverts commit 2a5f487e5f.
2024-01-17 12:32:50 +01:00
Alug 2a5f487e5f Revert "Fix vibing slope planes"
This reverts commit 82562bc20d.
2024-01-17 12:31:28 +01:00
Alug 141f6c51dc Revert "optimize plane stuff even more"
This reverts commit 120def9676.
2024-01-17 12:31:24 +01:00
Alug 1fc9492b30 Revert "Use floating point trig in R_SetSlopePlane"
This reverts commit 3555783284.
2024-01-17 12:31:13 +01:00
Alug 65782d3d75 Revert "more changes"
This reverts commit cb6d657c03.
2024-01-17 12:31:08 +01:00
Alug b5cb6dfb9d Revert "forgoer"
This reverts commit f476befc4b.
2024-01-17 12:31:03 +01:00
Alug 6667e4b8bc Revert "forgor R_GetSlopeZAt"
This reverts commit 4a94939d4f.
2024-01-17 12:30:58 +01:00
Alug 5e2492a930 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-17 12:19:30 +01:00
indev b7ef5e0931 Merge pull request #91 from Chearii/Saturn-Next
``v.getSpritePatch`` from 2.2
2024-01-17 14:18:22 +03:00
Alug b9115aa5f8 (hopefully) fix overflow in R_DrawRepeatMaskedColumn
well this fixes the game hanging in software renderer on Marsh´s Marble Zone
2024-01-17 12:11:42 +01:00
Alug 4f07372e0f (hopefully) fix overflow in R_DrawRepeatMaskedColumn
well this fixes the game hanging in software renderer on Marsh´s Marble Zone
2024-01-17 12:11:32 +01:00
Chearii 83c5618cb7 Add some labeling 2024-01-16 15:01:08 -05:00
Chearii c6faf8e6a2 Player sprite support. 2024-01-16 14:47:48 -05:00
Chearii 68354baf28 Add `getSpritePatch` 2024-01-16 13:46:30 -05:00
Alug 80a1a97083 Revert "Revert "Revert "Localskins on replays"""
This reverts commit 12059955e5.
2024-01-16 16:44:41 +01:00
Alug 204476c55d Revert "Hopefully fix the localskin replay issues 🙏"
This reverts commit 8fab258778.
2024-01-16 16:44:38 +01:00
hayaunderscore 8fab258778 Hopefully fix the localskin replay issues 🙏 2024-01-16 16:35:39 +01:00
Alug 12059955e5 Revert "Revert "Localskins on replays""
This reverts commit d3e5dfc346.
2024-01-16 16:35:33 +01:00
Alug 8f6cc895a0 fix ogl shearing with flipcam 2024-01-16 16:22:40 +01:00
Alug 3ca1f957ba fix ogl shearing with flipcam 2024-01-16 16:22:30 +01:00
Alug a0eab7d5f8 Revert "invert encore remap is 12 not 15?"
This reverts commit 8e6023d850.
2024-01-16 07:17:05 +01:00
Alug 6346ac0a96 Revert "invert encore remap is 12 not 15?"
This reverts commit 8e6023d850.
2024-01-16 07:11:43 +01:00
Alug 1b7870e905 Merge branch 'Saturn-Next' into newpalshader 2024-01-15 20:23:59 +01:00
Alug b11362aec1 remove the extra screentex and apply palshader directly to finaltex
theres basically barely any difference, even in the fades theres very little, and it just cost so freaking much performance

however, ill keep the revamped screentex setup as this it allows us to keep the better fadescreen background for menus
2024-01-15 20:12:35 +01:00
Alug 75630df10e readd oldpal
for performance reasons its better
2024-01-15 19:36:37 +01:00
Alug 4d93abb7ac do this a little better 2024-01-15 17:44:07 +01:00
Alug 731943f980 ensure consistent shader state 2024-01-15 16:50:20 +01:00
Alug 265dc1f296 Light table support for HWR_FadeScreenMenuBack 2024-01-15 16:29:01 +01:00
Alug c449ffcc98 remove gr_oldpal for now 2024-01-15 16:23:19 +01:00
Alug 34500d32d0 paletterenderer screentex stuff again
this didnt really work like it shouldve
so ill keep it here for now
2024-01-15 16:17:17 +01:00
Alug e2a4fdc395 Revert "Localskins on replays"
This reverts commit e1f821e121.
2024-01-15 15:57:17 +01:00
Alug d3e5dfc346 Revert "Localskins on replays"
This reverts commit e1f821e121.
2024-01-15 15:51:28 +01:00
Alug 3eb8886890 remove Shader_Load as Shader_SetUniforms literally did the same thing 2024-01-15 15:16:01 +01:00
Alug 8ed11107eb remove Shader_Load as Shader_SetUniforms literally did the same thing 2024-01-15 15:10:02 +01:00
Alug 2f51108783 fix lighttable batching for new batching and palshader code 2024-01-15 15:09:36 +01:00
Alug 2667a66419 Merge remote-tracking branch 'origin/batching-stuff' into lugstuff 2024-01-15 14:27:10 +01:00
Alug 5e0fe497f5 add stuff here too 2024-01-15 14:27:01 +01:00
Alug 35e8d54fc4 oopsie 2024-01-15 14:21:38 +01:00
Alug 0fd073f2f0 Merge remote-tracking branch 'origin/batching-stuff' into lugstuff 2024-01-15 14:18:10 +01:00
Alug 840cf4e00a Revert "Revert "Optimize HWR_RenderBatches polygon sorting""
This reverts commit a36e633555.
2024-01-15 14:15:26 +01:00
Alug 08e5b4844e fix palshader 2024-01-15 13:59:43 +01:00
Alug 7edfdf9325 forgor 2024-01-15 13:47:13 +01:00
Alug d5fdd60fed replace karts batching with srb2s batching
currently palette renderer does not work
may need to try it with the reworked
2024-01-15 13:35:17 +01:00
Alug d5d99f94b7 cap flashpals again
well it often resulted in flashpals that just made stuff so badly visable lmao
2024-01-15 11:38:09 +01:00
Alug dea19e4416 forgor R_GetSlopeZAt 2024-01-15 11:20:54 +01:00
Alug f7612d7398 forgoer 2024-01-15 11:17:19 +01:00
Alug e39182607e more changes 2024-01-15 11:16:16 +01:00
Alug 79f1febbce Use floating point trig in R_SetSlopePlane 2024-01-15 11:10:12 +01:00
Alug 120def9676 optimize plane stuff even more 2024-01-15 11:09:07 +01:00
Alug 82562bc20d Fix vibing slope planes 2024-01-15 10:44:43 +01:00
Alug 1c51361120 Plane optimization and cleanup
sned help

https://git.do.srb2.org/STJr/SRB2/-/commit/c07c80fd9e626f15b4d84d1766f8963e089d295a
2024-01-15 10:40:51 +01:00
Alug c07e79deb7 Move water ripple spanfunc out of r_plane + tilted water support
idk man
2024-01-15 10:18:13 +01:00
Alug 81cb1111b4 use malloc here 2024-01-15 09:36:35 +01:00
Alug 48320b5f96 this can be static 2024-01-15 08:59:37 +01:00
Alug be3a57c8ab proper big room fix
no idea what i was doing here, pointtoangle64 does all we need, no need for a hacky 64bit pointtoangleex
2024-01-15 08:59:04 +01:00
Alug 369307181e this can be static 2024-01-15 08:35:45 +01:00
Alug 7881e04e6b Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-15 08:26:13 +01:00
Alug 66a72eb1be Copy Interpolation to Shields and Overlays, Splitscreen Overlays
from https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1992
2024-01-15 08:25:54 +01:00
Alug 2093bf27b9 clean up drawfill transparency 2024-01-15 08:12:40 +01:00
Alug ad77f11859 Optimize polygon sorting on batch renderer
from https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2253

again lul
2024-01-15 00:31:29 +01:00
Alug 96d177876f Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-14 23:50:14 +01:00
Alug a36e633555 Revert "Optimize HWR_RenderBatches polygon sorting"
This reverts commit 5201ccd6d2.
2024-01-14 23:49:48 +01:00
Alug dc7392f86b Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-14 22:57:24 +01:00
Alug 79a594f6ee tooltips greenres fixed by nepdisk c: 2024-01-14 22:57:00 +01:00
Alug d2bf2bc581 forgor 2024-01-14 22:53:20 +01:00
Alug 6f6252b6f8 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-14 22:50:11 +01:00
Alug c1223d767d remove this hacky stuff, just dont interpolate it
it barely looked any better, it was actually just faster than it shouldve been
2024-01-14 22:39:50 +01:00
Alug d10c5fef2a remove gr_vhseffect cvar
the vhs effect can be toggled off in opengl with cv_vhseffect anyways, so having cvars to do the same thing is kinda unecessary
2024-01-14 22:30:27 +01:00
Alug 20b32df2c6 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-14 22:13:42 +01:00
Alug 2ffe7aa854 use hwr_drawpatch to fix compiler warning and casting wrong things 2024-01-14 22:13:30 +01:00
Alug d413d02bf7 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-14 21:38:49 +01:00
Alug d0761d0044 background for missing 4th player screen in 4 player splitscreen
just like software does c:
2024-01-14 21:29:14 +01:00
indev fe868a74d2 Merge branch 'Saturn-Next' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2024-01-14 18:04:42 +03:00
indev 76a233148b Restore old speedometer offset cvar names
Changed from "speed" to "spdm" in refactor accidently oops
2024-01-14 18:03:20 +03:00
hayaunderscore e1f821e121 Localskins on replays 2024-01-14 14:18:01 +01:00
Alug 9c6f720f11 Revert "change this"
This reverts commit 25bc55730e.
2024-01-14 14:14:54 +01:00
Alug 426c0366cc Merge remote-tracking branch 'origin/newpalshader' into lugstuff 2024-01-13 16:12:04 +01:00
Alug 2520626082 more cleanup of things i missed 2024-01-13 13:12:55 +01:00
Alug d3d3655580 Merge remote-tracking branch 'origin/crash-log-mention' into lugstuff 2024-01-13 12:05:55 +01:00
Alug d4a011ee6d Merge remote-tracking branch 'origin/addfilelocal-load-animdefs' into lugstuff 2024-01-12 13:37:17 +01:00
Alug b08118734e Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-12 13:37:14 +01:00
indev 41ee6de784 Make non-important files still load textures and animdefs 2024-01-12 15:35:24 +03:00
indev 0a6a40741b Don't reload addfilelocal'd files if md5 matches 2024-01-12 14:55:40 +03:00
hayaunderscore 139d2e6be8 Localskins on replays 2024-01-12 12:26:21 +01:00
Alug a866461b0a Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-11 18:46:14 +01:00
Alug 6f61331d46 Merge remote-tracking branch 'origin/newpalshader' into lugstuff 2024-01-11 18:46:12 +01:00
indev b7ffaf4243 Warn about possible crash for vanilla when failing to spawn mapthing 2024-01-11 20:13:13 +03:00
Alug 5e3b6a753e update some comments 2024-01-11 12:30:29 +01:00
Alug e03a17869e add some comments 2024-01-11 12:27:10 +01:00
Alug 7731ca9fb2 Merge remote-tracking branch 'origin/newpalshader' into lugstuff 2024-01-11 09:53:47 +01:00
Alug a1f7914c5e more cleanup 2024-01-11 09:51:58 +01:00
Alug d2a361c250 remove unecessary glActiveTexture calls 2024-01-11 09:06:23 +01:00
Alug b082f71ca7 change this back 2024-01-11 08:42:56 +01:00
Alug 3de0c4f5d8 Merge remote-tracking branch 'origin/newpalshader' into lugstuff 2024-01-11 01:10:04 +01:00
Alug cdef315866 fix software more crash 2024-01-11 01:09:51 +01:00
Alug ad87f7f895 dont initialize this to 1
oopsie
2024-01-11 00:51:19 +01:00
Alug 2e602f8861 Revert "Revert "just show text instead of miscoloured boxes""
This reverts commit 7072a50060.
2024-01-11 00:50:36 +01:00
Alug 1a7d92a082 Revert "Revert "fix some things""
This reverts commit a65e586de5.
2024-01-11 00:50:26 +01:00
Alug 5aa2a0c821 Revert "Revert "Merge remote-tracking branch 'origin/gammastuff' into lugstuff""
This reverts commit a9d7ca3332.
2024-01-11 00:50:17 +01:00
Alug 4f2328b8dc Merge remote-tracking branch 'origin/newpalshader' into lugstuff 2024-01-11 00:47:24 +01:00
Alug f5b4d7c314 small cleanup 2024-01-11 00:39:20 +01:00
Alug e929e524a3 Merge remote-tracking branch 'origin/newpalshader' into lugstuff 2024-01-10 14:18:45 +01:00
Alug f7b8c5b3ac move this 2024-01-10 14:16:09 +01:00
Alug e6b9f18d3d Merge remote-tracking branch 'origin/newpalshader' into lugstuff 2024-01-10 14:14:53 +01:00
Alug fc34fd708c fix lighttable batching issues
ugh
2024-01-10 14:14:46 +01:00
Alug 7f197ef84e Merge remote-tracking branch 'origin/newpalshader' into lugstuff 2024-01-10 13:52:26 +01:00
Alug a9d7ca3332 Revert "Merge remote-tracking branch 'origin/gammastuff' into lugstuff"
This reverts commit 9aca8438a2, reversing
changes made to c2d37dfb61.
2024-01-10 13:51:51 +01:00
Alug a65e586de5 Revert "fix some things"
This reverts commit 69ffee271d.
2024-01-10 13:51:46 +01:00
Alug 7072a50060 Revert "just show text instead of miscoloured boxes"
This reverts commit fc1a367c2e.
2024-01-10 13:51:43 +01:00
Alug 61897cdc4a bleh 2024-01-10 13:40:14 +01:00
Alug 1be27dc868 more smol changes 2024-01-10 13:38:30 +01:00
Alug 558963c57c Use GL_LUMINANCE8 for 3d palette lookup texture on OpenGL versions older than 3.0 2024-01-10 13:27:25 +01:00
Alug fba1c11861 fix 2d draw brightness issue + fix some other things 2024-01-10 13:26:29 +01:00
Alug 2c69f67d39 Decrease the amount of texture clearing when switching palette rendering state 2024-01-10 12:53:38 +01:00
Alug f4ded02c23 change some thing + cleanup
also changed added nearestpalettecolor
its entirely backwards compat
but works better for the pal lookup in pal rendermode
2024-01-10 12:48:13 +01:00
Alug bb24b767a6 we need this stuff but do it like new palshader 2024-01-10 10:57:29 +01:00
Alug 0ef4edc257 Fix Pal water shader
TODO: make this not half the pal shader again
2024-01-10 10:48:59 +01:00
Alug f8979ed80a forgor 2024-01-10 10:47:05 +01:00
Alug 3635d4adb1 Fix Flashpal toggle 2024-01-10 10:42:30 +01:00
Alug f3e23ad621 WIP: redo palette rendering
TODO: alot of cleanup from the old
but from quick testing this seems to actually work

tho since we dont have a preprocessor we still have to "switch out" the shaders at runtime

also didnt bother with any special toggles yet

needs alot of testing
2024-01-10 10:10:34 +01:00
Alug 4881471a6a just show text instead of miscoloured boxes 2024-01-09 14:27:13 +01:00
Alug fc1a367c2e just show text instead of miscoloured boxes 2024-01-09 14:27:05 +01:00
Alug 69ffee271d fix some things 2024-01-09 14:20:01 +01:00
Alug 088c250a19 use og values for pal 2024-01-09 14:19:50 +01:00
Alug 3b376d85d4 fix some things 2024-01-09 14:19:36 +01:00
Alug 9aca8438a2 Merge remote-tracking branch 'origin/gammastuff' into lugstuff 2024-01-09 14:09:56 +01:00
Alug 2321e4aa7f use og values for pal 2024-01-09 13:38:35 +01:00
Alug c2d37dfb61 use og values for pal 2024-01-09 13:38:24 +01:00
Alug 3c3bd0f0ea stuff 2024-01-09 13:25:59 +01:00
Alug 958db336b7 change this 2024-01-09 13:23:54 +01:00
Alug 25bc55730e change this 2024-01-09 12:23:43 +01:00
Alug 57cee31279 change all gamma stuff + add more options and change more things
uhhhhhhhhh
2024-01-09 12:11:42 +01:00
indev c4bb4965e1 Better check for 32 bit windows in I_ReportSignal 2024-01-08 23:35:34 +03:00
indev f1e146906a Mention crash log in crash popup 2024-01-08 23:14:22 +03:00
indev 6304a46c84 Allow setting 'none' or nil to mo.localskin and player.localskin 2024-01-08 19:06:31 +03:00
Alug 32cc37a424 update credits 2024-01-08 09:56:14 +01:00
Alug 342d570b3b Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-08 09:07:24 +01:00
Alug 7242c3c778 fix compiler warning
ugh
2024-01-08 08:58:55 +01:00
Alug 67457c25df Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-08 08:54:08 +01:00
Alug 07481fc2aa sleepy moment 2024-01-08 08:52:20 +01:00
Alug a98d46f8a8 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-08 08:51:05 +01:00
Alug 77577530da menu stuff 2024-01-08 08:50:08 +01:00
Alug 213718d1bd add toggle to be able to either rotate just players or everything
you can either just having Players be rotated on slopes, or every mobj

more customizable and also for performance concerns for some
also some stuff i forgor
2024-01-08 08:34:32 +01:00
Alug 9bf10bf35b make new cvar "spriteroll" for sprite rotation disable
so stuff that uses spriterotation can still be used when slope rotation is toggled off
better for some effects
2024-01-08 08:29:58 +01:00
Alug cb0c75e9a8 dont do anything if sloperoll is disabled
well it still precalcs some things, but only on gamestart which is needed since we cant reeinit sprites everytime we change sloperoll
2024-01-08 08:09:43 +01:00
Alug b2fca84b15 Zzz... 2024-01-07 08:25:49 +01:00
Alug cf78516c77 use fudge defines + remove wall and floor doom_colormap shader
both are now consilidated ( i have no idea how to spell that) into doom_colormap shader
2024-01-06 08:13:24 +01:00
Alug 39489fc6f1 use srb2´s sky shader
also its finally a defined shader now + move default fragment shader to the top
2024-01-06 08:12:20 +01:00
Alug 2e31169738 use fudge defines + remove wall and floor shader
both are now consilidated ( i have no idea how to spell that) into doom_colormap shader
2024-01-06 08:11:57 +01:00
Alug 4cda2c8093 use srb2´s sky shader
also its finally a defined shader now + move default fragment shader to the top
2024-01-06 08:07:11 +01:00
Alug 73b4e8a988 change this 2024-01-06 04:57:18 +01:00
Alug 82dbfb4379 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-06 01:15:05 +01:00
indev 910e20b542 Fix flipped objects having wrong slope roll angle 2024-01-06 03:13:49 +03:00
Alug 7f78873a8a Merge branch 'Saturn-Next' of https://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2024-01-06 01:07:54 +01:00
Alug 26938c20db fix 3d model offsets when flipped 2024-01-06 01:07:48 +01:00
indev 8562c9ad7d Hide ping when showhud is set to Off 2024-01-06 01:04:46 +03:00
Alug 0e2ff2390a Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-05 21:56:11 +01:00
indev d81640c57e Fix hud offsets for position number, also refactor offsets definition a bit 2024-01-05 19:04:13 +03:00
Alug 220d5db739 optimize camera mobj z stuff lol
idk wanna see if this does anything
2024-01-05 06:40:16 +01:00
Alug 619fe7bdaf fix menu fade screen background using wrong things in palshader 2024-01-05 01:24:43 +01:00
Alug 05b74102c0 little changes to palshader
use gl_texture 2 in postprocess like srb2s palshader does it
also disable depthtest for screentextures in palshader mode
2024-01-05 01:24:38 +01:00
Alug 5d699d4cf3 revert this 2024-01-05 01:24:31 +01:00
Alug 17c4a35df5 change order of those 2024-01-05 01:24:23 +01:00
Alug 212d475f50 fix menu fade screen background using wrong things in palshader 2024-01-05 01:23:05 +01:00
Alug b7fbd0433f little changes to palshader
use gl_texture 2 in postprocess like srb2s palshader does it
also disable depthtest for screentextures in palshader mode
2024-01-05 00:53:19 +01:00
Alug d28dd96aa0 revert this 2024-01-05 00:22:13 +01:00
Alug 0e46f91c51 change order of those 2024-01-05 00:21:51 +01:00
Alug d6dabacb05 wöter... 2024-01-04 23:31:55 +01:00
Alug 4363473955 hehe funky colours 2024-01-04 23:11:46 +01:00
Alug 7e5fd4e290 Merge remote-tracking branch 'origin/compilation-warnings-fix' into lugstuff 2024-01-03 20:02:35 +01:00
indev 191dfbe1bd forgor 2024-01-03 22:01:36 +03:00
Alug c30a0cd4f1 Merge remote-tracking branch 'origin/compilation-warnings-fix' into lugstuff 2024-01-03 20:00:34 +01:00
indev 8b06822092 change set_text to set_boolean for cv_amigafilter onchange function 2024-01-03 21:59:55 +03:00
Alug 98d56a38f5 Merge remote-tracking branch 'origin/compilation-warnings-fix' into lugstuff 2024-01-03 19:45:14 +01:00
indev e4bef0e3f4 Fix amigafilter 2024-01-03 21:39:17 +03:00
Alug f26e95e7c9 Merge remote-tracking branch 'origin/compilation-warnings-fix' into lugstuff 2024-01-03 18:24:19 +01:00
indev c755a4d8b6 Not all filenames are at least 256 characters long aaaa 2024-01-03 13:32:06 +03:00
Alug f39e1a9b70 wöter 2 2024-01-03 02:24:15 +01:00
Alug 1d5b531ba3 Revert "uuuh refactor batching a little + port Optimize polygon sorting"
This reverts commit d757e82e3f.
2024-01-02 22:21:25 +01:00
Alug a90bd08405 Revert " Avoid batching skybox and horizon lines"
This reverts commit b5fbaaa2b9ae91877c7c6ad3602956d677fa6e0c.
2024-01-02 22:21:21 +01:00
Alug 1cbb726cab Merge branch 'lugstuff' of https://github.com/Indev450/SRB2Kart-Saturn into lugstuff 2024-01-02 22:13:17 +01:00
Alug ce61d00dcf fix inline warnings 2024-01-02 22:13:13 +01:00
indev 2d92b798c6 Fix warnings related to boolean glib getters/setters 2024-01-03 00:10:28 +03:00
Alug cc62164a7c Revert "Revert "Merge remote-tracking branch 'origin/Saturn-Next-EnumLib' into lugstuff""
This reverts commit 142540e263.
2024-01-02 21:08:03 +01:00
Alug af510bce93 inline deez nuts 2024-01-02 21:07:02 +01:00
Alug 4ba60bedcd AAAAAaaa 2024-01-02 20:36:32 +01:00
Alug 583bf26129 wöter 2024-01-02 20:36:14 +01:00
Alug d8c3623141 Avoid batching skybox and horizon lines 2024-01-02 20:35:26 +01:00
Alug 2cd0875da6 lol 2024-01-02 06:19:31 +01:00
Alug 73d0848f7e (hopefully) fix horizonlines 2024-01-02 03:49:32 +01:00
Alug d757e82e3f uuuh refactor batching a little + port Optimize polygon sorting
uhhh https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2253
2024-01-02 01:02:42 +01:00
Alug 007238e7dd Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-02 00:09:27 +01:00
Alug a304229511 Merge pull request #84 from Chearii/Saturn-pitch-roll
Pitch and roll, and slope equivalents
2024-01-02 00:08:59 +01:00
Chearii b55fc95ce8 Remove `camera_tilting from K_RollMobjBySlopes`, and make the divisor a static value 2024-01-01 17:11:25 -05:00
Alug 944e019020 let indev compile this branch uwu 2024-01-01 21:28:03 +01:00
Alug 634f8897b4 Revert "uuuh refactor batching a little + port Optimize polygon sorting"
This reverts commit 7651d31c50.
2024-01-01 21:19:14 +01:00
Alug 7651d31c50 uuuh refactor batching a little + port Optimize polygon sorting
uhhh https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2253
2024-01-01 20:44:19 +01:00
Chearii f2faa87e51 Menu changes and additions.
"Player Distortion" is now "Sprite Distortion" to reflect the additions and changes to the slope-rolling system.
All relevant option names have also been changed.
2024-01-01 14:29:32 -05:00
Chearii d79d754b15 Changes to model rendering
Standard slope rotation is now handled through secondary variables, while the primary ones are used for pitch and roll.
2024-01-01 14:28:02 -05:00
Chearii 1babed3d66 Changes to rotation rendering
Handlers for ``pitch``, ``roll``, and slope equivalents have been added.
2024-01-01 14:26:29 -05:00
Chearii 5ec64e50ef Lots of pitch and roll stuff
``pitch``, ``roll``, slope versions, interpolation, and ``P_RollPitchMobj``
2024-01-01 13:26:17 -05:00
Chearii 793e8bfdcb Add `K_RollMobjBySlopes` and spark and trail rolling 2024-01-01 13:22:56 -05:00
Chearii 7a4d5ac1c1 Add `cv_sparkroll` 2024-01-01 13:21:23 -05:00
Alug 1702873ab1 Revert "attempt at making water shader ripple more accurate to software"
This reverts commit 8ab37040db.
2024-01-01 18:55:41 +01:00
Alug 44e7d5249c dont pack my memories 2024-01-01 18:30:06 +01:00
Alug 8ab37040db attempt at making water shader ripple more accurate to software 2024-01-01 18:29:04 +01:00
Alug ac203b0ccb Merge remote-tracking branch 'origin/compilation-warnings-fix' into lugstuff 2024-01-01 17:08:31 +01:00
Alug 557546c9c3 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2024-01-01 17:08:18 +01:00
indev 09c5baa899 Merge branch 'compilation-warnings-fix' of ssh://github.com/Indev450/SRB2Kart-Saturn into compilation-warnings-fix 2024-01-01 18:48:26 +03:00
indev ea6506f9f4 Remove attrpack from GLPatch_t so its alignment is same as for patch_t 2024-01-01 18:48:19 +03:00
Alug 5dd7e548c0 fix warning in discord.c 2024-01-01 16:22:30 +01:00
Alug b0928f3601 fix compiler error 127
seems like stuff for UPX aint even there or smth

make: upx: No such file or directory
make: [Makefile:610: ../bin/Mingw/Release/srb2kart-saturn.exe] Error 127 (ignored)
2024-01-01 04:23:50 +01:00
Alug 728cf1eca9 switches should have default i think ug 2023-12-31 03:46:07 +01:00
Alug 52a94dbe78 try and make p-speedometer a little less painful to look at 2023-12-31 03:39:24 +01:00
Alug f4ffc19981 lil k_kart cleanup
uh
2023-12-31 03:12:35 +01:00
Alug 9a1883cd66 duh 2023-12-31 03:01:03 +01:00
Alug ac3c117b03 uh 2023-12-31 00:12:11 +01:00
Alug 1ac008ab02 Merge remote-tracking branch 'origin/compilation-warnings-fix' into lugstuff 2023-12-31 00:07:39 +01:00
Alug 78ff158cb5 fix %zu warning with PRIuPTR X)
i hope that works lul
2023-12-31 00:03:12 +01:00
indev 02b42e4dbb Revert "Attempt to fix %zu warning"
This reverts commit 82083827ff.
2023-12-31 01:47:31 +03:00
indev 82083827ff Attempt to fix %zu warning 2023-12-31 01:44:41 +03:00
indev 571ea6fbc9 Fix 'missing braces around initializer' warning 2023-12-31 01:15:02 +03:00
indev 8af4a67f5e More warning fixes 2023-12-31 01:01:03 +03:00
Alug 58ac86e3bf noone cares about c90 mixed declarations lmao 2023-12-30 21:51:23 +01:00
Alug 2bc6c77fce noone cares about c90 mixed declarations lmao 2023-12-30 21:51:02 +01:00
Alug 1daf06858b Revert "(maybe?) fix net issues on server join"
This reverts commit af40bdb11b.
2023-12-30 21:41:33 +01:00
Alug a4e8ce7f01 Fix most of compilation warnings 2023-12-30 15:55:07 +01:00
indev 87d9f09f72 Fix most of compilation warnings 2023-12-30 16:53:45 +03:00
Alug ed6e16cdce uuh 2023-12-30 01:20:09 +01:00
Alug 57bb92a36c this didnt work out lmao 2023-12-30 00:55:24 +01:00
Alug 142540e263 Revert "Merge remote-tracking branch 'origin/Saturn-Next-EnumLib' into lugstuff"
This reverts commit 5dab606980, reversing
changes made to 661dfde6af.
2023-12-29 23:24:08 +01:00
Alug 5a17430747 Revert "Merge remote-tracking branch 'origin/moreopengl' into lugstuff"
This reverts commit a6015e4647, reversing
changes made to fcbe95447a.
2023-12-29 22:49:51 +01:00
Alug 23c84a9e96 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2023-12-29 22:49:27 +01:00
indev ea49c2a557 Fix 'Add local skins...' position in pause menu for remote admins 2023-12-29 20:58:39 +03:00
Alug 6bb9dcc216 revert that part it stuttered race conditions or somethjing lmao 2023-12-29 15:36:12 +01:00
Alug 1901e4dbdc fuckit idk lmoa 2023-12-29 14:23:29 +01:00
Alug 1657f769da Revert "dont need that"
This reverts commit f274ed3fd8.
2023-12-29 13:11:43 +01:00
Alug c82eb489fe give me all that shit yes 2023-12-29 01:47:27 +01:00
Alug 9f05befd70 i have no idea what im doing lmao 2023-12-29 01:36:33 +01:00
Alug f274ed3fd8 dont need that 2023-12-29 01:35:50 +01:00
Alug f6e027abcb Merge remote-tracking branch 'origin/gl-noencore-effect-fix' into lugstuff 2023-12-27 15:30:13 +01:00
indev 772bcf2125 Merge branch 'gl-noencore-effect-fix' of ssh://github.com/Indev450/SRB2Kart-Saturn into gl-noencore-effect-fix 2023-12-27 17:28:45 +03:00
indev 6748d5ad30 Remove unneeded condition for encore remap in opengl renderer (consistency with software renderer) 2023-12-27 17:28:02 +03:00
Alug a92114a854 Merge remote-tracking branch 'origin/gl-noencore-effect-fix' into lugstuff 2023-12-27 15:04:36 +01:00
Alug 81a8fc3daa move this out of gr_backsector 2023-12-27 15:02:57 +01:00
Alug ffb84705d3 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2023-12-27 14:40:50 +01:00
Alug 04ba08a825 move noencore out of fof stuff
idk if this is right lmao
2023-12-27 14:23:40 +01:00
Alug 647641214a try and cleanup sector special comments a little 2023-12-27 13:30:09 +01:00
indev 9eff693d00 Fix noencore effect not working for walls in opengl renderer 2023-12-27 15:18:06 +03:00
Alug 8e6023d850 invert encore remap is 12 not 15?
is it?
2023-12-27 13:11:08 +01:00
Alug ca288b89b3 why do that twice? 2023-12-27 13:10:48 +01:00
Alug 2f8366b6f9 -flto breaks crashlogs it seems lol 2023-12-24 20:28:57 +01:00
Alug a6f062c126 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2023-12-24 19:41:15 +01:00
indev 0e12ad0189 Fix HWR_DrawFill ignoring transparency levels 10-13 2023-12-24 21:40:15 +03:00
Alug 41c24f3bc9 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2023-12-24 19:13:15 +01:00
Alug c163f25319 Merge branch 'Saturn-Next' of https://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-12-24 18:54:16 +01:00
Alug a926cdf7c1 add translucency support to V_Drawfill
ayeyeerasyedasaedysase

i really hope the software version doesent break aaaaaaaaa
2023-12-24 18:54:10 +01:00
indev 134364eee3 Always load vanilla musicdefs 2023-12-24 20:51:16 +03:00
Alug af40bdb11b (maybe?) fix net issues on server join
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2238?commit_id=d79d22de63c5b84e3e0f4d737af81f74321dd80d

needs alot of testing
2023-12-24 00:15:47 +01:00
Alug 142d678e8c oops 2023-12-23 20:42:11 +01:00
Alug 86394e2c43 Merge branch 'Saturn-Next' of https://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-12-23 20:36:41 +01:00
Alug 405de4e597 remove asm leftovers - profiling stuff 2023-12-23 20:36:35 +01:00
indev 1a6893289c Remove p5prof.h from src/CMakeLists.txt 2023-12-23 22:29:02 +03:00
indev 3297a885eb Remove args.h from src/CMakeLists.txt 2023-12-23 22:24:13 +03:00
Alug 00a69e6aed Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2023-12-23 17:24:07 +01:00
Alug 590440ff82 make palshader a little more accurate 2023-12-22 22:54:33 +01:00
Alug 04b2d784ce Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2023-12-22 20:28:28 +01:00
Alug 37187c7753 fix pal water shader 2023-12-22 20:20:06 +01:00
indev 1b8b92925a Add files for flatpak package (by riomccloud) 2023-12-22 15:51:05 +03:00
Alug a5de51b039 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2023-12-21 13:54:33 +01:00
Alug b87b55ec45 fix compiler warning 2023-12-21 13:42:05 +01:00
Alug 0a38a2fd89 forgor to add ping display stuff to menu
someone pls make a better tooltip i bed ingles
2023-12-21 13:41:52 +01:00
Alug ea3fc8f526 Kart v1.0/srb2 styled fps counter option
this was so much pain for whatever reason lmao
2023-12-21 13:41:13 +01:00
Alug bccc79fe4b Kart v1.0/srb2 ping display option
well i adjusted it a little and made it compatible with the frame ping stuff
just hope the bar stuff is right but seemed so
also changed it so the numbers are right alignent so they dont go out of screen
aaaa
2023-12-21 12:06:31 +01:00
Alug 2a6f551f7a fix compact fps counter screwing up ping counter offsets in tab rankings
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2023-12-21 10:31:45 +01:00
Alug f7f3b6497b fix palshader compiler warning + other stuff
asdfgfagregar
set a gl special state instead of using the boolean in r_opengl
also move hwr_ code out of setshaders
2023-12-21 10:08:57 +01:00
Alug 0dca9f9537 use the bool
brap
2023-12-21 09:22:19 +01:00
Alug d07e7ade4a this does absolutely nothing
leftover from porting musictest
2023-12-21 09:18:20 +01:00
Alug 8dcdbecf0c fix may be unitialized warning 2023-12-21 09:01:27 +01:00
hayaunderscore c7c645de00 Portal code cleanup 2023-12-21 08:27:38 +01:00
hayaunderscore 23c7aaeff2 Some hardware renderer cleanup
GRAH WARNINGS
2023-12-21 08:27:34 +01:00
Alug 4a80e9f20f Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2023-12-20 23:06:24 +01:00
indev cdde33843e Refactor localskin command a bit, get rid of args.c since it is unused 2023-12-20 22:34:47 +03:00
Alug ca47e2edb7 Merge branch 'Saturn-Next' into Saturn 2023-12-20 18:21:57 +01:00
Alug 8676769a8f Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2023-12-20 17:53:09 +01:00
Alug 54ed45f531 remove pal postprocess shader
it never worked, and isnt the right one to do things anyways
the normal GLSL_PALETTE_FRAGMENT_SHADER already does a good job as a postprocess shader, and works similar to srb2´s newer paletterenderer branch
2023-12-20 17:38:20 +01:00
Alug 2f8c7a81ca Revert "Merge remote-tracking branch 'origin/thinkercache' into lugstuff"
This reverts commit 760fe392a8, reversing
changes made to 5dab606980.
2023-12-20 08:35:16 +01:00
Alug ac11af6048 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2023-12-20 06:09:25 +01:00
Alug 6ca2087dbc better wall and floor colormap calc
values taken from based on https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1516
2023-12-20 05:53:36 +01:00
Alug 7c558802a4 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2023-12-20 05:16:05 +01:00
Alug 51166640f5 proper water shader for palette renderer
based on https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1516
2023-12-20 05:15:27 +01:00
Alug ed3b1ea353 use floor light for fog shader
how it should be
2023-12-20 04:02:15 +01:00
Alug 5a516aa1ad dont need that 2023-12-19 21:52:21 +01:00
Alug 8555d38283 v5.1 2023-12-19 20:54:46 +01:00
Alug 4d1b6ed974 Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff 2023-12-19 20:20:57 +01:00
Alug d66f7fb369 forgor to add those 2023-12-19 20:20:42 +01:00
Alug 7818f17b27 show localskin option menu in options even when youre host
this is not the pause menu one, but the options one
since some may still want to apply a localskin to a player for some reason
2023-12-19 20:09:48 +01:00
Alug dd833097b3 fix some colour hud stuff not being greyed out if its unavailable 2023-12-19 20:08:20 +01:00
Alug e8e6bb0499 Revert "test stuff"
This reverts commit 085efaa605.
2023-12-19 19:41:55 +01:00
Alug dddb88db92 timeout sticker uses wrong patch 2023-12-19 19:04:05 +01:00
Alug 58f94666d1 timeout sticker uses wrong patch 2023-12-19 18:58:10 +01:00
Alug 085efaa605 test stuff
very crude, console scream at me if those are botched
most likely not the issue but whatever
2023-12-19 18:57:47 +01:00
Alug 769d93c7da dont prep shaders if theyre uneeded 2023-12-19 17:38:13 +01:00
Alug 6028e392f0 dont prep shaders if theyre uneeded 2023-12-19 17:34:15 +01:00
Alug fa67dd74a0 huehue 2023-12-19 16:28:51 +01:00
Alug cb734b50c3 bru 2023-12-19 16:24:33 +01:00
Alug 087e58b88b bugger off discord rpc 2023-12-19 16:21:35 +01:00
Alug 78b9d67aaa im not on pentium 4 2023-12-19 16:17:15 +01:00
Alug a6015e4647 Merge remote-tracking branch 'origin/moreopengl' into lugstuff 2023-12-19 16:14:18 +01:00
Alug fcbe95447a Merge remote-tracking branch 'origin/multithreadshit' into lugstuff 2023-12-19 16:13:44 +01:00
Alug 760fe392a8 Merge remote-tracking branch 'origin/thinkercache' into lugstuff 2023-12-19 16:11:54 +01:00
Alug 5dab606980 Merge remote-tracking branch 'origin/Saturn-Next-EnumLib' into lugstuff 2023-12-19 16:11:36 +01:00
indev 661dfde6af Don't print discord username in streamer mode at all since discriminators are not a thing anymore 2023-12-18 22:04:41 +03:00
indev 71dea0161d Only warn about custom master server when failed to connect to it 2023-12-18 14:15:01 +03:00
indev 37e9f54af9 Merge branch 'Saturn-Next' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-12-18 02:47:56 +03:00
Alug 5651219d2f Merge branch 'Saturn' into Saturn-Next 2023-12-18 00:47:12 +01:00
indev c544cf9a7c Fix static memory being re-tagged as purgable
Fixes crashes caused by lua-cached patches becoming invalid, may fix other crashes related to that
2023-12-18 02:45:40 +03:00
Alug 69c10365e5 menu stuff is the worst 2023-12-17 21:04:54 +01:00
Alug 040faa4c1c Merge branch 'Saturn-Next' into Saturn 2023-12-17 13:29:30 +01:00
Alug 640934634d fix typo 2023-12-17 12:45:13 +01:00
Alug 9842815557 fix compiler warning 2023-12-16 19:11:54 +01:00
Alug 4d19769dd0 you forgor this X) 2023-12-16 14:55:26 +01:00
indev dd75012982 Simplify calculating transparency flags a bit 2023-12-16 11:36:16 +03:00
Alug 9d48ac5bad hide fpscounter when you hide the hud
this was so absolutely annoying sometimes lmao
2023-12-16 07:04:01 +01:00
Alug 0dc8f320a9 make fps counter and ping display also translucent 2023-12-16 07:03:37 +01:00
Alug c9e96949a3 v5 2023-12-15 23:34:53 +01:00
indev 2d70bd0c73 Merge pull request #83 from Indev450/gl3mipmaps
make mipmaps less stuttery
2023-12-16 00:37:34 +03:00
indev 3949add6af Fix NOHW compilation 2023-12-16 00:31:28 +03:00
indev b87eeaa873 Merge branch 'Saturn-Next' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-12-16 00:21:21 +03:00
Alug b56402a0a9 software sprites should do the same as opengl
no idea why it even was like that tbh

sliptiding was not toggable here

Fixes https://github.com/Indev450/SRB2Kart-Saturn/issues/82
2023-12-16 05:31:49 +01:00
indev b1a47f164e Fix birdmod map-music-resume feature not working in cases when you use grow with invincibility 2023-12-16 00:21:09 +03:00
indev 7fa0820a93 Merge pull request #81 from Indev450/hflip
FF_HORIZONTALFLIP and mobj->mirrored
2023-12-15 00:53:01 +03:00
Alug f2ad6199bf experiment: change max LOD to 16
suprisingly, this made stutters even less for some reason, will need to test things
2023-12-13 01:04:12 +01:00
indev 14f0e70a9b Retreive OpenGL version only once at startup 2023-12-13 00:31:49 +03:00
alufolie91 58147117be gl 1.4 and gl2 can use GL_GENERATE_MIPMAP
uhhhhhhh
2023-12-12 11:12:23 +01:00
Alug 5c4e00694a uh oops
accidentally broke polyobjects
2023-12-12 09:26:49 +01:00
alufolie91 8d123f5e83 use the old thing when gl version below 3.0
also should compile for those with gl version lower than 3 hopefully

uhhh idk if this even is right at all tbh
2023-12-12 08:25:59 +01:00
alufolie91 d78fb05be0 use glGenerateMipmap instead of gluBuild2DMipmaps
as advised by https://www.khronos.org/opengl/wiki/Common_Mistakes#gluBuild2DMipmaps

fixes the godawful stuttering everywhere with mipmaps enabled
2023-12-12 07:50:23 +01:00
alufolie91 b9124e717d i slep
Zzz...
2023-12-12 06:35:48 +01:00
alufolie91 84c2721d8b disable here instead of in function itself 2023-12-12 04:56:22 +01:00
Alug 1569ec7a8b shrug 2023-12-11 14:51:08 +01:00
Alug f741c3ff17 eee 2023-12-10 17:13:54 +01:00
Alug ff31eb7d17 Zzz... 2023-12-10 17:07:00 +01:00
Alug 52b5db7ad0 use hwr_useshader also in palshader
this ensures palshader stuff can only do things when shaders are on AND availible
2023-12-09 08:14:33 +01:00
Alug f10608ea2c smh 2023-12-09 07:52:47 +01:00
Alug 364eb1b0c8 clean up a little + add some comments 2023-12-09 07:52:11 +01:00
Alug 0e2d793a7a add HWR_UseShader bool for shader stuff
just to make things look neater
2023-12-09 07:42:13 +01:00
Alug 9b8c569c9e reorder things a little 2023-12-09 07:38:12 +01:00
Alug 9402a006f4 FF_HORIZONTALFLIP and mobj->mirrored
from: https://git.do.srb2.org/STJr/SRB2/-/merge_requests/987
2023-12-07 18:35:27 +01:00
Alug 6aae3d5f90 more accurate transparent fof plane brigthness for palrendering mode 2023-12-07 17:54:27 +01:00
Alug b5cdc0ca94 just use simple boolean for flashpal
more sane than whatever tf it was before
2023-12-07 00:13:45 +01:00
Alug 28c0339261 a 2023-12-06 23:31:46 +01:00
alufolie91 d7cb89a232 Merge remote-tracking branch 'origin/hayaautoload' into Saturn-Next 2023-12-06 23:29:31 +01:00
hayaunderscore 98b132fcc4 use partialaddwadfile for addon autoload 2023-12-06 17:25:26 +01:00
alufolie91 37377a42e6 postload 2023-12-06 17:25:20 +01:00
hayaunderscore 088f1800ff AUTOLOADING HECK YEAH 2023-12-06 17:24:54 +01:00
alufolie91 a96fb7d247 prevent tab rankings from crashing when map has no name
thought i already did that lol
2023-12-05 22:18:32 +01:00
Alug ca30725f8d more stuff 2023-12-05 01:37:10 +01:00
Alug 6d8337dbad more zzz... 2023-12-05 01:21:50 +01:00
Alug 6a8360ab46 revert R_PointOnSegSide
no idea, was just guesswork and might actually slow things down so i revert it
2023-12-05 01:11:39 +01:00
Alug ddeb438a29 clean up colour hud a little 2023-12-05 01:06:41 +01:00
Alug 11fdaf1515 lol 2023-12-05 00:50:33 +01:00
Alug 7c68d50548 move stuff in pause menu Zzz... 2023-12-05 00:45:13 +01:00
Alug c81a434f0b was a bit ugly 2023-12-05 00:25:27 +01:00
alufolie91 c88f3dc302 Revert "Port Prevent dropped ticcmds due to interp timing jutter from srb2-next"
This reverts commit fed1b23b8b.
2023-12-04 23:51:24 +01:00
alufolie91 ffb22a954f forgor some of those 2023-12-04 23:46:20 +01:00
hayaunderscore 31f9937d7e Fix horizon lines not rendering with portals + fix portal wall z-fighting 2023-12-04 10:28:29 +01:00
Alug 1abdc6c747 Revert "Fix horizon lines not rendering on levels with portals"
This reverts commit ccb2c4ef18.
2023-12-03 22:36:28 +01:00
indev 122cb918a1 Merge pull request #80 from Indev450/musictest
Musictest
2023-12-03 14:30:39 +03:00
hayaunderscore a92f05b864 MUSCINFO
separate lump for music test stuff
2023-12-03 02:39:16 +01:00
alufolie91 a457bc4187 :chonkbuncle: 2023-12-02 22:51:55 +01:00
alufolie91 bb5b888aef Merge branch 'Saturn-Next' into musictest 2023-12-02 21:24:52 +01:00
alufolie91 2797fa9a05 add global toggle for bird music things + move stuff to s_sound
well reason a global toggle is, cause stuff always does stuff even when "disabled" and i cant be assed trying to unmangle this mess

like this we can just turn off everything and game behaves like vanilla

default is off so everythings disabled

if someone wants to do a better approach go ahead
2023-12-01 19:14:15 +01:00
alufolie91 7d5c63d8ee assign bool instead of if else thing 2023-12-01 16:39:47 +01:00
alufolie91 39b70b3686 add drawstretchypatch lua support 2023-12-01 16:13:45 +01:00
alufolie91 34933fdf82 optimise span drawers a little 2023-12-01 15:25:47 +01:00
hayaunderscore ccb2c4ef18 Fix horizon lines not rendering on levels with portals 2023-12-01 09:38:09 +01:00
alufolie91 ea5ac63e0f a 2023-12-01 09:36:40 +01:00
indev de04223443 Merge pull request #78 from Indev450/opengl-polyobj-nozcalloc
Opengl polyobj nozcalloc
2023-11-30 20:13:17 +03:00
indev 20467bdc1e Merge pull request #79 from Indev450/anigif-optimization
Optimize gif recording in opengl a bit
2023-11-30 20:12:50 +03:00
alufolie91 fc458128cf show file of where the music comes from + toggle
ty indev c:
2023-11-28 11:42:46 +01:00
Alug e57ad13004 align stuff proper + make it kart menu blue 2023-11-28 09:39:02 +01:00
alufolie91 88e8c0541b show some music info on bottom right when playing in music test
also allows the game to read "usage" from musicdefs
2023-11-28 07:34:03 +01:00
indev 2a3a63ca28 Merge branch 'Saturn-Next' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-11-28 01:46:43 +03:00
indev c2ddac2c1e Allow using localskins for any kind of mobj from lua 2023-11-28 01:46:28 +03:00
alufolie91 9de9b72940 do the same for lighttable tex 2023-11-27 22:34:02 +01:00
alufolie91 4cb3b5bc0d fix hudcolor when returning from time attacking 2023-11-27 22:28:28 +01:00
alufolie91 dc190be6b3 Zzz...
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2023-11-27 21:58:28 +01:00
alufolie91 0373b19269 hopefully fix older hardware crashing even if they dont use palshader
also guard the last InitPalette, we do not need to call it if we dont use palshader

also if either pglTexImage3D or ltcachetail->id is null, the game wont crash now, instead returns, and turns off the palshader so all should work hopefully
2023-11-27 21:46:18 +01:00
Alug 3610096c35 this always annoyed me
why was it always offcenter like that?
2023-11-27 19:05:17 +01:00
Alug 2b75d0b26b replace those with gl error messages instead 2023-11-27 18:35:38 +01:00
Alug a27dc33e25 1 extra row
hope this right lul
2023-11-27 15:58:13 +01:00
Alug 3718c5bd51 fix small gap on some resolutions 2023-11-27 15:45:44 +01:00
Alug a256e170ab fix interpolation speeding things up + make box wider 2023-11-27 15:37:22 +01:00
Alug 2009ed38f0 we dont have that stuff so remove it 2023-11-27 15:19:21 +01:00
indev 7599d9ddd4 Fix assigning null character out of string bounds 2023-11-27 17:06:38 +03:00
indev 0907c219af Change maximum string length for name in music test 2023-11-27 16:57:38 +03:00
indev 0ae1f2606f Merge branch 'musictest' of ssh://github.com/Indev450/SRB2Kart-Saturn into musictest 2023-11-27 16:49:54 +03:00
indev 2abb65403f Make music names in music test scroll 2023-11-27 16:49:48 +03:00
alufolie91 223e858d00 musictest should return you to music options menu 2023-11-27 14:25:26 +01:00
alufolie91 2769847c90 remove unused things + move stuff around
e
2023-11-27 14:13:15 +01:00
alufolie91 0fc3d9d4d6 do NOT change how sound freeslotting works
reasons
2023-11-27 14:03:54 +01:00
alufolie91 d6702be08b make it its own thing, add back normal sound test 2023-11-27 13:58:35 +01:00
alufolie91 d41c7bedd8 port musictest from srb2 + making it not crash
thing is super ugly, also replaces current sound test for now, which needs to be fixed
2023-11-27 13:23:53 +01:00
alufolie91 d0f9993385 add more stuff to experimental video menu + smol cleanup
might aswell add the other things
2023-11-27 06:09:02 +01:00
Alug caf05f5923 e 2023-11-27 05:48:02 +01:00
Alug cc996759be add stuff the experimental video stuff
idk description could be better but i suck at writing lmao

those three things were introduced back in v.5.3  internal (before release) which was the version which had some performance regression

those were looked into and from my testing saturn often performs better than vanilla

however those features still may tax computers from others, so i decided to make toggles for those things
2023-11-27 05:35:20 +01:00
Alug 51de2a4610 Merge branch 'Saturn-Next' of https://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-11-27 05:21:31 +01:00
Alug e15c9558fa toggle for slope midtexture pegging fix
also fixes a wrong ESLOPE ifdef
2023-11-27 05:21:26 +01:00
Alug 29edb49861 toggle for slope midtexture pegging fix 2023-11-27 05:20:33 +01:00
Alug 7ce3d0c733 add toggle for texture zfight fix 2023-11-27 04:40:13 +01:00
Alug fb8cdbb9cc only do it like that in pal rendering mode 2023-11-27 04:23:28 +01:00
Alug 882554a3fe splitwallfix toggle
idk maybe some still get worse performance from this
2023-11-27 04:10:39 +01:00
indev 40a8554cc9 Attempt to fix rare 'server player kick' bug 2023-11-26 23:52:07 +03:00
alufolie91 146a80e91c Dont mark this shit as modify doofus 2023-11-25 10:38:24 +01:00
hayaunderscore b533dbee55 Localskin support probably 2023-11-25 10:37:48 +01:00
hayaunderscore 3ede4eb1a6 Remove this dumb debug print 2023-11-25 10:37:43 +01:00
hayaunderscore 5813c2b3c3 Experimental SPRTINFO support
Based of leftover code from patch rotation
2023-11-25 10:37:35 +01:00
NepDisk 2b1dc82bfa Fix complilation due to menu code 2023-11-25 00:55:29 +03:00
NepDisk 0b59c156a0 Merge branch 'cleanedupcharpicker' into stacking-dev
Merge the new character select menu I created
2023-11-23 08:58:27 +01:00
NepDisk 03fb7fd145 Oops forgot to remove this 2023-11-23 08:58:04 +01:00
NepDisk f99e516e63 SkinSearch command. 2023-11-23 08:57:55 +01:00
Alug f62642f855 your hudcolor choice should overwrite everything else
also "fixes" the splitscreen issue thats been mentioned,
now whichever hudcolor you choose gets applied, regardless of splitscreen or if you sswitch viewpoints
2023-11-22 20:54:19 +01:00
NepDisk 3adad0ed18 Add Saturn peeps to credits :D 2023-11-22 09:10:26 +01:00
Alug 429976faf8 a 2023-11-22 08:27:16 +01:00
Alug 1d40c26fd9 make players snap when looking back and using sloperoll
always looked a bit weird tbh
2023-11-22 06:47:42 +01:00
indev 4c730ec84d Merge branch 'Saturn-Next' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-11-22 01:48:59 +03:00
indev 2d25fabe64 Fix few missing packet type names in d_net.c 2023-11-22 01:48:41 +03:00
Alug 095ec063fb spriteoffsets should be 0 + a little more oraganized 2023-11-21 22:22:03 +01:00
NepDisk ab8d3e2642 Change default offset so stat display doesn't go over mr 2023-11-21 19:41:59 +01:00
Alug cbd59a04f6 toggle for localskin menus
well wanna be able to toggle things
2023-11-21 17:34:07 +01:00
Alug e49e6b8998 toggle for playing music while paused 2023-11-21 17:02:10 +01:00
alufolie91 02cd4e753d make software horizonlines also extend fofs 2023-11-20 22:40:41 +01:00
indev d06f923066 Fix filesearch trying to open file symlinks as directory 2023-11-20 16:10:02 +03:00
Alug bb9f7c8196 also hide the other localskin menu in option menu when youre server 2023-11-19 08:46:34 +01:00
Alug bf2c786a02 make pause menu look more like vanilla now that some things get disabled
I HATE MENU CODE AAAAAAAAAAAAa
2023-11-19 08:02:13 +01:00
alufolie91 7d66da2b94 lol 2023-11-19 06:43:29 +01:00
hayaunderscore f346f075ee Fix localskin options not being available for server admins 2023-11-19 06:10:53 +01:00
Alug 38c612a752 add "find" command to search for for cvars
its better than "help", more organized and it shows any variable containing what you searched for

from https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2217
2023-11-19 02:27:42 +01:00
Alug d77ccd0dfc fixeur symlinks
i hope
2023-11-19 01:28:28 +01:00
Alug 7ba146b4ff Improve file search performance on Linux and FreeBSD
from: https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2198
2023-11-19 00:56:18 +01:00
Alug cf8ef69fed fix an overflow crash in terminal lul
could hold down the a key before and make the game crash

from https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2206
2023-11-19 00:51:27 +01:00
indev 2f5b894c47 Merge branch 'Saturn-Next' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-11-18 19:41:06 +03:00
indev e248b85380 Apply translucenthud for the VIEWPOINT text 2023-11-18 19:40:58 +03:00
NepDisk 84cc8d10a7 Quick bug fix for pages 2023-11-18 06:18:07 +01:00
NepDisk 0b4e70faf3 perfstats for PreThinkFrame and PostThinkFrame plus small rewrite 2023-11-18 06:14:03 +01:00
alufolie91 78018e1f78 I_SetSongTrack(int) should be I_SetSongTrack(INT32)
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2213
2023-11-18 05:13:04 +01:00
alufolie91 7a2f925078 Make module music volume more accurate
from https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2215
2023-11-18 05:09:45 +01:00
Alug ec1123251f fix sliptide toggle for 3d models 2023-11-17 23:45:17 +01:00
Alug cc408cc859 fix not being able to close warning screen when a mod spams warnings
lmao
2023-11-17 23:28:53 +01:00
Alug 16f8299c4a fix admin menu stuff
uuuuhhh
2023-11-17 20:48:27 +01:00
alufolie91 10953dbb3a add toggle to hide player ip addresses in nodes or listplayers command
also add "listplayers" command, which is pretty much the same as "nodes" but with colors and it looks better

tho kept "nodes" command just in case its needed for smth
2023-11-17 20:29:07 +01:00
NepDisk 49aaa25255 Mouse Controls for saturn 2023-11-17 18:10:14 +01:00
indev c265575dfd Fix config 2023-11-16 22:14:18 +03:00
indev ccbb894a6b Remove repeating code in VHS effect 2023-11-16 21:16:56 +03:00
alufolie91 4a1f526ac6 multithread exec command and some filesearch/add stuff
hey it actually improves some things alot
esp the loading addons stage when joining a server
2023-11-16 19:14:48 +01:00
indev 54542031a1 Fix the opengl VHS effect on linux 2023-11-16 20:20:49 +03:00
NepDisk ff04b83ec0 English (UK) 2023-11-16 18:06:35 +01:00
NepDisk b03faeff25 Do highresportaits for saturn specfically 2023-11-16 18:06:29 +01:00
alufolie91 d1becfcf0c this is better
like srb2 does it, but kk forgor
2023-11-16 17:19:13 +01:00
Alug 3c078c6676 uhh should be fixed_t or not? 2023-11-16 03:23:17 +01:00
alufolie91 4e6dc92033 fix "Resynching..." speeding up with interpolation
:p
2023-11-16 03:15:18 +01:00
Alug 8d607594ff add stuff to menu 2023-11-15 23:38:36 +01:00
Alug 71486a4982 opengl vhs effect
im in so much pain
2023-11-15 23:17:42 +01:00
Alug 9ae1f20735 actually only do it if its not centered 2023-11-15 21:24:39 +01:00
Alug 53febafd50 eeh do it later
idk looks better imo
2023-11-15 20:53:25 +01:00
alufolie91 7f7ea2c592 reset camera when joining from spec
camera look never got reset when you enter a game from spec, so if you looked up or down, you also did so ingame lol
2023-11-15 20:47:28 +01:00
Alug dc1dfe0d4d smh 2023-11-15 20:13:19 +01:00
alufolie91 48e3c14d30 hide screentex toggle in software
its an opengl only thing, so no need to toggle if in software mode
2023-11-15 20:09:09 +01:00
alufolie91 16b3687774 forgor 2023-11-15 19:58:13 +01:00
Alug cf101ccc5d add "experimental video options" menu
for a few things that might be interesting for some

also make some adjustments
2023-11-15 19:51:05 +01:00
Alug d04a6ad5ee Add more cvars to menu and lower minimum vote time 2023-11-15 19:45:22 +01:00
NepDisk 840c7ea154 Update speedometer code to refernce new values 2023-11-15 19:39:06 +01:00
NepDisk 268300913d fix for real this time 2023-11-15 19:39:01 +01:00
NepDisk 7a4ef35e7b forgot discord support ugh... 2023-11-15 19:38:33 +01:00
Alug 84140f3faa Revert "why did i remove this back then??"
i saw what this did again
fix for avoiding precip crash, cause precip doesent have that stuff

This reverts commit 2e4e0a8554538c841fb4c7be63449b32365d6bc0.
2023-11-15 10:12:07 +01:00
Alug 497b633661 Revert "why did i remove this back then??"
This reverts commit 91ed5c4871.
2023-11-15 09:59:24 +01:00
alufolie91 c7f54a98e0 Merge remote-tracking branch 'origin/Saturn-Next' into moreopengl 2023-11-14 21:16:47 +01:00
alufolie91 7da8c20409 remove that stuff 2023-11-14 21:16:04 +01:00
NepDisk 673a03e033 Stat display enable and disable luahook 2023-11-14 20:59:38 +01:00
Alug 32d4a38b9e just always reset palette regardless
the palshader palette however only gets reset when you enter palshader mode

AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2023-11-14 20:06:11 +01:00
Alug 7cc4d1f601 simplify this stuff
idk why i didnt do it like this in the first place tbh

no need for 3 seperate onchanges, i can just do shit like this

all of them pretty much did the same anyways

now the shader and all two palshader toggles reset palette stuff when it detects that youre in palrender mode aaaA
2023-11-14 20:02:07 +01:00
Alug 25e60a9882 ugh toggling shaders also needs to reset palette shit sometimes 2023-11-14 19:35:37 +01:00
Alug 79582ce73d we use them tho its good to future proof just in case 2023-11-14 18:31:19 +01:00
NepDisk 3526a52827 Allow holepunching to be disabled via a new define plus part 2 to masterserver 2023-11-14 18:29:48 +01:00
NepDisk 4b8bc46358 Master server 'b gone. Makes disabling the define actually alone the compile to work 2023-11-14 18:29:34 +01:00
Alug ddd6488b55 Fix typos and reword some stuff 2023-11-14 18:27:20 +01:00
Alug dfccca4026 Add a toggle to cut precip in half
ye this pretty much cuts the weather thinker count in half

since weather spawns all mobjs regardless of distance setting
its  good for ppl who like weather effects but have weaker hardware
2023-11-14 06:08:38 +01:00
Alug d33c1e83de Revert "refactor weather switching"
This reverts commit 873a611b33b0a3ef62633c1e8327c86ab0617655.

eeh i dont trust it tbh
2023-11-14 02:32:56 +01:00
alufolie91 2ffc7293af screw it, revamp the whole thing
blurgh like this theres never a condition where paletteshader shit runs even if you have shaders turned off and stuff
2023-11-13 22:44:23 +01:00
Alug fde184b7a7 Merge branch 'Saturn-Next' of https://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-11-13 21:52:25 +01:00
Alug 7163194ce9 fixup paletteshader stuff
uaghgegheuaghuagheghg

now every dumb edge case should be covered
and the palette should never turn to garbage if you toggle stuff around
2023-11-13 21:52:18 +01:00
indev ec97111d26 Make K_GetHudColor use player skincolor instead of color cvar when possible. Also fix compilation warning 2023-11-13 21:38:13 +03:00
Alug 6d24d5a44a reset palshader lookup if you toggle the thing
otherwise it can sometimes screw up and show garbage colors when toggling

idk if this is the right way tho
2023-11-13 18:53:56 +01:00
NepDisk 3700dc3bae Fix P-meter speedo not scaling on mobjscaled map 2023-11-13 01:23:44 +01:00
indev 6114bdd9dc Merge branch 'Saturn-Next' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-11-13 01:36:01 +03:00
indev 2fe912eebf Fix compilation with NOTHREADS 2023-11-13 01:35:49 +03:00
Alug ccf6840cd5 forgor and fixuer typos :p 2023-11-12 18:21:16 +01:00
alufolie91 955c7f0cfb remove some tooltips for things we dont have 2023-11-12 17:56:59 +01:00
alufolie91 994fd6354f fix kk typo lol
fixes the X symbol with itembox offsets changed
2023-11-12 17:30:08 +01:00
indev 30602a8eb7 Fix crash related to localskins and stat display 2023-11-12 19:10:51 +03:00
alufolie91 2290c1955b oops we dont have that menu lol 2023-11-12 17:04:45 +01:00
hayaunderscore f167db0cc6 Fix weird stutter on grow and invinc music stutters 2023-11-12 17:00:44 +01:00
hayaunderscore 42e04ce981 haya you fucking dumbass
never use mo->player here again
2023-11-12 16:59:15 +01:00
Alug 41cf467f2a Revert "Revert "localskin rework incoming!!!!!""
This reverts commit 25b5e5f510.
2023-11-12 16:58:26 +01:00
alufolie91 2ca7c8178f Implement tooltips for rest of the menus (Aside from HUD and data options)
by @NepDisk ty much
2023-11-12 16:57:38 +01:00
alufolie91 c4d8de471e P-MeterSpeedometer
by @NepDisk thx much
2023-11-12 16:56:52 +01:00
Alug 2a49236914 Fix colourizedhudcolor not respecting your colourized hud choice
make the stuff also grey out in the menu if you disable stuff
2023-11-12 16:43:33 +01:00
Alug fcf0836e7b Fix shadows from sometimes crashing on mapload
this properly fixes the mapchange spam from crashing the game

P_RunShadows, like any other thinker function, should also be called in preticker not just ticker

potentioally also fixes other issues
2023-11-12 16:09:34 +01:00
Alug 284845aad6 Cleanup Splitwall and remove smth we dont need
Perhaps not removing the endpegmul setting to 0 in some cases caused many of those division by zero crashes aswell

since i reverted the stuff relating to this a while back
2023-11-12 02:08:36 +01:00
Alug 44b2937ea1 Avoid a devision by zero in Splitwall and make it static 2023-11-12 01:46:58 +01:00
alufolie91 00c20f7c8c revert this thing
just incase, dont wanna break high res support
2023-11-12 00:39:04 +01:00
alufolie91 e74a28a2c1 Fix old big room fix
no idea what i was thinking
but kart does use viewx and viewy for those originially, so just let me do a 64bit version of R_PointToAngleEx
2023-11-11 22:08:48 +01:00
alufolie91 91ed5c4871 why did i remove this back then?? 2023-11-11 21:38:12 +01:00
alufolie91 7ca88fb131 make it save lol 2023-11-11 21:29:44 +01:00
alufolie91 76047e75d5 Toggle for FOF wall cutoff when slopes
was testing things, so might aswell add this
2023-11-11 21:01:53 +01:00
Alug 25b5e5f510 Revert "localskin rework incoming!!!!!"
This reverts commit 6196185d62.
2023-11-11 17:39:17 +01:00
indev 4377a6d7fe Remove unnecessary Z_Calloc from HWR_AddPolyObjectSegs
Effect is most likely unnoticable but still having less calls to Z_Calloc and Z_Free would be better
2023-11-11 18:43:37 +03:00
indev 5cfe9a4c4e Optimize gif recording in opengl a bit 2023-11-11 18:27:24 +03:00
Alug b5f90ab5b9 Merge branch 'Saturn-Next' of https://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-11-10 22:37:48 +01:00
Alug badf395dad Remove WIndows shake thing
noone likes it
also theres been reports of this thing triggering false positives in anti viruses
2023-11-10 22:37:40 +01:00
indev 1e13abea19 Attempt to fix the rewrite bug 2023-11-10 18:59:58 +03:00
alufolie91 ca08c7b6e4 Merge remote-tracking branch 'origin/hayathings' into Saturn-Next 2023-11-10 16:24:35 +01:00
alufolie91 d427cd60b2 fix merge conflicts 2023-11-10 16:22:49 +01:00
hayaunderscore f29240f3e8 FUCKING TYPO 2023-11-10 16:16:24 +01:00
hayaunderscore 6196185d62 localskin rework incoming!!!!! 2023-11-10 16:16:07 +01:00
alufolie91 ba825cf688 Fix some issues 2023-11-10 16:16:02 +01:00
hayaunderscore cbbc356386 yeah yeah yeah 2023-11-10 16:15:43 +01:00
alufolie91 62cc95da95 Tooltips....
WIP, and only for the Saturn Options for now,,,,,,
2023-11-10 16:15:28 +01:00
indev 48ae18cede Merge pull request #77 from Indev450/stat-display-hud
Stat display hud
2023-11-10 18:11:23 +03:00
Alug cd804c5984 Fix FOFs with transferline flag and many linedefs randomly crashing
linenum could go out of bounds if you use more than 4 linedefs for such setup, hence making the game unable to retrieve textures and therefore crashing the games sometimes

Visually its not perfect, but you shouldnt do it anyways, atleast it wont crash everything now

ty much indev <3
2023-11-10 01:01:24 +01:00
indev c338453ce9 Merge branch 'Saturn-Next' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-11-09 21:34:53 +03:00
indev 6d5d1a1339 Fix RA ghosts failing to load 2023-11-09 21:34:40 +03:00
alufolie91 953e1734b4 Merge remote-tracking branch 'origin/spriteclip' into Saturn-Next 2023-11-09 18:00:36 +01:00
NepDisk cc01c576a3 move zero down for saturn menu by 5 2023-11-09 19:53:13 +03:00
NepDisk 018bac2be6 Add menus and redo saturn menu offsets so it fits 2023-11-09 19:51:49 +03:00
indev c01bc39659 Add stat display 2023-11-09 11:20:31 +03:00
NepDisk 5d49fd9411 Add shortcuts for current/next map to map command 2023-11-08 23:31:08 +01:00
Alug 23775b6ec0 Fix the gravstretch setting sometimes not saving
I hate this so much but it works
I used the same values the game presented before so the behaviour (hopefully) shouldnt change and like this i atleast can call off "Off"
2023-11-08 23:22:00 +01:00
alufolie91 b8ada40a72 fix highres sprites 2023-11-08 18:55:21 +01:00
alufolie91 58c72ab345 make it actually do something
knew it didnt really work before
2023-11-08 18:46:41 +01:00
alufolie91 143dc55f90 Merge remote-tracking branch 'origin/Saturn-Next' into spriteclip 2023-11-08 18:46:00 +01:00
Alug 227664bd12 Zzzzz... 2023-11-08 17:25:05 +01:00
alufolie91 3ee2e47724 Fix uninitialized reads in PreparePolygon
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1392
2023-11-08 17:24:59 +01:00
Alug 4aa4e235a5 Hide localskin menu stuff when youre the host/offline play
now only shows if you are a player in a netgame
2023-11-08 17:20:21 +01:00
Alug 76521ec0dd make wide lap sticker go back to normal when race is finished 2023-11-08 15:16:51 +01:00
Alug dfae95c7a3 fix the flashpal issue for good 2023-11-08 09:43:13 +01:00
Alug 116328c7bf attempt at linked list for textures
also changes to caching handling a bit
seems to have helped with stuck colors a bit
2023-11-08 02:50:17 +01:00
Alug bd68fef4a2 Zzzzz... 2023-11-08 00:38:48 +01:00
alufolie91 7759d56ad3 Fix uninitialized reads in PreparePolygon
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1392
2023-11-08 00:17:42 +01:00
indev 516f9f4941 Merge branch 'Saturn-Next-EnumLib' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next-EnumLib 2023-11-08 02:12:11 +03:00
indev 7054b8658e Fix sprite freeslots behaving differently from vanilla (same as for MT_ and S_) 2023-11-08 02:01:06 +03:00
Alug 9c7020a369 GRRRRRR not GLLLLLLLL 2023-11-07 18:23:31 +01:00
alufolie91 f8c1903316 change how mipmap caching works
also a bit of texture conversion
idk
2023-11-07 18:19:40 +01:00
Alug 44a4275806 Revert "Cache and reuse removed mobjs when spawning mobjs"
This reverts commit e421c1345b.

accidentally merged this lol
2023-11-07 00:40:34 +01:00
alufolie91 a872756992 Merge remote-tracking branch 'origin/Saturn-Next' into Saturn-Next-EnumLib 2023-11-07 00:28:51 +01:00
alufolie91 7a31dffcdc Merge branch 'Saturn' into Saturn-Next
oh somehow this didnt make it into next
2023-11-07 00:23:35 +01:00
alufolie91 e421c1345b Cache and reuse removed mobjs when spawning mobjs
from https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2200
2023-11-06 19:51:16 +01:00
Alug 0f27f573f6 remove asm leftover 2023-11-06 15:52:16 +01:00
alufolie91 652423ad14 Cache and reuse removed mobjs when spawning mobjs
from https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2200
2023-11-06 12:27:23 +01:00
alufolie91 52590350fa Merge remote-tracking branch 'origin/Saturn-Next' into Saturn-Next-EnumLib 2023-11-06 11:58:25 +01:00
NepDisk 67d2673dc0 Add menu option for showing all maps 2023-11-06 11:50:23 +01:00
NepDisk c36564df1e Add toggle for ping icon 2023-11-06 11:49:50 +01:00
NepDisk 4ed6066e97 Ping measurement menu option 2023-11-06 11:49:35 +01:00
NepDisk 4e7a5d1b89 Fix offset looking ping icon in compact
Alug: grrrrrr frame delay measurement users..
2023-11-06 11:48:09 +01:00
indev c70ef22141 Add option to masterserver_debug to not print verbose debug messages in console (errors are still printed) 2023-11-06 13:25:49 +03:00
indev d15f69dfcd Merge branch 'Saturn-Next' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-11-06 12:01:04 +03:00
indev 27734387c0 Fix compilation with NOHW and NOOPENMPT 2023-11-06 12:00:47 +03:00
Alug b05eb4d848 paletteshader fix for potatoes 2023-11-06 02:02:20 +01:00
Alug 5e079a3990 Revert "Improve file search performance on Linux and FreeBSD"
This reverts commit 5c54f7dc7a.

smth smth doesent support symlinks
2023-11-06 01:13:58 +01:00
Alug 39964e995d add slopecontrast
same as wall contrast but for slopes
gives slopes a bit more contrast instead of them having the same brightness as everything else
there to clog up the opengl menu even more :p
2023-11-06 01:13:36 +01:00
Alug 8d80118a72 fix ping command showing a random players ms ping instead of your ping
bruh
2023-11-05 22:17:46 +01:00
Alug 5a163be5e8 Fix crash in FixedDiv when passing -2147483648
lul
2023-11-05 21:31:47 +01:00
Alug 429d8620e1 Use nanosleep for I_SleepDuration on *nix
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2184
2023-11-05 21:12:03 +01:00
Alug 5c54f7dc7a Improve file search performance on Linux and FreeBSD
from: https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2198
2023-11-05 21:00:03 +01:00
Alug 153ae53f8c sigh 2023-11-05 18:29:45 +01:00
Alug 95e54e97e5 show gamemap in tab ranking screen instead of gametype
this time functional
2023-11-05 16:51:58 +01:00
Alug 949bbebf7b fix ping stuff with new fps counter shit
goddammit i never do anything when im tired again
2023-11-05 16:29:55 +01:00
Alug ef1eea5ba8 Revert "show mapname instead of gametype in tab ranking"
This reverts commit cb03260e43.
2023-11-05 01:31:34 +01:00
alufolie91 822a55a124 Merge remote-tracking branch 'origin/Saturn-Next' into Saturn-Next-EnumLib 2023-11-05 01:21:32 +01:00
Gustaf Alhäll d3ea2eb287 Fix FreeBSD build errors 2023-11-05 01:14:11 +01:00
Alug 383b395c78 bruh 2023-11-05 01:11:56 +01:00
Alug cb03260e43 show mapname instead of gametype in tab ranking
who tf needs the gametype the mapname much more useful
2023-11-05 01:08:58 +01:00
Alug e8a92dd836 add a "compact" fps counter option
it just removes the "FPS" text and moves the ping display much further down

also dont show it during startup
2023-11-05 00:16:18 +01:00
alufolie91 a6296445da windows 10 and 11 support :trollge: 2023-11-04 23:35:01 +01:00
alufolie91 2658003a1a move this out of NONET compile stuff
was error on my part sry indev :c
2023-11-04 23:31:27 +01:00
hayaunderscore 54c6196412 Fun fact: visual scale already factors for scale
So no need for this!
2023-11-04 23:27:32 +01:00
Alug 4b3989f18c v4 <- when next branch uses old version name lmao 2023-11-04 23:13:53 +01:00
Alug 3b41873893 make the thing compile, remove drmingw stuff from 64bit builds
and properly link libbacktrace

rip in piece drmingw but we got goddamn 64bit crashlogs now c:
2023-11-04 23:09:39 +01:00
Alug a211badb73 Update README.md
bruh this formatting
2023-11-04 21:11:25 +01:00
Alug 262a07ea9a Update README.md
before i forgert that later lmao
2023-11-04 21:10:45 +01:00
Alug ef323c66c7 Update README.md
i most likely forgor smth
but the most important thing was libbacktrace dependency for building the gam,e
2023-11-04 21:07:22 +01:00
indev 74c8b05469 Merge branch 'Saturn-Next' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-11-04 23:00:11 +03:00
alufolie91 8028c285ff Add libs and DLLs for libbacktrace 2023-11-04 21:02:35 +01:00
indev 966b273ecd More information in debug log 2023-11-04 23:00:05 +03:00
Alug bf2eecf9a4 Update README.md
i most likely forgor smth
but the most important thing was libbacktrace dependency for building the gam,e
2023-11-04 20:39:19 +01:00
indev 84d9665467 Bye bye unix-specific backtrace 2023-11-04 22:30:38 +03:00
indev df60b9ceee Try to get full traceback in all builds, or fall back to simple traceback if that failed 2023-11-04 22:00:17 +03:00
indev 37459d3d09 Simple backtrace in non-debug builds 2023-11-03 17:46:36 +03:00
indev 3e0cc1bb48 Use asctime instead of manually formatting time 2023-11-03 15:54:17 +03:00
indev ae5cf2116f Don't use unix-specific functions for libbacktrace crash report 2023-11-03 15:37:31 +03:00
indev 6c1426f1f3 Always include time.h 2023-11-03 15:18:55 +03:00
indev 067ebba4d4 Don't use libbacktrace on win32 2023-11-03 15:12:44 +03:00
indev dc16f8b4a6 Make libbacktrace crash reports append to file instead of overwriting. Add more info into libbacktrace crash reports 2023-11-03 15:04:38 +03:00
indev 9ed348c8a8 Use libbacktrace for crash logs (wip) 2023-11-03 14:11:56 +03:00
Alug 4c5df81dac fixuer localskin stuff
Fixes the Apply to all players and displaying player not working (thx haya c: )

Fixes the Vibrating? player animation speeding up when uncapped in localskinmenu

Make so that the char spin speed respects the setting from saturn options (and add pain support )
2023-11-03 01:22:24 +01:00
indev 0c5a1e95b0 Fix overwriting states too 2023-11-02 21:25:42 +03:00
Alug 3ccf44a0be fixuer localskin stuff
Fixes the Apply to all players and displaying player not working (thx haya c: )

Fixes the Vibrating? player animation speeding up when uncapped in localskinmenu

Make so that the char spin speed respects the setting from saturn options (and add pain support )
2023-11-02 15:02:26 +01:00
indev 6c7131ff80 Fix overwriting mobj slots working differently from vanilla 2023-11-02 03:19:10 +03:00
indev db30a53b23 Merge branch 'Saturn-Next-EnumLib' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next-EnumLib 2023-10-31 20:41:38 +03:00
indev 74ee1fcdd8 Fix few warnings related to lua_glib. Get rid of f32 setters/getters since floats aren't used in lua 2023-10-31 20:40:43 +03:00
Alug ee2bc85fe7 v4 2023-10-31 11:02:12 +01:00
alufolie91 9b3bfaabad Merge remote-tracking branch 'origin/Saturn-Next' into Saturn 2023-10-31 11:01:00 +01:00
alufolie91 3ea80bec60 Merge branch 'Saturn-Next' into Saturn-Next-EnumLib 2023-10-30 21:01:06 +01:00
alufolie91 3f8a227769 comment that out for now
we dont use it yet, so lets not make compiler cry about smth unused
2023-10-30 20:59:38 +01:00
indev 23dce9f5b6 Merge branch 'Saturn-Next-EnumLib' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next-EnumLib 2023-10-30 21:35:53 +03:00
indev 034961c6ed Fix hardcoded actions lookup not working 2023-10-30 21:24:38 +03:00
indev d96389db54 Fix looking up mobj type crashing game 2023-10-30 21:23:55 +03:00
indev 3d1e150b6f Merge pull request #53 from utkumaden/patch-enumlib-fast
[WIP] Patch enumlib to be a bit faster.
2023-10-30 15:06:20 +03:00
indev f59fbf94d3 Remove include for PC_DOS 2023-10-30 14:52:10 +03:00
indev ec897ed7e4 Merge branch 'Saturn-Next' into patch-enumlib-fast 2023-10-30 14:27:06 +03:00
indev 17629ad462 Fix lua state for LUA_EvalMath being recreated multiple times (maybe not the best solution). Also fix segfault in lua_enumlib_mobjtype_get 2023-10-30 14:23:03 +03:00
indev 7993df1be7 Merge branch 'Saturn-Next' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-10-30 12:36:23 +03:00
indev f2b0b8359e Add description for custom lua features 2023-10-30 12:35:57 +03:00
alufolie91 7d7c053fc1 Revert "more sprite rotation anlges = smoother sprite rotation"
This reverts commit 0921eb57c4792fc5cb2b120de04d8905513ae75c.
2023-10-30 08:19:55 +01:00
alufolie91 25398af8f5 add toggle for dark itembox bg
some may dislike how it looks with the colour hud
2023-10-27 18:54:53 +02:00
alufolie91 c98971953c Merge remote-tracking branch 'ball/colorizeditembox' into Saturn-Next 2023-10-26 02:08:11 +02:00
alufolie91 d9739755ce Merge remote-tracking branch 'origin/command-history' into Saturn-Next 2023-10-26 02:07:43 +02:00
NepDisk 895bd2da15 Made this a menu option anyway lololololol 2023-10-25 19:57:46 -04:00
NepDisk 8950e31f4c Colorized Itembox 2023-10-25 19:26:34 -04:00
indev 601928f49f Only add command to history if it differs from previous one 2023-10-24 20:57:42 +03:00
alufolie91 773e243c88 ugh make that save lol 2023-10-23 15:34:38 +02:00
indev 311f3a6cf4 Merge branch 'Saturn-Next' of ssh://github.com/Indev450/SRB2Kart-Saturn into Saturn-Next 2023-10-22 13:00:05 +03:00
NepDisk fed1b23b8b Port Prevent dropped ticcmds due to interp timing jutter from srb2-next 2023-10-22 12:01:14 +02:00
indev 5c2d8f6901 Fix characters with SF_HIRES flag being displayed too big in grid skin select menu 2023-10-22 12:59:25 +03:00
alufolie91 68b88e40b5 smol change 2023-10-21 15:44:38 +02:00
alufolie91 6f3770a54a update the credits and menu
add ppl to credits, and just have less seperation between the ppl that contributed to saturn
move flashpal setting to opengl options
2023-10-21 12:57:55 +02:00
alufolie91 eaf2506b4f almost forgor
respect the menu caps choice
2023-10-21 12:24:12 +02:00
alufolie91 2cec4c8b52 add M_DrawGenericScrollMenu
will most likely need this since saturn menu esp is starting to fill up
2023-10-21 12:12:35 +02:00
alufolie91 7ebccc19db fixuer de typo 2023-10-21 12:06:43 +02:00
alufolie91 797d080df0 Join last server button in multiplayer menu (thx nep c:)
from:  https://github.com/NepDisk/srb2k-planeptune/commit/3f42ca357e16702a47a1197a738d92741b38950f

also now finally works with server browser
2023-10-21 11:42:19 +02:00
alufolie91 7c6b03145d uncap water effects
also caps software heatwave effect since it was sped up with interp

note : waterofs was left out, due to it producing stutters on water surfaces in softwaremode
2023-10-21 03:20:23 +02:00
alufolie91 7b136a62c4 revert this part
well with how some kart mapss are set up, this doesent work out
2023-10-21 03:05:30 +02:00
alufolie91 fec433372d clean up shader stuff a bit
Makes the game not "hard crash" when it fails to compile shaders
Fixes issues with shader leveltime
also fixes an issue where certain textures were blurred with shaders enables
2023-10-21 02:49:14 +02:00
alufolie91 41a827727d Merge remote-tracking branch 'origin/fix-bool-types-w-checkmultiplewads' into Saturn-Next 2023-10-20 22:19:35 +02:00
indev bfd0f0c7c2 Fix wrong boolean constants used in W_CheckMultipleWads. That was causing compilation error on linux, and maybe on other non windows platforms 2023-10-20 15:38:53 +03:00
alufolie91 21c9ae8f7e revert this again
despite what kk says, opengl sdl render hint is so much worse performancewise in software mode.
some of the feedback we´ve gotten on saturn also more or less confirms this
2023-10-20 08:09:07 +02:00
alufolie91 581b503edf Uncap palette lump palettes & allow flashpal palettes to display during pause 2023-10-20 07:45:00 +02:00
alufolie91 d380391d80 Clean up the backtrace code and make it use write() more safely. 2023-10-19 11:15:03 +02:00
alufolie91 ff41393edd Fix segfaults on some systems due to polyvertex being NULL
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2065
2023-10-19 10:46:30 +02:00
alufolie91 654784690e we dont have asm stuff 2023-10-19 10:12:32 +02:00
alufolie91 cd682e3961 Avoid branch prediction slowdowns in bla bla but better
i hope
2023-10-19 09:39:35 +02:00
alufolie91 cd4482dd97 Merge remote-tracking branch 'sdfadfsa/gitlab-ci' into Saturn-Next 2023-10-18 15:11:56 +02:00
hayaunderscore 6eb96a4992 clean up extra.kart and extra2.kart lump checking 2023-10-18 15:03:53 +02:00
Alam Ed Arias 3c3c59928d Makefile: support for Mingw64 toolchain 2023-10-18 00:02:17 -04:00
Alam Ed Arias 01911e4d37 Clear unused-but-set-variable warnings 2023-10-18 00:02:17 -04:00
Alam Ed Arias 37c65ca7e4 Makefile: PREFIX overwrite make's default CC and CXX 2023-10-17 23:14:09 -04:00
Alam Ed Arias cb4ffe6f60 no Dr. Mingw support for Win x64 build 2023-10-17 23:12:14 -04:00
Alam Ed Arias 98f8b49e45 Makefile: support toolchain envs 2023-10-17 22:36:17 -04:00
Alam Ed Arias bf6be522ea GitLib CI: SRB2 2.1 codebase use WFLAGS to control warning flags 2023-10-17 21:46:56 -04:00
Alam Ed Arias 2365ee9cb0 GitLab CI: SRB2 2.1 wants nasm 2023-10-17 21:46:56 -04:00
Alam Ed Arias 16c70e7b29 GitLab CI: Compile the SDL version of Win32 builds 2023-10-17 21:46:37 -04:00
Alam Ed Arias 46f0385566 d_netfile.c: Update libcurl support to 7.88 2023-10-17 21:45:47 -04:00
Alam Ed Arias 579c5ab052 Makefile: Support GCC version 11, 12 and 13 2023-10-17 21:45:34 -04:00
Alam Ed Arias 94e7430dd9 copy gitlib-ci config from SRB2's next 2023-10-17 20:57:14 -04:00
Alam Ed Arias 7fea4894a2 Add support for GCC 13.2 2023-10-17 20:55:26 -04:00
Alam Ed Arias a5b99199fc Clear implicit-const-int-float-conversion warnings 2023-10-17 20:05:48 -04:00
Alam Ed Arias 79e2596ce6 Clear missing-noreturn warnings 2023-10-17 19:57:56 -04:00
Alam Ed Arias 1b82918384 Clear misleading-indentation warnings 2023-10-17 19:56:27 -04:00
Alam Ed Arias 4e9e18df82 Clear unused-but-set-variable warnings 2023-10-17 19:54:07 -04:00
Alug cec92474d2 Add check for "extra.kart" files contents......
make lapcounter bigger when a map has 10 or more laps (needs updated extra.kart),
fixed menu not greying out user defined hud colour
2023-10-18 01:27:37 +02:00
indev 81c555efd9 Fix battle playing wrong ending music sometimes 2023-10-18 01:35:32 +03:00
Alug d8f3dca2fc more sprite rotation anlges = smoother sprite rotation 2023-10-17 22:58:14 +02:00
alufolie91 89576adbcf Merge remote-tracking branch 'origin/Saturn-Next' into Saturn-Next 2023-10-16 02:12:22 +02:00
Alug d9b8bd0b8c Add Colourized Hud Color to menu 2023-10-16 02:12:15 +02:00
Alug 525f1b317c Merge pull request #75 from Indev450/more-colorized-hud
More colorized hud
2023-10-16 02:11:16 +02:00
Alug ac119f9d42 Merge pull request #76 from Indev450/pspawnmapthing-null-check
Add null check into P_SpawnMapThing so game doesn't crash if it fails…
2023-10-16 02:11:10 +02:00
Alug a18af5b3e0 Add toggle for CECHO messages
Well you could turn em off with "cechoflags" before, but this is easier and it also saves
2023-10-16 02:10:12 +02:00
alufolie91 ae87cdc8d9 Show "OVERTIME" in karttimer when overtime occurs in battle
instead of it just showing "00´00´00"
2023-10-16 02:08:18 +02:00
indev f2f324c487 Add null check into P_SpawnMapThing so game doesn't crash if it fails to spawn mapthing for some reason 2023-10-13 01:30:46 +03:00
indev 8cd848e44d Default value for colorizedhudcolor is now called 'Skin Color' 2023-10-12 23:40:11 +03:00
indev d83842df55 Allow selecting hud color via colorizedhudcolor cvar. 'None' means use current player's skincolor 2023-10-12 21:35:18 +03:00
alufolie91 0a0567c311 Add a check if stplyr even exists
cause the game otherwise crashes in some situations
2023-10-12 11:32:48 +02:00
alufolie91 1c067d7eec pls 2023-10-12 00:32:12 +02:00
alufolie91 1b5c155dda Revert " Fix a series of buffer overflows in SOC loading"
This reverts commit 1af9e362e0.
2023-10-12 00:26:16 +02:00
alufolie91 8065761c38 Fix spelling "Colourized Hud" 2023-10-11 18:44:46 +02:00
alufolie91 118bb5b107 unfuck sound stuff
-Fix sound sometimes not unmuting when unfocusing and refocusing the game

- Fix the game not being able to turn sound on when starting the game with sound and music disabled

- Fix the sound toggles looking weird in the menu
2023-10-11 17:21:41 +02:00
alufolie91 d1db73342a lowercase kc_ uhgugugeusg 2023-10-11 12:58:16 +02:00
alufolie91 f3e8630049 fix color hud menu grey out thingie 2023-10-11 12:18:41 +02:00
alufolie91 17b1369085 uh also make it support the small minimap icons 2023-10-11 11:41:39 +02:00
alufolie91 497b7e983e give "libd_drawOnMinimap" support for hud offsets 2023-10-11 11:22:33 +02:00
alufolie91 e8e24be6e1 ah move it to saturn options instead
both menus are cramped, but eh, we already had the speedometer toggle there, so this should be also there for consistency
2023-10-11 02:00:25 +02:00
alufolie91 52e2c2bc17 Add colorized hud to menu, make default off
Its in HUD Options since it makes the most sense its in there.
Also off by default, as always
2023-10-11 01:43:36 +02:00
alufolie91 d5d3445fae HUD colorization
https://github.com/NepDisk/srb2k-nepanus/commit/6e45c9bb5ebf8a7335e05316c1e1f70cab1fb160
2023-10-11 01:24:16 +02:00
alufolie91 f22fcbc31c Merge remote-tracking branch 'origin/lua-localskin-fields' into Saturn-Next 2023-10-11 01:22:37 +02:00
alufolie91 275f2f7c28 Merge remote-tracking branch 'origin/miscfixes2' into Saturn-Next 2023-10-11 01:22:02 +02:00
alufolie91 b96663ffb8 Merge remote-tracking branch 'origin/Saturn' into Saturn-Next 2023-10-11 01:21:56 +02:00
indev 939aedd384 Add mobj.localskin and player.localskin fields 2023-10-09 13:43:06 +03:00
Alug b3509e46dd Revert "Avoid branch prediction slowdowns in R_PointOnSide and R_PointOnSegSide"
This reverts commit c5476ff8f9.
2023-10-09 07:39:52 +02:00
Alug 869ddb0b35 Revert "optimise mipmaps"
This reverts commit 7dae68561e.
2023-10-09 06:56:16 +02:00
Alug 466ab2883b remove this
uneeded and i think it crashes
2023-10-09 06:54:49 +02:00
Alug 544c471a9c Add toggle for showing all race maps in level select
"showallmaps yes/no"
2023-10-08 23:27:27 +02:00
alufolie91 b3c1111cd3 forgor 1 line 2023-10-08 03:36:30 +02:00
alufolie91 2fa79155de make the player afterimage sprites follow however the player sprite look
playerafter images now support things like saltyhop and gravstretching to make them feel more grounded or whatever
2023-10-08 03:34:56 +02:00
indev 8af91b8c9b Attempt to fix some replays segfaulting when trying unarchive lua tables from demo 2023-10-06 18:33:55 +02:00
Alug 7dae68561e optimise mipmaps
https://git.do.srb2.org/STJr/SRB2/-/commit/cc12496e9c3fce929546640bbe2c1b35056d7a86
2023-10-05 21:32:08 +02:00
Alug c5476ff8f9 Avoid branch prediction slowdowns in R_PointOnSide and R_PointOnSegSide
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2168/diffs

a bit experimental
2023-10-05 20:55:03 +02:00
alufolie91 2071684fec forgor this oops 2023-10-05 01:05:12 +02:00
alufolie91 50cde90736 add all gl commands even when in software mode
this makes the game not reset some things everytime you switch from opengl to software and back to opengl
2023-10-05 01:04:30 +02:00
alufolie91 b00538a123 lol 2023-10-05 00:38:07 +02:00
alufolie91 1f900c4c75 remove some double defines and move some stuffs 2023-10-04 22:33:14 +02:00
alufolie91 72890d6ed4 move those where they belong 2023-10-04 22:14:02 +02:00
alufolie91 1a13e70b37 rename to maptitle to not conflict with mods 2023-10-04 02:44:32 +02:00
alufolie91 21dcd757b5 toggable stagetitles
basically what it says, made a toggle for stagetitles.
2023-10-04 02:35:18 +02:00
alufolie91 817c4a4042 add some missing stuff to m_menu.c 2023-10-03 12:18:59 +02:00
Alug ea2281355a forgor to delet 2023-10-03 04:12:55 +02:00
Alug 643c7a851d lemme change the audio buffersize for less sound lag pls
"buffersize" command
2023-10-03 04:11:41 +02:00
Alug 3d56f3f212 ugh oops 2023-10-03 03:04:20 +02:00
Alug f086d9a698 nah dont wanna mess with software
leave it as is
2023-10-03 02:58:58 +02:00
alufolie91 e4cd3f8bb7 comment this out for now 2023-10-03 02:56:00 +02:00
alufolie91 4647fd80b9 Revert "fix some things resetting when switching to software from ogl and back"
i am a dumbass lmao


This reverts commit 6f998f922b.
2023-10-03 02:53:15 +02:00
alufolie91 2ce9803257 remove direct3d stuff aswell as minigl stuff 2023-10-03 02:38:09 +02:00
alufolie91 90623359c7 total destruction
removed wince, wii, psp, ps3, msdos and gp2x things aswell as removing sdl 1.2 things since that cant be used with kart anyways
2023-10-03 02:10:33 +02:00
alufolie91 8ecf4f26a7 death 2023-10-03 01:12:07 +02:00
alufolie91 b5c525a990 rip wii and psp 2023-10-03 01:02:45 +02:00
alufolie91 09fcff21ed red light of death, bye ps3 2023-10-03 00:35:02 +02:00
alufolie91 eb229e1844 get Xecuted
rip xbox
2023-10-03 00:06:21 +02:00
alufolie91 22bdf442d4 rip dreamcast sweet prince 2023-10-02 23:38:23 +02:00
alufolie91 f92a7582c6 oops 2023-10-02 23:05:59 +02:00
alufolie91 d158eae377 wtf online mp3 playlists, die! 2023-10-02 23:04:02 +02:00
alufolie91 67c67ec1b0 rip in pieces cd music
death
2023-10-02 23:02:23 +02:00
alufolie91 6f998f922b fix some things resetting when switching to software from ogl and back
also add a missing hwrender ifdef
2023-10-02 22:01:42 +02:00
Alug 859c0181a1 Merge pull request #74 from Indev450/lua-fix-drawpingnum
Fix v.drawPingNum flickering in any fps higher than 35
2023-10-02 15:32:00 +02:00
indev 6a8bfb0da2 This can be const too 2023-10-02 13:08:05 +03:00
indev 26fae628da Forgor to remove first V_DrawPingNum, also change colormap type to const to silence warning 2023-10-02 13:01:36 +03:00
indev 7ce18078f0 Fix v.drawPingNum flickering in any fps higher than 35 2023-10-02 12:31:36 +03:00
alufolie91 c9289dec5a fix opengl sprite shadows 2023-10-02 00:47:52 +02:00
lug420 2ba311705f redo gif recording
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/928?commit_id=ab7987d1cf34fd5d30ce82385bf1c81caf1cb2d3
2023-10-01 02:32:13 +02:00
alufolie91 5201ccd6d2 Optimize HWR_RenderBatches polygon sorting 2023-10-01 02:31:38 +02:00
alufolie91 74a6f76621 oops this doesent belong here 2023-10-01 02:20:17 +02:00
alufolie91 1702cc249d why even 2023-10-01 02:14:25 +02:00
alufolie91 0fbe87a481 change those to UINT32 2023-10-01 01:43:04 +02:00
alufolie91 ad3a5e9329 avoid a crash in intermission drawer
https://git.do.srb2.org/STJr/SRB2/-/commit/38c74cecc04b4cc06158b337b4ce71f45a11984d
2023-10-01 01:10:39 +02:00
alufolie91 2a3acc7286 Fix G_GhostTicker crashing trying to read netvars as ghost data 2023-09-30 22:16:45 +02:00
alufolie91 e7fc777e57 Lua: disallow bitwise not on anything but number values
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1262
2023-09-30 22:12:55 +02:00
alufolie91 5cd4b79ecf Fix sigsegv caused by bad target check in A_Custom3DRotate
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1430
2023-09-30 22:09:50 +02:00
alufolie91 1af9e362e0 Fix a series of buffer overflows in SOC loading
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1457
2023-09-30 22:06:17 +02:00
alufolie91 9c35e61f6c lower max precip dist again
3072 should be absolute max, it already tanks performance

also with precip dist on 4096 you literally hit the games vissprite limit and things start to disappear
2023-09-30 21:25:47 +02:00
alufolie91 e2a1147eea Fix PRIdS define for Windows MINGW64
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1367
2023-09-30 21:00:35 +02:00
alufolie91 503629024a comptime refactoring
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1776
2023-09-30 20:48:41 +02:00
alufolie91 1fa7eb24ac Compile with -rdynamic for UNIXCOMMON platforms
should fix backtrace logging only showing adresses
2023-09-30 20:14:55 +02:00
alufolie91 ac211aabe8 Print a backtrace when SRB2 crashes in a Unix-like environment.
good stuff

https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1288
2023-09-30 20:07:08 +02:00
alufolie91 e9e501bb10 Merge remote-tracking branch 'origin/weathershit' into Saturn 2023-09-30 11:16:34 +02:00
alufolie91 1bc674d73f Merge remote-tracking branch 'origin/removeasmstuff' into Saturn 2023-09-30 11:16:31 +02:00
Alug 10a724a048 fix software mode flashpals when gr_paletteshader is turned off 2023-09-29 22:43:20 +02:00
Alug 7a780bf898 make precip interpolation toggable
saves a few frames while looking basically the same
2023-09-29 21:07:58 +02:00
alufolie91 b9d6d510be Revert "completely remove precip interpolation"
This reverts commit c444d4180e.
2023-09-29 20:48:09 +02:00
alufolie91 5d98bde04c a 2023-09-29 20:24:12 +02:00
alufolie91 1059a7ca5e Revert "Revert "Clean up and simplify zone memory allocation" and "Some memory allocations have been properly aligned" Fixes #35"
This reverts commit 44c9b87557.
2023-09-29 16:15:48 +02:00
alufolie91 05173de41f forgor 2023-09-29 15:35:48 +02:00
alufolie91 ec1cd5f933 rip in pieces asm code
this thing makes software crash so goddamn often, its useless nowadays anyways, and SRB2 removed it some time ago aswell

https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2074?commit_id=7634a960314d5a576656cc4300a74caf889f8d7f
2023-09-29 15:34:29 +02:00
alufolie91 074be933ad remove asm FixedDiv and FixedMul functions
DIE!
2023-09-29 15:15:13 +02:00
alufolie91 41229be341 Merge branch 'Saturn' into weathershit 2023-09-27 17:22:49 +02:00
Alug 1336848f1d Merge pull request #73 from Indev450/lua-remove-unneeded-interpolation
Remove unneeded interpolation from R_PlayerSliptideAngle
2023-09-27 16:03:08 +02:00
indev e10ed14a3c Remove unneeded interpolation from R_PlayerSliptideAngle (this function is only used from lua, and lua is always running at 35 fps anyway) 2023-09-27 12:36:10 +03:00
alufolie91 dc0e67515b compiler complains 2023-09-27 06:00:27 +02:00
alufolie91 6544851ba5 c90 shit 2023-09-27 05:45:29 +02:00
Alug 02fab76406 remove all that crap
nothing uses it, leftovers from cep port
2023-09-27 02:17:23 +02:00
Alug acb139a8c6 die 2023-09-27 02:02:03 +02:00
Alug 82fe3e5362 ughuguha 2023-09-27 02:00:40 +02:00
Alug 26b28f9b4d why are these here?? 2023-09-27 01:49:54 +02:00
alufolie91 689f5add60 smooooth console
uncap console opening/closing animation
2023-09-27 00:48:21 +02:00
alufolie91 c444d4180e completely remove precip interpolation
DIE!
2023-09-27 00:46:48 +02:00
alufolie91 c4312e3f2f smooooth console
uncap console opening/closing animation
2023-09-26 22:54:34 +02:00
alufolie91 50526d2728 remove parts of precip interpolation
it looks exactly the same, but improves performance on maps with weather a bit
2023-09-26 22:44:52 +02:00
alufolie91 04edcd03f2 refactor weather switching 2023-09-26 22:42:39 +02:00
hayaunderscore 09cb8779e4 Fix an issue where flats dont look correctly without retoggling gr_paletteshader 2023-09-26 21:21:47 +02:00
alufolie91 d86eec52ae precip doesent need that stuff interpolated 2023-09-26 21:18:41 +02:00
lug420 e6a1e58405 uaaagheue 2023-09-18 17:14:59 +02:00
lug420 ea10c9ac13 v3 2023-09-18 16:00:19 +02:00
indev e6d3f3f27c Merge pull request #72 from Indev450/localskins
Localskins
2023-09-18 16:52:11 +03:00
indev f713b7fb60 Merge pull request #71 from Indev450/paletteshader
Paletteshader
2023-09-18 16:51:58 +03:00
indev c35a542d60 Merge pull request #70 from Indev450/slopetexture
Slopetexture
2023-09-18 16:51:45 +03:00
indev e6c699faf4 Merge pull request #69 from Indev450/lua-more-rotation-fields
Add mo.rollsum and player.sliproll fields. Rendering and frame interp…
2023-09-18 16:51:34 +03:00
indev f626b4b031 Merge pull request #61 from Indev450/animatedvotescreens
Animatedvotescreens
2023-09-18 16:51:23 +03:00
indev aed81c0ff5 Merge pull request #60 from Indev450/sdldraganddrop-utf8-on-windows
Sdldraganddrop utf8 on windows
2023-09-18 16:51:07 +03:00
indev 1354f2f302 Merge pull request #59 from Indev450/softwarestuff
Softwarestuff
2023-09-18 16:50:49 +03:00
indev 8ea5d0f729 Merge pull request #58 from Indev450/no-discordrpc-when-cvar-is-off
No discordrpc when cvar is off
2023-09-18 16:50:29 +03:00
alufolie91 a4f5f3b7dc Merge remote-tracking branch 'origin/paletteshader' into Saturn-Next 2023-09-18 15:41:14 +02:00
lug420 ab93865255 make flashpals toggable
could be a bit distracting for some
2023-09-18 15:39:13 +02:00
hayaunderscore 1ecdd3dae6 fix compilation error 2023-09-18 14:49:56 +02:00
hayaunderscore ddcd6b0d31 Redo localskin command 2023-09-18 14:49:19 +02:00
alufolie91 5196f1c5b9 Merge remote-tracking branch 'origin/Saturn' into localskins 2023-09-18 14:47:56 +02:00
alufolie91 e4afbc93fe Merge remote-tracking branch 'origin/Saturn' into Saturn-Next 2023-09-17 02:08:50 +02:00
alufolie91 ec62d20a7c Merge remote-tracking branch 'origin/paletteshader' into Saturn-Next 2023-09-17 02:07:51 +02:00
Alug 9dd6ec718f Merge pull request #68 from hayaunderscore/paletteshader
`P_FlashPal` support in palette renderering
2023-09-17 01:52:12 +02:00
hayaunderscore 69237d6a3a Fix stuttering and gamma 2023-09-17 07:28:47 +08:00
hayaunderscore 426cbee752 Make flashpals work
I hate this
2023-09-17 07:28:34 +08:00
alufolie91 d8ed0681ab Merge remote-tracking branch 'origin/paletteshader' into Saturn-Next 2023-09-15 21:36:18 +02:00
lug420 c2f3486e6d Revert "(hopefully) make flashpals work with palette rendering"
This reverts commit e4a575cc5e.
2023-09-15 21:36:05 +02:00
alufolie91 784093603e Merge remote-tracking branch 'origin/paletteshader' into Saturn-Next 2023-09-15 20:56:49 +02:00
lug420 e4a575cc5e (hopefully) make flashpals work with palette rendering 2023-09-15 20:54:57 +02:00
lug420 f00c9d8c23 dont do this in dedi
unecessary if someone runs this thing in dedi mode
2023-09-15 20:54:25 +02:00
indev 9440a22e88 Merge pull request #67 from Indev450/paletteshader
Paletteshader
2023-09-14 21:55:25 +03:00
lug420 f70f7152ab let the thing do its thing
fixes switching of paletterenderer thing
2023-09-14 20:24:36 +02:00
lug420 8c7f35fa29 absolute hell
lighttable sorting was on even with the palette shader disabled, but, we dont need that shit for non palette renderer mode

hope this shit doesent break anything ever pls
2023-09-14 19:17:46 +02:00
lug420 fe74e69da6 dont need this 2023-09-14 18:42:35 +02:00
alufolie91 c170f53948 Merge remote-tracking branch 'origin/slopetexture' into paletteshader 2023-09-14 18:32:10 +02:00
alufolie91 13fd825bcf hackiest shit to make custom shaders not kill palette shader
this is so super dumb its unreal
but it works
2023-09-14 03:43:11 +02:00
indev 8ee4fc2fa1 Oops used upscaled image >< 2023-09-14 00:18:22 +03:00
indev 679a8387c9 Add logo (WIP) 2023-09-14 00:09:33 +03:00
alufolie91 00f3805721 Merge remote-tracking branch 'origin/lua-more-rotation-fields' into Saturn-Next 2023-09-13 21:47:09 +02:00
alufolie91 ab2194e053 Merge remote-tracking branch 'origin/slopetexture' into Saturn-Next 2023-09-13 21:44:26 +02:00
lug420 9044a46b31 fix fullscreen toggle and resolution changes 2023-09-13 21:32:35 +02:00
indev 53d76ea037 Merge pull request #66 from Indev450/no-discordrpc-when-cvar-is-off
No discordrpc when cvar is off (into saturn-next)
2023-09-13 21:23:02 +03:00
indev f3a28c83d8 Merge pull request #65 from Indev450/softwarestuff
Softwarestuff (into saturn-next)
2023-09-13 21:21:59 +03:00
indev b1e2986f65 Merge pull request #64 from Indev450/sdldraganddrop-utf8-on-windows
Sdldraganddrop utf8 on windows (into saturn-next)
2023-09-13 21:21:14 +03:00
indev 267b53a90e Merge pull request #63 from Indev450/animatedvotescreens
Animatedvotescreens (merge into saturn-next)
2023-09-13 21:20:12 +03:00
indev e1b41d2c58 Merge pull request #62 from Indev450/fix-lua-onchange-error-in-error-handling
Fix 'error in error handling' for cases when error happens in cvar.fu…
2023-09-13 21:16:54 +03:00
lug420 3204095afb revert "redo parts of the lighttable shader"
die
2023-09-13 16:09:58 +02:00
lug420 538de7d2d2 fix memfree command on 64bit 2023-09-13 04:42:35 +02:00
alufolie91 2cba586d9c im good at coding
absolute bruh thing, but it somehow works, fixes the midtextures, and doesent kill performance lmao
2023-09-13 03:54:12 +02:00
alufolie91 ad4d587a52 screw you
bleh, pegging midtextures to slopes now works correctly, but cutting them is broken again
atleast this fixes the performance issues
no idea tho why it screws up things so much
2023-09-13 02:58:20 +02:00
alufolie91 a929636a28 Revert "cleanup HWR_SplitWall"
This reverts commit 06a2508a9c.
2023-09-13 02:56:11 +02:00
alufolie91 06a2508a9c cleanup HWR_SplitWall
e
2023-09-13 01:52:25 +02:00
alufolie91 64b2e2ee37 Fix bugs with HWR_SplitWall and sloped midtextures but cleaner
performance still pretty bad, atleast this is cleaner than last time
2023-09-13 01:40:52 +02:00
alufolie91 b6ef6eb801 revert sloped midtexture fix for now
huge performance regression on some maps
ill look into it in the future again maybe
2023-09-12 21:03:58 +02:00
indev b4d48cc9ec Set palette uniform in InitPalette instead of DrawScreenFinalTexture 2023-09-12 21:55:35 +03:00
alufolie91 f83a937dc5 redo parts of the lighttable shader
this caused performance drops before even with the whole thing disabled
2023-09-12 18:56:51 +02:00
alufolie91 e2acb4c3fc only do this when were running the palette shader 2023-09-12 17:07:19 +02:00
alufolie91 5bf722a1fb only allow this thing when shaders are enabled aswell
yes i will do it like that
no i wont use gl_allowshaders
i want this thing to be able to affect the menus and hud, just like software :p
2023-09-12 01:50:46 +02:00
alufolie91 0751484439 fix some effects
idk lmao but this fixes a few effects to be "on par" with software renderer
aswell as menus and hud stuff
2023-09-12 00:38:50 +02:00
alufolie91 e5b16c7aa0 Merge remote-tracking branch 'origin/Saturn' into paletteshader 2023-09-11 20:45:20 +02:00
lug420 bac058d128 forgor some things 2023-09-11 20:07:03 +02:00
haya dd4a9ae890 i may be stupid 2023-09-11 20:01:27 +02:00
hayaunderscore f91687209b fix horizon lines on batching somewhat 2023-09-11 20:01:22 +02:00
lug420 ec4140a9d2 remove custom shader toggle + clear colormaps when toggle palette shader
the custom shader toggle often broke stuff when toggled while palette shader was active

also clearing colormaps when toggling palette shader is ugly midlevel but atleast it doesent visually break completely

def need to somehow reinitialze colormaps instead or smth
2023-09-11 20:00:09 +02:00
lug420 2553c9e878 cleanup a bit
remove debug prints and vars
clean stuff up a bit
2023-09-11 18:30:35 +02:00
lug420 f9f33aa53a add lighttabble shader
this was way too much headache
set up a basic condition atm, so lighttable generation turns off if the paletteshader is turned off
this will break visually if the shader is turned on midrace atm
will implement smth better
2023-09-11 18:13:59 +02:00
hayaunderscore 4455ebe58f Fix issue with upside-down salty hop 2023-09-11 16:03:18 +02:00
alufolie91 35cfdea9e7 allow opengl to also use widescreen backgrounds for votes
thanks kk for locking this to software mode only despite this working without issues in opengl aswell
2023-09-11 15:55:59 +02:00
indev 346433d248 Shutdown DiscordRPC when discordrp cvar is set to Off 2023-09-11 13:17:12 +03:00
indev 16a7e69292 Don't init discord rich presence untill discordrp is set to On
Haven't tested this since i'm on linux and the feature looks like it is windows only
2023-09-11 13:01:29 +03:00
Alug 441824fc70 Merge pull request #57 from hayaunderscore/paletteshader
Fix shader compile error and level palettes
2023-09-11 10:40:01 +02:00
hayaunderscore f46b77ab7b fix shader compile error, fix custom level palettes 2023-09-11 14:00:36 +08:00
alufolie91 561af0e601 smol adjustment 2023-09-11 02:14:22 +02:00
alufolie91 362c21505d smol fixup
fixes the weird black/white screen on game start
2023-09-11 01:04:43 +02:00
alufolie91 d3d40de996 unfuck this thing change lut size to full 64
holy fuck, goddamit, im so mad at this
2023-09-10 18:59:31 +02:00
alufolie91 3ce4653bb5 smol adjustment 2023-09-10 16:57:38 +02:00
alufolie91 a639c87a90 rework this thing, use parts of the new palette renderer
this atleast completely fixed the stutters and prob the memory leaks the thing had before

its still super messy and idk
2023-09-10 16:43:42 +02:00
alufolie91 3aac16432a adjust things more
try to mitigate performance loss and stutters
readjust the look a bit
cleanup stuff a bit
this thing still pretty much runs badly
2023-09-09 16:18:46 +02:00
lug420 1c9ea1eb2e fix a crash with rotsprites
+ clean up this absolute mess
2023-09-09 01:38:23 +02:00
indev a47aea4c9f Fix 'error in error handling' for cases when error happens in cvar.func right when cvar is registered 2023-09-08 18:29:05 +03:00
alufolie91 c31e7ff2b3 Optimize sprite rendering by ignoring completely occluded sprites
backport of the srb2 thing
judging by perfstats it often cuts the spritecount in half
take with a grain of salt since i barely tested it
software mode only btw

https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2131?commit_id=b8313ceda283ac0c8dd9ab6141e83a31f0bb9639
2023-09-08 12:44:13 +02:00
indev 9cd0e6c385 Why is this 'variable-sized' and can't be initialized like that??? 2023-09-08 12:00:10 +03:00
indev c23a0f08c4 Merge pull request #55 from Indev450/rotsnap
smoother slope rotation for players
2023-09-08 11:51:55 +03:00
indev 3ff865b1b6 Merge pull request #56 from Indev450/sdldraganddrop
Addfile per drag and drop
2023-09-08 11:51:31 +03:00
indev cdedf1349c Attempt to fix non-ansii filenames on windows 2023-09-08 11:47:19 +03:00
alufolie91 7beab3b582 fix the sprite renderstats again
aAAaaa
2023-09-08 10:42:31 +02:00
alufolie91 b1b592f88d readd the stuff blubuabb 2023-09-08 10:38:48 +02:00
lug420 8737a40a4d bleh 2023-09-07 23:55:26 +02:00
lug420 71ce5be570 me wondering why the hw sprite perfstats were broken
+ removing some stuff we dont need
2023-09-07 23:54:22 +02:00
indev b883d02abb Use P_AddWadFile directly instead of command so non-ansii file names also supported 2023-09-07 19:28:53 +03:00
alufolie91 09f79a6934 Addfile per drag and drop
https://git.do.srb2.org/SteelT/SRB2/-/commit/01cc2b91e189e4d268eddd38f3ba917133a07adc
2023-09-07 17:24:06 +02:00
lug420 9bdcfe9750 adjust some stuff
bleh looks alr, but def loose some color depth with it
2023-09-07 15:59:10 +02:00
lug420 b767180473 readd the lookup texture, adjust its size
it runs a bit better like this, but also is a bit darker
def needs adjustments
2023-09-07 14:38:10 +02:00
indev acb5d96788 Merge pull request #54 from Indev450/misc-fixes
Fix few typos
2023-09-06 19:58:45 +03:00
indev 228a932598 Fix few typos 2023-09-06 19:54:14 +03:00
lug420 b53cc6fd2b fuck it palette renderer "lite"
remove the goddamn lookup textures, this atleast runs okish and looks not that bad
2023-09-06 18:29:26 +02:00
lug420 01cd8f5a0f 4fps
this thing runs like crap 4fps
2023-09-06 18:02:04 +02:00
alufolie91 9732e74bf3 more work
https://git.do.srb2.org/Hannu_Hanhi/SRB2/-/commit/140dba15b86ad7e206c50c8336103bee89e6b032
2023-09-06 15:24:31 +02:00
alufolie91 2ed4a7b548 Palette Lookup Texture
https://git.do.srb2.org/Hannu_Hanhi/SRB2/-/commit/9562a95d0adb9384b5db26145ed03cb5d3e5a893
https://git.do.srb2.org/Hannu_Hanhi/SRB2/-/commit/d8a329b89dad75a57e076d88b8d5d1fdb5f959bc
2023-09-06 15:19:39 +02:00
alufolie91 52c11d1444 paletteshader
stuff from hannu
https://git.do.srb2.org/Hannu_Hanhi/SRB2/-/commit/2530e8b2938eb3ecb6f56b6cdc9916f387a72c6a

this thing tanks my framerate to hell
2023-09-06 15:12:18 +02:00
alufolie91 78d50e4c43 just a bit more
looks even better like this imo
2023-09-05 23:01:03 +02:00
indev 7f05d27f42 Allow lua to change vote background via hud.setVoteBackground 2023-09-05 12:47:49 +03:00
alufolie91 3675fdd361 smoother slope rotation for players
dont snap player directly to whatever theyre standing on
instead make the sprite rotate a bit smoother
see: https://git.do.srb2.org/haya_/Kart-Public/-/commit/8448d75b031fa86cdb854d13eda4712352d35a89
2023-09-05 09:13:12 +02:00
alufolie91 98dfe528d8 remove this 2023-09-04 16:37:11 +02:00
alufolie91 7da590df94 Fix sprite scale column iteration crash
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2130
2023-09-04 15:30:42 +02:00
alufolie91 90cc5a6cb0 Fix a possible crash in R_RenderMaskedSegRange
https://git.do.srb2.org/STJr/SRB2/-/commit/55b4458001b2ffe76774ff07a11b56ebf1f70de9
2023-09-04 15:30:21 +02:00
xyzzy 96552765c2 Include doomdef.h :') 2023-09-03 17:01:12 +03:00
xyzzy 8420b2414c Change into a look up based system instead of whatever the fuck yanderedev suggested. 2023-09-03 14:43:55 +03:00
xyzzy 49949309df Some fixes and feature additions to glib. 2023-09-02 22:17:18 +03:00
xyzzy 39312ebd4b Merge remote-tracking branch 'upstream/Saturn' into patch-enumlib-fast 2023-09-01 22:20:31 +03:00
alufolie91 ca9277366c anim screen stuff 2023-09-01 19:43:24 +02:00
indev e79bf24bcd Add lua memory usage in memfree command output 2023-09-01 18:34:06 +03:00
indev 2c1201ff34 Add mo.rollsum and player.sliproll fields. Rendering and frame interpolation code was used, so they are NOT synch safe! 2023-09-01 12:45:23 +03:00
alufolie91 c4ff1a3aca forgor to readd those 2023-09-01 10:12:06 +02:00
xyzzy 511d66c8fa Merge remote-tracking branch 'upstream/Saturn' into patch-enumlib-fast 2023-08-31 23:17:37 +03:00
xyzzy 3f9d64717d Create a Lua globals library. 2023-08-31 23:16:32 +03:00
alufolie91 5760f25c74 readd the namecheck to addlocalskin menu
until we find a better way to check for skins c:
2023-08-31 13:41:25 +02:00
indev 0a6f700c6f Addon browser can now be in 2 states - loading addons and loading localskins, which fixes its behavior when trying to load character addon as server admin 2023-08-31 13:59:30 +03:00
alufolie91 3147dfb012 2.1 2023-08-31 11:18:38 +02:00
Alug 5007a33bbf Merge pull request #49 from Indev450/fixspeedometer
fix the speedometer
2023-08-31 10:57:03 +02:00
Alug c65acfa90e Merge pull request #50 from Indev450/nospecialmusic
Nospecialmusic
2023-08-31 10:56:50 +02:00
Alug b167c19137 Merge pull request #51 from hayaunderscore/readme-refactor
make the readme look more consistent
2023-08-31 10:56:15 +02:00
alufolie91 d48b08856e Support for Animated Votingscreens
i hate the interpolation i hate it
no idea honestly if those play correctly atm but atleast they dont freak out with uncapped
https://gitlab.com/blondedradio/srb-2-k-cep/-/commit/776a547087cdef46b2bdbfc3ddc9d4d963bbea4b
2023-08-31 10:42:43 +02:00
alufolie91 9ba5c9a38b bruuuuuh 2023-08-31 03:35:42 +02:00
haya 1a9f30a328 ok github markdown 2023-08-31 07:06:17 +08:00
haya 97058bfcf6 try being consistent 2023-08-31 07:05:06 +08:00
alufolie91 bd41bbb304 fix the speedometer
things got swapped X)
also removed the extra number, kart adds a 3rd one if needed
2023-08-31 00:24:16 +02:00
alufolie91 f47cb885cc eeeeheheheeheheh ifdefs 2023-08-30 22:27:52 +02:00
alufolie91 1ab243d93a add shit to menu 2023-08-30 22:26:38 +02:00
alufolie91 15d59cbbd8 i dont want any special music
no to grow and star music!
2023-08-30 22:20:07 +02:00
Alug c88d2dadb0 Update README.md again 2023-08-30 21:15:07 +02:00
alufolie91 a4e96d2380 bruh 2023-08-30 19:20:35 +02:00
alufolie91 002c550263 more fixes
ugh
2023-08-30 19:17:51 +02:00
alufolie91 25b9bc4100 smol fix 2023-08-30 19:15:22 +02:00
alufolie91 7105606475 more menu shit
- Youll now get a preview of what skin is going to be used.
- Removed redundant code
https://git.do.srb2.org/haya_/Kart-Public/-/commit/a6728c26f76bfc94f7bc07aa076c8979c9bef5c9
2023-08-30 19:14:41 +02:00
alufolie91 71e4005226 add menu n shit
https://git.do.srb2.org/haya_/Kart-Public/-/commit/b85a55137cfef0a18b297c59e62018586323a2e9
2023-08-30 19:12:56 +02:00
alufolie91 76b66b41b6 Argh!
https://git.do.srb2.org/haya_/Kart-Public/-/commit/217f15452c1fda9ea3c0d00650d470e13e14e0f5
2023-08-30 18:58:26 +02:00
alufolie91 43e1331594 another localfile thingie
https://git.do.srb2.org/haya_/Kart-Public/-/commit/4a60babf75ce6362d32a1633b12a718d65bcd18c
2023-08-30 18:51:10 +02:00
alufolie91 23ba3d493b issues fixing 2023-08-30 18:50:00 +02:00
alufolie91 487cbc495a more changes
https://git.do.srb2.org/haya_/Kart-Public/-/commit/9e3919195d143956e31bf092f6822cab61d1ee81
2023-08-30 18:47:57 +02:00
alufolie91 faeb4d22ed Add a -force parameter to addskins, fix localskin not playing the right sounds
https://git.do.srb2.org/haya_/Kart-Public/-/commit/932e9b92c3551dc4910157ea8d3eea1145ccfc40
2023-08-30 18:43:55 +02:00
alufolie91 9dc2ad4f32 add localskinall command
https://git.do.srb2.org/haya_/Kart-Public/-/commit/958fe796eb070b6678cd45ea835a998d8dc6d2c9
2023-08-30 17:39:41 +02:00
alufolie91 ceae12baba fix an issue with desynchs
https://git.do.srb2.org/haya_/Kart-Public/-/commit/a47d965b82e45bcf600217899a2cd6951024093b
2023-08-30 17:34:28 +02:00
alufolie91 58c58e9542 fix shit even more
https://git.do.srb2.org/haya_/Kart-Public/-/commit/37d72b4680bbb1ecb68aaa817f2afc8b34deab96
2023-08-30 17:31:57 +02:00
alufolie91 46c7bf8b03 fix shit
https://git.do.srb2.org/haya_/Kart-Public/-/commit/e4ba8b9a753fe741f1e5a65490ae0d2d645baa97
2023-08-30 17:24:50 +02:00
alufolie91 c011d09e33 fix for localskins not properly saving when returning back into the titlescreen
https://git.do.srb2.org/haya_/Kart-Public/-/commit/e679dfe0aa059cca68bc67da5a45c12c26dfd9ac
2023-08-30 17:11:38 +02:00
alufolie91 65fadcf709 fix
https://git.do.srb2.org/haya_/Kart-Public/-/commit/b6b3dcb3f08b470d6075c2949b2dee364afb5c99
2023-08-30 17:09:40 +02:00
alufolie91 e2b06aa600 Ghost and signpost support
https://git.do.srb2.org/haya_/Kart-Public/-/commit/f07179589414b15605da14901f742342ab53de66
2023-08-30 17:08:50 +02:00
alufolie91 7ab0a808a9 Show which skin is the real one 2023-08-30 17:05:21 +02:00
alufolie91 bc7ce5c983 "immersion"
https://git.do.srb2.org/haya_/Kart-Public/-/commit/4547347e219158c1d11a6f373c9c94a7bd2ee789
2023-08-30 17:04:40 +02:00
alufolie91 6e55d88816 more shit
https://git.do.srb2.org/haya_/Kart-Public/-/commit/28fa3039c147d7b479b8d4ddfca50918c620aa2f
2023-08-30 17:02:05 +02:00
alufolie91 97f0ea1b0f initial support
https://git.do.srb2.org/haya_/Kart-Public/-/commit/a464df2165d62528af46d7ef0a6cbdbf29c3d07c
2023-08-30 16:59:23 +02:00
Alug b6be5bc6b4 bruh 2023-08-30 14:57:58 +02:00
Alug fca542cd4e Update README.md
v2 hope i didnt forgor smth again
2023-08-30 14:47:41 +02:00
alufolie91 e3d61b2974 v2 moment 2023-08-30 14:22:56 +02:00
alufolie91 9cb84d214e change default to off 2023-08-30 14:21:17 +02:00
indev 6a0069f08f Merge pull request #48 from Indev450/lua-feature-votehud
Add vote hud hook for lua
2023-08-30 14:51:29 +03:00
indev 4a32bb7f9f Merge pull request #47 from Indev450/fix-udatalib-warnings
Fix few warnings regarding udatalib
2023-08-30 14:45:02 +03:00
indev 3404ca63bc Merge pull request #46 from Indev450/bring-few-mobj-fields-back
Bring sprite scale and rotation mobj fields back.
2023-08-30 14:43:26 +03:00
Alug 238688047e Merge pull request #45 from Indev450/fix-cv-grrenderdistance
Fix cv_grrenderdistance not changing current_bsp_culling_distance bac…
2023-08-30 13:20:37 +02:00
indev c0e24c1119 Fix cv_grrenderdistance not changing current_bsp_culling_distance back after it was changed from max to any other value 2023-08-30 14:09:28 +03:00
alufolie91 cc2bab7736 rename some things
for obvious reasons :p
2023-08-30 12:41:22 +02:00
indev c6d0627f08 Actually fix memfree for gpu textures 2023-08-29 13:17:09 +03:00
indev 6c22b1e01a Fix 'All GPU textures' showing incorrect value in memfree command 2023-08-29 13:07:15 +03:00
alufolie91 144bddea78 Show which renderer youre using on main menu
cause some ppl dont know how to check
and we cant switch the game
2023-08-29 11:42:51 +02:00
indev 050ae2ab6d Add vote hud hook for lua. Use FEATURE_VOTEHUD global to check if this feature is available 2023-08-29 12:09:46 +03:00
alufolie91 f6da608402 Menu stuff
add missing things
rearrange saturn menu
make saturn menu and player distortion menu prettier finally
2023-08-29 10:44:00 +02:00
alufolie91 76685068fe Add Toggle to satlyhop squish effect
just for those who may dislike it
2023-08-29 10:43:16 +02:00
indev d5f1b744bb Fix few warnings regarding udatalib. Use size_t and uint8_t* instead of intptr_t since all offsets are >= 0 anyway 2023-08-29 11:18:08 +03:00
alufolie91 bd221ef0b4 Stop game from using broken draw function
"that sigsegvs at random on some maps for seeming no reason."
actually this fixed some crashes for someone who tested it
See: https://git.do.srb2.org/Galactice/Kart-Public/-/commit/095e1ac621cb0810af7a4efbe7f3fb6e242df5ab
2023-08-29 10:09:26 +02:00
alufolie91 dc42c5b8b5 Change default renderer to Opengl
also turn off 3d models by default
2023-08-29 10:05:33 +02:00
indev c29e6911b1 Merge pull request #44 from Indev450/always-show-music-credit
Return null in S_FindMusicCredit if there are no musicdefs at all
2023-08-29 10:47:11 +03:00
indev 44a31e7561 Comment out cv_smallpos 2023-08-29 10:38:36 +03:00
indev e250e706a0 Merge pull request #43 from Indev450/snowy
Snowy
2023-08-29 10:33:57 +03:00
indev 00f09421b8 Merge branch 'Saturn' into snowy 2023-08-29 10:33:10 +03:00
indev daa747805d Return null in S_FindMusicCredit if there are no musicdefs at all (thanks NepDisk for pointing at that) 2023-08-29 10:32:35 +03:00
indev 3612a9cd02 Merge pull request #42 from Indev450/hidelapemblem
Toggable Lap Emblem Animation
2023-08-29 10:21:24 +03:00
indev 78e94b66ba Merge branch 'Saturn' into hidelapemblem 2023-08-29 10:21:11 +03:00
indev 8fe9173355 Merge pull request #41 from Indev450/squishsound
Squishsound
2023-08-29 10:15:46 +03:00
indev 1210a885d4 Merge branch 'Saturn' into squishsound 2023-08-29 10:15:36 +03:00
indev 25f02f6cd3 Merge pull request #40 from Indev450/fixprecip
Fixprecip
2023-08-29 10:14:14 +03:00
indev d69b6672be Merge pull request #38 from Indev450/dont-record-demo-if-disabled
Attempt to fix demo buffer overflow crash. Also don't record demos at…
2023-08-29 10:13:21 +03:00
indev 24ccc5eee4 Merge pull request #39 from Indev450/always-show-music-credit
Don't show music credit when music is disabled
2023-08-29 10:13:01 +03:00
indev d577944143 Don't show music credit when music is disabled 2023-08-29 10:07:26 +03:00
alufolie91 c4746962bd do the thing for software renderer too
i forgor
2023-08-29 08:18:59 +02:00
alufolie91 664e8c363b raise max precip distance a bit
basically twice as far, cant go higher or else we hit sprite limit and stuff starts disappearing
2023-08-29 07:57:35 +02:00
alufolie91 b5269ebbb5 oops 2023-08-29 07:25:55 +02:00
alufolie91 52b4f65582 Improve rain/weather.
* Better thinker with more return optimisation.
* Better placement of thinking in rendering, to avoid ceiling-mounted sprite glitches.
See: https://git.do.srb2.org/STJr/SRB2/-/commit/6371de806b932d1026904937b19e13feb10fa322
2023-08-29 07:19:31 +02:00
alufolie91 e91c90329d Fix precip interpolation
See: https://git.do.srb2.org/STJr/SRB2/-/commit/6c54af377481a42f639da2db6cefe33d02918bce
2023-08-29 06:57:52 +02:00
alufolie91 ab6f33929d don't check flippedness in HWR_RotateSpritePolyToAim
if the mobj is actually a precipmobj!

precipmobj_t does not have eflags, so P_MobjFlip checking it would actually be accessing memory addresses beyond the end of the struct

perhaps this fixes a rare crash in P_MobjFlip on maps with snow and rain

See: https://git.do.srb2.org/STJr/SRB2/-/commit/197da95a232da92e61f88ee27c754e8671a6624f
2023-08-29 06:49:10 +02:00
Alug 557187a305 Update README.md
smh these confused ppl, ill readd them when next stable build
2023-08-29 06:43:46 +02:00
alufolie91 47f194b82e fix the wanted recticle
also small fix to big players
2023-08-28 22:28:41 +02:00
indev 5da6739077 Don't play slam sound too often 2023-08-28 13:56:19 +03:00
indev 2f689c1ab7 Merge pull request #37 from Indev450/showmusiccredit-command
Add showmusiccredit command
2023-08-28 10:54:08 +03:00
indev 82d30b5abf Don't play landing sound on really small jumps 2023-08-28 10:29:44 +03:00
alufolie91 8c3b6911a3 remove unused thing
we removed the shear fucntion since it completely broke sprite rendering anyways so this stuff goes unused and is just clutter
2023-08-28 01:12:48 +02:00
Alug 294a459fc2 Update README.md
eeeehehehheh
hope i didnt forgor smth again
2023-08-28 01:02:36 +02:00
alufolie91 44c9b87557 Revert "Clean up and simplify zone memory allocation" and "Some memory allocations have been properly aligned" Fixes #35
seems like screwing with the extrabytes/alignbits specifically in the zone memory allocations corrupt something in 32bit software mode
reverting this fixes the issue but comes with a small performance hit on busy maps
2023-08-28 00:52:03 +02:00
alufolie91 911264ccb3 kill smallposition toggle for now and add minimap head size toggle instead
eeeeeeeeeeeeeeeeeeee
2023-08-27 22:33:21 +02:00
indev 9936e38f20 Merge pull request #36 from hayaunderscore/no-break-moment
Fix overlapping speedometer text
2023-08-27 20:57:09 +03:00
haya e1f402b86c i am stupid
💀
2023-08-28 01:37:55 +08:00
indev 124bfe6ca9 Merge pull request #34 from hayaunderscore/visuals-and-friends
Visuals and friends
2023-08-27 20:16:35 +03:00
haya e3b1dba13c Remove precipitation salty values
As per suggestion
2023-08-28 01:06:37 +08:00
haya 6cbd7503f9 revert freeslot limit from master
that was for tmm sorry
2023-08-28 01:03:19 +08:00
haya 1cc4c2df72 Merge branch 'Indev450:Saturn' into Saturn 2023-08-27 18:27:58 +08:00
xyzzy 5726658729 Patch in listskins for Saturn :3
* Listskins lists all loaded skins.
    * It's fun
    * Paginated display.
2023-08-27 13:22:28 +03:00
xyzzy d0a307e5b5 Make alias print a list of all defined aliases.
* Alias with no args not only prints out the help text but all
      command aliases.
    * Alias with just one argument prints all commands that begin with
      the first argument.
2023-08-27 13:22:11 +03:00
indev 9208a7233f Redo slamsound using MFE_JUSTHITFLOOR 2023-08-27 11:13:47 +03:00
haya e58c66facd Merge branch 'Indev450:Saturn' into Saturn 2023-08-27 15:25:18 +08:00
hayaunderscore 8117b528ab fix hanged yoffset upon turning off saltyhop mid start drift 2023-08-27 15:22:46 +08:00
hayaunderscore 9f4df6b80d nuh uh 2023-08-27 15:18:12 +08:00
alufolie91 355a1c2046 fix up 3dmodels
those things werent affected by setting smth in spriteoffsets
also cleans up the code alot

taken from srb2s model plus branch
https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1840
2023-08-27 09:06:53 +02:00
hayaunderscore 00d383cc28 Merge branch 'Saturn' of github.com:hayaunderscore/SRB2Kart-Saturn into Saturn 2023-08-27 12:39:06 +08:00
hayaunderscore e46391992a fix precipitation 2023-08-27 12:39:00 +08:00
haya fff8b24309 Merge branch 'Indev450:Saturn' into Saturn 2023-08-27 10:28:11 +08:00
hayaunderscore 59f9705b93 Distracting sprite scaling for saltyhop
Mayo asked for this.
2023-08-27 09:57:08 +08:00
alufolie91 7be1c58ba5 ooof forgot to remove those
sprite offsets shouldnt have two states which are either interpolated and non interpolated goddamit
2023-08-27 03:47:35 +02:00
hayaunderscore da1df719e3 HARDCODED SALTYHOP
`hardcodehop on` on console :)
2023-08-27 09:12:11 +08:00
hayaunderscore b626c095d0 Gray out speedometer option 2023-08-27 08:26:57 +08:00
haya 3df993184b Merge branch 'Indev450:Saturn' into Saturn 2023-08-27 07:34:01 +08:00
alufolie91 ec9c8dba1b Revert "P_RandomFixed should return the same result"
goddamit, it seems to cause desynchs in rare cases
and here i thought it may help with desynchs
2023-08-27 00:56:35 +02:00
alufolie91 171d36158c Toggable Lap Emblem Animation
hides the animation that happens when you do a lap
toggable with "showlapemblem" and in saturn options
2023-08-27 00:45:04 +02:00
indev 22a84a5504 Bring sprite scale and rotation mobj fields back. Hopefully this wouldn't cause synch failures 2023-08-26 15:05:21 +03:00
hayaunderscore 53ead1007e forgor :skull 2023-08-26 14:38:46 +08:00
hayaunderscore e852034ca8 V2 speedometer nonsense
you can get extra.kart from me (for now). It's not the same as snowy_files.kart :V
2023-08-26 14:33:14 +08:00
alufolie91 00112bc4c8 Two small things from Snowy-Kart
- small position number (has been made toggable)
- toggable minimap playernames

from: https://github.com/JadenArcm/Snowy-Kart
2023-08-26 07:27:23 +02:00
hayaunderscore 4a74eaa6b0 mkay 2023-08-26 13:17:03 +08:00
hayaunderscore ed04181899 readd smaller position with input display 2023-08-26 10:02:28 +08:00
hayaunderscore ed86f2c227 tmm stuff 2023-08-26 09:34:49 +08:00
indev 1175247614 Move stretchonground in mobj_t at the end of struct because game assumes precipmobj and mobj have same layout in rendering code -_- 2023-08-25 21:32:26 +03:00
indev f8825c5024 Add showmusiccredit command 2023-08-25 20:48:38 +03:00
alufolie91 9a8ef2c7e0 aaaand add it to the menu 2023-08-25 19:26:02 +02:00
alufolie91 5a7626d88e add toggable sound effect when player squishes after landing
"slamsound" toggles it
2023-08-25 19:19:04 +02:00
indev d5b28577c1 Attempt to fix demo buffer overflow crash. Also don't record demos at all when netdemo_record is set to Disabled 2023-08-25 13:59:53 +03:00
James R 684b016487 Merge branch 'fix-ban-txt-crash' into 'master'
Fix ban.txt crashing game

See merge request KartKrew/Kart-Public!329
2023-08-14 11:41:53 +00:00
James R 0b55e8df7b Rename HAVE_STRLCPY to SRB2_HAVE_STRLCPY, fix non-glibc compile
- Fix compile with msvcrt
- Fix compile with SDL 2.28.2
2023-08-14 04:40:00 -07:00
indev f9880e8413 Fix ban.txt crashing game 2023-08-05 14:50:12 +03:00
James R c499a8387e Fix glibc 2.38 compile
glibc 2.38 added strlcpy and strlcat.
2023-08-03 16:45:34 -07:00
1624 changed files with 66011 additions and 418705 deletions

No files matched your search

+1 -1
View File
@@ -43,7 +43,7 @@ jobs:
- v1-SRB2-APT
- run:
name: Install SDK
command: apt-get -qq -y --no-install-recommends install git build-essential nasm libpng-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 libcurl4-openssl-dev:i386 libopenmpt-dev:i386 gettext ccache wget gcc-multilib upx openssh-client
command: apt-get -qq -y --no-install-recommends install git build-essential libpng-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 libcurl4-openssl-dev:i386 libopenmpt-dev:i386 gettext ccache wget gcc-multilib upx openssh-client
- save_cache:
key: v1-SRB2-APT
paths:
+2
View File
@@ -16,3 +16,5 @@
#Appveyor
/appveyor.yml -crlf -whitespace
# Other
*.c text=auto
*.h text=auto
+436
View File
@@ -0,0 +1,436 @@
default:
image: debian:stable-slim
stages: # List of stages for jobs, and their order of execution
- build
variables:
GIT_STRATEGY: clone
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
.job_template: &job_build # This job runs in the build stage, which runs first.
stage: build
cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
fallback_keys:
- cache-$CI_PROJECT_PATH_SLUG-$CI_DEFAULT_BRANCH
- cache-$CI_PROJECT_PATH_SLUG-default
paths:
- ccache
- ccache_statslog
- key: apt-$CI_JOB_IMAGE
paths:
- apt-cache
unprotect: true
before_script:
- - |
# debconf
echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
- export DEBIAN_FRONTEND="noninteractive"
- export DEBIAN_PRIORITY="low"
- export DEBCONF_NONINTERACTIVE_SEEN="true"
- |
# debconf
echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
- - |
# dpkg_aa
echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
- dpkg --add-architecture i386
- dpkg --add-architecture amd64
- dpkg --add-architecture arm64
- |
# dpkg_aa
echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
- - |
# apt_conf
echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- touch /etc/apt/apt.conf.d/99build
- |
# apt.conf
echo Adding options to apt.conf':'
- |
# APT::Install-Recommends
echo APT::Install-Recommends "false"\; | tee --append /etc/apt/apt.conf.d/99build
- |
# quit
echo quiet "1"\; | tee --append /etc/apt/apt.conf.d/99build
- |
# APT::Get::Assume-Yes
echo APT::Get::Assume-Yes "true"\; | tee --append /etc/apt/apt.conf.d/99build
- |
# Dir::Cache::Archives
echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
- |
# apt_conf
echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
- - |
# apt_update
echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
- apt-get update
- |
# apt_update
echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
- - |
# apt_pre
echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
- apt-get install apt-utils
- |
# apt_pre
echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
- - |
# apt_upgrade
echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages"
- apt-get upgrade
- |
# apt_update
echo -e "\e[0Ksection_end:`date +%s`:apt_upgrade\r\e[0K"
- - |
# apt_common
echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
- apt-get install make git ccache
- |
# apt_common
echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
- - |
# ccache_config
echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
- mkdir --parents --verbose ~/.ccache/
- touch ~/.ccache/ccache.conf
- |
# cache.conf
echo Adding ccache configution option
- |
# base_dir
echo base_dir = $PWD | tee --append ~/.ccache/ccache.conf
- |
# cache_dir
echo cache_dir = $PWD/ccache | tee --append ~/.ccache/ccache.conf
- |
# compiler_check
echo compiler_check = content | tee --append ~/.ccache/ccache.conf
- |
# stats_log
echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf
- |
# max_size
echo max_size = 50M | tee --append ~/.ccache/ccache.conf
- |
# ccache_config
echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
- - |
# cache_reset
echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics"
- ccache --zero-stats
- ccache --show-stats
- |
# ccache_reset
echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
after_script:
- - |
# apt_clean
echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
- apt-get autoclean
- |
# apt_clean
echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
- - |
# ccache_stats
echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
- ccache --show-stats --verbose
- ccache --show-log-stats --verbose
- |
# ccahe_stats
echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
Debian testing GCC:
<<: *job_build
image: debian:testing-slim
allow_failure: true
artifacts:
paths:
- "bin/"
- "src/comptime.h"
expose_as: "Debian GCC testing"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-gcc"
variables:
CC: gcc
script:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
# apt_development
echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- |
# apt_development
echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
Windows x86:
<<: *job_build
artifacts:
paths:
- "bin/"
- "src/comptime.h"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
variables:
PREFIX: i686-w64-mingw32
script:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-mingw-w64-i686-win32
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 SDL=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 SDL=1
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
Debian stable:amd64:
<<: *job_build
artifacts:
paths:
- "bin/"
- "src/comptime.h"
expose_as: "Debian amd64"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
variables:
CC: x86_64-linux-gnu-gcc
OBJCOPY: x86_64-linux-gnu-objcopy
OBJDUMP: x86_64-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig
script:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
# apt_development
echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- |
# apt_development
echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
Debian stable:i386:
<<: *job_build
artifacts:
paths:
- "bin/"
- "src/comptime.h"
expose_as: "Debian i386"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
variables:
CC: i686-linux-gnu-gcc
OBJCOPY: i686-linux-gnu-objcopy
OBJDUMP: i686-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
script:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-i686-linux-gnu || apt-get install gcc
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
# apt_development
echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- |
# apt_development
echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
Debian stable:arm64:
<<: *job_build
artifacts:
paths:
- "bin/"
- "src/comptime.h"
expose_as: "Debian arm64"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
variables:
CC: aarch64-linux-gnu-gcc
OBJCOPY: aarch64-linux-gnu-objcopy
OBJDUMP: aarch64-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
script:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
# apt_development
echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- |
# apt_development
echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
Windows x64:
<<: *job_build
artifacts:
paths:
- "bin/"
- "src/comptime.h"
expose_as: "Win64"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
variables:
PREFIX: x86_64-w64-mingw32
script:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-mingw-w64-x86-64-win32
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 SDL=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 SDL=1
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
Debian stable Clang:
<<: *job_build
allow_failure: true
artifacts:
paths:
- "bin/"
- "src/comptime.h"
expose_as: "Debian Clang"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-clang"
variables:
CC: clang
WFLAGS: -Wno-cast-align
script:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install clang
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
# apt_development
echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- |
# apt_development
echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
Debian testing Clang:
extends: Debian stable Clang
image: debian:testing-slim
artifacts:
paths:
- "bin/"
- "src/comptime.h"
expose_as: "Debina Clang testing"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-clang"
variables:
CC: clang
WFLAGS: -Wno-cast-align -Wno-deprecated-non-prototype
+1 -4
View File
@@ -109,13 +109,10 @@ FILE_PATTERNS = *.c \
*.mm \
*.dox
RECURSIVE = YES
EXCLUDE = ./src/djgppdos/internal.h \
./src/djgppdos/setup.c \
./src/sdl/IMG_xpm.c \
EXCLUDE = ./src/sdl/IMG_xpm.c \
./src/sdl/SRB2DC/scramble.c
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS = */src/hardware/*/* \
*/src/djgppdos/bcd.? \
*/src/sdl/SDL_main/* \
*/src/*/*_private.h \
*/src/sdl/*/*help.? \
+68
View File
@@ -0,0 +1,68 @@
# SRB2Kart Saturn: Custom lua features
## mobj.localskin and player.localskin fields
Allow reading and assigning localskins.
## mobj.rollsum field
**Not netsafe**. Returns total sprite rotation value, taking sliptideroll and sloperoll cvars value into account.
Mainly for use in visual-only addons like secondcolor.
## player.sliproll field
**Not netsafe**. Returns player's current sliptide roll angle, taking sliptideroll cvar value into account.
## hud.setVoteBackground(name)
Changes vote background texture prefix (game looks for PREFIX + "W" or "C" (depends on resolution) + FRAME\_NUMBER).
## hud.add(fn, "vote") and hud.add(fn, "intermission")
Hud hooks for vote screen and intermission screen. They only get drawer (`v`) as argument.
To check if those hooks are available, check if globals FEATURE\_VOTEHUD and FEATURE\_INTERMISSIONHUD
exist.
## x, y = hud.getOffsets(item)
Returns the values of the given HUD item's `xoffset`/`yoffset` cvars.
Available for any HUD item with offset cvars.
## x, y, flags = v.getDrawInfo(item)
Returns the X, Y and flags where the given HUD item will be drawn for the current displayplayer.
Available for `item`, `gametypeinfo` and `minimap`.
## patch, colormap = v.getColorHudPatch(item)
Returns the patch and colormap to use for the given HUD item. Colorization is based on the user's settings.
Available for `item` and `itemmul`.
Extra arguments for some items:
### item
* `small`: true for small item box, false for big item box.
* `dark`: true to darken item box. Depends on `darkitembox`.
### itemmul
* `small`: true for small sticker, false for big sticker.
## hudcolor = v.getHudColor()
Returns the displayplayer's HUD color.
## colorize = v.useColorHud()
Returns true if colorization is enabled, false otherwise.
## mobj.spritexscale, mobj.spriteyscale, mobj.spritexoffset, mobj.spriteyoffset, mobj.rollangle, mobj.sloperoll, mobj.rollmodel fields
Same fields as in SRB2 2.2
## S\_StopSoundByNum
Allows stopping specific sound globally. Because this function starts with S\_, like state, checking
if it exists is a bit more complicated:
```lua
if rawget(_G, "S_StopSoundByNum") ~= nil then
... -- Can use it
end
```
+50 -15
View File
@@ -6,42 +6,74 @@
- Sprites player rotation on slopes; going on hills, levitate, going down, and so on alters your sprites (configurable)
- You can alter all the base kart HUD element offsets on the fly in the Saturn Options settings menu
- "addfilelocal" Command, for those who want to use things like their custom hud in netgames (Same as addfile but completely client sided)
- OpenMPT for Tracker module playback (Complete with filters) fixed looping issues while even sounding better than the old GME playback
- `addfilelocal` Command, for those who want to use things like their custom hud in netgames (Same as addfile but completely client sided)
- Palette rendering, make the OpenGL renderer (almost) look like software mode!
- OpenMPT for Tracker module playback instead of GME
- Fixes looping and sounds better
- Allows filter configuration
- Colourize your Kart HUD, to either your player color or whichever colour you like! (optional / requieres extra2.kart file)
- The minimal brightness with Shaders can be configured, now you can seeeee in dark areas (0-255 , uses Sector brightness values)
- Lua hooks for Intermission (ex: You can make hostmod votes still visible during intermission!)
- Visual Portals from Haya´s HEP Client
- Toggable lowercase menu´s also from Haya´s HEP client
- Lua HUD hooks for Intermission (ex: You can make hostmod votes still visible during intermission!)
- Lua HUD hooks for Vote Screen (ex: You can make hostmod votes still visible during map vote screen!)
- Saltyhop! do a funny hop
- Smaller Speedometer (optional / requieres extra.kart file)
- Record Attack input display can now be used everywhere
- Smaller minimap icons and also show player names on the minimap (toggable)
- Support for animated votescreens!
- `showmusiccredit` command, shows you the current music track again
- `listskins` show a list of all skins currently loaded
- Visual Portals from Haya's HEP Client
- Horizonline effect in OpenGL (watch the endless bricks on SNES Bowsers Castle!)
- Localskins! use whatever skin you like!
- Toggable lowercase menu's also from Haya's HEP client
- Everything that Galaxy has
## Improvements / Bug fixes
- Replay size has been increased to 10MiB minimum, to make replay overflows very unlikely to happen (can be set to 100MiB max with "maxdemosize" command in console)
- Music changes now properly show the music credits (ex: Kart maps with easter eggs that alter the music) *The mapper still has to provide a MusicDEF for this to work.
- Replay size has been increased to 10MiB minimum, to make replay overflows very unlikely to happen
- can be set to 100MiB max with `maxdemosize` command in console
- Music changes now properly show the music credits (ex: Kart maps with easter eggs that alter the music)
- The mapper still has to provide a MusicDEF for this to work.
- Configurable chatlog length (yay can read those messages from 30 mins ago without opening log.txt)
- Configurable timeout for waiting to join a full server (in vanilla this is capped to 5 minutes before it boots you out)
- Characters now spin in skin selection menu (configurable)
- HTTP Addon download speed has been raised dramatically (configurable with "downloadspeed" command)
- Zone memory allocations have been rewritten, speeds up some map loading, and may improve performance on busy maps
- HTTP Addon download speed has been raised dramatically
- configurable with `downloadspeed` command
- HWR Drawnodes have been refactored, this should fix a few rare crashes esp in regards to OpenGL Visportals
- The Position Number in the corner is alot smaller now (half the size!)
- Toggable Lap animation
- Main menu shows the current renderer being used
- MSAA and A2C Antialiasing support (Configurable in renderer.txt file)
- A simple button to rejoin your last visited server
- Ability to show ALL maps in the mapselect screen, this includes hidden or hellmaps "showallmaps yes/no"
- Ability to toggle the Stagetitlecard "maptitles on/off"
## Performance / Debugging
- Access for `mobj_t` and `player_t` fields from Lua has been completely rewritten, for much better performance with many Lua scripts
- Lua shows Tracebacks whenever an error occurs
- The Lua Perfstats page now has multiple pages and is more organized (ps_thinkframe_page X in console)
- People with lower end hardware can disable "screen textures" with "gr_screentextures" command, huge performance gain with minimal visual loss (Note intermission screen background is broken with this)
- Software mode has gotten "ffloorclip", which boosts performance on maps with many Floor over Floor roads
- People with lower end hardware can disable "screen textures" with "gr_screentextures" command, huge performance gain with minimal visual loss
- Intermission backgrounds, heat wave effects and etc are broken with this
- `ffloorclip`, exclusive to Software, which boosts performance on maps with many Floor over Floor sectors
## Technical fixes
- ZFigthing Textures in Opengl mode have been fixed in engine (well almost all of it)
- Fof's intersecting with slopes have less issues and now render correctly in Opengl
- FOFs intersecting with slopes have less issues and now render correctly in Opengl
- Midtextures on slopes in Opengl are fixed, many weird guardrails and fences, aswell as some of those sticking out textures from the ground on some maps should be gone
- The annoying depraction messages for "P_TeleportMove" and "P_AproxDistance" have been silenced
- The annoying depraction messages for `P_TeleportMove` and `P_AproxDistance` have been silenced
- Silenced the annoying "cant find next map..." messages as theyre super useless and annoying anyways
- Added a small cooldown on "map" command due to spamming causing a SIGSEGV
- Added a small cooldown on `map` command due to spamming causing a SIGSEGV
- Many bugfixes to the Software renderer, so its much less prone to crashing
- Many bugfixes to the OpenGL renderer (too many too list all of them here; check the changelogs for more information)
- Bugfixes to the soundsystem, mainly regarding Sound muting
- Refactored Zone Memory Allocations (helps a bit with large maps)
- Many many more crash fixes and other bugfixes to the basegame (too many too list all of them here; check the changelogs for more information)
- Crash Backtraces have been replaced by libbacktrace (except for 32bit Windows builds)
Crashlogs now contain alot more informations. and even more if your build has debug symbols
Also allows 64bit Windows builds to produce Crashlogs!
## MISC
- Bird's Camara Tilting feature is no longer turned on by default
@@ -52,13 +84,16 @@
- A2C antialiasing makes transparent surfaces even more transparent
- You tell us! c:
## Note
Check the LUASTUFF file for more information on all the lua things Saturn has.
## Dependencies
- NASM (x86 builds only)
- SDL2 (Linux/OS X only)
- SDL2-Mixer (Linux/OS X only)
- libupnp (Linux/OS X only)
- libgme (Linux/OS X only)
- libopenmpt (Linux/OS X only)
- libbacktrace (Linux/OS X only)
## Compiling
-18
View File
@@ -1996,24 +1996,6 @@ HW3SOUND for 3D hardware sound support
<Option compilerVar="CC" />
</Unit>
<Unit filename="src/v_video.h" />
<Unit filename="src/vid_copy.s">
<Option compilerVar="CC" />
<Option compiler="avrgcc" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
<Option compiler="gnu_gcc_compiler_for_mingw32" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
<Option compiler="gnu_gcc_compiler_for_mingw64" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
<Option compiler="armelfgcc" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
<Option compiler="tricoregcc" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
<Option compiler="ppcgcc" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
<Option compiler="gcc" use="1" buildCommand="$compiler $options -x assembler-with-cpp -c $file -o $object" />
<Option target="Debug Native/SDL" />
<Option target="Release Native/SDL" />
<Option target="Debug Linux/SDL" />
<Option target="Release Linux/SDL" />
<Option target="Debug Mingw/SDL" />
<Option target="Release Mingw/SDL" />
<Option target="Debug Mingw/DirectX" />
<Option target="Release Mingw/DirectX" />
</Unit>
<Unit filename="src/w_wad.c">
<Option compilerVar="CC" />
</Unit>
-3
View File
@@ -25,9 +25,6 @@
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(PlatformTarget)'=='x86'">
<ClCompile>
<PreprocessorDefinitions>USEASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
+1 -51
View File
@@ -5,7 +5,7 @@ Ver=3
IsCpp=0
Type=0
UnitCount=279
Folders=A_Asm,B_Bot,BLUA,D_Doom,F_Frame,G_Game,H_Hud,Hw_Hardware,Hw_Hardware/r_opengl,I_Interface,I_Interface/Dummy,I_Interface/SDL,I_Interface/Win32,LUA,M_Misc,P_Play,R_Rend,S_Sounds,W_Wad
Folders=B_Bot,BLUA,D_Doom,F_Frame,G_Game,H_Hud,Hw_Hardware,Hw_Hardware/r_opengl,I_Interface,I_Interface/Dummy,I_Interface/SDL,I_Interface/Win32,LUA,M_Misc,P_Play,R_Rend,S_Sounds,W_Wad
CommandLine=
CompilerSettings=00000000000100000111e1
PchHead=-1
@@ -1473,36 +1473,6 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit149]
FileName=src\tmap.nas
Folder=A_Asm
Compile=0
CompileCpp=0
Link=0
Priority=1000
OverrideBuildCmd=1
BuildCmd=nasm.exe -g -o $@ -f win32 src/tmap.nas
[Unit150]
FileName=src\asm_defs.inc
Folder=A_Asm
Compile=0
CompileCpp=0
Link=0
Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit151]
FileName=src\vid_copy.s
Folder=A_Asm
Compile=1
CompileCpp=0
Link=1
Priority=1000
OverrideBuildCmd=1
BuildCmd=$(CC) $(CFLAGS) -x assembler-with-cpp -c src/vid_copy.s -o $@
[Unit152]
FileName=src\y_inter.h
Folder=H_Hud
@@ -1543,26 +1513,6 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit156]
FileName=src\p5prof.h
Folder=A_Asm
Compile=1
CompileCpp=0
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit157]
FileName=src\tmap_mmx.nas
Folder=A_Asm
Compile=0
CompileCpp=0
Link=0
Priority=1000
OverrideBuildCmd=1
BuildCmd=nasm.exe -g -o $@ -f win32 src/tmap_mmx.nas
[Unit159]
FileName=src\lzf.h
Folder=W_Wad
-8
View File
@@ -11,8 +11,6 @@ environment:
# c:\msys64 x86_64 has gcc 8.2.0, so use c:\mingw-w64 7.3.0 instead
MINGW_SDK_64: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64
CFLAGS: -Wall -W -Werror -Wno-error=implicit-fallthrough -Wimplicit-fallthrough=3 -Wno-tautological-compare -Wno-error=suggest-attribute=noreturn
NASM_ZIP: nasm-2.12.01
NASM_URL: http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/win64/nasm-2.12.01-win64.zip
UPX_ZIP: upx391w
UPX_URL: http://upx.sourceforge.net/download/upx391w.zip
CCACHE_EXE: ccache.exe
@@ -46,7 +44,6 @@ environment:
ASSET_CLEAN: 0
cache:
- nasm-2.12.01.zip
- upx391w.zip
- ccache.exe
- C:\Users\appveyor\.ccache
@@ -58,10 +55,6 @@ install:
- if [%X86_64%] == [1] ( set "MINGW_SDK=%MINGW_SDK_64%" )
- if [%X86_64%] == [1] ( set "CCACHE_CC=%CCACHE_CC_64%" )
- if not exist "%NASM_ZIP%.zip" appveyor DownloadFile "%NASM_URL%" -FileName "%NASM_ZIP%.zip"
- 7z x -y "%NASM_ZIP%.zip" -o%TMP% >null
- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs "%TMP%\%NASM_ZIP%" "%MINGW_SDK%\bin" nasm.exe || exit 0
- if not exist "%UPX_ZIP%.zip" appveyor DownloadFile "%UPX_URL%" -FileName "%UPX_ZIP%.zip"
- 7z x -y "%UPX_ZIP%.zip" -o%TMP% >null
- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs "%TMP%\%UPX_ZIP%" "%MINGW_SDK%\bin" upx.exe || exit 0
@@ -78,7 +71,6 @@ before_build:
- set "Path=%MINGW_SDK%\bin;%Path%"
- if [%X86_64%] == [1] ( x86_64-w64-mingw32-gcc --version ) else ( i686-w64-mingw32-gcc --version )
- mingw32-make --version
- if not [%X86_64%] == [1] ( nasm -v )
- if not [%NOUPX%] == [1] ( upx -V )
- ccache -V
- ccache -s
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-5
View File
@@ -1,5 +0,0 @@
/*.elf
/*.self
/*.pkg
/*.BIN
/pkg
-5
View File
@@ -1,5 +0,0 @@
/*.elf
/*.self
/*.pkg
/*.BIN
/pkg
-4
View File
@@ -1,4 +0,0 @@
/EBOOT.PBP
/PARAM.SFO
/SRB2PSP.PBP
/SRB2PSP.elf
-2
View File
@@ -1,2 +0,0 @@
/Release
/Debug
-2
View File
@@ -1,2 +0,0 @@
/Win32
/x64
-3
View File
@@ -1,3 +0,0 @@
/*.elf
/*.dol
/apps
-3
View File
@@ -1,3 +0,0 @@
/*.elf
/*.dol
/apps
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-2
View File
@@ -1,2 +0,0 @@
# DON'T REMOVE
# This keeps the folder from disappearing
-3
View File
@@ -1,3 +0,0 @@
*.arm9
*.elf*
*.nds
-3
View File
@@ -1,3 +0,0 @@
*.arm9
*.elf*
*.nds
@@ -1,46 +0,0 @@
#=============================================================================
# Copyright 2010 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
# support for the yasm assembler
set(CMAKE_ASM_YASM_SOURCE_FILE_EXTENSIONS nasm yasm asm)
if(NOT CMAKE_ASM_YASM_OBJECT_FORMAT)
if(WIN32)
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
set(CMAKE_ASM_YASM_OBJECT_FORMAT win64)
else()
set(CMAKE_ASM_YASM_OBJECT_FORMAT win32)
endif()
elseif(APPLE)
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
set(CMAKE_ASM_YASM_OBJECT_FORMAT macho64)
else()
set(CMAKE_ASM_YASM_OBJECT_FORMAT macho)
endif()
else()
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
set(CMAKE_ASM_YASM_OBJECT_FORMAT elf64)
else()
set(CMAKE_ASM_YASM_OBJECT_FORMAT elf)
endif()
endif()
endif()
set(CMAKE_ASM_YASM_COMPILE_OBJECT "<CMAKE_ASM_YASM_COMPILER> <FLAGS> -f ${CMAKE_ASM_YASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
# Load the generic ASMInformation file:
set(ASM_DIALECT "_YASM")
include(CMakeASMInformation)
set(ASM_DIALECT)
@@ -1,27 +0,0 @@
#=============================================================================
# Copyright 2010 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
# Find the nasm assembler. yasm (http://www.tortall.net/projects/yasm/) is nasm compatible
set(CMAKE_ASM_YASM_COMPILER_LIST nasm yasm)
if(NOT CMAKE_ASM_YASM_COMPILER)
find_program(CMAKE_ASM_YASM_COMPILER yasm
"$ENV{ProgramFiles}/YASM")
endif()
# Load the generic DetermineASM compiler file with the DIALECT set properly:
set(ASM_DIALECT "_YASM")
include(CMakeDetermineASMCompiler)
set(ASM_DIALECT)
@@ -1,23 +0,0 @@
#=============================================================================
# Copyright 2010 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
# This file is used by EnableLanguage in cmGlobalGenerator to
# determine that the selected ASM_NASM "compiler" works.
# For assembler this can only check whether the compiler has been found,
# because otherwise there would have to be a separate assembler source file
# for each assembler on every architecture.
set(ASM_DIALECT "_YASM")
include(CMakeTestASMCompiler)
set(ASM_DIALECT)
+23 -32
View File
@@ -1,54 +1,45 @@
#!/bin/bash -e
#!/bin/sh
path="."
if [ x"$1" != x ]; then
path="$1"
fi
versiongit() {
gitbranch=`git rev-parse --abbrev-ref HEAD`
gitversion=`git rev-parse HEAD`
cat <<EOF > $path/comptime.h
version() {
cat <<EOF > "$path/comptime.h"
// Do not edit! This file was autogenerated
// by the $0 script with git
//
const char* compbranch = "$gitbranch";
const char* comprevision = "${gitversion:0:8}";
const char* compbranch = "$1";
const char* comprevision = "$2";
EOF
exit 0
}
versiongit() {
gitbranch="$(git rev-parse --abbrev-ref HEAD)"
gitversion="$(git rev-parse HEAD | cut -c -8)"
version "$gitbranch" "$gitversion";
exit 0
}
versionsvn() {
svnrevision=`svnversion -n $1`
cat <<EOF > $path/comptime.h
// Do not edit! This file was autogenerated
// by the $0 script with subversion
//
const char* compbranch = "Subversion";
const char* comprevision = "r$svnrevision";
EOF
exit 0
svnrevision="$(svnversion -n "$1")"
version "Subversion" "r$svnrevision";
exit 0
}
versionfake() {
cat <<EOF > $path/comptime.h
// Do not edit! This file was autogenerated
// by the $0 script with an unknown or nonexist SCM
//
const char* compbranch = "Unknown";
const char* comprevision = "illegal";
EOF
version "Unknown" "illegal";
}
compversion() {
touch $path/comptime.c
versionfake
test -d $path/.svn && versionsvn
test -d $path/../.git && versiongit
exit 1
touch "$path/comptime.c"
versionfake
[ -d "$path/.svn" ] && versionsvn "$@"
[ -d "$path/../.git" ] && versiongit
exit 1
}
test -f $path/comptime.c && compversion
[ -f "$path/comptime.c" ] && compversion "$@"
exit 2
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
-576
View File
@@ -1,576 +0,0 @@
; Defines general parameters of the game for which wadfiles are intended.
;
; Name textual name for internal use
; IWAD standard 8.3 base name and extension of main wadfile
; NewMap default name for new map -- dictates format for all maps
; Directory directory in which main wadfile (and game files) reside
; Run command to execute (from the directory) for running a map
[WadGame]
Name=Sonic Robo Blast 2
IWAD=srb2.srb
NewMap=MAP01
Directory=C:\Documents and Settings\Ben\My Documents\srb2
Run=fd\srb2win.exe -file $_Wadfile -warp $_Wadmap
; Defines parameters of the default sector motif created when no motif
; file can be located at startup.
[Default.Sector]
Above=GFZROCK
Main=GFZROCK
Below=GFZROCK
Ceiling=F_SKY1
Floor=FLOOR0_6
CeilingHeight=4096
FloorHeight=0
Lighting=255
; Defines parameters of the default door motif created when no motif
; file can be located at startup.
[Default.Door]
Base=FLAT1
Door=BIGDOOR2
Track=DOORTRAK
Type=1
; Defines parameters of the default stair motif created when no motif
; file can be located at startup.
[Default.Stair]
FloorRunner=GFZROCK
CeilingRunner=GFZROCK
Stairwell=GFZROCK
FloorInc=8
CeilingInc=0
LightingInc=0
; ID used to classify things
; Flags supplies some additional information:
; 0x0001 - indicate thing facing angle
; Red red value for drawing things of said class
; Green green value for drawing things of said class
; Blue blue value for drawing things of said class
; Name textual description of class
[Things.Classes]
0x001 0x0001 255 255 255 Starts
0x002 0x0000 192 0 224 Emeralds
0x003 0x0001 255 0 0 Enemies
0x004 0x0000 255 192 0 Nights Things
0x005 0x0000 0 192 192 Power-Up Monitors
0x006 0x0000 192 0 224 Misc.
0x007 0x0000 192 192 192 Scenery
0x008 0x0000 255 255 0 Mario
0x009 0x0000 255 192 224 Christmas
0x00b 0x0000 0 0 255 Rings
0x00c 0x0000 0 224 0 Springs and Such
; ID used to uniquely identify things in a map
; Class classification (defined above section)
; Size approximate thing size (in map units)
; Sprite name of the sprite to use for display purposes
; Name textual description of thing
[Things.Types]
0x001 1 32 suptd0 Player 01 Start
0x002 1 32 suptd0 Player 02 Start
0x003 1 32 suptd0 Player 03 Start
0x004 1 32 suptd0 Player 04 Start
0xfa1 1 32 suptd0 Player 05 Start
0xfa2 1 32 suptd0 Player 06 Start
0xfa3 1 32 suptd0 Player 07 Start
0xfa4 1 32 suptd0 Player 08 Start
0xfa5 1 32 suptd0 Player 09 Start
0xfa6 1 32 suptd0 Player 10 Start
0xfa7 1 32 suptd0 Player 11 Start
0xfa8 1 32 suptd0 Player 12 Start
0xfa9 1 32 suptd0 Player 13 Start
0xfaa 1 32 suptd0 Player 14 Start
0xfab 1 32 suptd0 Player 15 Start
0xfac 1 32 suptd0 Player 16 Start
0xfad 1 32 suptd0 Player 17 Start
0xfae 1 32 suptd0 Player 18 Start
0xfaf 1 32 suptd0 Player 19 Start
0xfb0 1 32 suptd0 Player 20 Start
0xfb1 1 32 suptd0 Player 21 Start
0xfb2 1 32 suptd0 Player 22 Start
0xfb3 1 32 suptd0 Player 23 Start
0xfb4 1 32 suptd0 Player 24 Start
0xfb5 1 32 suptd0 Player 25 Start
0xfb6 1 32 suptd0 Player 26 Start
0xfb7 1 32 suptd0 Player 27 Start
0xfb8 1 32 suptd0 Player 28 Start
0xfb9 1 32 suptd0 Player 29 Start
0xfba 1 32 suptd0 Player 30 Start
0xfbb 1 32 suptd0 Player 31 Start
0xfbc 1 32 suptd0 Player 32 Start
0x057 1 32 suptd0 CTF Team Start (Red)
0x059 1 32 suptd0 CTF Team Start (Blue)
0x00b 1 32 suptd0 Deathmatch Start
0x1a4 2 20 cemga0 Emerald 1 (Green)
0x1a5 2 20 cemoa0 Emerald 2 (Orange)
0x1a6 2 20 cempa0 Emerald 3 (Pink)
0x1a7 2 20 cemba0 Emerald 4 (Blue)
0x1a8 2 20 cemra0 Emerald 5 (Red)
0x1a9 2 20 cemla0 Emerald 6 (Light Blue)
0x1aa 2 20 cemga0 Emerald 7 (Grey)
0x1ab 2 20 cemka0 Emerald 8 (Master)
0x009 3 40 sposa1 Crawla (Red)
0xbbc 3 40 possa1 Crawla (Blue)
0x02a 3 40 tfogi0 Pop-up Turret
0xbbd 3 40 jetba1 Jetty-Syn Bomber
0x016 3 40 jetga1 Jetty-Syn Gunner
0x03a 3 40 fisha0 Stupid Dumb Unnamed Robofish (tm)
0x047 3 40 detna1 Deton
0x038 3 40 skima0 Skim
0x7d4 3 40 treta1 THZ Turret
0x010 3 80 eggma1 Egg Mobile (Boss 1)
0x7d8 3 80 eggna1 Egg Slimer (Boss 2)
0x015 3 40 ccoma1 Crawla Commander
0x008 3 40 tfogi0 Chaos Mode Enemy Spawn
0x138d 3 40 buzza0 Gold Buzz
0x138e 3 40 rbuza0 Red Buzz
0x034 4 20 dissa0 1024 Axis
0x035 4 20 dissa0 512 Axis
0x03b 4 20 dissa0 2048 Axis
0x03e 4 20 dissa0 1024 Axis (Inverted)
0x00f 4 20 dissa0 512 Axis (Inverted)
0x02d 4 20 dissa0 2048 Axis (Inverted)
0x03d 4 20 dissa0 Axis Transfer
0x02e 4 20 dissa0 Axis Transfer Closest
0x037 4 20 dissa0 Axis Transfer LastToFirst
0x03c 4 20 ndrna1 Ideya Drone
0x039 4 20 hoopa0 Hoop
0x02f 4 20 bon1a0 Circle of Rings
0x7d7 4 20 bon1a0 Circle of Rings (Big)
0x800 4 20 nwnga0 Circle of Wing Logos
0x7da 4 20 nwnga0 Circle of Wing Logos (Big)
0x7fe 4 20 nwnga0 Circle of Rings and Wings
0x7ff 4 20 nwnga0 Circle of Rings and Wings (Big)
0x025 4 20 nwnga0 Wing Logo
0x052 4 20 dissa0 Axis Transfer Condition
0x055 4 20 dissa0 Axis Transfer Condition 2
0xbbf 4 20 npraa0 Super Loop
0xbc0 4 20 nprba0 Drill Refill
0xbc1 4 20 nprca0 Helper
0x019 5 20 shtva0 Super Sneakers
0x023 5 20 whtva0 Whirlwind Shield
0x029 5 20 prupa0 Extra Life
0x030 5 20 yltva0 Attraction Shield
0x7d2 5 20 rdtva0 Inferno Shield
0x7e2 5 20 bktva0 Armageddon Shield
0x7e6 5 20 pinva0 Invincibility
0x7ec 5 20 bltva0 Liquid Shield
0x7db 5 20 srbxa0 Super Ring (10 Rings)
0x7dc 5 20 grbxa0 Silver Ring (25 Rings)
0x04e 5 20 mixua0 Teleporter
0x7d5 5 20 eggba0 Eggman
0xbb8 5 20 quesa0 Random
0x01f 6 20 rflga0 CTF Flag (Red)
0x022 6 20 bflga0 CTF Flag (Blue)
0x7dd 6 20 tokea0 Special Stage Token
0x056 6 20 signd0 End Level Sign
0x021 6 20 bubla0 Air Bubble Patch
0x040 6 20 emera0 Emerald Hunt Location 1
0xbba 6 20 emera0 Emerald Hunt Location 2
0xbb9 6 20 emera0 Emerald Hunt Location 3
0xbbe 6 20 stpta0 Star Post
0x1389 6 20 ppsha0 Push
0x138a 6 20 pplla0 Pull
0x138b 6 20 dissa0 Teleport Destination
0x138f 6 20 dissa0 Cut-Away View
0x043 6 20 dspka0 Ceiling Spike
0x044 6 20 uspka0 Floor Spike
0x017 6 20 spika0 Spikeball (Special Stage)
0x011 6 20 dissa0 Boss Flypoint
0x012 6 20 dissa0 Zoom Tube Waypoint
0x801 6 20 dissa0 Egg Capsule Center
0x033 6 20 lasra0 Laser
0x024 7 20 fwr1b0 GFZ Flower (Normal)
0x046 7 20 fwr2a0 GFZ Sunflower
0x049 7 20 fwr3a0 GFZ Budding Flower
0x04a 7 20 bus1a0 Berry Bush
0x04b 7 20 bus2a0 Bush
0x7f3 7 20 thzpa0 THZ Flower
0x00d 7 20 xms2a0 Palm Tree
0x051 7 20 garga1 Gargoyle
;wtraa0 through wtrha0 are empty sprites, formerly used for the below
0x7ea 7 20 dumba0 Ambient Water SFX 1A (Large)
0x7e8 7 20 dumba0 Ambient Water SFX 1B (Large)
0x7e7 7 20 dumba0 Ambient Water SFX 2A (Medium)
0x7fd 7 20 dumba0 Ambient Water SFX 2B (Medium)
0x053 7 20 dumba0 Ambient Water SFX 3A (Small)
0x7e3 7 20 dumba0 Ambient Water SFX 3B (Small)
0x7e9 7 20 dumba0 Ambient Water SFX 4A (Extra Large)
0x01b 7 20 dumba0 Ambient Water SFX 4B (Extra Large)
0x00e 7 20 dumba0 Random Ambience 1
0x02b 7 20 dumba0 Random Ambience 2
0x031 7 20 chana0 Hanging Chain
0x7d6 7 20 alrma0 THZ Alarm
0x7d1 7 20 fwr4a0 CEZ Flower
0x018 7 20 flama0 CEZ Torch
0x7d3 7 20 dissa0 Light Source (MAP92)
0x2710 8 20 gooma0 Overworld Goomba
0x2711 8 20 bgoma0 Underworld Goomba
0x2712 8 20 mus1a0 Bush (Short)
0x2713 8 20 mus2a0 Bush (Tall)
0x2714 8 20 toada0 Toad
0x2715 8 20 coina0 Coin
0x013 8 20 koopa0 King Bowser
0x00a 8 20 shlla0 Koopa Shell
0x00c 8 20 maxea0 Axe
0x032 8 20 ffwra0 Fire Flower
0x01d 8 20 pumaa0 Puma (Mario Fireball)
0x005 9 20 xms1a0 Pole
0x006 9 20 xms3a0 Snowman
0x00d 9 20 xms2a0 Candy Cane
0x054 11 20 bon1a0 5 Vertical Rings (Yellow Spring)
0x02c 11 20 bon1a0 5 Vertical Rings (Red Spring)
0x04c 11 20 bon1a0 5 Diagonal Rings (Yellow Spring)
0x04d 11 20 bon1a0 10 Diagonal Rings (Red Spring)
0x7de 11 20 bon1a0 Ring
0x045 11 20 homra0 Homing Ring
0xbbb 11 20 raila0 Rail Ring
0x01a 11 20 autra0 Automatic Ring
0x036 11 20 bomra0 Explosion Ring
0x050 11 20 infra0 Infinity Ring
0x138c 12 20 sprba0 Blue Spring
0x01c 12 20 sprya0 Yellow Spring (Up)
0x04f 12 20 sprra0 Red Spring (Up)
0x7df 12 20 yspra1 Yellow Spring (Diagonal Up)
0x026 12 20 rspra1 Red Spring (Diagonal Up)
0x014 12 20 ysuda1 Yellow Spring (Diagonal Down)
0x027 12 20 rsuda1 Red Spring (Diagonal Down)
0x041 12 20 sudya0 Yellow Spring (Down)
0x042 12 20 sudra0 Red Spring (Down)
0x01e 12 20 stemd0 THZ Gas Jet
0x020 12 20 fansa0 THZ Fan
; ID used to classify linedefs
; Name textual description of class
;
; Note: When converting a sector to a door, the linedef types
; available are those in class number two.
[LineDefs.Classes]
0x001 *Important
0x002 Floor Over Floor
0x003 Linedef Executor
0x004 Plane Movement
0x005 Lighting
0x006 Scroll Effects
0x007 Pushers
0x008 Miscellaneous
; ID
; class
; codes
; n does NOT require a tag number
; W walk-over activation
; S switch (triggered by player use)
; G gunfire (pistol, shotgun, chaingun) cross or hit line
; 1 the line may be activated once only
; R potentially repeatable activation
; & affected sectors locked out from further changes
; m monster actions can activate the line's effect
; speed
; (slow=1, medium = 2, fast = 3, turbo = 4)
; time
; texture changes
; description
[LineDefs.Types]
; Commonly used types
0x019 1 - - - - Floor Over Floor: Solid, Opaque, Shadowcasting
0x02d 1 - - - - Floor Over Floor: Water, Translucent
0x010 1 - - - - Colormap
0x001 2 - - - - Crumbling (No Respawn), Floating, Bobbing
0x002 4 - - - - Continuous Floor/Ceiling Mover
0x003 4 - - - - Continuous Floor Mover
0x004 4 - - - - Continuous Ceiling Mover
0x005 5 - - - - Ceiling Lighting
0x006 4 - - - - Continuous Two-Speed Floor/Ceiling Mover
0x007 4 - - - - Continuous Two-Speed Floor Mover
0x008 4 - - - - Continuous Two-Speed Ceiling Mover
0x009 3 - - - - Trigger Linedef Executor (Race Only, Once)
0x00a 3 - - - - Trigger Linedef Executor (CTF Red Team, Continuous)
0x00b 3 - - - - Trigger Linedef Executor (CTF Red Team, Each Time)
0x00c 3 - - - - Trigger Linedef Executor (CTF Blue Team, Continuous)
0x00d 3 - - - - Trigger Linedef Executor (CTF Blue Team, Each Time)
0x00f 3 - - - - Trigger Linedef Executor (No More Enemies, Once)
0x010 5 - - - - Colormap
0x012 8 - - - - Zoom Tube Parameters
0x013 3 - - - - Trigger Linedef Executor (Character Ability, Continuous)
0x014 3 - - - - Trigger Linedef Executor (Character Ability, Each Time)
0x015 3 - - - - Trigger Linedef Executor (Character Ability, Once)
0x018 4 - - - - Instant Ceiling Raise
0x019 2 - - - - Solid, Opaque, Shadowcasting
0x01a 4 - - - - Instant Floor Lower
0x021 2 - - - - Solid, Opaque, Non-Shadowcasting
0x022 2 - - - - Floating, Bobbing
0x023 2 - - - - Crumbling (No Respawn)
0x024 2 - - - - Crumbling (Respawn)
0x025 2 - - - - Crumbling (Respawn), Floating
0x026 2 - - - - Bobbing (Air)
0x027 2 - - - - Crumbling (Respawn), Floating, Bobbing
0x028 2 - - - - Crumbling (Respawn), Bobbing (Air)
0x029 2 - - - - Mario Block
0x02a 2 - - - - Crumbling (No Respawn), Floating
0x02b 4 - - - - Crusher 1 (Ceiling to Floor)
0x02c 2 - - - - Solid, Translucent
0x02d 2 - - - - Water, Translucent
0x02e 2 - - - - Fog Block
0x02f 2 - - - - Half Light Block
0x030 2 - - - - Water, Opaque
0x031 2 - - - - Light Block
0x032 4 - - - - Crusher 2 (Floor to Ceiling)
0x033 2 - - - - Solid, No Sides
0x034 2 - - - - Intangible, Translucent
0x035 2 - - - - Laser Block
0x036 2 - - - - Thwomp Block
0x037 2 - - - - Bustable Block
0x038 2 - - - - Quicksand Block
0x039 2 - - - - Solid, Invisible
0x03a 2 - - - - Intangible, Invisible
0x03b 2 - - - - Intangible from Bottom, Opaque
0x03c 5 - - - - Adjustable Pulsating Light
0x03d 5 - - - - Adjustable Flickering Light
0x03e 2 - - - - Intangible, Opaque
0x03f 8 - - - - Camera Scanner
0x040 8 - - - - Per-Sector Gravity
0x041 8 - - - - Speed Pad
0x042 8 - - - - Flat Alignment
0x043 2 - - - - Intangible, Sides Only
0x044 2 - - - - Adjustable Bobbing (Air)
0x045 2 - - - - Solid, Sides Only
0x046 8 - - - - Ideya Time Modifier
0x047 8 - - - - Custom Exit
0x048 2 - - - - Reverse Adjustable Bobbing (Air)
0x049 8 - - - - Disable Linedef
0x04a 2 - - - - Water, Translucent, No Sides
0x04b 2 - - - - Water, Opaque, No Sides
0x04c 2 - - - - Shatter Block
0x04d 2 - - - - Intangible from Bottom, Translucent, No Sides
0x04e 2 - - - - Spin Bust Block
0x04f 2 - - - - Crumbling (Respawn)
0x050 2 - - - - Crumbling (No Respawn)
0x051 2 - - - - Intangible from Bottom, Translucent
0x052 2 - - - - Intangible from Bottom, Crumbling (Respawn), Translucent
0x053 2 - - - - Intangible from Bottom, Crumbling (No Respawn), Translucent
0x054 2 - - - - Spin Bust Block, Translucent
0x055 6 - - - - Scroll Wall First Side Opposite Direction
0x056 2 - - - - Shatter Block, Translucent
0x057 2 - - - - Custom
0x058 4 - - - - Continuously Falling Sector
0x059 2 - - - - Rising, Solid, Opaque, Shadowcasting
0x05a 2 - - - - Rising, Solid, Opaque, Non-shadowcasting
0x05b 2 - - - - Rising, Solid, Translucent
0x05c 2 - - - - Rising, Intangible from Bottom, Opaque
0x05d 2 - - - - Rising, Intangible from Bottom, Translucent
0x05e 2 - - - - Rising, Solid, Invisible
0x05f 3 - - - - Trigger Linedef Executor (Ring Count, Continuous)
0x060 3 - - - - Trigger Linedef Executor (Continuous)
0x061 3 - - - - Trigger Linedef Executor (Each Time)
0x062 3 - - - - Trigger Linedef Executor (Once)
0x063 3 - - - - Trigger Linedef Executor (Ring Count, Once)
0x064 6 - - - - Scroll Wall First Side Left
0x065 3 - - - - Set Tagged Sector's Floor Height/Pic
0x066 3 - - - - Set Tagged Sector's Ceiling Height/Pic
0x067 3 - - - - Set Tagged Sector's Light Level
0x068 3 - - - - Teleport Player to Tagged Sector
0x069 3 - - - - Change Music
0x06a 3 - - - - Move Tagged Sector's Floor
0x06b 3 - - - - Move Tagged Sector's Ceiling
0x06c 3 - - - - Lower Floor by Line
0x06d 3 - - - - Raise Floor by Line
0x06e 3 - - - - Lower Ceiling by Line
0x06f 3 - - - - Raise Ceiling by Line
0x070 3 - - - - Change Tagged Sector's Tag
0x071 3 - - - - Run Script
0x072 3 - - - - Change Front Sector's Tag
0x073 3 - - - - Play SFX
0x074 3 - - - - Stop Plane Movement
0x075 3 - - - - Fade Light Level
0x076 3 - - - - Stop Lighting Effect
0x077 3 - - - - Start Adjustable Fire Flicker
0x078 3 - - - - Start Adjustable Glowing Light
0x079 3 - - - - Cut-Away View
0x07a 3 - - - - Stop Object
0x07b 3 - - - - Change Sky
0x07c 3 - - - - Change Weather
0x07d 3 - - - - Change Object State
0x07e 3 - - - - Stop Object
0x07f 3 - - - - Award Score
0x080 3 - - - - Start Platform Movement
0x081 3 - - - - Crush Ceiling Once
0x082 3 - - - - Crush Floor Once
0x083 3 - - - - Crush Floor And Ceiling Once
0x084 3 - - - - Enable/Disable 2D Mode
0x085 3 - - - - Enable/Disable Gravity Flip
0x086 3 - - - - Award Power-Up
0x087 3 - - - - Change Plane Scroller Direction
0x088 3 - - - - Shatter FOF
0x089 3 - - - - Disable Player Control
0x08a 3 - - - - Change Object Size
0x08b 3 - - - - Change Tagged Linedef Textures
0x08c 3 - - - - Start Metal Sonic Race
0x08d 3 - - - - Unlockable Trigger
0x08e 3 - - - - Change Object Type State
0x08f 3 - - - - Call Lua Function
0x090 3 - - - - Earthquake
0x096 3 - - - - Execute Linedef Executor (from tag)
0x097 3 - - - - Execute Linedef Executor (random range)
0x0c8 6 - - - - Disp Scroll Ceiling Texture and Carry Objects
0x0c9 6 - - - - Disp Carry Objects on Ceiling
0x0ca 6 - - - - Scroll Ceiling Texture and Carry Objects
0x0cb 6 - - - - Carry Objects on Ceiling
0x0cc 6 - - - - Acc Scroll Ceiling Texture and Carry Objects
0x0cd 6 - - - - Acc Carry Objects on Ceiling
0x0d5 5 - - - - Floor Lighting
0x0d6 6 - - - - Acc Scroll Ceiling Texture
0x0d7 6 - - - - Acc Scroll Floor Texture
0x0d8 6 - - - - Acc Carry Objects on Floor
0x0d9 6 - - - - Acc Scroll Floor Texture and Carry Objects
0x0da 6 - - - - Acc Scroll Wall According to Linedef
0x0df 8 - - - - Friction
0x0e0 7 - - - - Wind
0x0e1 7 - - - - Current
0x0e2 7 - - - - Boom Push/Pull Thing
0x0e3 7 - - - - Upwards Current
0x0e4 7 - - - - Downwards Current
0x0e5 7 - - - - Upwards Wind
0x0e6 7 - - - - Downwards Wind
0x0e8 4 - - - - Activate Floating Platform
0x0e9 4 - - - - Activate Floating Platform (Adjustable Speed)
0x0f2 8 - - - - Fake Floor
0x0f5 6 - - - - Disp Scroll Ceiling Texture
0x0f6 6 - - - - Disp Scroll Floor Texture
0x0f7 6 - - - - Disp Carry Objects on Floor
0x0f8 6 - - - - Disp Scroll Floor Texture and Carry Objects
0x0f9 6 - - - - Disp Scroll Wall According to Linedef
0x0fa 6 - - - - Scroll Ceiling Texture
0x0fb 6 - - - - Scroll Floor Texture
0x0fc 6 - - - - Carry Objects on Floor
0x0fd 6 - - - - Scroll Floor Texture and Carry Objects
0x0fe 6 - - - - Scroll Wall According to Linedef
0x0ff 6 - - - - Scroll Texture by Offsets
[Sectors.Types]
0x001 Blink (random)
0x002 Blink (1/2 second)
0x003 Blink (1 second)
0x004 Spikes
0x005 Death Pit (no camera modifications)
0x006 Space Countdown
0x007 Damage (Fire)
0x008 Light oscillates
0x009 Damage (Special Stage)
0x00a Instant Kill
0x00b Damage (Non-Elemental)
0x00c Blink (1 second synch)
0x00d Blink (1/2 second synch)
0x00e Bouncy Sector (FOF Control Only)
0x010 Death Pit (camera modifications)
0x011 Light flickers like fire
0x012 Damage (Electrical)
0x021 Special Stage Goal
0x100 Ice/Sludge
0x200 Wind/Current
0x207 Damage (Fire) and Current
0x29a Egg Trap Capsule
0x2b2 Button 1 (Open Door A/700 B/701)
0x2b3 Button 2 (Open Door A/702 B/703)
0x2b4 Button 3 (Open Door A/704 B/705)
0x2b5 Button 4 (Open Door A/706 B/707)
0x2b6 Button 5 (Open Door A/708 B/709)
0x2b7 Button 6 (Open Door A/710 B/711)
0x2b8 Button 7 (Open Door A/712 B/713)
0x2b9 Button 8 (Open Door A/714 B/715)
0x2ba Button 9 (Open Door A/716 B/717)
0x2bb Button 10 (Open Door A/718 B/719)
0x2bc Button 11 (Open Door A/720 B/721)
0x2bd Button 12 (Open Door A/722 B/723)
0x2be Button 13 (Open Door A/724 B/725)
0x2bf Button 14 (Open Door A/726 B/727)
0x2c0 Button 15 (Open Door A/728 B/729)
0x2c1 Button 16 (Open Door A/730 B/731)
0x2c2 Button 17 (Open Door A/732 B/733)
0x2c3 Button 18 (Open Door A/734 B/735)
0x2c4 Button 19 (Open Door A/736 B/737)
0x2c5 Button 20 (Open Door A/738 B/739)
0x2c6 Button 21 (THZ2 A/740 B/741 D/742)
0x2c7 Close Door Blazing (Tag 743)
0x300 Ice/Sludge and Wind/Current
0x3c7 Linedef Executor (Emerald Check)
0x3c8 Linedef Executor (NiGHTS Mare)
0x3c9 Super Sonic Transform
0x3ca Check 3DFloors for Linedef Executor
0x3cb Linedef Executor (Pushable Objects)
0x3cc Linedef Executor (No Floor Touch, All Players)
0x3cd Linedef Executor (Floor Touch, All Players)
0x3ce Linedef Executor (No Floor Touch)
0x3cf Linedef Executor (Floor Touch)
0x3d0 Speed Pad (No Spin)
0x3d1 Speed Pad (Spin)
0x3d2 Ring Drainer (Floor Touch)
0x3d3 Spinner
0x3d4 Ring Drainer (No Floor Touch)
0x3d5 Raise Ceiling to Highest (Tag 744)
0x3d6 Exit Sector
0x3d7 Damage (Water)
0x3d8 Damage (Water) and Current
0x3d9 Conveyor Belt
0x3da THZ2 Slime Raise (B/712 S/713 P/714 D/715 S/716)
0x3db No Tag Zone
0x3dc CTF - Red Team Base
0x3dd CTF - Blue Team Base
0x3de Special Stage (Floor=Time) (Ceiling=Rings)
0x3df Custom Gravity
0x3e0 Ramp Sector
0x3e1 Starpost Activator
0x3e2 Finish Line
0x3e4 Non-Ramp Sector
0x3e5 Fan Sector
0x3e6 Zoom Tube Start
0x3e7 Zoom Tube End
0x5dc Bustable Block Sprite ROIA
0x5dd Bustable Block Sprite ROIB
0x5de Bustable Block Sprite ROIC
0x5df Bustable Block Sprite ROID
0x5e0 Bustable Block Sprite ROIE
0x5e1 Bustable Block Sprite ROIF
0x5e2 Bustable Block Sprite ROIG
0x5e3 Bustable Block Sprite ROIH
0x5e4 Bustable Block Sprite ROII
0x5e5 Bustable Block Sprite ROIJ
0x5e6 Bustable Block Sprite ROIK
0x5e7 Bustable Block Sprite ROIL
0x5e8 Bustable Block Sprite ROIM
0x5e9 Bustable Block Sprite ROIN
0x5ea Bustable Block Sprite ROIO
0x5eb Bustable Block Sprite ROIP
-539
View File
@@ -1,539 +0,0 @@
# Yadex game definition file version 4
#
# srb2.ygd
# Yadex Game Definitions for Sonic Robo Blast 2
# See Yadex's doc/ygd.html for the specs.
#
# File made by Alam_GBC.
# Updated by Graue, 2006-06-19
# Yadex has only a few games like "doom2", etc. hardcoded into it.
# Rather than hack the code, since I don't expect to ever edit Doom 2,
# I went into /usr/local/share/games/yadex/1.7.0/ and renamed
# doom2.ygd to doom2_real.ygd, then installed this file as srb2.ygd,
# then made a hard link from doom2.ygd to srb2.ygd; that is:
# ln srb2.ygd /usr/local/share/games/yadex/1.7.0/doom2.ygd
# If you do that, change "iwad2" in yadex.cfg to point to your copy of
# srb2.srb.
# It's not the most beautiful thing to do, but it works. Also, Doom 2
# is the default game, so this way you don't have to do anything
# special when starting Yadex.
# I claim no copyright on this file. -- Graue <graue@oceanbase.org>
level_format doom
level_name map01
picture_format normal
sky_flat sky1
texture_format normal
texture_lumps normal
#
# Definition of linedef type groups
# Format is : ldtgroup <ldtgroup> <description>
#
ldtgroup e "Linedef Executor"
ldtgroup E "3D Floors"
ldtgroup A "Water"
ldtgroup t "Scroll Effects"
ldtgroup x "Misc."
ldtgroup L "Lighting"
ldtgroup l "Pushers"
ldtgroup P "Plane Movement"
#
# Definition of linedef types
# Format is : ldt <number> <ldtgroup> <shortdesc> <longdesc>
# <shortdesc> must not exceed 16 characters.
#
# Linedef Executor
ldt 00009 e "Trigger(Race1)" "Trigger (Race, Once) (1.09)"
ldt 00010 e "Trigger(RedCont)" "Trigger (CTF Red Team, Continuous) (1.09)"
ldt 00011 e "Trigger(RedEach)" "Trigger (CTF Red Team, Once per Floor Touch) (1.09)"
ldt 00012 e "Trigger(BluCont)" "Trigger (CTF Blue Team, Continuous) (1.09)"
ldt 00013 e "Trigger(BluEach)" "Trigger (CTF Blue Team, Once per Floor Touch) (1.09)"
ldt 00015 e "Trigger(NoEnemy)" "Trigger (Once when no more enemies) (1.09)"
ldt 00019 e "Trigger(ChrCont)" "Trigger (Character Ability, Continuous) (1.09)"
ldt 00020 e "Trigger(ChrEach)" "Trigger (Character Ability, Once per Floor Touch) (1.09)"
ldt 00021 e "Trigger(Chr1)" "Trigger (Character Ability, Once) (1.09)"
ldt 00095 e "Trigger(RngCont)" "Trigger (Ring Count, Continuous) (1.09)"
ldt 00096 e "Trigger (Cont)" "Trigger (Continuous)"
ldt 00097 e "Trigger (Each)" "Trigger (Once per Floor Touch)"
ldt 00098 e "Trigger (1)" "Trigger (Once)"
ldt 00099 e "Trigger (Rng1)" "Trigger (Ring Count, Once) (1.09)"
ldt 00101 e "Set Floor" "Set Tagged Sector's Floor Height/Flat"
ldt 00102 e "Set Ceiling" "Set Tagged Sector's Ceiling Height/Flat"
ldt 00103 e "Set Light Level" "Set Tagged Sector's Light Level"
ldt 00104 e "Teleport to" "Teleport to Tagged Sector"
ldt 00105 e "Music Change" "Music Change"
ldt 00106 e "Move Floor by FS" "Move Floor by Front Sector (Length=Speed)"
ldt 00107 e "Move Ceil. by FS" "Move Ceiling by Front Sector (Length=Speed)"
ldt 00108 e "Lower Flr by Ld" "Lower Floor by Line (dx=speed, dy=amount)"
ldt 00109 e "Raise Flr by Ld" "Raise Floor by Line (dx=speed, dy=amount)"
ldt 00110 e "Lower Ceil by Ld" "Lower Ceiling by Line (dx=speed, dy=amount)"
ldt 00111 e "Raise Ceil by Ld" "Raise Ceiling by Line (dx=speed, dy=amount)"
ldt 00112 e "Change Clg/T Tag" "Change Calling Sector's Tag (Change Tagged Sector's Tag in 1.09)"
ldt 00113 e "Run Script" "Run Script"
ldt 00114 e "Change FS Tag" "Change Front Sector's Tag"
ldt 00115 e "Play SFX" "Play SFX"
ldt 00116 e "Stop Plane Move" "Stop Plane Movement"
ldt 00117 e "Fade Light to FS" "Fade Light Level to Front Sector (Length=Speed)"
ldt 00118 e "Stop Light FX" "Stop Lighting Effect"
ldt 00119 e "Start Fire Flckr" "Start Adjustable Fire Flicker"
ldt 00120 e "Start Pulsate" "Start Adjustable Pulsating Light"
ldt 00121 e "Cut-Away View" "Cut-Away View"
ldt 00122 e "Stop Object" "Stop Object"
ldt 00123 e "Change Sky" "Change Sky (1.09)"
ldt 00124 e "Change Weather" "Change Weather (1.09)"
ldt 00125 e "Change Obj State" "Change Object State (1.09)"
ldt 00126 e "Award Score" "Award Score (1.09)"
ldt 00127 e "Start Platf Mvmt" "Start Platform Movement"
# 3D Floors/Blocks
ldt 00001 E "CrumBobFlt NoRet" "Crumbling Floating Bobbing FOF (Never Reappears)"
ldt 00025 E "FOFSoliOpaquShad" "FOF (Solid, Opaque, Shadows)"
ldt 00033 E "FOFSolOpaqNShado" "FOF (Solid, Opaque, No Shadows)"
ldt 00034 E "BobbingFOFWater" "Bobbing Platform (Water)"
ldt 00035 E "CrumblingFOFNRea" "Crumbling FOF (Never Reappears)"
ldt 00036 E "CrumblingFOFReap" "Crumbling FOF (Reappears)"
ldt 00037 E "CrumblingFOFRaps" "Crumbling Floating FOF (Reappears)"
ldt 00038 E "BobbingFOF(Air)" "Bobbing FOF (Air)"
ldt 00039 E "CrumBobbFOF(Rep)" "Crumbling Floating Bobbing FOF (Reappears)"
ldt 00040 E "CrumBobbFOF(Air)" "Crumbling Bobbing FOF (Air)"
ldt 00041 E "Mario Block" "Mario Block"
ldt 00042 E "CrumblingFOF(NR)" "Crumbling Floating FOF (Never Reappears)"
ldt 00044 E "FOFSolidTransluc" "FOF (Solid, Translucent)"
ldt 00046 E "Fog Block" "Fog Block"
ldt 00047 E "Light Block" "Light Block"
ldt 00049 E "2x Light Block" "Double Light Block"
ldt 00051 E "FOFSolid,NoSides" "FOF (Solid, No Sides)"
ldt 00052 E "FOFIntangTranslu" "FOF (Intangible, Translucent)"
ldt 00053 E "Laser Block" "Laser Block"
ldt 00054 E "Thwomp Block" "Thwomp Block"
ldt 00055 E "Bustable Block" "Bustable Block"
ldt 00056 E "Quicksand Block" "Quicksand Block"
ldt 00057 E "FOFSolidInv" "FOF (Solid, Invisible)"
ldt 00058 E "FOFIntangiInvisi" "FOF (Intangible, Invisible)"
ldt 00059 E "Platform" "Platform"
ldt 00062 E "FOFIntangibOpaqu" "FOF (Intangible, Opaque)"
ldt 00067 E "FOFIntaSidesOnly" "FOF (Intangible, Sides Only)"
#removed: ldt 00068 E "AdjBobbFOF(Air)" "Adjustable Bobbing FOF (Air)"
ldt 00069 E "FOFSoliSidesOnly" "FOF (Solid, Sides Only)"
#removed: ldt 00072 E "RevAdjBobFOFAir" "Reverse Adjustable Bobbing FOF (Air)"
ldt 00076 E "Shatter Block" "Shatter Block"
ldt 00077 E "Platf (Trnsl-NS)" "Platform (Translucent, No Sides)"
ldt 00078 E "Spin Bust Block" "Spin Bust Block"
ldt 00079 E "CrumblPlatf(Rep)" "Crumbling Platform (Reappears)"
ldt 00080 E "CrumblPlat(NRep)" "Crumbling Platform (Never Reappears)"
ldt 00081 E "Platform (Trnsl)" "Platform (Translucent)"
ldt 00082 E "CrmPlt(Trns,Rep)" "Crumbling Platform (Translucent, Reappears)"
ldt 00083 E "CrmPlt(Trs,NRep)" "Crumbling Platform (Translucent, Never Reappears)"
ldt 00084 E "SpinBust (Trnsl)" "Spin Bust Block (Translucent)"
ldt 00086 E "Shatter (Trnsl.)" "Shatter Block (Translucent)"
ldt 00087 E "Custom FOF" "Custom FOF (1.09)"
ldt 00089 E "Rising FOF Shado" "Rising FOF (Solid, Opaque, Shadows) (1.09)"
ldt 00090 E "Rising FOF NShad" "Rising FOF (Solid, Opaque, No Shadows) (1.09)"
ldt 00091 E "Rising FOF Trnsl" "Rising FOF (Translucent) (1.09)"
ldt 00092 E "Rising Plat Opaq" "Rising Platform (Opaque) (1.09)"
ldt 00093 E "Rising Plat Trsl" "Rising Platform (Translucent) (1.09)"
ldt 00094 E "Rising FOF SlInv" "Rising FOF (Solid, Invisible) (1.09)"
# Water
ldt 00045 A "Water (Transl.)" "Water (Translucent)"
ldt 00048 A "Water (Opaque)" "Water (Opaque)"
ldt 00074 A "Water (Trnsl-NS)" "Water (Translucent, No Sides)"
ldt 00075 A "Water (Opaq-NS)" "Water (Opaque, No Sides)"
# Scroll Effects
ldt 00085 t "Scr Wl Front Opp" "Scroll Wall First Side Opposite Direction"
ldt 00100 t "Scr Wl FrontLeft" "Scroll Wall First Side Left"
ldt 00202 t "Scr&Carry Ceil" "Scroll&Carry Things Sector Ceiling (FOF Conveyor)"
ldt 00203 t "Carry Ceiling" "Carry Things on Sector Ceiling (FOF Conveyor)"
ldt 00214 t "AccScr Ceiling" "Accel Scroll Sector's Ceiling"
ldt 00215 t "AccScr Floor" "Accel Scroll Sector's Floor"
ldt 00216 t "AccCarry Floor" "Accel Carry Things on Floor"
ldt 00217 t "AccScr&Carry Flr" "Accel Scroll Floor & Carry Things"
ldt 00218 t "AccScr Front" "Accel Scroll 1st Side Tagged Line"
ldt 00245 t "RemScr Ceiling" "Remote Scroll Sector's Ceiling"
ldt 00246 t "RemScr Floor" "Remote Scroll Sector's Floor"
ldt 00247 t "RemCarry Floor" "Remote Carry Things on Floor"
ldt 00248 t "RemScr&Carry Flr" "Remote Scroll Floor & Carry Things"
ldt 00249 t "RemScr Front" "Remote Scroll 1st Side Tagged Line"
ldt 00250 t "Scroll Ceiling" "Scroll Sector's Ceiling"
ldt 00251 t "Scroll Floor" "Scroll Sector's Floor"
ldt 00252 t "Carry on Floor" "Carry Things On Sector Floor"
ldt 00253 t "Scroll&Carry Flr" "Scroll&Carry Things Sector Floor"
ldt 00254 t "Scroll Front" "Scroll First Side of Tagged Line"
ldt 00255 t "Scroll by Offset" "Effect Scrolling From XY Offsets"
# Misc.
ldt 00018 x "Zoom Tube Params" "Zoom Tube Parameters (1.09)"
ldt 00063 x "Camera Scanner" "Camera Scanner"
ldt 00064 x "Sector Gravity" "Per-Sector Gravity"
ldt 00065 x "Speed Pad" "Speed Pad"
ldt 00066 x "Flat Alignment" "Flat Alignment"
ldt 00070 x "IdeyaTimeModify " "Ideya Time Modifier"
ldt 00071 x "Custom Exit" "Custom Exit"
ldt 00073 x "Disable Linedef" "Disable Linedef (main game only)"
ldt 00223 x "Friction" "Friction (Ice>100, Sludge<100)"
ldt 00242 x "Fake Floor" "Fake Floor"
# Lighting
ldt 00005 L "Ceiling Lighting" "Ceiling Lighting"
ldt 00016 L "Colormap" "Colormap"
ldt 00060 L "AdjPulsLight" "Adjustable Pulsating Light"
ldt 00061 L "AdjFlickLight" "Adjustable Flickering Light"
ldt 00213 L "Floor Lighting" "Floor Lighting"
# Plane Movement
ldt 00002 P "ContMover F/C" "Continuous Floor/Ceiling Mover"
ldt 00003 P "ContMover Floor" "Continuous Floor Mover"
ldt 00004 P "ContMover Ceilng" "Continuous Ceiling Mover"
ldt 00006 P "Cont2Mover F/C" "Continuous 2-Speed Floor/Ceiling Mover"
ldt 00007 P "Cont2Mover Floor" "Continuous 2-Speed Floor Mover"
ldt 00008 P "Cont2Mover Ceilg" "Continuous 2-Speed Ceiling Mover"
ldt 00024 P "InstCeilingRaise" "Instant Ceiling Raise"
ldt 00026 P "InstFloorLower" "Instant Floor Lower"
ldt 00043 P "Crusher 1 (C2F)" "Crusher 1 (Ceiling to Floor)"
ldt 00050 P "Crusher 2 (F2C)" "Crusher 2 (Floor to Ceiling)"
ldt 00088 P "Continuous Fall" "Continuously Falling Sector (1.09)"
ldt 00232 P "FloatingPlatform" "Floating Platform"
ldt 00233 P "FloatPFAdjuSpeed" "Floating Platform Adjustable Speed"
# Pushers
ldt 00224 l "Wind Force/Dir" "Wind Force/Direction"
ldt 00225 l "Water Force/Dir" "Water Current Force/Direction"
ldt 00226 l "Boom Push/Pull" "Boom Push/Pull Thing"
ldt 00227 l "Upwards Current" "Upwards Current"
ldt 00228 l "DownwardsCurrent" "Downwards Current"
ldt 00229 l "Upwards Wind" "Upwards Wind"
ldt 00230 l "Downwards Wind" "Downwards Wind"
#
# Definition of sector types
# Format is : st <number> <shortdesc> <longdesc>
# <shortdesc> must not exceed 14 characters.
#
st 00000 "X Normal" "X Normal"
st 00001 "Blink random" "Blink (random)"
st 00002 "Blink halfsec" "Blink (1/2 second)"
st 00003 "Blink oneasec" "Blink (1 second)"
st 00004 "Spikes of Doom" "Spikes"
st 00005 "DeathPit (ncm)" "Death Pit (no camera modifications)"
st 00006 "SpaceCountdown" "Space Countdown"
st 00007 "Fire Damage" "Damage (Fire)"
st 00008 "Lightoscilates" "Light oscillates"
st 00009 "SS Damage" "Damage (Special Stage)"
st 00010 "Instant Kill" "Instant Kill"
st 00011 "Normal Damage" "Damage (Non-elemental)"
st 00012 "Blinks oneasec" "Blink (1 second synch)"
st 00013 "Blinks hafasec" "Blink (1/2 second synch)"
st 00014 "FOF Bouncy Con" "Bouncy Sector (FOF Control Only)"
st 00016 "DeathPit (wcm)" "Death Pit (camera modifications)"
st 00017 "Lightslikefire" "Light flickers like fire"
st 00018 "Elec Damage" "Damage (Electrical)"
st 00256 "Ice/Sludge" "Ice/Sludge"
st 00512 "Wind/Current" "Wind/Current"
st 00680 "EggCapsule But" "Egg Capsule (Button)"
st 00681 "EggCapsule Top" "Egg Capsule (Top)"
st 00682 "EggCapsule Bot" "Egg Capsule (Bottom)"
st 00683 "EggCapsule Cen" "Egg Capsule (Center)"
st 00690 "Button 01" "Button 1 (Open Door A/700 B/701)"
st 00691 "Button 02" "Button 2 (Open Door A/702 B/703)"
st 00692 "Button 03" "Button 3 (Open Door A/704 B/705)"
st 00693 "Button 04" "Button 4 (Open Door A/706 B/707)"
st 00694 "Button 05" "Button 5 (Open Door A/708 B/709)"
st 00695 "Button 06" "Button 6 (Open Door A/710 B/711)"
st 00696 "Button 07" "Button 7 (Open Door A/712 B/713)"
st 00697 "Button 08" "Button 8 (Open Door A/714 B/715)"
st 00698 "Button 09" "Button 9 (Open Door A/716 B/717)"
st 00699 "Button 10" "Button 10 (Open Door A/718 B/719)"
st 00700 "Button 11" "Button 11 (Open Door A/720 B/721)"
st 00701 "Button 12" "Button 12 (Open Door A/722 B/723)"
st 00702 "Button 13" "Button 13 (Open Door A/724 B/725)"
st 00703 "Button 14" "Button 14 (Open Door A/726 B/727)"
st 00704 "Button 15" "Button 15 (Open Door A/728 B/729)"
st 00705 "Button 16" "Button 16 (Open Door A/730 B/731)"
st 00706 "Button 17" "Button 17 (Open Door A/732 B/733)"
st 00707 "Button 18" "Button 18 (Open Door A/734 B/735)"
st 00708 "Button 19" "Button 19 (Open Door A/736 B/737)"
st 00709 "Button 20" "Button 20 (Open Door A/738 B/739)"
st 00710 "Button 21" "Button 21 (THZ2 A/740 B/741 D/742)"
st 00768 "IceSluWindCurr" "Ice/Sludge and Wind/Current"
st 00974 "Linedefx (NFT)" "Linedef Executor (No Floor Touch)"
st 00975 "Linedefx (WFT)" "Linedef Executor (Floor Touch)"
st 00976 "Speed Pad (NS)" "Speed Pad (No Spin)"
st 00977 "Speed Pad (WS)" "Speed Pad (Spin)"
st 00978 "Ring Drainer" "Ring Drainer"
st 00979 "Spinner" "Spinner"
st 00980 "Ring Drain NFT" "Ring Drainer (No Floor Touch)" # 1.09?
st 00981 "RaiseCeilHghst" "Raise Ceiling to Highest (tag 744) (obsolete)"
st 00982 "Exit" "Exit Sector"
st 00983 "Water Damage" "Damage (Water)"
st 00984 "WaterDm&Curent" "Damage (Water) and Current"
st 00985 "ConveyorBelt" "Conveyor Belt"
st 00986 "Slime Raise" "THZ2 Slime Raise (B/712 W/713 P/714 D/715 S/716)"
st 00987 "No Tag Zone" "No Tag Zone"
st 00988 "CTF - Red" "CTF - Red Team Base"
st 00989 "CTF - Bule" "CTF - Blue Team Base"
st 00990 "SS Control" "Special Stage (Floor=Time) (Ceiling=Rings)"
st 00991 "Custom Gravity" "Custom Gravity"
st 00992 "Ramp" "Ramp Sector (Stairs)"
st 00993 "Starpost Actor" "Starpost Activator"
st 00994 "Hockey - Red" "Hockey - Red Team Goal (Finish Line in 1.09)"
st 00995 "Hockey - Blue" "Hockey - Blue Team Goal (not in 1.09)"
st 00996 "Non-Ramp" "Non-Ramp Sector"
st 00997 "Fan Sector" "Fan Sector"
st 00998 "Zoom Tube Strt" "Zoom Tube Start (1.09)"
st 00999 "Zoom Tube End" "Zoom Tube End (1.09)"
st 01500 "BustSprt ROIA" "Bustable Block Sprite ROIA (1.09)"
st 01501 "BustSprt ROIB" "Bustable Block Sprite ROIB (1.09)"
st 01502 "BustSprt ROIC" "Bustable Block Sprite ROIC (1.09)"
st 01503 "BustSprt ROID" "Bustable Block Sprite ROID (1.09)"
st 01504 "BustSprt ROIE" "Bustable Block Sprite ROIE (1.09)"
st 01505 "BustSprt ROIF" "Bustable Block Sprite ROIF (1.09)"
st 01506 "BustSprt ROIG" "Bustable Block Sprite ROIG (1.09)"
st 01507 "BustSprt ROIH" "Bustable Block Sprite ROIH (1.09)"
st 01508 "BustSprt ROII" "Bustable Block Sprite ROII (1.09)"
st 01509 "BustSprt ROIJ" "Bustable Block Sprite ROIJ (1.09)"
st 01510 "BustSprt ROIK" "Bustable Block Sprite ROIK (1.09)"
st 01511 "BustSprt ROIL" "Bustable Block Sprite ROIL (1.09)"
st 01512 "BustSprt ROIM" "Bustable Block Sprite ROIM (1.09)"
st 01513 "BustSprt ROIN" "Bustable Block Sprite ROIN (1.09)"
st 01514 "BustSprt ROIO" "Bustable Block Sprite ROIO (1.09)"
st 01515 "BustSprt ROIP" "Bustable Block Sprite ROIP (1.09)"
#
# Definition of thing groups
# Format is : thinggroup <thinggroup> <colour> <description>
#
thinggroup b rgb:f/f/f "Starts"
thinggroup e rgb:f/0/0 "Enemies"
thinggroup n rgb:f/b/0 "Nights Things"
thinggroup p rgb:0/b/b "Power-Up Monitors"
thinggroup o rgb:b/0/c "Misc."
thinggroup d rgb:b/b/b "Scenery"
thinggroup m rgb:f/f/0 "Mario"
thinggroup c rgb:f/b/c "Christmas"
thinggroup r rgb:0/0/f "Rings"
thinggroup s rgb:0/c/0 "Springs and Such"
#
# Definition of things
# Format is :
# thing <number> <thinggroup> <flags> <radius> <desc> [<sprite>]
# <desc> must not exceed 19 characters. <flags> s for see-thur
#
# FIXME: replace dissa0 and dumba0 with sprites that are really there
# FIXME: replace start images of ndrna1 with something better.
# ndrna1 is really the nights drone
#thig 00000 g s ## " " ?????#
thing 00001 b - 32 "Player 01 Start" ndrna1
thing 00002 b - 32 "Player 02 Start" ndrna1
thing 00003 b - 32 "Player 03 Start" ndrna1
thing 00004 b - 32 "Player 04 Start" ndrna1
thing 04001 b - 32 "Player 05 Start" ndrna1
thing 04002 b - 32 "Player 06 Start" ndrna1
thing 04003 b - 32 "Player 07 Start" ndrna1
thing 04004 b - 32 "Player 08 Start" ndrna1
thing 04005 b - 32 "Player 09 Start" ndrna1
thing 04006 b - 32 "Player 10 Start" ndrna1
thing 04007 b - 32 "Player 11 Start" ndrna1
thing 04008 b - 32 "Player 12 Start" ndrna1
thing 04009 b - 32 "Player 13 Start" ndrna1
thing 04010 b - 32 "Player 14 Start" ndrna1
thing 04011 b - 32 "Player 15 Start" ndrna1
thing 04012 b - 32 "Player 16 Start" ndrna1
thing 04013 b - 32 "Player 17 Start" ndrna1
thing 04014 b - 32 "Player 18 Start" ndrna1
thing 04015 b - 32 "Player 19 Start" ndrna1
thing 04016 b - 32 "Player 20 Start" ndrna1
thing 04017 b - 32 "Player 21 Start" ndrna1
thing 04018 b - 32 "Player 22 Start" ndrna1
thing 04019 b - 32 "Player 23 Start" ndrna1
thing 04020 b - 32 "Player 24 Start" ndrna1
thing 04021 b - 32 "Player 25 Start" ndrna1
thing 04022 b - 32 "Player 26 Start" ndrna1
thing 04023 b - 32 "Player 27 Start" ndrna1
thing 04024 b - 32 "Player 28 Start" ndrna1
thing 04025 b - 32 "Player 29 Start" ndrna1
thing 04026 b - 32 "Player 30 Start" ndrna1
thing 04027 b - 32 "Player 31 Start" ndrna1
thing 04028 b - 32 "Player 32 Start" ndrna1
thing 00087 b - 32 "CTF Red Team Start" ndrna1
thing 00089 b - 32 "CTF Blue Team Start" ndrna1
thing 00011 b - 32 "Deathmatch Start" ndrna1
#thig 00000 g s ## " " ?????#
#thig 00000 g s ## " " ?????#
thing 00009 e - 40 "Crawla (Red)" sposa1
thing 03004 e - 40 "Crawla (Blue)" possa1
thing 03005 e - 40 "Jetty-Syn Bomber" jetba1
thing 00022 e - 40 "Jetty-Syn Gunner" jetga1
thing 00058 e - 40 "Robofish (tm)" fisha0
thing 00071 e - 40 "Deton" detna1
thing 00056 e - 40 "Skim" skima0
thing 05005 e - 40 "Buzz (Yellow)" buzza0
thing 05006 e - 40 "Buzz (Red)" rbuza0
thing 02004 e - 40 "THZ Turret" treta1
thing 00042 e - 40 "Popup Turret" turre1
thing 00016 e - 80 "Egg Mobile (Boss 1)" eggma1
thing 01008 e - 80 "Egg Slimer (Boss 2)" eggna1
thing 00021 e - 40 "Crawla Commander" ccoma1
thing 00008 e s 20 "ChaosModeEnemySpawn" tfogi0
#thig 00000 g s ## " " ?????#
#thig 00000 g s ## " " ?????#
thing 00052 n s 20 "1024 Axis" dissa0
thing 00053 n s 20 "512 Axis" dissa0
thing 00059 n s 20 "2048 Axis" dissa0
thing 00062 n s 20 "1024 Axis(Inverted)" dissa0
thing 00015 n s 20 "512 Axis (Inverted)" dissa0
thing 00045 n s 20 "2048 Axis(Inverted)" dissa0
thing 00061 n s 20 "Axis Transfer" dissa0
thing 00046 n s 20 "Axis Transfer Closest" dissa0
thing 00055 n s 20 "Axis Transfer LastToFirst" dissa0
thing 00060 n - 20 "Ideya Drone" ndrna1
thing 00057 n - 20 "Hoop" hoopa0
thing 00047 n - 20 "Circle of Rings" bon1a0
thing 02007 n - 20 "Circle ofRings(Big)" bon1a0
thing 02048 n - 20 "Circle ofWing Logos" nwnga0
thing 02010 n - 20 "CircleofWingLogos-B" nwnga0
thing 02046 n - 20 "CircleofRings&Wings" nwnga0
thing 02047 n - 20 "CirleofRngs&Wings-B" nwnga0
thing 00037 n - 20 "Wing Logo" nwnga0
thing 00082 n s 20 "AxisTrnsferCodtion" dissa0
thing 00085 n s 20 "AxisTrnsferCodtion2" dissa0
thing 03007 n - 20 "Super Loop" npraa0
thing 03008 n - 20 "Drill Refill" nprba0
thing 03009 n - 20 "Helper" nprca0
#thig 00000 g s ## " " ?????#
#thig 00000 g s ## " " ?????#
thing 00025 p - 20 "Super Sneakers" shtva0
thing 00035 p - 20 "Basic/WhirlShield" bltva0
thing 00041 p - 20 "Extra Life" prupa0
thing 00048 p - 20 "Attraction Shield" yltva0
thing 02002 p - 20 "Inferno Shield" rdtva0
thing 02018 p - 20 "Armageddon Shield" bktva0
thing 02022 p - 20 "Invincibility" pinva0
thing 02028 p - 20 "Liquid Shield" grtva0
thing 02011 p - 20 "SuperRing(10 Rings)" srbxa0
thing 02012 p - 20 "SilverRing(25Rings)" grbxa0
thing 00078 p - 20 "Teleporter" mixua0
thing 02005 p - 20 "Eggman" eggba0
thing 03000 p - 20 "Random" quesa0
#thig 00000 g s ## " " ?????#
#thig 00000 g s ## " " ?????#
thing 00031 o - 20 "CTF Flag (Red)" rflga0
thing 00034 o - 20 "CTF Flag (Blue)" bflga0
thing 02013 o - 20 "Special Stage Token" tokea0
thing 00086 o - 20 "End Level Sign" signd0
thing 00033 o - 20 "Air Bubble Patch" bubla0
thing 00064 o - 20 "Emerald Hunt Place1" emera0
thing 03002 o - 20 "Emerald Hunt Place2" emera0
thing 03001 o - 20 "Emerald Hunt Place3" emera0
thing 03006 o - 20 "Star Post" stpta0
thing 05001 o s 20 "Push" ppsha0
thing 05002 o s 20 "Pull" pplla0
thing 05003 o s 20 "TeleportDestination" dissa0
thing 05007 o s 20 "Cut-Away View Thing" dissa0
thing 00067 o - 20 "Ceiling Spike" dspka0
thing 00068 o - 20 "Floor Spike" uspka0
thing 00023 o - 20 "Spikeball" spika0
thing 00017 o s 20 "Boss Flypoint" dissa0
thing 02049 o s 20 "Egg Capsule Center" dissa0
thing 00051 o - 20 "Laser" lasra0
thing 00018 o - 20 "ZoomTubeWaypoint109" dissa0
thing 00420 o - 20 "Emerald 1 (Green)" emmya0
thing 00421 o - 20 "Emerald 2 (Orange)" emmyb0
thing 00422 o - 20 "Emerald 3 (Pink)" emmyc0
thing 00423 o - 20 "Emerald 4 (Blue)" emmyd0
thing 00424 o - 20 "Emerald 5 (Red)" emmye0
thing 00425 o - 20 "Emerald 6 (LtBlue)" emmyf0
thing 00426 o - 20 "Emerald 7 (Gray)" emmyg0
# FIXME: add correct sprite for this emerald
thing 00427 o - 20 "Emerald 8 (Master)" dissa0
#thig 00000 g s ## " " ?????#
thing 00036 d - 20 "GFZ Flower (Normal)" fwr1b0
thing 00070 d - 20 "GFZ Sunflower" fwr2a0
thing 00073 d - 20 "GFZ Budding Flower" fwr3a0
thing 00074 d - 20 "Berry Bush" bus1a0
thing 00075 d - 20 "Bush" bus2a0
thing 02035 d - 20 "THZ Flower" thzpa0
thing 00081 d - 20 "Gargoyle" garga1
thing 02026 d s 20 "AmbientWaterSFX1A-L" dumba0
thing 02024 d s 20 "AmbientWaterSFX1B-L" dumba0
thing 02025 d s 20 "AmbientWaterSFX2A-M" dumba0
thing 02045 d s 20 "AmbientWaterSFX2B-M" dumba0
thing 00083 d s 20 "AmbientWaterSFX3A-S" dumba0
thing 02019 d s 20 "AmbientWaterSFX3B-S" dumba0
thing 02025 d s 20 "AmbientWaterSFX4A-E" dumba0
thing 00027 d s 20 "AmbientWaterSFX4B-E" dumba0
thing 00014 d s 20 "Random Ambience 1" dumba0
thing 00043 d s 20 "Random Ambience 2" dumba0
thing 00049 d - 20 "Hanging Chain" chana0
thing 02006 d - 20 "THZ Alarm" alrma0
thing 02001 d - 20 "CEZ Flower" fwr4a0
thing 00024 d - 20 "CEZ Torch" flama0
thing 02003 d s 20 "LightSource (MAP92)" dissa0
#thig 00000 g s ## " " ?????#
#thig 00000 g s ## " " ?????#
thing 100000 m - 20 "Overworld Goomba" gooma0
thing 100001 m - 20 "Underworld Goomba" bgoma0
thing 100002 m - 20 "Bush (Short)" mus1a0
thing 100003 m - 20 "Bush (Tall)" mus2a0
thing 100004 m - 20 "Toad" toada0
thing 100005 m - 20 "Coin" coina0
thing 00019 m - 20 "King Bowser" koopa0
thing 00010 m - 20 "Koopa Shell" shlla0
thing 00012 m - 20 "Axe" maxea0
thing 00050 m - 20 "Fire Flower" ffwra0
thing 00029 m - 20 "Puma(MarioFireball)" pumaa0
#thig 00000 g s ## " " ?????#
#thig 00000 g s ## " " ?????#
thing 00005 c - 20 "Pole" xms1a0
thing 00006 c - 20 "Snowman" xms3a0
thing 00013 c - 20 "Candy Cane" xms2a0
thing 00084 r - 20 "5VerticalRings-YwSg" bon1a0
thing 00044 r - 20 "5VerticalRings-RdSg" bon1a0
thing 00076 r - 20 "5DiagonalRings-YwSg" bon1a0
thing 00077 r - 20 "10DiagonalRings-RSg" bon1a0
thing 02014 r - 20 "Ring" bon1a0
thing 00069 r - 20 "Homing Ring" homra0
thing 03003 r - 20 "Rail Ring" raila0
thing 00026 r - 20 "Automatic Ring" autra0
thing 00054 r - 20 "Explosion Ring" bomra0
thing 00080 r - 20 "Infinity Ring" infra0
thing 00028 s - 20 "Yellow Spring (Up)" sprya0
thing 00079 s - 20 "Red Spring (Up)" sprra0
thing 02015 s - 20 "Yellow Spring (DU)" yspra1
thing 00038 s - 20 "Red Spring (DU)" rspra1
thing 00020 s - 20 "Yellow Spring (DD)" ysuda1
thing 00039 s - 20 "Red Spring (DD)" rsuda1
thing 00065 s - 20 "Yellow Spring (Dn)" sudya0
thing 00066 s - 20 "Red Spring (Dn)" sudra0
thing 05004 s - 20 "Blue Spring" sprba0
thing 00030 s - 20 "THZ Gas Jet" stemd0
thing 00032 s - 20 "THZ Fan" fansa0
#thig 00000 g s ## " " ?????#
File diff suppressed because it is too large. Load diff
-58
View File
@@ -1,58 +0,0 @@
# wminput configuration for SRB2Wii by Alam Arias
# based on Callum Dickinson's version
#Wiimote.Up = KEY_RESERVED
#Wiimote.Down = KEY_RESERVED
#Wiimote.Left = KEY_RESERVED
#Wiimote.Right = KEY_RESERVED
Wiimote.A = BTN_THUMB
Wiimote.B = BTN_TRIGGER
Wiimote.Minus = BTN_THUMBL
Wiimote.Plus = BTN_THUMBR
Wiimote.Home = BTN_MODE
Wiimote.1 = BTN_1
Wiimote.2 = BTN_2
Wiimote.Dpad.X = -ABS_HAT0Y
Wiimote.Dpad.Y = -ABS_HAT0X
Nunchuk.C = BTN_C
Nunchuk.Z = BTN_Z
Nunchuk.Stick.X = ABS_THROTTLE
Nunchuk.Stick.Y = -ABS_RUDDER
#Classic.Up = KEY_RESERVED
#Classic.Down = KEY_RESERVED
#Classic.Left = KEY_RESERVED
#Classic.Right = KEY_RESERVED
Classic.Minus = BTN_SELECT
Classic.Plus = BTN_START
Classic.Home = BTN_MODE
Classic.A = BTN_A
Classic.B = BTN_B
Classic.X = BTN_X
Classic.Y = BTN_Y
Classic.ZL = BTN_TL2
Classic.ZR = BTN_TR2
Classic.L = BTN_TL
Classic.R = BTN_TR
Classic.Dpad.X = ABS_HAT1X
Classic.Dpad.Y = -ABS_HAT1Y
Classic.LStick.X = ABS_X
Classic.LStick.Y = -ABS_Y
Classic.RStick.X = ABS_RX
Classic.RStick.Y = -ABS_RY
Classic.LAnalog = ABS_GAS
Classic.RAnalog = ABS_BRAKE
# Nunchuk Stick buttons
Plugin.nunchuk_stick2btn.Up = BTN_BASE
Plugin.nunchuk_stick2btn.Down = BTN_BASE2
Plugin.nunchuk_stick2btn.Left = BTN_BASE3
Plugin.nunchuk_stick2btn.Right = BTN_BASE4
# Mouse Control
#Plugin.ir_ptr.X = REL_X
#Plugin.ir_ptr.Y = REL_Y
+4 -2
View File
@@ -23,10 +23,12 @@ and don't forget to build r_opengl.dll for srb2dd.
## srb2kart, 64-bit
* libs\dll-binaries\x86_64\exchndl.dll
* libs\dll-binaries\x86_64\libgme.dll
* libs\dll-binaries\x86_64\discord-rpc.dll
* libs\dll-binaries\x86_64\mgwhelp.dll (depend for exchndl.dll)
* libs\SDL2\x86_64-w64-mingw32\bin\SDL2.dll
* libs\SDL2_mixer\x86_64-w64-mingw32\bin\*.dll (get everything)
* libs\libopenmpt\x86_64\bin\mingw\libopenmpt.dll
Updated 2/17/2024 (v1.6 Saturn)
No i threw everthing into dll-binaries
theres no reason at all to have stuff spread across multiple directories
-30
View File
@@ -1,30 +0,0 @@
#
# Makefile for installing the mingw32 version of the SDL library
CROSS_PATH := /usr/local
ARCHITECTURES := i686-w64-mingw32 x86_64-w64-mingw32
all install:
@echo "Type \"make native\" to install 32-bit to /usr"
@echo "Type \"make cross\" to install 32-bit and 64-bit to $(CROSS_PATH)"
native:
make install-package arch=i686-w64-mingw32 prefix=/usr
cross:
for arch in $(ARCHITECTURES); do \
make install-package arch=$$arch prefix=$(CROSS_PATH)/$$arch; \
done
install-package:
@if test -d $(arch) && test -d $(prefix); then \
(cd $(arch) && cp -rv bin include lib share $(prefix)/); \
sed "s|^prefix=.*|prefix=$(prefix)|" <$(arch)/bin/sdl2-config >$(prefix)/bin/sdl2-config; \
chmod 755 $(prefix)/bin/sdl2-config; \
sed "s|^libdir=.*|libdir=\'$(prefix)/lib\'|" <$(arch)/lib/libSDL2.la >$(prefix)/lib/libSDL2.la; \
sed "s|^libdir=.*|libdir=\'$(prefix)/lib\'|" <$(arch)/lib/libSDL2main.la >$(prefix)/lib/libSDL2main.la; \
sed "s|^prefix=.*|prefix=$(prefix)|" <$(arch)/lib/pkgconfig/sdl2.pc >$(prefix)/lib/pkgconfig/sdl2.pc; \
else \
echo "*** ERROR: $(arch) or $(prefix) does not exist!"; \
exit 1; \
fi
+148 -4
View File
@@ -1,6 +1,150 @@
This is a list of major changes in SDL's version history.
---------------------------------------------------------------------------
2.30.0:
---------------------------------------------------------------------------
General:
* Added support for 2 bits-per-pixel indexed surface formats
* Added the function SDL_GameControllerGetSteamHandle() to get the Steam API handle for a controller, if available
* Added the event SDL_CONTROLLERSTEAMHANDLEUPDATED which is sent when the Steam API handle for a controller changes. This could also change the name, VID, and PID of the controller.
* Added the environment variable SDL_LOGGING to control default log output
macOS:
* Added the hint SDL_HINT_JOYSTICK_IOKIT to control whether the IOKit controller driver should be used
* Added the hint SDL_HINT_JOYSTICK_MFI to control whether the GCController controller driver should be used
* Added the hint SDL_HINT_RENDER_METAL_PREFER_LOW_POWER_DEVICE to choose whether high or low power GPU should be used for rendering, in the case where there are multiple GPUs available
Xbox:
* Added the function SDL_GDKGetDefaultUser()
---------------------------------------------------------------------------
2.28.2:
---------------------------------------------------------------------------
General:
* Added the hint SDL_HINT_JOYSTICK_WGI to control whether to use Windows.Gaming.Input for controllers
---------------------------------------------------------------------------
2.28.0:
---------------------------------------------------------------------------
General:
* Added SDL_HasWindowSurface() and SDL_DestroyWindowSurface() to switch between the window surface and rendering APIs
* Added a display event SDL_DISPLAYEVENT_MOVED which is sent when the primary monitor changes or displays change position relative to each other
* Added the hint SDL_HINT_ENABLE_SCREEN_KEYBOARD to control whether the on-screen keyboard should be shown when text input is active
---------------------------------------------------------------------------
2.26.0:
---------------------------------------------------------------------------
General:
* Updated OpenGL headers to the latest API from The Khronos Group Inc.
* Added SDL_GetWindowSizeInPixels() to get the window size in pixels, which may differ from the window coordinate size for windows with high-DPI support
* Added simulated vsync synchronization for the software renderer
* Added the mouse position to SDL_MouseWheelEvent
* Added SDL_ResetHints() to reset all hints to their default values
* Added SDL_GetJoystickGUIDInfo() to get device information encoded in a joystick GUID
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_XBOX_360 to control whether the HIDAPI driver for XBox 360 controllers should be used
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_XBOX_360_PLAYER_LED to control whether the player LEDs should be lit to indicate which player is associated with an Xbox 360 controller
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_XBOX_360_WIRELESS to control whether the HIDAPI driver for XBox 360 wireless controllers should be used
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_XBOX_ONE to control whether the HIDAPI driver for XBox One controllers should be used
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_XBOX_ONE_HOME_LED to control the brightness of the XBox One guide button LED
* Added support for PS3 controllers to the HIDAPI driver, enabled by default on macOS, controlled by the SDL_HINT_JOYSTICK_HIDAPI_PS3 hint
* Added support for Nintendo Wii controllers to the HIDAPI driver, not enabled by default, controlled by the SDL_HINT_JOYSTICK_HIDAPI_WII hint
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_WII_PLAYER_LED to control whether the player LED should be lit on the Nintendo Wii controllers
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_VERTICAL_JOY_CONS to control whether Nintendo Switch Joy-Con controllers will be in vertical mode when using the HIDAPI driver
* Added access to the individual left and right gyro sensors of the combined Joy-Cons controller
* Added a microsecond timestamp to SDL_SensorEvent and SDL_ControllerSensorEvent, when the hardware provides that information
* Added SDL_SensorGetDataWithTimestamp() and SDL_GameControllerGetSensorDataWithTimestamp() to retrieve the last sensor data with the associated microsecond timestamp
* Added the hint SDL_HINT_HIDAPI_IGNORE_DEVICES to have the SDL HID API ignore specific devices
* SDL_GetRevision() now includes more information about the SDL build, including the git commit hash if available
Windows:
* Added the hint SDL_HINT_MOUSE_RELATIVE_SYSTEM_SCALE to control whether the system mouse acceleration curve is used for relative mouse motion
macOS:
* Implemented vsync synchronization on macOS 12
Linux:
* Added SDL_SetPrimarySelectionText(), SDL_GetPrimarySelectionText(), and SDL_HasPrimarySelectionText() to interact with the X11 primary selection clipboard
* Added the hint SDL_HINT_VIDEO_WAYLAND_EMULATE_MOUSE_WARP to control whether mouse pointer warp emulation is enabled under Wayland
Android:
* Enabled IME soft keyboard input
* Added version checking to make sure the SDL Java and C code are compatible
---------------------------------------------------------------------------
2.24.0:
---------------------------------------------------------------------------
General:
* New version numbering scheme, similar to GLib and Flatpak.
* An even number in the minor version (second component) indicates a production-ready stable release such as 2.24.0, which would have been 2.0.24 under the old system.
* The patchlevel (micro version, third component) indicates a bugfix-only update: for example, 2.24.1 would be a bugfix-only release to fix bugs in 2.24.0, without adding new features.
* An odd number in the minor version indicates a prerelease such as 2.23.0. Stable distributions should not use these prereleases.
* The patchlevel indicates successive prereleases, for example 2.23.1 and 2.23.2 would be prereleases during development of the SDL 2.24.0 stable release.
* Added SDL_GetPointDisplayIndex() and SDL_GetRectDisplayIndex() to get the display associated with a point and rectangle in screen space
* Added SDL_bsearch(), SDL_crc16(), and SDL_utf8strnlen() to the stdlib routines
* Added SDL_CPUPauseInstruction() as a macro in SDL_atomic.h
* Added SDL_size_mul_overflow() and SDL_size_add_overflow() for better size overflow protection
* Added SDL_ResetHint() to reset a hint to the default value
* Added SDL_ResetKeyboard() to reset SDL's internal keyboard state, generating key up events for all currently pressed keys
* Added the hint SDL_HINT_MOUSE_RELATIVE_WARP_MOTION to control whether mouse warping generates motion events in relative mode. This hint defaults off.
* Added the hint SDL_HINT_TRACKPAD_IS_TOUCH_ONLY to control whether trackpads are treated as touch devices or mice. By default touchpads are treated as mouse input.
* The hint SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS now defaults on
* Added support for mini-gamepad mode for Nintendo Joy-Con controllers using the HIDAPI driver
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS to control whether Joy-Con controllers are automatically merged into a unified gamepad when using the HIDAPI driver. This hint defaults on.
* The hint SDL_HINT_JOYSTICK_HIDAPI_SWITCH_HOME_LED can be set to a floating point value to set the brightness of the Home LED on Nintendo Switch controllers
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_JOYCON_HOME_LED to set the Home LED brightness for the Nintendo Joy-Con controllers. By default the Home LED is not modified.
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_SWITCH_PLAYER_LED to control whether the player LED should be lit on the Nintendo Joy-Con controllers
* Added support for Nintendo Online classic controllers using the HIDAPI driver
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_NINTENDO_CLASSIC to control whether the HIDAPI driver for Nintendo Online classic controllers should be used
* Added support for the NVIDIA Shield Controller to the HIDAPI driver, supporting rumble and battery status
* Added support for NVIDIA SHIELD controller to the HIDAPI driver, and a hint SDL_HINT_JOYSTICK_HIDAPI_SHIELD to control whether this is used
* Added functions to get the platform dependent name for a joystick or game controller:
* SDL_JoystickPathForIndex()
* SDL_JoystickPath()
* SDL_GameControllerPathForIndex()
* SDL_GameControllerPath()
* Added SDL_GameControllerGetFirmwareVersion() and SDL_JoystickGetFirmwareVersion(), currently implemented for DualSense(tm) Wireless Controllers using HIDAPI
* Added SDL_JoystickAttachVirtualEx() for extended virtual controller support
* Added joystick event SDL_JOYBATTERYUPDATED for when battery status changes
* Added SDL_GUIDToString() and SDL_GUIDFromString() to convert between SDL GUID and string
* Added SDL_HasLSX() and SDL_HasLASX() to detect LoongArch SIMD support
* Added SDL_GetOriginalMemoryFunctions()
* Added SDL_GetDefaultAudioInfo() to get the name and format of the default audio device, currently implemented for PipeWire, PulseAudio, WASAPI, and DirectSound
* Added HIDAPI driver for the NVIDIA SHIELD controller (2017 model) to enable support for battery status and rumble
* Added support for opening audio devices with 3 or 5 channels (2.1, 4.1). All channel counts from Mono to 7.1 are now supported.
* Rewrote audio channel converters used by SDL_AudioCVT, based on the channel matrix coefficients used as the default for FAudio voices
* SDL log messages are no longer limited to 4K and can be any length
* Fixed a long-standing calling convention issue with dynapi affecting OpenWatcom or OS/2 builds
Windows:
* Added initial support for building for Windows and Xbox with Microsoft's Game Development Kit (GDK), see docs/README-gdk.md for details
* Added a D3D12 renderer implementation and SDL_RenderGetD3D12Device() to retrieve the D3D12 device associated with it
* Added the hint SDL_HINT_WINDOWS_DPI_AWARENESS to set whether the application is DPI-aware. This hint must be set before initializing the video subsystem
* Added the hint SDL_HINT_WINDOWS_DPI_SCALING to control whether the SDL coordinates are in DPI-scaled points or pixels
* Added the hint SDL_HINT_DIRECTINPUT_ENABLED to control whether the DirectInput driver should be used
* Added support for SDL_GetAudioDeviceSpec to the DirectSound backend
Linux:
* Support for XVidMode has been removed, mode changes are only supported using the XRandR extension
* Added the hint SDL_HINT_VIDEO_WAYLAND_MODE_EMULATION to control whether to expose a set of emulated modes in addition to the native resolution modes available on Wayland
* Added the hint SDL_HINT_KMSDRM_DEVICE_INDEX to specify which KMSDRM device to use if the default is not desired
* Added the hint SDL_HINT_LINUX_DIGITAL_HATS to control whether to treat hats as digital rather than checking to see if they may be analog
* Added the hint SDL_HINT_LINUX_HAT_DEADZONES to control whether to use deadzones on analog hats
macOS:
* Bumped minimum OS deployment version to macOS 10.9
* Added SDL_GL_FLOATBUFFERS to allow Cocoa GL contexts to use EDR
* Added the hint SDL_HINT_MAC_OPENGL_ASYNC_DISPATCH to control whether dispatching OpenGL context updates should block the dispatching thread until the main thread finishes processing. This hint defaults to blocking, which is the safer option on modern macOS.
---------------------------------------------------------------------------
2.0.22:
---------------------------------------------------------------------------
@@ -537,7 +681,7 @@ iOS:
tvOS:
* Added support for Apple TV
* Added a hint SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION to control whether he Apple TV remote's joystick axes will automatically match the rotation of the remote.
* Added a hint SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION to control whether he Apple TV remote's joystick axes will automatically match the rotation of the remote.
Android:
* Fixed SDL not resizing window when Android screen resolution changes
@@ -682,8 +826,8 @@ Linux:
* Added experimental Wayland and Mir support, disabled by default
Android:
* Joystick support (minimum SDK version required to build SDL is now 12,
the required runtime version remains at 10, but on such devices joystick
* Joystick support (minimum SDK version required to build SDL is now 12,
the required runtime version remains at 10, but on such devices joystick
support won't be available).
* Hotplugging support for joysticks
* Added a hint SDL_HINT_ACCELEROMETER_AS_JOYSTICK to control whether the accelerometer should be listed as a 3 axis joystick, which it will by default.
@@ -736,7 +880,7 @@ iOS:
Android:
IMPORTANT: You MUST get the updated SDLActivity.java to match C code
* Moved EGL initialization to native code
* Moved EGL initialization to native code
* Fixed the accelerometer axis rotation relative to the device rotation
* Fixed race conditions when handling the EGL context on pause/resume
* Touch devices are available for enumeration immediately after init
+97
View File
@@ -0,0 +1,97 @@
# Contributing to SDL
We appreciate your interest in contributing to SDL, this document will describe how to report bugs, contribute code or ideas or edit documentation.
**Table Of Contents**
- [Filing a GitHub issue](#filing-a-github-issue)
- [Reporting a bug](#reporting-a-bug)
- [Suggesting enhancements](#suggesting-enhancements)
- [Contributing code](#contributing-code)
- [Forking the project](#forking-the-project)
- [Following the style guide](#following-the-style-guide)
- [Running the tests](#running-the-tests)
- [Opening a pull request](#opening-a-pull-request)
- [Contributing to the documentation](#contributing-to-the-documentation)
- [Editing a function documentation](#editing-a-function-documentation)
- [Editing the wiki](#editing-the-wiki)
## Filing a GitHub issue
### Reporting a bug
If you think you have found a bug and would like to report it, here are the steps you should take:
- Before opening a new issue, ensure your bug has not already been reported on the [GitHub Issues page](https://github.com/libsdl-org/SDL/issues).
- On the issue tracker, click on [New Issue](https://github.com/libsdl-org/SDL/issues/new).
- Include details about your environment, such as your Operating System and SDL version.
- If possible, provide a small example that reproduces your bug.
### Suggesting enhancements
If you want to suggest changes for the project, here are the steps you should take:
- Check if the suggestion has already been made on:
- the [issue tracker](https://github.com/libsdl-org/SDL/issues);
- the [discourse forum](https://discourse.libsdl.org/);
- or if a [pull request](https://github.com/libsdl-org/SDL/pulls) already exists.
- On the issue tracker, click on [New Issue](https://github.com/libsdl-org/SDL/issues/new).
- Describe what change you would like to happen.
## Contributing code
This section will cover how the process of forking the project, making a change and opening a pull request.
### Forking the project
The first step consists in making a fork of the project, this is only necessary for the first contribution.
Head over to https://github.com/libsdl-org/SDL and click on the `Fork` button in the top right corner of your screen, you may leave the fields unchanged and click `Create Fork`.
You will be redirected to your fork of the repository, click the green `Code` button and copy the git clone link.
If you had already forked the repository, you may update it from the web page using the `Fetch upstream` button.
### Following the style guide
Code formatting is done using a custom `.clang-format` file, you can learn more about how to run it [here](https://clang.llvm.org/docs/ClangFormat.html).
Some legacy code may not be formatted, as such avoid formatting the whole file at once and only format around your changes.
For your commit message to be properly displayed on GitHub, it should contain:
- A short description of the commit of 50 characters or less on the first line.
- If necessary, add a blank line followed by a long description, each line should be 72 characters or less.
For example:
```
Fix crash in SDL_FooBar.
This addresses the issue #123456 by making sure Foo was successful
before calling Bar.
```
### Running the tests
Tests allow you to verify if your changes did not break any behaviour, here are the steps to follow:
- Before pushing, run the `testautomation` suite on your machine, there should be no more failing tests after your change than before.
- After pushing to your fork, Continuous Integration (GitHub Actions) will ensure compilation and tests still pass on other systems.
### Opening a pull request
- Head over to your fork's GitHub page.
- Click on the `Contribute` button and `Open Pull Request`.
- Fill out the pull request template.
- If any changes are requested, you can add new commits to your fork and they will be automatically added to the pull request.
## Contributing to the documentation
### Editing a function documentation
The wiki documentation for API functions is synchronised from the headers' doxygen comments. As such, all modifications to syntax; function parameters; return value; version; related functions should be done in the header directly.
### Editing the wiki
Other changes to the wiki should done directly from https://wiki.libsdl.org/
+37 -29
View File
@@ -13,22 +13,22 @@ supported, but you can use the "android-project-ant" directory as a template.
Requirements
================================================================================
Android SDK (version 26 or later)
Android SDK (version 34 or later)
https://developer.android.com/sdk/index.html
Android NDK r15c or later
https://developer.android.com/tools/sdk/ndk/index.html
Minimum API level supported by SDL: 16 (Android 4.1)
Minimum API level supported by SDL: 19 (Android 4.4)
How the port works
================================================================================
- Android applications are Java-based, optionally with parts written in C
- As SDL apps are C-based, we use a small Java shim that uses JNI to talk to
- As SDL apps are C-based, we use a small Java shim that uses JNI to talk to
the SDL library
- This means that your application C code must be placed inside an Android
- This means that your application C code must be placed inside an Android
Java project, along with some C support code that communicates with Java
- This eventually produces a standard Android .apk package
@@ -68,14 +68,22 @@ Finally, a word of caution: re running androidbuild.sh wipes any changes you may
done in the build directory for the app!
For more complex projects, follow these instructions:
1. Copy the android-project directory wherever you want to keep your projects
and rename it to the name of your project.
2. Move or symlink this SDL directory into the "<project>/app/jni" directory
3. Edit "<project>/app/jni/src/Android.mk" to include your source files
4a. If you want to use Android Studio, simply open your <project> directory and start building.
For more complex projects, follow these instructions:
1. Get the source code for SDL and copy the 'android-project' directory located at SDL/android-project to a suitable location. Also make sure to rename it to your project name (In these examples: YOURPROJECT).
(The 'android-project' directory can basically be seen as a sort of starting point for the android-port of your project. It contains the glue code between the Android Java 'frontend' and the SDL code 'backend'. It also contains some standard behaviour, like how events should be handled, which you will be able to change.)
2. Move or [symlink](https://en.wikipedia.org/wiki/Symbolic_link) the SDL directory into the "YOURPROJECT/app/jni" directory
(This is needed as the source of SDL has to be compiled by the Android compiler)
3. Edit "YOURPROJECT/app/jni/src/Android.mk" to include your source files.
(They should be separated by spaces after the "LOCAL_SRC_FILES := " declaration)
4a. If you want to use Android Studio, simply open your 'YOURPROJECT' directory and start building.
4b. If you want to build manually, run './gradlew installDebug' in the project directory. This compiles the .java, creates an .apk with the native code embedded, and installs it on any connected Android device
@@ -83,9 +91,9 @@ For more complex projects, follow these instructions:
If you already have a project that uses CMake, the instructions change somewhat:
1. Do points 1 and 2 from the instruction above.
2. Edit "<project>/app/build.gradle" to comment out or remove sections containing ndk-build
2. Edit "YOURPROJECT/app/build.gradle" to comment out or remove sections containing ndk-build
and uncomment the cmake sections. Add arguments to the CMake invocation as needed.
3. Edit "<project>/app/jni/CMakeLists.txt" to include your project (it defaults to
3. Edit "YOURPROJECT/app/jni/CMakeLists.txt" to include your project (it defaults to
adding the "src" subdirectory). Note that you'll have SDL2, SDL2main and SDL2-static
as targets in your project, so you should have "target_link_libraries(yourgame SDL2 SDL2main)"
in your CMakeLists.txt file. Also be aware that you should use add_library() instead of
@@ -132,15 +140,15 @@ Here's an example of a minimal class file:
--- MyGame.java --------------------------
package com.gamemaker.game;
import org.libsdl.app.SDLActivity;
import org.libsdl.app.SDLActivity;
/**
* A sample wrapper class that just calls SDLActivity
*/
* A sample wrapper class that just calls SDLActivity
*/
public class MyGame extends SDLActivity { }
------------------------------------------
Then replace "SDLActivity" in AndroidManifest.xml with the name of your
@@ -179,7 +187,7 @@ may want to keep this fact in mind when building your APK, specially when large
files are involved.
For more information on which extensions get compressed by default and how to
disable this behaviour, see for example:
http://ponystyle.com/blog/2010/03/26/dealing-with-asset-compression-in-android-apps/
@@ -350,7 +358,7 @@ I get output from addr2line showing that it's in the quit function, in testsprit
You can add logging to your code to help show what's happening:
#include <android/log.h>
__android_log_print(ANDROID_LOG_INFO, "foo", "Something happened! x = %d", x);
If you need to build without optimization turned on, you can create a file called
@@ -423,13 +431,13 @@ The Tegra Graphics Debugger is available from NVidia here:
https://developer.nvidia.com/tegra-graphics-debugger
Why is API level 16 the minimum required?
Why is API level 19 the minimum required?
================================================================================
The latest NDK toolchain doesn't support targeting earlier than API level 16.
As of this writing, according to https://developer.android.com/about/dashboards/index.html
about 99% of the Android devices accessing Google Play support API level 16 or
higher (January 2018).
The latest NDK toolchain doesn't support targeting earlier than API level 19.
As of this writing, according to https://www.composables.com/tools/distribution-chart
about 99.7% of the Android devices accessing Google Play support API level 19 or
higher (August 2023).
A note regarding the use of the "dirty rectangles" rendering technique
@@ -440,7 +448,7 @@ where you only update a portion of the screen on each frame, you may notice a
variety of visual glitches on Android, that are not present on other platforms.
This is caused by SDL's use of EGL as the support system to handle OpenGL ES/ES2
contexts, in particular the use of the eglSwapBuffers function. As stated in the
documentation for the function "The contents of ancillary buffers are always
documentation for the function "The contents of ancillary buffers are always
undefined after calling eglSwapBuffers".
Setting the EGL_SWAP_BEHAVIOR attribute of the surface to EGL_BUFFER_PRESERVED
is not possible for SDL as it requires EGL 1.4, available only on the API level
@@ -459,7 +467,7 @@ Two legitimate ways:
Activity by calling Activity.finish().
- Android OS can decide to terminate your application by calling onDestroy()
(see Activity life cycle). Your application will receive a SDL_QUIT event you
(see Activity life cycle). Your application will receive a SDL_QUIT event you
can handle to save things and quit.
Don't call exit() as it stops the activity badly.
+108 -29
View File
@@ -1,40 +1,102 @@
CMake
================================================================================
# CMake
(www.cmake.org)
SDL's build system was traditionally based on autotools. Over time, this
approach has suffered from several issues across the different supported
approach has suffered from several issues across the different supported
platforms.
To solve these problems, a new build system based on CMake is under development.
It works in parallel to the legacy system, so users can experiment with it
without complication.
While still experimental, the build system should be usable on the following
platforms:
To solve these problems, a new build system based on CMake was introduced.
It is developed in parallel to the legacy autotools build system, so users
can experiment with it without complication.
The CMake build system is supported on the following platforms:
* FreeBSD
* Linux
* VS.NET 2010
* Microsoft Visual C
* MinGW and Msys
* macOS, iOS, and tvOS, with support for XCode
* Android
* Emscripten
* RiscOS
* Playstation Vita
## Building SDL
================================================================================
Usage
================================================================================
Assuming the source for SDL is located at `~/sdl`
```sh
cd ~
mkdir build
cd build
cmake ~/sdl
cmake --build .
```
Assuming the source for SDL is located at ~/sdl
This will build the static and dynamic versions of SDL in the `~/build` directory.
Installation can be done using:
cd ~
mkdir build
cd build
cmake ../sdl
```sh
cmake --install . # '--install' requires CMake 3.15, or newer
```
This will build the static and dynamic versions of SDL in the ~/build directory.
## Including SDL in your project
SDL can be included in your project in 2 major ways:
- using a system SDL library, provided by your (*nix) distribution or a package manager
- using a vendored SDL library: this is SDL copied or symlinked in a subfolder.
================================================================================
Usage, iOS/tvOS
================================================================================
The following CMake script supports both, depending on the value of `MYGAME_VENDORED`.
```cmake
cmake_minimum_required(VERSION 3.5)
project(mygame)
# Create an option to switch between a system sdl library and a vendored sdl library
option(MYGAME_VENDORED "Use vendored libraries" OFF)
if(MYGAME_VENDORED)
add_subdirectory(vendored/sdl EXCLUDE_FROM_ALL)
else()
# 1. Look for a SDL2 package, 2. look for the SDL2 component and 3. fail if none can be found
find_package(SDL2 REQUIRED CONFIG REQUIRED COMPONENTS SDL2)
# 1. Look for a SDL2 package, 2. Look for the SDL2maincomponent and 3. DO NOT fail when SDL2main is not available
find_package(SDL2 REQUIRED CONFIG COMPONENTS SDL2main)
endif()
# Create your game executable target as usual
add_executable(mygame WIN32 mygame.c)
# SDL2::SDL2main may or may not be available. It is e.g. required by Windows GUI applications
if(TARGET SDL2::SDL2main)
# It has an implicit dependency on SDL2 functions, so it MUST be added before SDL2::SDL2 (or SDL2::SDL2-static)
target_link_libraries(mygame PRIVATE SDL2::SDL2main)
endif()
# Link to the actual SDL2 library. SDL2::SDL2 is the shared SDL library, SDL2::SDL2-static is the static SDL libarary.
target_link_libraries(mygame PRIVATE SDL2::SDL2)
```
### A system SDL library
For CMake to find SDL, it must be installed in [a default location CMake is looking for](https://cmake.org/cmake/help/latest/command/find_package.html#config-mode-search-procedure).
The following components are available, to be used as an argument of `find_package`.
| Component name | Description |
|----------------|--------------------------------------------------------------------------------------------|
| SDL2 | The SDL2 shared library, available through the `SDL2::SDL2` target [^SDL_TARGET_EXCEPTION] |
| SDL2-static | The SDL2 static library, available through the `SDL2::SDL2-static` target |
| SDL2main | The SDL2main static library, available through the `SDL2::SDL2main` target |
| SDL2test | The SDL2test static library, available through the `SDL2::SDL2test` target |
### Using a vendored SDL
This only requires a copy of SDL in a subdirectory.
## CMake configuration options for platforms
### iOS/tvOS
CMake 3.14+ natively includes support for iOS and tvOS. SDL binaries may be built
using Xcode or Make, possibly among other build-systems.
@@ -53,32 +115,49 @@ To use, set the following CMake variables when running CMake's configuration sta
- `CMAKE_OSX_ARCHITECTURES=<semicolon-separated list of CPU architectures>` (example: "arm64;armv7s;x86_64")
### Examples (for iOS/tvOS):
#### Examples
- for iOS-Simulator, using the latest, installed SDK:
`cmake ~/sdl -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_ARCHITECTURES=x86_64`
```bash
cmake ~/sdl -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_ARCHITECTURES=x86_64
```
- for iOS-Device, using the latest, installed SDK, 64-bit only
`cmake ~/sdl -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_ARCHITECTURES=arm64`
```bash
cmake ~/sdl -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_ARCHITECTURES=arm64
```
- for iOS-Device, using the latest, installed SDK, mixed 32/64 bit
`cmake ~/sdl -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_ARCHITECTURES="arm64;armv7s"`
```cmake
cmake ~/sdl -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_ARCHITECTURES="arm64;armv7s"
```
- for iOS-Device, using a specific SDK revision (iOS 12.4, in this example):
`cmake ~/sdl -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos12.4 -DCMAKE_OSX_ARCHITECTURES=arm64`
```cmake
cmake ~/sdl -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos12.4 -DCMAKE_OSX_ARCHITECTURES=arm64
```
- for iOS-Simulator, using the latest, installed SDK, and building SDL test apps (as .app bundles):
`cmake ~/sdl -DSDL_TEST=1 -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_ARCHITECTURES=x86_64`
```cmake
cmake ~/sdl -DSDL_TESTS=1 -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_ARCHITECTURES=x86_64
```
- for tvOS-Simulator, using the latest, installed SDK:
`cmake ~/sdl -DCMAKE_SYSTEM_NAME=tvOS -DCMAKE_OSX_SYSROOT=appletvsimulator -DCMAKE_OSX_ARCHITECTURES=x86_64`
```cmake
cmake ~/sdl -DCMAKE_SYSTEM_NAME=tvOS -DCMAKE_OSX_SYSROOT=appletvsimulator -DCMAKE_OSX_ARCHITECTURES=x86_64
```
- for tvOS-Device, using the latest, installed SDK:
`cmake ~/sdl -DCMAKE_SYSTEM_NAME=tvOS -DCMAKE_OSX_SYSROOT=appletvos -DCMAKE_OSX_ARCHITECTURES=arm64`
```cmake
cmake ~/sdl -DCMAKE_SYSTEM_NAME=tvOS -DCMAKE_OSX_SYSROOT=appletvos -DCMAKE_OSX_ARCHITECTURES=arm64`
```
[^SDL_TARGET_EXCEPTION]: `SDL2::SDL2` can be an ALIAS to a static `SDL2::SDL2-static` target for multiple reasons.
+5 -5
View File
@@ -12,7 +12,7 @@ Supports:
What you need:
* DirectFB 1.0.1, 1.2.x, 1.3.0
* Kernel-Framebuffer support: required: vesafb, radeonfb ....
* Kernel-Framebuffer support: required: vesafb, radeonfb ....
* Mesa 7.0.x - optional for OpenGL
The `/etc/directfbrc` file should contain the following lines to make
@@ -44,7 +44,7 @@ To use hardware accelerated YUV-overlays for YUV-textures, use:
export SDL_DIRECTFB_YUV_DIRECT=1
```
This is disabled by default. It will only support one
This is disabled by default. It will only support one
YUV texture, namely the first. Every other YUV texture will be
rendered in software.
@@ -84,7 +84,7 @@ As of this writing 20100802 you need to pull Mesa from git and do the following:
```
git clone git://anongit.freedesktop.org/git/mesa/mesa
cd mesa
cd mesa
git checkout 2c9fdaf7292423c157fc79b5ce43f0f199dd753a
```
@@ -92,10 +92,10 @@ Edit `configs/linux-directfb` so that the Directories-section looks like this:
```
# Directories
SRC_DIRS = mesa glu
SRC_DIRS = mesa glu
GLU_DIRS = sgi
DRIVER_DIRS = directfb
PROGRAM_DIRS =
PROGRAM_DIRS =
```
Then do the following:
+56 -56
View File
@@ -4,29 +4,29 @@ Originally posted on Ryan's Google+ account.
Background:
- The Steam Runtime has (at least in theory) a really kick-ass build of SDL2,
but developers are shipping their own SDL2 with individual Steam games.
These games might stop getting updates, but a newer SDL2 might be needed later.
Certainly we'll always be fixing bugs in SDL, even if a new video target isn't
- The Steam Runtime has (at least in theory) a really kick-ass build of SDL2,
but developers are shipping their own SDL2 with individual Steam games.
These games might stop getting updates, but a newer SDL2 might be needed later.
Certainly we'll always be fixing bugs in SDL, even if a new video target isn't
ever needed, and these fixes won't make it to a game shipping its own SDL.
- Even if we replace the SDL2 in those games with a compatible one, that is to
say, edit a developer's Steam depot (yuck!), there are developers that are
statically linking SDL2 that we can't do this for. We can't even force the
- Even if we replace the SDL2 in those games with a compatible one, that is to
say, edit a developer's Steam depot (yuck!), there are developers that are
statically linking SDL2 that we can't do this for. We can't even force the
dynamic loader to ignore their SDL2 in this case, of course.
- If you don't ship an SDL2 with the game in some form, people that disabled the
Steam Runtime, or just tried to run the game from the command line instead of
Steam Runtime, or just tried to run the game from the command line instead of
Steam might find themselves unable to run the game, due to a missing dependency.
- If you want to ship on non-Steam platforms like GOG or Humble Bundle, or target
generic Linux boxes that may or may not have SDL2 installed, you have to ship
the library or risk a total failure to launch. So now, you might have to have
a non-Steam build plus a Steam build (that is, one with and one without SDL2
included), which is inconvenient if you could have had one universal build
generic Linux boxes that may or may not have SDL2 installed, you have to ship
the library or risk a total failure to launch. So now, you might have to have
a non-Steam build plus a Steam build (that is, one with and one without SDL2
included), which is inconvenient if you could have had one universal build
that works everywhere.
- We like the zlib license, but the biggest complaint from the open source
community about the license change is the static linking. The LGPL forced this
- We like the zlib license, but the biggest complaint from the open source
community about the license change is the static linking. The LGPL forced this
as a legal, not technical issue, but zlib doesn't care. Even those that aren't
concerned about the GNU freedoms found themselves solving the same problems:
swapping in a newer SDL to an older game often times can save the day.
concerned about the GNU freedoms found themselves solving the same problems:
swapping in a newer SDL to an older game often times can save the day.
Static linking stops this dead.
So here's what we did:
@@ -35,7 +35,7 @@ SDL now has, internally, a table of function pointers. So, this is what SDL_Init
now looks like:
```c
UInt32 SDL_Init(Uint32 flags)
Uint32 SDL_Init(Uint32 flags)
{
return jump_table.SDL_Init(flags);
}
@@ -45,7 +45,7 @@ Except that is all done with a bunch of macro magic so we don't have to maintain
every one of these.
What is jump_table.SDL_init()? Eventually, that's a function pointer of the real
SDL_Init() that you've been calling all this time. But at startup, it looks more
SDL_Init() that you've been calling all this time. But at startup, it looks more
like this:
```c
@@ -56,12 +56,12 @@ Uint32 SDL_Init_DEFAULT(Uint32 flags)
}
```
SDL_InitDynamicAPI() fills in jump_table with all the actual SDL function
pointers, which means that this `_DEFAULT` function never gets called again.
SDL_InitDynamicAPI() fills in jump_table with all the actual SDL function
pointers, which means that this `_DEFAULT` function never gets called again.
First call to any SDL function sets the whole thing up.
So you might be asking, what was the value in that? Isn't this what the operating
system's dynamic loader was supposed to do for us? Yes, but now we've got this
system's dynamic loader was supposed to do for us? Yes, but now we've got this
level of indirection, we can do things like this:
```bash
@@ -69,70 +69,70 @@ export SDL_DYNAMIC_API=/my/actual/libSDL-2.0.so.0
./MyGameThatIsStaticallyLinkedToSDL2
```
And now, this game that is statically linked to SDL, can still be overridden
with a newer, or better, SDL. The statically linked one will only be used as
And now, this game that is statically linked to SDL, can still be overridden
with a newer, or better, SDL. The statically linked one will only be used as
far as calling into the jump table in this case. But in cases where no override
is desired, the statically linked version will provide its own jump table,
is desired, the statically linked version will provide its own jump table,
and everyone is happy.
So now:
- Developers can statically link SDL, and users can still replace it.
- Developers can statically link SDL, and users can still replace it.
(We'd still rather you ship a shared library, though!)
- Developers can ship an SDL with their game, Valve can override it for, say,
new features on SteamOS, or distros can override it for their own needs,
- Developers can ship an SDL with their game, Valve can override it for, say,
new features on SteamOS, or distros can override it for their own needs,
but it'll also just work in the default case.
- Developers can ship the same package to everyone (Humble Bundle, GOG, etc),
- Developers can ship the same package to everyone (Humble Bundle, GOG, etc),
and it'll do the right thing.
- End users (and Valve) can update a game's SDL in almost any case,
- End users (and Valve) can update a game's SDL in almost any case,
to keep abandoned games running on newer platforms.
- Everyone develops with SDL exactly as they have been doing all along.
- Everyone develops with SDL exactly as they have been doing all along.
Same headers, same ABI. Just get the latest version to enable this magic.
A little more about SDL_InitDynamicAPI():
Internally, InitAPI does some locking to make sure everything waits until a
single thread initializes everything (although even SDL_CreateThread() goes
Internally, InitAPI does some locking to make sure everything waits until a
single thread initializes everything (although even SDL_CreateThread() goes
through here before spinning a thread, too), and then decides if it should use
an external SDL library. If not, it sets up the jump table using the current
an external SDL library. If not, it sets up the jump table using the current
SDL's function pointers (which might be statically linked into a program, or in
a shared library of its own). If so, it loads that library and looks for and
a shared library of its own). If so, it loads that library and looks for and
calls a single function:
```c
SInt32 SDL_DYNAPI_entry(Uint32 version, void *table, Uint32 tablesize);
Sint32 SDL_DYNAPI_entry(Uint32 version, void *table, Uint32 tablesize);
```
That function takes a version number (more on that in a moment), the address of
the jump table, and the size, in bytes, of the table.
Now, we've got policy here: this table's layout never changes; new stuff gets
added to the end. Therefore SDL_DYNAPI_entry() knows that it can provide all
the jump table, and the size, in bytes, of the table.
Now, we've got policy here: this table's layout never changes; new stuff gets
added to the end. Therefore SDL_DYNAPI_entry() knows that it can provide all
the needed functions if tablesize <= sizeof its own jump table. If tablesize is
bigger (say, SDL 2.0.4 is trying to load SDL 2.0.3), then we know to abort, but
if it's smaller, we know we can provide the entire API that the caller needs.
The version variable is a failsafe switch.
Right now it's always 1. This number changes when there are major API changes
(so we know if the tablesize might be smaller, or entries in it have changed).
Right now SDL_DYNAPI_entry gives up if the version doesn't match, but it's not
inconceivable to have a small dispatch library that only supplies this one
The version variable is a failsafe switch.
Right now it's always 1. This number changes when there are major API changes
(so we know if the tablesize might be smaller, or entries in it have changed).
Right now SDL_DYNAPI_entry gives up if the version doesn't match, but it's not
inconceivable to have a small dispatch library that only supplies this one
function and loads different, otherwise-incompatible SDL libraries and has the
right one initialize the jump table based on the version. For something that
must generically catch lots of different versions of SDL over time, like the
right one initialize the jump table based on the version. For something that
must generically catch lots of different versions of SDL over time, like the
Steam Client, this isn't a bad option.
Finally, I'm sure some people are reading this and thinking,
"I don't want that overhead in my project!"
"I don't want that overhead in my project!"
To which I would point out that the extra function call through the jump table
probably wouldn't even show up in a profile, but lucky you: this can all be
disabled. You can build SDL without this if you absolutely must, but we would
encourage you not to do that. However, on heavily locked down platforms like
To which I would point out that the extra function call through the jump table
probably wouldn't even show up in a profile, but lucky you: this can all be
disabled. You can build SDL without this if you absolutely must, but we would
encourage you not to do that. However, on heavily locked down platforms like
iOS, or maybe when debugging, it makes sense to disable it. The way this is
designed in SDL, you just have to change one #define, and the entire system
vaporizes out, and SDL functions exactly like it always did. Most of it is
macro magic, so the system is contained to one C file and a few headers.
However, this is on by default and you have to edit a header file to turn it
off. Our hopes is that if we make it easy to disable, but not too easy,
everyone will ultimately be able to get what they want, but we've gently
designed in SDL, you just have to change one #define, and the entire system
vaporizes out, and SDL functions exactly like it always did. Most of it is
macro magic, so the system is contained to one C file and a few headers.
However, this is on by default and you have to edit a header file to turn it
off. Our hopes is that if we make it easy to disable, but not too easy,
everyone will ultimately be able to get what they want, but we've gently
nudged everyone towards what we think is the best solution.
+359 -20
View File
@@ -1,35 +1,374 @@
Emscripten
================================================================================
# Emscripten
## The state of things
(As of September 2023, but things move quickly and we don't update this
document often.)
In modern times, all the browsers you probably care about (Chrome, Firefox,
Edge, and Safari, on Windows, macOS, Linux, iOS and Android), support some
reasonable base configurations:
- WebAssembly (don't bother with asm.js any more)
- WebGL (which will look like OpenGL ES 2 or 3 to your app).
- Threads (see caveats, though!)
- Game controllers
- Autoupdating (so you can assume they have a recent version of the browser)
All this to say we're at the point where you don't have to make a lot of
concessions to get even a fairly complex SDL-based game up and running.
## RTFM
This document is a quick rundown of some high-level details. The
documentation at [emscripten.org](https://emscripten.org/) is vast
and extremely detailed for a wide variety of topics, and you should at
least skim through it at some point.
## Porting your app to Emscripten
Many many things just need some simple adjustments and they'll compile
like any other C/C++ code, as long as SDL was handling the platform-specific
work for your program.
First, you probably need this in at least one of your source files:
```c
#ifdef __EMSCRIPTEN__
#include <emscripten.h>
#endif
```
Second: assembly language code has to go. Replace it with C. You can even use
[x86 SIMD intrinsic functions in Emscripten](https://emscripten.org/docs/porting/simd.html)!
Third: Middleware has to go. If you have a third-party library you link
against, you either need an Emscripten port of it, or the source code to it
to compile yourself, or you need to remove it.
Fourth: You still start in a function called main(), but you need to get out of
it and into a function that gets called repeatedly, and returns quickly,
called a mainloop.
Somewhere in your program, you probably have something that looks like a more
complicated version of this:
```c
void main(void)
{
initialize_the_game();
while (game_is_still_running) {
check_for_new_input();
think_about_stuff();
draw_the_next_frame();
}
deinitialize_the_game();
}
```
This will not work on Emscripten, because the main thread needs to be free
to do stuff and can't sit in this loop forever. So Emscripten lets you set up
a [mainloop](https://emscripten.org/docs/porting/emscripten-runtime-environment.html#browser-main-loop).
```c
static void mainloop(void) /* this will run often, possibly at the monitor's refresh rate */
{
if (!game_is_still_running) {
deinitialize_the_game();
#ifdef __EMSCRIPTEN__
emscripten_cancel_main_loop(); /* this should "kill" the app. */
#else
exit(0);
#endif
}
check_for_new_input();
think_about_stuff();
draw_the_next_frame();
}
void main(void)
{
initialize_the_game();
#ifdef __EMSCRIPTEN__
emscripten_set_main_loop(mainloop, 0, 1);
#else
while (1) { mainloop(); }
#endif
}
```
Basically, `emscripten_set_main_loop(mainloop, 0, 1);` says "run
`mainloop` over and over until I end the program." The function will
run, and return, freeing the main thread for other tasks, and then
run again when it's time. The `1` parameter does some magic to make
your main() function end immediately; this is useful because you
don't want any shutdown code that might be sitting below this code
to actually run if main() were to continue on, since we're just
getting started.
There's a lot of little details that are beyond the scope of this
document, but that's the biggest intial set of hurdles to porting
your app to the web.
## Do you need threads?
If you plan to use threads, they work on all major browsers now. HOWEVER,
they bring with them a lot of careful considerations. Rendering _must_
be done on the main thread. This is a general guideline for many
platforms, but a hard requirement on the web.
Many other things also must happen on the main thread; often times SDL
and Emscripten make efforts to "proxy" work to the main thread that
must be there, but you have to be careful (and read more detailed
documentation than this for the finer points).
Even when using threads, your main thread needs to set an Emscripten
mainloop that runs quickly and returns, or things will fail to work
correctly.
You should definitely read [Emscripten's pthreads docs](https://emscripten.org/docs/porting/pthreads.html)
for all the finer points. Mostly SDL's thread API will work as expected,
but is built on pthreads, so it shares the same little incompatibilities
that are documented there, such as where you can use a mutex, and when
a thread will start running, etc.
IMPORTANT: You have to decide to either build something that uses
threads or something that doesn't; you can't have one build
that works everywhere. This is an Emscripten (or maybe WebAssembly?
Or just web browsers in general?) limitation. If you aren't using
threads, it's easier to not enable them at all, at build time.
If you use threads, you _have to_ run from a web server that has
[COOP/COEP headers set correctly](https://web.dev/why-coop-coep/)
or your program will fail to start at all.
If building with threads, `__EMSCRIPTEN_PTHREADS__` will be defined
for checking with the C preprocessor, so you can build something
different depending on what sort of build you're compiling.
## Audio
Audio works as expected at the API level, but not exactly like other
platforms.
You'll only see a single default audio device. Audio capture also works;
if the browser pops up a prompt to ask for permission to access the
microphone, the SDL_OpenAudioDevice call will succeed and start producing
silence at a regular interval. Once the user approves the request, real
audio data will flow. If the user denies it, the app is not informed and
will just continue to receive silence.
Modern web browsers will not permit web pages to produce sound before the
user has interacted with them (clicked or tapped on them, usually); this is
for several reasons, not the least of which being that no one likes when a
random browser tab suddenly starts making noise and the user has to scramble
to figure out which and silence it.
SDL will allow you to open the audio device for playback in this
circumstance, and your audio callback will fire, but SDL will throw the audio
data away until the user interacts with the page. This helps apps that depend
on the audio callback to make progress, and also keeps audio playback in sync
once the app is finally allowed to make noise.
There are two reasonable ways to deal with the silence at the app level:
if you are writing some sort of media player thing, where the user expects
there to be a volume control when you mouseover the canvas, just default
that control to a muted state; if the user clicks on the control to unmute
it, on this first click, open the audio device. This allows the media to
play at start, and the user can reasonably opt-in to listening.
Many games do not have this sort of UI, and are more rigid about starting
audio along with everything else at the start of the process. For these, your
best bet is to write a little Javascript that puts up a "Click here to play!"
UI, and upon the user clicking, remove that UI and then call the Emscripten
app's main() function. As far as the application knows, the audio device was
available to be opened as soon as the program started, and since this magic
happens in a little Javascript, you don't have to change your C/C++ code at
all to make it happen.
Please see the discussion at https://github.com/libsdl-org/SDL/issues/6385
for some Javascript code to steal for this approach.
## Rendering
If you use SDL's 2D render API, it will use GLES2 internally, which
Emscripten will turn into WebGL calls. You can also use OpenGL ES 2
directly by creating a GL context and drawing into it.
Calling SDL_RenderPresent (or SDL_GL_SwapWindow) will not actually
present anything on the screen until your return from your mainloop
function.
## Building SDL/emscripten
First: do you _really_ need to build SDL from source?
If you aren't developing SDL itself, have a desire to mess with its source
code, or need something on the bleeding edge, don't build SDL. Just use
Emscripten's packaged version!
Compile and link your app with `-sUSE_SDL=2` and it'll use a build of
SDL packaged with Emscripten. This comes from the same source code and
fixes the Emscripten project makes to SDL are generally merged into SDL's
revision control, so often this is much easier for app developers.
`-sUSE_SDL=1` will select Emscripten's JavaScript reimplementation of SDL
1.2 instead; if you need SDL 1.2, this might be fine, but we generally
recommend you don't use SDL 1.2 in modern times.
If you want to build SDL, though...
SDL currently requires at least Emscripten 3.1.35 to build. Newer versions
are likely to work, as well.
Build:
$ mkdir build
$ cd build
$ emconfigure ../configure --host=asmjs-unknown-emscripten --disable-assembly --disable-threads --disable-cpuinfo CFLAGS="-O2"
$ emmake make
This works on Linux/Unix and macOS. Please send comments about Windows.
Make sure you've [installed emsdk](https://emscripten.org/docs/getting_started/downloads.html)
first, and run `source emsdk_env.sh` at the command line so it finds the
tools.
(These configure options might be overkill, but this has worked for me.)
```bash
cd SDL
mkdir build
cd build
emconfigure ../configure --host=wasm32-unknown-emscripten --disable-pthreads --disable-assembly --disable-cpuinfo CFLAGS="-sUSE_SDL=0 -O3"
emmake make -j4
```
If you want to build with thread support, something like this works:
```bash
emconfigure ../configure --host=wasm32-unknown-emscripten --enable-pthreads --disable-assembly --disable-cpuinfo CFLAGS="-sUSE_SDL=0 -O3 -pthread" LDFLAGS="-pthread"
```
Or with cmake:
$ mkdir build
$ cd build
$ emcmake cmake ..
$ emmake make
```bash
mkdir build
cd build
emcmake cmake ..
emmake make -j4
```
To build one of the tests:
$ cd test/
$ emcc -O2 --js-opts 0 -g4 testdraw2.c -I../include ../build/.libs/libSDL2.a ../build/libSDL2_test.a -o a.html
```bash
cd test/
emcc -O2 --js-opts 0 -g4 testdraw2.c -I../include ../build/.libs/libSDL2.a ../build/libSDL2_test.a -o a.html
```
Uses GLES2 renderer or software
## Building your app
Some other SDL2 libraries can be easily built (assuming SDL2 is installed somewhere):
You need to compile with `emcc` instead of `gcc` or `clang` or whatever, but
mostly it uses the same command line arguments as Clang.
SDL_mixer (http://www.libsdl.org/projects/SDL_mixer/):
Link against the SDL/build/.libs/libSDL2.a file you generated by building SDL,
link with `-sUSE_SDL=2` to use Emscripten's prepackaged SDL2 build.
Usually you would produce a binary like this:
```bash
gcc -o mygame mygame.c # or whatever
```
But for Emscripten, you want to output something else:
```bash
emcc -o index.html mygame.c
```
This will produce several files...support Javascript and WebAssembly (.wasm)
files. The `-o index.html` will produce a simple HTML page that loads and
runs your app. You will (probably) eventually want to replace or customize
that file and do `-o index.js` instead to just build the code pieces.
If you're working on a program of any serious size, you'll likely need to
link with `-sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=1gb` to get access
to more memory. If using pthreads, you'll need the `-sMAXIMUM_MEMORY=1gb`
or the app will fail to start on iOS browsers, but this might be a bug that
goes away in the future.
## Data files
Your game probably has data files. Here's how to access them.
Filesystem access works like a Unix filesystem; you have a single directory
tree, possibly interpolated from several mounted locations, no drive letters,
'/' for a path separator. You can access them with standard file APIs like
open() or fopen() or SDL_RWops. You can read or write from the filesystem.
By default, you probably have a "MEMFS" filesystem (all files are stored in
memory, but access to them is immediate and doesn't need to block). There are
other options, like "IDBFS" (files are stored in a local database, so they
don't need to be in RAM all the time and they can persist between runs of the
program, but access is not synchronous). You can mix and match these file
systems, mounting a MEMFS filesystem at one place and idbfs elsewhere, etc,
but that's beyond the scope of this document. Please refer to Emscripten's
[page on the topic](https://emscripten.org/docs/porting/files/file_systems_overview.html)
for more info.
The _easiest_ (but not the best) way to get at your data files is to embed
them in the app itself. Emscripten's linker has support for automating this.
```bash
emcc -o index.html loopwave.c --embed-file=../test/sample.wav@/sounds/sample.wav
```
This will pack ../test/sample.wav in your app, and make it available at
"/sounds/sample.wav" at runtime. Emscripten makes sure this data is available
before your main() function runs, and since it's in MEMFS, you can just
read it like you do on other platforms. `--embed-file` can also accept a
directory to pack an entire tree, and you can specify the argument multiple
times to pack unrelated things into the final installation.
Note that this is absolutely the best approach if you have a few small
files to include and shouldn't worry about the issue further. However, if you
have hundreds of megabytes and/or thousands of files, this is not so great,
since the user will download it all every time they load your page, and it
all has to live in memory at runtime.
[Emscripten's documentation on the matter](https://emscripten.org/docs/porting/files/packaging_files.html)
gives other options and details, and is worth a read.
## Debugging
Debugging web apps is a mixed bag. You should compile and link with
`-gsource-map`, which embeds a ton of source-level debugging information into
the build, and make sure _the app source code is available on the web server_,
which is often a scary proposition for various reasons.
When you debug from the browser's tools and hit a breakpoint, you can step
through the actual C/C++ source code, though, which can be nice.
If you try debugging in Firefox and it doesn't work well for no apparent
reason, try Chrome, and vice-versa. These tools are still relatively new,
and improving all the time.
SDL_Log() (or even plain old printf) will write to the Javascript console,
and honestly I find printf-style debugging to be easier than setting up a build
for proper debugging, so use whatever tools work best for you.
## Questions?
Please give us feedback on this document at [the SDL bug tracker](https://github.com/libsdl-org/SDL/issues).
If something is wrong or unclear, we want to know!
$ EMCONFIGURE_JS=1 emconfigure ../configure
build as usual...
SDL_gfx (http://cms.ferzkopp.net/index.php/software/13-sdl-gfx):
$ EMCONFIGURE_JS=1 emconfigure ../configure --disable-mmx
build as usual...
+176
View File
@@ -0,0 +1,176 @@
GDK
=====
This port allows SDL applications to run via Microsoft's Game Development Kit (GDK).
Windows (GDK) and Xbox One/Xbox Series (GDKX) are both supported and all the required code is included in this public SDL release. However, only licensed Xbox developers have access to the GDKX libraries which will allow you to build the Xbox targets.
Requirements
------------
* Microsoft Visual Studio 2022 (in theory, it should also work in 2017 or 2019, but this has not been tested)
* Microsoft GDK June 2022 or newer (public release [here](https://github.com/microsoft/GDK/releases/tag/June_2022))
* For Xbox, you will need the corresponding GDKX version (licensed developers only)
* To publish a package or successfully authenticate a user, you will need to create an app id/configure services in Partner Center. However, for local testing purposes (without authenticating on Xbox Live), the identifiers used by the GDK test programs in the included solution will work.
Windows GDK Status
------
The Windows GDK port supports the full set of Win32 APIs, renderers, controllers, input devices, etc., as the normal Windows x64 build of SDL.
* Additionally, the GDK port adds the following:
* Compile-time platform detection for SDL programs. The `__GDK__` is `#define`d on every GDK platform, and the `__WINGDK__` is `#define`d on Windows GDK, specifically. (This distinction exists because other GDK platforms support a smaller subset of functionality. This allows you to mark code for "any" GDK separate from Windows GDK.)
* GDK-specific setup:
* Initializing/uninitializing the game runtime, and initializing Xbox Live services
* Creating a global task queue and setting it as the default for the process. When running any async operations, passing in `NULL` as the task queue will make the task get added to the global task queue.
* An implementation on `WinMain` that performs the above GDK setup (you should link against SDL2main.lib, as in Windows x64). If you are unable to do this, you can instead manually call `SDL_GDKRunApp` from your entry point, passing in your `SDL_main` function and `NULL` as the parameters.
* Global task queue callbacks are dispatched during `SDL_PumpEvents` (which is also called internally if using `SDL_PollEvent`).
* You can get the handle of the global task queue through `SDL_GDKGetTaskQueue`, if needed. When done with the queue, be sure to use `XTaskQueueCloseHandle` to decrement the reference count (otherwise it will cause a resource leak).
* Single-player games have some additional features available:
* Call `SDL_GDKGetDefaultUser` to get the default XUserHandle pointer.
* `SDL_GetPrefPath` still works, but only for single-player titles.
These functions mostly wrap around async APIs, and thus should be treated as synchronous alternatives. Also note that the single-player functions return on any OS errors, so be sure to validate the return values!
* What doesn't work:
* Compilation with anything other than through the included Visual C++ solution file
## VisualC-GDK Solution
The included `VisualC-GDK/SDL.sln` solution includes the following targets for the Gaming.Desktop.x64 configuration:
* SDL2 (DLL) - This is the typical SDL2.dll, but for Gaming.Desktop.x64.
* SDL2main (lib) - This contains a drop-in implementation of `WinMain` that is used as the entry point for GDK programs.
* tests/testgamecontroller - Standard SDL test program demonstrating controller functionality.
* tests/testgdk - GDK-specific test program that demonstrates using the global task queue to login a user into Xbox Live.
*NOTE*: As of the June 2022 GDK, you cannot test user logins without a valid Title ID and MSAAppId. You will need to manually change the identifiers in the `MicrosoftGame.config` to your valid IDs from Partner Center if you wish to test this.
* tests/testsprite2 - Standard SDL test program demonstrating sprite drawing functionality.
If you set one of the test programs as a startup project, you can run it directly from Visual Studio.
Windows GDK Setup, Detailed Steps
---------------------
These steps assume you already have a game using SDL that runs on Windows x64 along with a corresponding Visual Studio solution file for the x64 version. If you don't have this, it's easiest to use one of the test program vcxproj files in the `VisualC-GDK` directory as a starting point, though you will still need to do most of the steps below.
### 1. Add a Gaming.Desktop.x64 Configuration ###
In your game's existing Visual Studio Solution, go to Build > Configuration Manager. From the "Active solution platform" drop-down select "New...". From the drop-down list, select Gaming.Desktop.x64 and copy the settings from the x64 configuration.
### 2. Build SDL2 and SDL2main for GDK ###
Open `VisualC-GDK/SDL.sln` in Visual Studio, you need to build the SDL2 and SDL2main targets for the Gaming.Desktop.x64 platform (Release is recommended). You will need to copy/keep track of the `SDL2.dll`, `XCurl.dll` (which is output by Gaming.Desktop.x64), `SDL2.lib`, and `SDL2main.lib` output files for your game project.
*Alternatively*, you could setup your solution file to instead reference the SDL2/SDL2main project file targets from the SDL source, and add those projects as a dependency. This would mean that SDL2 and SDL2main would both be built when your game is built.
### 3. Configuring Project Settings ###
While the Gaming.Desktop.x64 configuration sets most of the required settings, there are some additional items to configure for your game project under the Gaming.Desktop.x64 Configuration:
* Under C/C++ > General > Additional Include Directories, make sure the `SDL/include` path is referenced
* Under Linker > General > Additional Library Directories, make sure to reference the path where the newly-built SDL2.lib and SDL2main.lib are
* Under Linker > Input > Additional Dependencies, you need the following:
* `SDL2.lib`
* `SDL2main.lib` (unless not using)
* `xgameruntime.lib`
* `../Microsoft.Xbox.Services.141.GDK.C.Thunks.lib`
* Note that in general, the GDK libraries depend on the MSVC C/C++ runtime, so there is no way to remove this dependency from a GDK program that links against GDK.
### 4. Setting up SDL_main ###
Rather than using your own implementation of `WinMain`, it's recommended that you instead `#include "SDL_main.h"` and declare a standard main function. If you are unable to do this, you can instead manually call `SDL_GDKRunApp` from your entry point, passing in your `SDL_main` function and `NULL` as the parameters.
### 5. Required DLLs ###
The game will not launch in the debugger unless required DLLs are included in the directory that contains the game's .exe file. You need to make sure that the following files are copied into the directory:
* Your SDL2.dll
* "$(Console_GRDKExtLibRoot)Xbox.Services.API.C\DesignTime\CommonConfiguration\Neutral\Lib\Release\Microsoft.Xbox.Services.141.GDK.C.Thunks.dll"
* XCurl.dll
You can either copy these in a post-build step, or you can add the dlls into the project and set its Configuration Properties > General > Item type to "Copy file," which will also copy them into the output directory.
### 6. Setting up MicrosoftGame.config ###
You can copy `VisualC-GDK/tests/testgdk/MicrosoftGame.config` and use that as a starting point in your project. Minimally, you will want to change the Executable Name attribute, the DefaultDisplayName, and the Description.
This file must be copied into the same directory as the game's .exe file. As with the DLLs, you can either use a post-build step or the "Copy file" item type.
For basic testing, you do not need to change anything else in `MicrosoftGame.config`. However, if you want to test any Xbox Live services (such as logging in users) _or_ publish a package, you will need to setup a Game app on Partner Center.
Then, you need to set the following values to the values from Partner Center:
* Identity tag - Name and Publisher attributes
* TitleId
* MSAAppId
### 7. Adding Required Logos
Several logo PNG files are required to be able to launch the game, even from the debugger. You can use the sample logos provided in `VisualC-GDK/logos`. As with the other files, they must be copied into the same directory as the game's .exe file.
### 8. Copying any Data Files ###
When debugging GDK games, there is no way to specify a working directory. Therefore, any required game data must also be copied into the output directory, likely in a post-build step.
### 9. Build and Run from Visual Studio ###
At this point, you should be able to build and run your game from the Visual Studio Debugger. If you get any linker errors, make sure you double-check that you referenced all the required libs.
If you are testing Xbox Live functionality, it's likely you will need to change to the Sandbox for your title. To do this:
1. Run "Desktop VS 2022 Gaming Command Prompt" from the Start Menu
2. Switch the sandbox name with:
`XblPCSandbox SANDBOX.#`
3. (To switch back to the retail sandbox):
`XblPCSandbox RETAIL`
### 10. Packaging and Installing Locally
You can use one of the test program's `PackageLayout.xml` as a starting point. Minimally, you will need to change the exe to the correct name and also reference any required game data. As with the other data files, it's easiest if you have this copy to the output directory, although it's not a requirement as you can specify relative paths to files.
To create the package:
1. Run "Desktop VS 2022 Gaming Command Prompt" from the Start Menu
2. `cd` to the directory containing the `PackageLayout.xml` with the correct paths (if you use the local path as in the sample package layout, this would be from your .exe output directory)
3. `mkdir Package` to create an output directory
4. To package the file into the `Package` directory, use:
`makepkg pack /f PackageLayout.xml /lt /d . /nogameos /pc /pd Package`
5. To install the package, use:
`wdapp install PACKAGENAME.msixvc`
6. Once the package is installed, you can run it from the start menu.
7. As with when running from Visual Studio, if you need to test any Xbox Live functionality you must switch to the correct sandbox.
Xbox GDKX Setup
---------------------
In general, the same process in the Windows GDK instructions work. There are just a few additional notes:
* For Xbox One consoles, use the Gaming.Xbox.XboxOne.x64 target
* For Xbox Series consoles, use the Gaming.Xbox.Scarlett.x64 target
* The Xbox One target sets the `__XBOXONE__` define and the Xbox Series target sets the `__XBOXSERIES__` define
* You don't need to link against the Xbox.Services Thunks lib nor include that dll in your package (it doesn't exist for Xbox)
* The shader blobs for Xbox are created in a pre-build step for the Xbox targets, rather than included in the source (due to NDA and version compatability reasons)
* To create a package, use:
`makepkg pack /f PackageLayout.xml /lt /d . /pd Package`
* To install the package, use:
`xbapp install [PACKAGE].xvc`
* For some reason, if you make changes that require SDL2.dll to build, and you are running through the debugger (instead of a package), you have to rebuild your .exe target for the debugger to recognize the dll has changed and needs to be transferred to the console again
* While there are successful releases of Xbox titles using this port, it is not as extensively tested as other targets
Troubleshooting
---------------
#### Xbox Live Login does not work
As of June 2022 GDK, you must have a valid Title Id and MSAAppId in order to test Xbox Live functionality such as user login. Make sure these are set correctly in the `MicrosoftGame.config`. This means that even testgdk will not let you login without setting these properties to valid values.
Furthermore, confirm that your PC is set to the correct sandbox.
#### "The current user has already installed an unpackaged version of this app. A packaged version cannot replace this." error when installing
Prior to June 2022 GDK, running from the Visual Studio debugger would still locally register the app (and it would appear on the start menu). To fix this, you have to uninstall it (it's simplest to right click on it from the start menu to uninstall it).
+3 -3
View File
@@ -2,7 +2,7 @@ Dollar Gestures
===========================================================================
SDL provides an implementation of the $1 gesture recognition system. This allows for recording, saving, loading, and performing single stroke gestures.
Gestures can be performed with any number of fingers (the centroid of the fingers must follow the path of the gesture), but the number of fingers must be constant (a finger cannot go down in the middle of a gesture). The path of a gesture is considered the path from the time when the final finger went down, to the first time any finger comes up.
Gestures can be performed with any number of fingers (the centroid of the fingers must follow the path of the gesture), but the number of fingers must be constant (a finger cannot go down in the middle of a gesture). The path of a gesture is considered the path from the time when the final finger went down, to the first time any finger comes up.
Dollar gestures are assigned an Id based on a hash function. This is guaranteed to remain constant for a given gesture. There is a (small) chance that two different gestures will be assigned the same ID. In this case, simply re-recording one of the gestures should result in a different ID.
@@ -42,7 +42,7 @@ Both functions return the number of gestures successfully saved.
Loading:
--------
To load templates from a file, call SDL_LoadDollarTemplates(touchId,src) where touchId is the id of the touch to load to (or -1 to load to all touch devices), and src is an SDL_RWops pointer to a gesture save file.
To load templates from a file, call SDL_LoadDollarTemplates(touchId,src) where touchId is the id of the touch to load to (or -1 to load to all touch devices), and src is an SDL_RWops pointer to a gesture save file.
SDL_LoadDollarTemplates returns the number of templates successfully loaded.
@@ -51,7 +51,7 @@ SDL_LoadDollarTemplates returns the number of templates successfully loaded.
===========================================================================
Multi Gestures
===========================================================================
SDL provides simple support for pinch/rotate/swipe gestures.
SDL provides simple support for pinch/rotate/swipe gestures.
Every time a finger is moved an SDL_MULTIGESTURE event is sent with the following fields:
* event.mgesture.touchId - the Id of the touch on which the gesture was performed.
+45 -13
View File
@@ -1,10 +1,10 @@
iOS
======
Building the Simple DirectMedia Layer for iOS 5.1+
Building the Simple DirectMedia Layer for iOS 9.0+
==============================================================================
Requirements: Mac OS X 10.8 or later and the iOS 7+ SDK.
Requirements: Mac OS X 10.9 or later and the iOS 9.0 or newer SDK.
Instructions:
@@ -111,17 +111,17 @@ e.g.
return 1;
}
}
int main(int argc, char *argv[])
{
SDL_SetEventFilter(HandleAppEvents, NULL);
... run your main loop
return 0;
}
Notes -- Accelerometer as Joystick
==============================================================================
@@ -185,12 +185,44 @@ Once your application is installed its directory tree looks like:
Preferences/
tmp/
When your SDL based iPhone application starts up, it sets the working directory to the main bundle (MySDLApp Home/MySDLApp.app), where your application resources are stored. You cannot write to this directory. Instead, I advise you to write document files to "../Documents/" and preferences to "../Library/Preferences".
When your SDL based iPhone application starts up, it sets the working directory to the main bundle (MySDLApp Home/MySDLApp.app), where your application resources are stored. You cannot write to this directory. Instead, I advise you to write document files to "../Documents/" and preferences to "../Library/Preferences".
More information on this subject is available here:
http://developer.apple.com/library/ios/#documentation/iPhone/Conceptual/iPhoneOSProgrammingGuide/Introduction/Introduction.html
Notes -- xcFramework
==============================================================================
The SDL.xcodeproj file now includes a target to build SDL2.xcframework. An xcframework is a new (Xcode 11) uber-framework which can handle any combination of processor type and target OS platform.
In the past, iOS devices were always an ARM variant processor, and the simulator was always i386 or x86_64, and thus libraries could be combined into a single framework for both simulator and device. With the introduction of the Apple Silicon ARM-based machines, regular frameworks would collide as CPU type was no longer sufficient to differentiate the platform. So Apple created the new xcframework library package.
The xcframework target builds into a Products directory alongside the SDL.xcodeproj file, as SDL2.xcframework. This can be brought in to any iOS project and will function properly for both simulator and device, no matter their CPUs. Note that Intel Macs cannot cross-compile for Apple Silicon Macs. If you need AS compatibility, perform this build on an Apple Silicon Mac.
This target requires Xcode 11 or later. The target will simply fail to build if attempted on older Xcodes.
In addition, on Apple platforms, main() cannot be in a dynamically loaded library. This means that iOS apps which used the statically-linked libSDL2.lib and now link with the xcframwork will need to define their own main() to call SDL_UIKitRunApp(), like this:
#ifndef SDL_MAIN_HANDLED
#ifdef main
#undef main
#endif
int
main(int argc, char *argv[])
{
return SDL_UIKitRunApp(argc, argv, SDL_main);
}
#endif /* !SDL_MAIN_HANDLED */
Using an xcFramework is similar to using a regular framework. However, issues have been seen with the build system not seeing the headers in the xcFramework. To remedy this, add the path to the xcFramework in your app's target ==> Build Settings ==> Framework Search Paths and mark it recursive (this is critical). Also critical is to remove "*.framework" from Build Settings ==> Sub-Directories to Exclude in Recursive Searches. Clean the build folder, and on your next build the build system should be able to see any of these in your code, as expected:
#include "SDL_main.h"
#include <SDL.h>
#include <SDL_main.h>
Notes -- iPhone SDL limitations
==============================================================================
@@ -220,7 +252,7 @@ to your Info.plist:
<string>MyApp would like to remain connected to nearby bluetooth Game Controllers and Game Pads even when you're not using the app.</string>
Game Center
Game Center
==============================================================================
Game Center integration might require that you break up your main loop in order to yield control back to the system. In other words, instead of running an endless main loop, you run each frame in a callback function, using:
@@ -236,15 +268,15 @@ e.g.
{
... do event handling, frame logic and rendering ...
}
int main(int argc, char *argv[])
{
... initialize game ...
#if __IPHONEOS__
#ifdef __IPHONEOS__
// Initialize the Game Center for scoring and matchmaking
InitGameCenter();
// Set up the game to run in the window animation callback on iOS
// so that Game Center and so forth works correctly.
SDL_iPhoneSetAnimationCallback(window, 1, ShowFrame, NULL);
@@ -261,7 +293,7 @@ e.g.
Deploying to older versions of iOS
==============================================================================
SDL supports deploying to older versions of iOS than are supported by the latest version of Xcode, all the way back to iOS 6.1
SDL supports deploying to older versions of iOS than are supported by the latest version of Xcode, all the way back to iOS 8.0
In order to do that you need to download an older version of Xcode:
https://developer.apple.com/download/more/?name=Xcode
+33 -33
View File
@@ -3,36 +3,36 @@ Linux
By default SDL will only link against glibc, the rest of the features will be
enabled dynamically at runtime depending on the available features on the target
system. So, for example if you built SDL with Xinerama support and the target
system does not have the Xinerama libraries installed, it will be disabled
at runtime, and you won't get a missing library error, at least with the
system. So, for example if you built SDL with XRandR support and the target
system does not have the XRandR libraries installed, it will be disabled
at runtime, and you won't get a missing library error, at least with the
default configuration parameters.
Build Dependencies
--------------------------------------------------------------------------------
Ubuntu 20.04, all available features enabled:
Ubuntu 18.04, all available features enabled:
sudo apt-get install build-essential git make cmake autoconf automake \
libtool pkg-config libasound2-dev libpulse-dev libaudio-dev libjack-dev \
libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev \
libxinerama-dev libxxf86vm-dev libxss-dev libgl1-mesa-dev libdbus-1-dev \
libudev-dev libgles2-mesa-dev libegl1-mesa-dev libibus-1.0-dev \
fcitx-libs-dev libsamplerate0-dev libsndio-dev libwayland-dev \
libxkbcommon-dev libdrm-dev libgbm-dev
sudo apt-get install build-essential git make autoconf automake libtool \
pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
libaudio-dev libjack-dev libsndio-dev libsamplerate0-dev libx11-dev libxext-dev \
libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libwayland-dev \
libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev
Ubuntu 22.04+ can also add `libpipewire-0.3-dev libdecor-0-dev` to that command line.
Fedora 35, all available features enabled:
sudo yum install gcc git-core make cmake autoconf automake libtool \
alsa-lib-devel pulseaudio-libs-devel nas-devel pipewire-devel \
libX11-devel libXext-devel libXrandr-devel libXcursor-devel libXfixes-devel \
libXi-devel libXinerama-devel libXxf86vm-devel libXScrnSaver-devel \
dbus-devel ibus-devel fcitx-devel systemd-devel mesa-libGL-devel \
libxkbcommon-devel mesa-libGLES-devel mesa-libEGL-devel vulkan-devel \
wayland-devel wayland-protocols-devel libdrm-devel mesa-libgbm-devel \
libusb-devel pipewire-jack-audio-connection-kit-devel libdecor-devel \
libsamplerate-devel
libXi-devel libXScrnSaver-devel dbus-devel ibus-devel fcitx-devel \
systemd-devel mesa-libGL-devel libxkbcommon-devel mesa-libGLES-devel \
mesa-libEGL-devel vulkan-devel wayland-devel wayland-protocols-devel \
libdrm-devel mesa-libgbm-devel libusb-devel libdecor-devel \
libsamplerate-devel pipewire-jack-audio-connection-kit-devel \
NOTES:
- This includes all the audio targets except arts and esd, because Ubuntu
@@ -43,7 +43,7 @@ NOTES:
is missing, so it's safe to build in support even if the end user doesn't
have this library installed.
- DirectFB isn't included because the configure script (currently) fails to find
it at all. You can do "sudo apt-get install libdirectfb-dev" and fix the
it at all. You can do "sudo apt-get install libdirectfb-dev" and fix the
configure script to include DirectFB support. Send patches. :)
@@ -55,42 +55,42 @@ there's a few issues that may cause SDL to fail to detect your joystick. To
debug this, start by installing the evtest utility. On Ubuntu/Debian:
sudo apt-get install evtest
Then run:
sudo evtest
You'll hopefully see your joystick listed along with a name like "/dev/input/eventXX"
Now run:
cat /dev/input/event/XX
If you get a permission error, you need to set a udev rule to change the mode of
your device (see below)
your device (see below)
Also, try:
sudo udevadm info --query=all --name=input/eventXX
If you see a line stating ID_INPUT_JOYSTICK=1, great, if you don't see it,
you need to set up an udev rule to force this variable.
A combined rule for the Saitek Pro Flight Rudder Pedals to fix both issues looks
A combined rule for the Saitek Pro Flight Rudder Pedals to fix both issues looks
like:
SUBSYSTEM=="input", ATTRS{idProduct}=="0763", ATTRS{idVendor}=="06a3", MODE="0666", ENV{ID_INPUT_JOYSTICK}="1"
SUBSYSTEM=="input", ATTRS{idProduct}=="0764", ATTRS{idVendor}=="06a3", MODE="0666", ENV{ID_INPUT_JOYSTICK}="1"
You can set up similar rules for your device by changing the values listed in
idProduct and idVendor. To obtain these values, try:
sudo udevadm info -a --name=input/eventXX | grep idVendor
sudo udevadm info -a --name=input/eventXX | grep idProduct
If multiple values come up for each of these, the one you want is the first one of each.
If multiple values come up for each of these, the one you want is the first one of each.
On other systems which ship with an older udev (such as CentOS), you may need
to set up a rule such as:
SUBSYSTEM=="input", ENV{ID_CLASS}=="joystick", ENV{ID_INPUT_JOYSTICK}="1"
+12 -13
View File
@@ -43,15 +43,14 @@ make
sudo make install
```
This script builds SDL with 10.6 ABI compatibility on 64-bit Intel and 11.0
This script builds SDL with 10.9 ABI compatibility on 64-bit Intel and 11.0
ABI compatibility on ARM64 architectures. For best compatibility you
should compile your application the same way.
Please note that building SDL requires at least Xcode 4.6 and the 10.7 SDK
(even if you target back to 10.6 systems). PowerPC support for Mac OS X has
been officially dropped as of SDL 2.0.2. 32-bit Intel, using an older Xcode
release, is still supported at the time of this writing, but current Xcode
releases no longer support it, and eventually neither will SDL.
Please note that building SDL requires at least Xcode 6 and the 10.9 SDK.
PowerPC support for macOS has been officially dropped as of SDL 2.0.2.
32-bit Intel and macOS 10.8 runtime support has been officially dropped as
of SDL 2.24.0.
To use the library once it's built, you essential have two possibilities:
use the traditional autoconf/automake/make method, or use Xcode.
@@ -75,10 +74,10 @@ NSApplicationDelegate implementation:
event.type = SDL_QUIT;
SDL_PushEvent(&event);
}
return NSTerminateCancel;
}
- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
{
if (SDL_GetEventState(SDL_DROPFILE) == SDL_ENABLE) {
@@ -87,7 +86,7 @@ NSApplicationDelegate implementation:
event.drop.file = SDL_strdup([filename UTF8String]);
return (SDL_PushEvent(&event) > 0);
}
return NO;
}
```
@@ -197,12 +196,12 @@ normally from the Finder.
The SDL Library is packaged as a framework bundle, an organized
relocatable folder hierarchy of executable code, interface headers,
and additional resources. For practical purposes, you can think of a
and additional resources. For practical purposes, you can think of a
framework as a more user and system-friendly shared library, whose library
file behaves more or less like a standard UNIX shared library.
To build the framework, simply open the framework project and build it.
By default, the framework bundle "SDL.framework" is installed in
To build the framework, simply open the framework project and build it.
By default, the framework bundle "SDL.framework" is installed in
/Library/Frameworks. Therefore, the testers and project stationary expect
it to be located there. However, it will function the same in any of the
following locations:
@@ -254,7 +253,7 @@ Use `xcode-build` in the same directory as your .pbxproj file
You can send command line args to your app by either invoking it from
the command line (in *.app/Contents/MacOS) or by entering them in the
Executables" panel of the target settings.
# Implementation Notes
Some things that may be of interest about how it all works...
-240
View File
@@ -1,240 +0,0 @@
Mac OS X
==============================================================================
These instructions are for people using Apple's Mac OS X (pronounced
"ten").
From the developer's point of view, OS X is a sort of hybrid Mac and
Unix system, and you have the option of using either traditional
command line tools or Apple's IDE Xcode.
Command Line Build
==================
To build SDL using the command line, use the standard configure and make
process:
./configure
make
sudo make install
You can also build SDL as a Universal library (a single binary for both
32-bit and 64-bit Intel architectures), on Mac OS X 10.7 and newer, by using
the gcc-fat.sh script in build-scripts:
mkdir mybuild
cd mybuild
CC=$PWD/../build-scripts/gcc-fat.sh CXX=$PWD/../build-scripts/g++-fat.sh ../configure
make
sudo make install
This script builds SDL with 10.5 ABI compatibility on i386 and 10.6
ABI compatibility on x86_64 architectures. For best compatibility you
should compile your application the same way.
Please note that building SDL requires at least Xcode 4.6 and the 10.7 SDK
(even if you target back to 10.5 systems). PowerPC support for Mac OS X has
been officially dropped as of SDL 2.0.2.
To use the library once it's built, you essential have two possibilities:
use the traditional autoconf/automake/make method, or use Xcode.
==============================================================================
Caveats for using SDL with Mac OS X
==============================================================================
Some things you have to be aware of when using SDL on Mac OS X:
- If you register your own NSApplicationDelegate (using [NSApp setDelegate:]),
SDL will not register its own. This means that SDL will not terminate using
SDL_Quit if it receives a termination request, it will terminate like a
normal app, and it will not send a SDL_DROPFILE when you request to open a
file with the app. To solve these issues, put the following code in your
NSApplicationDelegate implementation:
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
{
if (SDL_GetEventState(SDL_QUIT) == SDL_ENABLE) {
SDL_Event event;
event.type = SDL_QUIT;
SDL_PushEvent(&event);
}
return NSTerminateCancel;
}
- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
{
if (SDL_GetEventState(SDL_DROPFILE) == SDL_ENABLE) {
SDL_Event event;
event.type = SDL_DROPFILE;
event.drop.file = SDL_strdup([filename UTF8String]);
return (SDL_PushEvent(&event) > 0);
}
return NO;
}
==============================================================================
Using the Simple DirectMedia Layer with a traditional Makefile
==============================================================================
An existing autoconf/automake build system for your SDL app has good chances
to work almost unchanged on OS X. However, to produce a "real" Mac OS X binary
that you can distribute to users, you need to put the generated binary into a
so called "bundle", which basically is a fancy folder with a name like
"MyCoolGame.app".
To get this build automatically, add something like the following rule to
your Makefile.am:
bundle_contents = APP_NAME.app/Contents
APP_NAME_bundle: EXE_NAME
mkdir -p $(bundle_contents)/MacOS
mkdir -p $(bundle_contents)/Resources
echo "APPL????" > $(bundle_contents)/PkgInfo
$(INSTALL_PROGRAM) $< $(bundle_contents)/MacOS/
You should replace EXE_NAME with the name of the executable. APP_NAME is what
will be visible to the user in the Finder. Usually it will be the same
as EXE_NAME but capitalized. E.g. if EXE_NAME is "testgame" then APP_NAME
usually is "TestGame". You might also want to use `@PACKAGE@` to use the package
name as specified in your configure.in file.
If your project builds more than one application, you will have to do a bit
more. For each of your target applications, you need a separate rule.
If you want the created bundles to be installed, you may want to add this
rule to your Makefile.am:
install-exec-hook: APP_NAME_bundle
rm -rf $(DESTDIR)$(prefix)/Applications/APP_NAME.app
mkdir -p $(DESTDIR)$(prefix)/Applications/
cp -r $< /$(DESTDIR)$(prefix)Applications/
This rule takes the Bundle created by the rule from step 3 and installs them
into "$(DESTDIR)$(prefix)/Applications/".
Again, if you want to install multiple applications, you will have to augment
the make rule accordingly.
But beware! That is only part of the story! With the above, you end up with
a bare bone .app bundle, which is double clickable from the Finder. But
there are some more things you should do before shipping your product...
1) The bundle right now probably is dynamically linked against SDL. That
means that when you copy it to another computer, *it will not run*,
unless you also install SDL on that other computer. A good solution
for this dilemma is to static link against SDL. On OS X, you can
achieve that by linking against the libraries listed by
sdl-config --static-libs
instead of those listed by
sdl-config --libs
Depending on how exactly SDL is integrated into your build systems, the
way to achieve that varies, so I won't describe it here in detail
2) Add an 'Info.plist' to your application. That is a special XML file which
contains some meta-information about your application (like some copyright
information, the version of your app, the name of an optional icon file,
and other things). Part of that information is displayed by the Finder
when you click on the .app, or if you look at the "Get Info" window.
More information about Info.plist files can be found on Apple's homepage.
As a final remark, let me add that I use some of the techniques (and some
variations of them) in Exult and ScummVM; both are available in source on
the net, so feel free to take a peek at them for inspiration!
==============================================================================
Using the Simple DirectMedia Layer with Xcode
==============================================================================
These instructions are for using Apple's Xcode IDE to build SDL applications.
- First steps
The first thing to do is to unpack the Xcode.tar.gz archive in the
top level SDL directory (where the Xcode.tar.gz archive resides).
Because Stuffit Expander will unpack the archive into a subdirectory,
you should unpack the archive manually from the command line:
cd [path_to_SDL_source]
tar zxf Xcode.tar.gz
This will create a new folder called Xcode, which you can browse
normally from the Finder.
- Building the Framework
The SDL Library is packaged as a framework bundle, an organized
relocatable folder hierarchy of executable code, interface headers,
and additional resources. For practical purposes, you can think of a
framework as a more user and system-friendly shared library, whose library
file behaves more or less like a standard UNIX shared library.
To build the framework, simply open the framework project and build it.
By default, the framework bundle "SDL.framework" is installed in
/Library/Frameworks. Therefore, the testers and project stationary expect
it to be located there. However, it will function the same in any of the
following locations:
~/Library/Frameworks
/Local/Library/Frameworks
/System/Library/Frameworks
- Build Options
There are two "Build Styles" (See the "Targets" tab) for SDL.
"Deployment" should be used if you aren't tweaking the SDL library.
"Development" should be used to debug SDL apps or the library itself.
- Building the Testers
Open the SDLTest project and build away!
- Using the Project Stationary
Copy the stationary to the indicated folders to access it from
the "New Project" and "Add target" menus. What could be easier?
- Setting up a new project by hand
Some of you won't want to use the Stationary so I'll give some tips:
* Create a new "Cocoa Application"
* Add src/main/macosx/SDLMain.m , .h and .nib to your project
* Remove "main.c" from your project
* Remove "MainMenu.nib" from your project
* Add "$(HOME)/Library/Frameworks/SDL.framework/Headers" to include path
* Add "$(HOME)/Library/Frameworks" to the frameworks search path
* Add "-framework SDL -framework Foundation -framework AppKit" to "OTHER_LDFLAGS"
* Set the "Main Nib File" under "Application Settings" to "SDLMain.nib"
* Add your files
* Clean and build
- Building from command line
Use pbxbuild in the same directory as your .pbproj file
- Running your app
You can send command line args to your app by either invoking it from
the command line (in *.app/Contents/MacOS) or by entering them in the
"Executables" panel of the target settings.
- Implementation Notes
Some things that may be of interest about how it all works...
* Working directory
As defined in the SDL_main.m file, the working directory of your SDL app
is by default set to its parent. You may wish to change this to better
suit your needs.
* You have a Cocoa App!
Your SDL app is essentially a Cocoa application. When your app
starts up and the libraries finish loading, a Cocoa procedure is called,
which sets up the working directory and calls your main() method.
You are free to modify your Cocoa app with generally no consequence
to SDL. You cannot, however, easily change the SDL window itself.
Functionality may be added in the future to help this.
Known bugs are listed in the file "BUGS.txt".
+28
View File
@@ -0,0 +1,28 @@
# Nintendo 3DS
SDL port for the Nintendo 3DS [Homebrew toolchain](https://devkitpro.org/) contributed by:
- [Pierre Wendling](https://github.com/FtZPetruska)
Credits to:
- The awesome people who ported SDL to other homebrew platforms.
- The Devkitpro team for making all the tools necessary to achieve this.
## Building
To build for the Nintendo 3DS, make sure you have devkitARM and cmake installed and run:
```bash
cmake -S. -Bbuild -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/3DS.cmake" -DCMAKE_BUILD_TYPE=Release
cmake --build build
cmake --install build
```
## Notes
- Currently only software rendering is supported.
- SDL2main should be used to ensure ROMFS is enabled.
- By default, the extra L2 cache and higher clock speeds of the New 2/3DS lineup are enabled. If you wish to turn it off, use `osSetSpeedupEnable(false)` in your main function.
- `SDL_GetBasePath` returns the romfs root instead of the executable's directory.
- The Nintendo 3DS uses a cooperative threading model on a single core, meaning a thread will never yield unless done manually through the `SDL_Delay` functions, or blocking waits (`SDL_LockMutex`, `SDL_SemWait`, `SDL_CondWait`, `SDL_WaitThread`). To avoid starving other threads, `SDL_SemTryWait` and `SDL_SemWaitTimeout` will yield if they fail to acquire the semaphore, see https://github.com/libsdl-org/SDL/pull/6776 for more information.
+26 -26
View File
@@ -1,13 +1,13 @@
Native Client
================================================================================
Requirements:
Requirements:
* Native Client SDK (https://developer.chrome.com/native-client),
* Native Client SDK (https://developer.chrome.com/native-client),
(tested with Pepper version 33 or higher).
The SDL backend for Chrome's Native Client has been tested only with the PNaCl
toolchain, which generates binaries designed to run on ARM and x86_32/64
toolchain, which generates binaries designed to run on ARM and x86_32/64
platforms. This does not mean it won't work with the other toolchains!
================================================================================
@@ -17,15 +17,15 @@ Building SDL for NaCl
Set up the right environment variables (see naclbuild.sh), then configure SDL with:
configure --host=pnacl --prefix some/install/destination
Then "make".
As an example of how to create a deployable app a Makefile project is provided
in test/nacl/Makefile, which includes some monkey patching of the common.mk file
provided by NaCl, without which linking properly to SDL won't work (the search
path can't be modified externally, so the linker won't find SDL's binaries unless
Then "make".
As an example of how to create a deployable app a Makefile project is provided
in test/nacl/Makefile, which includes some monkey patching of the common.mk file
provided by NaCl, without which linking properly to SDL won't work (the search
path can't be modified externally, so the linker won't find SDL's binaries unless
you dump them into the SDK path, which is inconvenient).
Also provided in test/nacl is the required support file, such as index.html,
Also provided in test/nacl is the required support file, such as index.html,
manifest.json, etc.
SDL apps for NaCl run on a worker thread using the ppapi_simple infrastructure.
This allows for blocking calls on all the relevant systems (OpenGL ES, filesystem),
@@ -38,20 +38,20 @@ Running tests
================================================================================
Due to the nature of NaCl programs, building and running SDL tests is not as
straightforward as one would hope. The script naclbuild.sh in build-scripts
automates the process and should serve as a guide for users of SDL trying to build
straightforward as one would hope. The script naclbuild.sh in build-scripts
automates the process and should serve as a guide for users of SDL trying to build
their own applications.
Basic usage:
./naclbuild.sh path/to/pepper/toolchain (i.e. ~/naclsdk/pepper_35)
This will build testgles2.c by default.
If you want to build a different test, for example testrendercopyex.c:
SOURCES=~/sdl/SDL/test/testrendercopyex.c ./naclbuild.sh ~/naclsdk/pepper_35
Once the build finishes, you have to serve the contents with a web server (the
script will give you instructions on how to do that with Python).
@@ -60,28 +60,28 @@ RWops and nacl_io
================================================================================
SDL_RWops work transparently with nacl_io. Two functions control the mount points:
int mount(const char* source, const char* target,
const char* filesystemtype,
int mount(const char* source, const char* target,
const char* filesystemtype,
unsigned long mountflags, const void *data);
int umount(const char *target);
For convenience, SDL will by default mount an httpfs tree at / before calling
For convenience, SDL will by default mount an httpfs tree at / before calling
the app's main function. Such setting can be overridden by calling:
umount("/");
And then mounting a different filesystem at /
It's important to consider that the asynchronous nature of file operations on a
browser is hidden from the application, effectively providing the developer with
a set of blocking file operations just like you get in a regular desktop
environment, which eases the job of porting to Native Client, but also introduces
a set of challenges of its own, in particular when big file sizes and slow
a set of blocking file operations just like you get in a regular desktop
environment, which eases the job of porting to Native Client, but also introduces
a set of challenges of its own, in particular when big file sizes and slow
connections are involved.
For more information on how nacl_io and mount points work, see:
https://developer.chrome.com/native-client/devguide/coding/nacl_io
https://src.chromium.org/chrome/trunk/src/native_client_sdk/src/libraries/nacl_io/nacl_io.h
+44
View File
@@ -0,0 +1,44 @@
Nokia N-Gage
============
SDL2 port for Symbian S60v1 and v2 with a main focus on the Nokia N-Gage
(Classic and QD) by [Michael Fitzmayer](https://github.com/mupfdev).
Compiling
---------
SDL is part of the [N-Gage SDK.](https://github.com/ngagesdk) project.
The library is included in the
[toolchain](https://github.com/ngagesdk/ngage-toolchain) as a
sub-module.
A complete example project based on SDL2 can be found in the GitHub
account of the SDK: [Wordle](https://github.com/ngagesdk/wordle).
Current level of implementation
-------------------------------
The video driver currently provides full screen video support with
keyboard input.
At the moment only the software renderer works.
Audio is not yet implemented.
Acknowledgements
----------------
Thanks to Hannu Viitala, Kimmo Kinnunen and Markus Mertama for the
valuable insight into Symbian programming. Without the SDL 1.2 port
which was specially developed for CDoom (Doom for the Nokia 9210), this
adaptation would not have been possible.
I would like to thank my friends
[Razvan](https://twitter.com/bewarerazvan) and [Dan
Whelan](https://danwhelan.ie/), for their continuous support. Without
you and the [N-Gage community](https://discord.gg/dbUzqJ26vs), I would
have lost my patience long ago.
Last but not least, I would like to thank the development team of
[EKA2L1](https://12z1.com/) (an experimental Symbian OS emulator). Your
patience and support in troubleshooting helped me a lot.
+1 -1
View File
@@ -3,7 +3,7 @@ Simple DirectMedia Layer 2 for OS/2 & eComStation
SDL port for OS/2, authored by Andrey Vasilkin <digi@os2.snc.ru>, 2016
OpenGL and audio capture not supported by this port.
OpenGL not supported by this port.
Additional optional environment variables:
+1 -1
View File
@@ -1,4 +1,4 @@
Pandora
Pandora
=====================================================================
( http://openpandora.org/ )
+51
View File
@@ -0,0 +1,51 @@
PS2
======
SDL2 port for the Sony Playstation 2 contributed by:
- Francisco Javier Trujillo Mata
Credit to
- The guys that ported SDL to PSP & Vita because I'm taking them as reference.
- David G. F. for helping me with several issues and tests.
## Building
To build SDL2 library for the PS2, make sure you have the latest PS2Dev status and run:
```bash
cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$PS2DEV/ps2sdk/ps2dev.cmake
cmake --build build
cmake --install build
```
## Hints
The PS2 port has a special Hint for having a dynamic VSYNC. The Hint is `SDL_HINT_PS2_DYNAMIC_VSYNC`.
If you enabled the dynamic vsync having as well `SDL_RENDERER_PRESENTVSYNC` enabled, then if the app is not able to run at 60 FPS, automatically the `vsync` will be disabled having a better performance, instead of droping FPS to 30.
## Notes
If you trying to debug a SDL app through [ps2client](https://github.com/ps2dev/ps2client) you need to avoid the IOP reset, otherwise you will lose the conection with your computer.
So to avoid the reset of the IOP CPU, you need to call to the macro `SDL_PS2_SKIP_IOP_RESET();`.
It could be something similar as:
```c
.....
SDL_PS2_SKIP_IOP_RESET();
int main(int argc, char *argv[])
{
.....
```
For a release binary is recommendable to reset the IOP always.
Remember to do a clean compilation everytime you enable or disable the `SDL_PS2_SKIP_IOP_RESET` otherwise the change won't be reflected.
## Getting PS2 Dev
[Installing PS2 Dev](https://github.com/ps2dev/ps2dev)
## Running on PCSX2 Emulator
[PCSX2](https://github.com/PCSX2/pcsx2)
[More PCSX2 information](https://pcsx2.net/)
## To Do
- PS2 Screen Keyboard
- Dialogs
- Others
+2 -2
View File
@@ -1,7 +1,7 @@
PSP
======
SDL2 port for the Sony PSP contributed by:
- Captian Lex
- Captian Lex
- Francisco Javier Trujillo Mata
- Wouter Wijsman
@@ -33,4 +33,4 @@ cmake --install build
## To Do
- PSP Screen Keyboard
- Dialogs
- Dialogs
+21 -21
View File
@@ -20,9 +20,9 @@ Raspbian Build Dependencies
sudo apt-get install libudev-dev libasound2-dev libdbus-1-dev
You also need the VideoCore binary stuff that ships in /opt/vc for EGL and
You also need the VideoCore binary stuff that ships in /opt/vc for EGL and
OpenGL ES 2.x, it usually comes pre-installed, but in any case:
sudo apt-get install libraspberrypi0 libraspberrypi-bin libraspberrypi-dev
@@ -45,7 +45,7 @@ will be placed in /opt/rpi-tools
sudo git clone --depth 1 https://github.com/raspberrypi/tools /opt/rpi-tools
You'll also need a Raspbian binary image.
Get it from: http://downloads.raspberrypi.org/raspbian_latest
Get it from: http://downloads.raspberrypi.org/raspbian_latest
After unzipping, you'll get file with a name like: "<date>-wheezy-raspbian.img"
Let's assume the sysroot will be built in /opt/rpi-sysroot.
@@ -63,14 +63,14 @@ Now, before chrooting into the ARM sysroot, you'll need to apply a workaround,
edit $SYSROOT/etc/ld.so.preload and comment out all lines in it.
sudo chroot $SYSROOT
apt-get install libudev-dev libasound2-dev libdbus-1-dev libraspberrypi0 libraspberrypi-bin libraspberrypi-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libxxf86vm-dev libxss-dev
apt-get install libudev-dev libasound2-dev libdbus-1-dev libraspberrypi0 libraspberrypi-bin libraspberrypi-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxi-dev libxss-dev
exit
sudo umount $SYSROOT/dev
sudo umount $SYSROOT/proc
sudo umount $SYSROOT/sys
sudo umount /mnt
There's one more fix required, as the libdl.so symlink uses an absolute path
There's one more fix required, as the libdl.so symlink uses an absolute path
which doesn't quite work in our setup.
sudo rm -rf $SYSROOT/usr/lib/arm-linux-gnueabihf/libdl.so
@@ -86,13 +86,13 @@ The final step is compiling SDL itself.
make install
To be able to deploy this to /usr/local in the Raspbian system you need to fix up a few paths:
perl -w -pi -e "s#$PWD/rpi-sdl2-installed#/usr/local#g;" ./rpi-sdl2-installed/lib/libSDL2.la ./rpi-sdl2-installed/lib/pkgconfig/sdl2.pc ./rpi-sdl2-installed/bin/sdl2-config
Apps don't work or poor video/audio performance
-----------------------------------------------
If you get sound problems, buffer underruns, etc, run "sudo rpi-update" to
If you get sound problems, buffer underruns, etc, run "sudo rpi-update" to
update the RPi's firmware. Note that doing so will fix these problems, but it
will also render the CMA - Dynamic Memory Split functionality useless.
@@ -101,7 +101,7 @@ low in general, specially if a 1080p TV is hooked up.
See here how to configure this setting: http://elinux.org/RPiconfig
Using a fixed gpu_mem=128 is the best option (specially if you updated the
Using a fixed gpu_mem=128 is the best option (specially if you updated the
firmware, using CMA probably won't work, at least it's the current case).
No input
@@ -115,9 +115,9 @@ No HDMI Audio
-------------
If you notice that ALSA works but there's no audio over HDMI, try adding:
hdmi_drive=2
to your config.txt file and reboot.
Reference: http://www.raspberrypi.org/phpBB3/viewtopic.php?t=5062
@@ -129,7 +129,7 @@ The Text Input API is supported, with translation of scan codes done via the
kernel symbol tables. For this to work, SDL needs access to a valid console.
If you notice there's no SDL_TEXTINPUT message being emitted, double check that
your app has read access to one of the following:
* /proc/self/fd/0
* /dev/tty
* /dev/tty[0...6]
@@ -137,17 +137,17 @@ your app has read access to one of the following:
* /dev/console
This is usually not a problem if you run from the physical terminal (as opposed
to running from a pseudo terminal, such as via SSH). If running from a PTS, a
to running from a pseudo terminal, such as via SSH). If running from a PTS, a
quick workaround is to run your app as root or add yourself to the tty group,
then re-login to the system.
sudo usermod -aG tty `whoami`
The keyboard layout used by SDL is the same as the one the kernel uses.
To configure the layout on Raspbian:
sudo dpkg-reconfigure keyboard-configuration
To configure the locale, which controls which keys are interpreted as letters,
this determining the CAPS LOCK behavior:
@@ -157,9 +157,9 @@ this determining the CAPS LOCK behavior:
OpenGL problems
---------------
If you have desktop OpenGL headers installed at build time in your RPi or cross
compilation environment, support for it will be built in. However, the chipset
does not actually have support for it, which causes issues in certain SDL apps
If you have desktop OpenGL headers installed at build time in your RPi or cross
compilation environment, support for it will be built in. However, the chipset
does not actually have support for it, which causes issues in certain SDL apps
since the presence of OpenGL support supersedes the ES/ES2 variants.
The workaround is to disable OpenGL at configuration time:
@@ -176,5 +176,5 @@ Notes
* When launching apps remotely (via SSH), SDL can prevent local keystrokes from
leaking into the console only if it has root privileges. Launching apps locally
does not suffer from this issue.
+1 -1
View File
@@ -8,7 +8,7 @@ The linux touch system is currently based off event streams, and proc/bus/device
Mac:
The Mac and iPhone APIs are pretty. If your touch device supports them then you'll be fine. If it doesn't, then there isn't much we can do.
iPhone:
iPhone:
Works out of box.
Windows:
+60
View File
@@ -0,0 +1,60 @@
# Versioning
## Since 2.23.0
SDL follows an "odd/even" versioning policy, similar to GLib, GTK, Flatpak
and older versions of the Linux kernel:
* The major version (first part) increases when backwards compatibility
is broken, which will happen infrequently.
* If the minor version (second part) is divisible by 2
(for example 2.24.x, 2.26.x), this indicates a version of SDL that
is believed to be stable and suitable for production use.
* In stable releases, the patchlevel or micro version (third part)
indicates bugfix releases. Bugfix releases should not add or
remove ABI, so the ".0" release (for example 2.24.0) should be
forwards-compatible with all the bugfix releases from the
same cycle (for example 2.24.1).
* The minor version increases when new API or ABI is added, or when
other significant changes are made. Newer minor versions are
backwards-compatible, but not fully forwards-compatible.
For example, programs built against SDL 2.24.x should work fine
with SDL 2.26.x, but programs built against SDL 2.26.x will not
necessarily work with 2.24.x.
* If the minor version (second part) is not divisible by 2
(for example 2.23.x, 2.25.x), this indicates a development prerelease
of SDL that is not suitable for stable software distributions.
Use with caution.
* The patchlevel or micro version (third part) increases with
each prerelease.
* Each prerelease might add new API and/or ABI.
* Prereleases are backwards-compatible with older stable branches.
For example, 2.25.x will be backwards-compatible with 2.24.x.
* Prereleases are not guaranteed to be backwards-compatible with
each other. For example, new API or ABI added in 2.25.1
might be removed or changed in 2.25.2.
If this would be a problem for you, please do not use prereleases.
* Only upgrade to a prerelease if you can guarantee that you will
promptly upgrade to the stable release that follows it.
For example, do not upgrade to 2.23.x unless you will be able to
upgrade to 2.24.0 when it becomes available.
* Software distributions that have a freeze policy (in particular Linux
distributions with a release cycle, such as Debian and Fedora)
should usually only package stable releases, and not prereleases.
## Before 2.23.0
Older versions of SDL followed a similar policy, but instead of the
odd/even rule applying to the minor version, it applied to the patchlevel
(micro version, third part). For example, 2.0.22 was a stable release
and 2.0.21 was a prerelease.
+5 -5
View File
@@ -17,10 +17,10 @@ _Editor's note: I've been able to successfully build SDL using Visual Studio 201
2. Your IDE will likely prompt you to upgrade this solution file to whatever later version of the IDE you're using. In the `Retarget Projects` dialog,
all of the affected project files should be checked allowing you to use the latest `Windows SDK Version` you have installed, along with
the `Platform Toolset`.
If you choose *NOT* to upgrade to use the latest `Windows SDK Version` or `Platform Toolset`, then you'll need the `Visual Studio 2010 Platform Toolset`.
3. Build the `.dll` and `.lib` files by right clicking on each project in turn (Projects are listed in the _Workspace_
3. Build the `.dll` and `.lib` files by right clicking on each project in turn (Projects are listed in the _Workspace_
panel in the _FileView_ tab), and selecting `Build`.
You may get a few warnings, but you should not get any errors.
@@ -90,17 +90,17 @@ Here's a sample SDL snippet to verify everything is setup in your IDE:
SDL_Init(SDL_INIT_VIDEO);
window = SDL_CreateWindow("SDL2 Test", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, WIDTH, HEIGHT, SDL_WINDOW_SHOWN);
renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
SDL_DestroyRenderer(renderer);
SDL_DestroyWindow(window);
SDL_Quit();
return 0;
}
```
```
### That's it!
I hope that this document has helped you get through the most difficult part of using the SDL: installing it.
I hope that this document has helped you get through the most difficult part of using the SDL: installing it.
Suggestions for improvements should be posted to the [Github Issues](https://github.com/libsdl-org/SDL/issues).
### Credits
+2 -2
View File
@@ -20,13 +20,13 @@ To build for the PSVita, make sure you have vitasdk and cmake installed and run:
Notes
-----
* gles1/gles2 support and renderers are disabled by default and can be enabled by configuring with `-DVIDEO_VITA_PVR=ON`
These renderers support 720p and 1080i resolutions. These can be specified with:
These renderers support 720p and 1080i resolutions. These can be specified with:
`SDL_setenv("VITA_RESOLUTION", "720", 1);` and `SDL_setenv("VITA_RESOLUTION", "1080", 1);`
* Desktop GL 1.X and 2.X support and renderers are also disabled by default and also can be enabled with `-DVIDEO_VITA_PVR=ON` as long as gl4es4vita is present in your SDK.
They support the same resolutions as the gles1/gles2 backends and require specifying `SDL_setenv("VITA_PVR_OGL", "1", 1);`
anytime before video subsystem initialization.
* gles2 support via PIB is disabled by default and can be enabled by configuring with `-DVIDEO_VITA_PIB=ON`
* By default SDL emits mouse events for touch events on every touchscreen.
* By default SDL emits mouse events for touch events on every touchscreen.
Vita has two touchscreens, so it's recommended to use `SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0");` and handle touch events instead.
Individual touchscreens can be disabled with:
`SDL_setenv("VITA_DISABLE_TOUCH_FRONT", "1", 1);` and `SDL_setenv("VITA_DISABLE_TOUCH_BACK", "1", 1);`
+2 -2
View File
@@ -34,7 +34,7 @@ from a recent Chrome/Chromium install for Windows. The files you need are:
- libGLESv2.dll
- d3dcompiler_46.dll (supports Windows Vista or later, better shader
compiler) *or* d3dcompiler_43.dll (supports Windows XP or later)
If you compile ANGLE from source, you can configure it so it does not need the
d3dcompiler_* DLL at all (for details on this, see their documentation).
However, by default SDL will try to preload the d3dcompiler_46.dll to
@@ -48,7 +48,7 @@ Known Bugs:
- SDL_GL_SetSwapInterval is currently a no op when using ANGLE. It appears
that there's a bug in the library which prevents the window contents from
refreshing if this is set to anything other than the default value.
## Vulkan Surface Support
Support for creating Vulkan surfaces is configured on by default. To disable
+72 -103
View File
@@ -5,49 +5,23 @@ This port allows SDL applications to run on Microsoft's platforms that require
use of "Windows Runtime", aka. "WinRT", APIs. Microsoft may, in some cases,
refer to them as either "Windows Store", or for Windows 10, "UWP" apps.
Some of the operating systems that include WinRT, are:
* Windows 10, via its Universal Windows Platform (UWP) APIs
* Windows 8.x
* Windows RT 8.x (aka. Windows 8.x for ARM processors)
* Windows Phone 8.x
In the past, SDL has supported Windows RT 8.x, Windows Phone, etc, but in
modern times this port is focused on UWP apps, which run on Windows 10,
and modern Xbox consoles.
Requirements
------------
* Microsoft Visual C++ (aka Visual Studio), either 2017, 2015, 2013, or 2012
* Microsoft Visual C++ (aka Visual Studio) 2019.
- Free, "Community" or "Express" editions may be used, so long as they
include support for either "Windows Store" or "Windows Phone" apps.
include support for either "Windows Store" or "Windows Phone" apps.
"Express" versions marked as supporting "Windows Desktop" development
typically do not include support for creating WinRT apps, to note.
(The "Community" editions of Visual C++ do, however, support both
desktop/Win32 and WinRT development).
- Visual Studio 2017 can be used, however it is recommended that you install
the Visual C++ 2015 build tools. These build tools can be installed
using VS 2017's installer. Be sure to also install the workload for
"Universal Windows Platform development", its optional component, the
"C++ Universal Windows Platform tools", and for UWP / Windows 10
development, the "Windows 10 SDK (10.0.10240.0)". Please note that
targeting UWP / Windows 10 apps from development machine(s) running
earlier versions of Windows, such as Windows 7, is not always supported
by Visual Studio, and you may get error(s) when attempting to do so.
- Visual C++ 2012 can only build apps that target versions 8.0 of Windows,
or Windows Phone. 8.0-targeted apps will run on devices running 8.1
editions of Windows, however they will not be able to take advantage of
8.1-specific features.
- Visual C++ 2013 cannot create app projects that target Windows 8.0.
Visual C++ 2013 Update 4, can create app projects for Windows Phone 8.0,
Windows Phone 8.1, and Windows 8.1, but not Windows 8.0. An optional
Visual Studio add-in, "Tools for Maintaining Store apps for Windows 8",
allows Visual C++ 2013 to load and build Windows 8.0 projects that were
created with Visual C++ 2012, so long as Visual C++ 2012 is installed
on the same machine. More details on targeting different versions of
Windows can found at the following web pages:
- [Develop apps by using Visual Studio 2013](http://msdn.microsoft.com/en-us/library/windows/apps/br211384.aspx)
- [To add the Tools for Maintaining Store apps for Windows 8](http://msdn.microsoft.com/en-us/library/windows/apps/dn263114.aspx#AddMaintenanceTools)
* A valid Microsoft account - This requirement is not imposed by SDL, but
rather by Microsoft's Visual C++ toolchain. This is required to launch or
rather by Microsoft's Visual C++ toolchain. This is required to launch or
debug apps.
@@ -57,7 +31,7 @@ Status
Here is a rough list of what works, and what doesn't:
* What works:
* compilation via Visual C++ 2012 through 2015
* compilation via Visual C++ 2019.
* compile-time platform detection for SDL programs. The C/C++ #define,
`__WINRT__`, will be set to 1 (by SDL) when compiling for WinRT.
* GPU-accelerated 2D rendering, via SDL_Renderer.
@@ -70,8 +44,8 @@ Here is a rough list of what works, and what doesn't:
SDL_GetPerformanceFrequency(), etc.)
* file I/O via SDL_RWops
* mouse input (unsupported on Windows Phone)
* audio, via SDL's WASAPI backend (if you want to record, your app must
have "Microphone" capabilities enabled in its manifest, and the user must
* audio, via SDL's WASAPI backend (if you want to record, your app must
have "Microphone" capabilities enabled in its manifest, and the user must
not have blocked access. Otherwise, capture devices will fail to work,
presenting as a device disconnect shortly after opening it.)
* .DLL file loading. Libraries *MUST* be packaged inside applications. Loading
@@ -81,7 +55,7 @@ Here is a rough list of what works, and what doesn't:
SDL_GameController APIs, and is backed by Microsoft's XInput API. Please
note, however, that Windows limits game-controller support in UWP apps to,
"Xbox compatible controllers" (many controllers that work in Win32 apps,
do not work in UWP, due to restrictions in UWP itself.)
do not work in UWP, due to restrictions in UWP itself.)
* multi-touch input
* app events. SDL_APP_WILLENTER* and SDL_APP_DIDENTER* events get sent out as
appropriate.
@@ -225,7 +199,7 @@ libraries such that, when the app is built:
1. each library gets built for the appropriate CPU architecture(s) and WinRT
platform(s).
2. each library's output, such as .dll files, get copied to the app's build
2. each library's output, such as .dll files, get copied to the app's build
output.
To set this up for SDL/WinRT, you'll need to run through the following steps:
@@ -234,13 +208,8 @@ To set this up for SDL/WinRT, you'll need to run through the following steps:
"Solution Explorer")
2. right click on your app's solution.
3. navigate to "Add", then to "Existing Project..."
4. find SDL/WinRT's Visual C++ project file and open it. Different project
files exist for different WinRT platforms. All of them are in SDL's
source distribution, in the following directories:
* `VisualC-WinRT/UWP_VS2015/` - for Windows 10 / UWP apps
* `VisualC-WinRT/WinPhone81_VS2013/` - for Windows Phone 8.1 apps
* `VisualC-WinRT/WinRT80_VS2012/` - for Windows 8.0 apps
* `VisualC-WinRT/WinRT81_VS2013/` - for Windows 8.1 apps
4. find SDL/WinRT's Visual C++ project file and open it, in the `VisualC-WinRT`
directory.
5. once the project has been added, right-click on your app's project and
select, "References..."
6. click on the button titled, "Add New Reference..."
@@ -276,12 +245,12 @@ To change these settings:
7. edit the "Additional Include Directories" setting, and add a path to SDL's
"include" directory
8. **Optional: to enable compilation of C code:** change the setting for
"Consume Windows Runtime Extension" from "Yes (/ZW)" to "No". If you're
working with a completely C++ based project, this step can usually be
"Consume Windows Runtime Extension" from "Yes (/ZW)" to "No". If you're
working with a completely C++ based project, this step can usually be
omitted.
9. **Optional: to disable precompiled headers (which can produce
'stdafx.h'-related build errors, if setup incorrectly:** in the left-hand
list, select "Precompiled Headers", then change the setting for "Precompiled
9. **Optional: to disable precompiled headers (which can produce
'stdafx.h'-related build errors, if setup incorrectly:** in the left-hand
list, select "Precompiled Headers", then change the setting for "Precompiled
Header" from "Use (/Yu)" to "Not Using Precompiled Headers".
10. close the dialog, saving settings, by clicking the "OK" button
@@ -298,7 +267,7 @@ A few files should be included directly in your app's MSVC project, specifically
To include these files for C/C++ projects:
1. right-click on your project (again, in Visual C++'s Solution Explorer),
1. right-click on your project (again, in Visual C++'s Solution Explorer),
navigate to "Add", then choose "Existing Item...".
2. navigate to the directory containing SDL's source code, then into its
subdirectory, 'src/main/winrt/'. Select, then add, the following files:
@@ -313,8 +282,8 @@ To include these files for C/C++ projects:
7. change the setting for "Consume Windows Runtime Extension" to "Yes (/ZW)".
8. click the OK button. This will close the dialog.
**NOTE: C++/CX compilation is currently required in at least one file of your
app's project. This is to make sure that Visual C++'s linker builds a 'Windows
**NOTE: C++/CX compilation is currently required in at least one file of your
app's project. This is to make sure that Visual C++'s linker builds a 'Windows
Metadata' file (.winmd) for your app. Not doing so can lead to build errors.**
For non-C++ projects, you will need to call SDL_WinRTRunApp from your language's
@@ -324,37 +293,37 @@ first <PropertyGroup> block in your Visual Studio project file.
### 6. Add app code and assets ###
At this point, you can add in SDL-specific source code. Be sure to include a
C-style main function (ie: `int main(int argc, char *argv[])`). From there you
should be able to create a single `SDL_Window` (WinRT apps can only have one
window, at present), as well as an `SDL_Renderer`. Direct3D will be used to
draw content. Events are received via SDL's usual event functions
(`SDL_PollEvent`, etc.) If you have a set of existing source files and assets,
you can start adding them to the project now. If not, or if you would like to
make sure that you're setup correctly, some short and simple sample code is
At this point, you can add in SDL-specific source code. Be sure to include a
C-style main function (ie: `int main(int argc, char *argv[])`). From there you
should be able to create a single `SDL_Window` (WinRT apps can only have one
window, at present), as well as an `SDL_Renderer`. Direct3D will be used to
draw content. Events are received via SDL's usual event functions
(`SDL_PollEvent`, etc.) If you have a set of existing source files and assets,
you can start adding them to the project now. If not, or if you would like to
make sure that you're setup correctly, some short and simple sample code is
provided below.
#### 6.A. ... when creating a new app ####
If you are creating a new app (rather than porting an existing SDL-based app),
or if you would just like a simple app to test SDL/WinRT with before trying to
get existing code working, some working SDL/WinRT code is provided below. To
If you are creating a new app (rather than porting an existing SDL-based app),
or if you would just like a simple app to test SDL/WinRT with before trying to
get existing code working, some working SDL/WinRT code is provided below. To
set this up:
1. right click on your app's project
2. select Add, then New Item. An "Add New Item" dialog will show up.
3. from the left-hand list, choose "Visual C++"
4. from the middle/main list, choose "C++ File (.cpp)"
5. near the bottom of the dialog, next to "Name:", type in a name for your
5. near the bottom of the dialog, next to "Name:", type in a name for your
source file, such as, "main.cpp".
6. click on the Add button. This will close the dialog, add the new file to
6. click on the Add button. This will close the dialog, add the new file to
your project, and open the file in Visual C++'s text editor.
7. Copy and paste the following code into the new file, then save it.
```c
#include <SDL.h>
int main(int argc, char **argv)
{
SDL_DisplayMode mode;
@@ -362,7 +331,7 @@ int main(int argc, char **argv)
SDL_Renderer * renderer = NULL;
SDL_Event evt;
SDL_bool keep_going = SDL_TRUE;
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
return 1;
} else if (SDL_GetCurrentDisplayMode(0, &mode) != 0) {
@@ -370,14 +339,14 @@ int main(int argc, char **argv)
} else if (SDL_CreateWindowAndRenderer(mode.w, mode.h, SDL_WINDOW_FULLSCREEN, &window, &renderer) != 0) {
return 1;
}
while (keep_going) {
while (SDL_PollEvent(&evt)) {
if ((evt.type == SDL_KEYDOWN) && (evt.key.keysym.sym == SDLK_ESCAPE)) {
keep_going = SDL_FALSE;
}
}
}
SDL_SetRenderDrawColor(renderer, 0, 255, 0, 255);
SDL_RenderClear(renderer);
SDL_RenderPresent(renderer);
@@ -390,41 +359,41 @@ int main(int argc, char **argv)
#### 6.B. Adding code and assets ####
If you have existing code and assets that you'd like to add, you should be able
If you have existing code and assets that you'd like to add, you should be able
to add them now. The process for adding a set of files is as such.
1. right click on the app's project
2. select Add, then click on "New Item..."
3. open any source, header, or asset files as appropriate. Support for C and
3. open any source, header, or asset files as appropriate. Support for C and
C++ is available.
Do note that WinRT only supports a subset of the APIs that are available to
Win32-based apps. Many portions of the Win32 API and the C runtime are not
Do note that WinRT only supports a subset of the APIs that are available to
Win32-based apps. Many portions of the Win32 API and the C runtime are not
available.
A list of unsupported C APIs can be found at
A list of unsupported C APIs can be found at
<http://msdn.microsoft.com/en-us/library/windows/apps/jj606124.aspx>
General information on using the C runtime in WinRT can be found at
General information on using the C runtime in WinRT can be found at
<https://msdn.microsoft.com/en-us/library/hh972425.aspx>
A list of supported Win32 APIs for WinRT apps can be found at
<http://msdn.microsoft.com/en-us/library/windows/apps/br205757.aspx>. To note,
the list of supported Win32 APIs for Windows Phone 8.0 is different.
That list can be found at
A list of supported Win32 APIs for WinRT apps can be found at
<http://msdn.microsoft.com/en-us/library/windows/apps/br205757.aspx>. To note,
the list of supported Win32 APIs for Windows Phone 8.0 is different.
That list can be found at
<http://msdn.microsoft.com/en-us/library/windowsphone/develop/jj662956(v=vs.105).aspx>
### 7. Build and run your app ###
Your app project should now be setup, and you should be ready to build your app.
To run it on the local machine, open the Debug menu and choose "Start
Debugging". This will build your app, then run your app full-screen. To switch
out of your app, press the Windows key. Alternatively, you can choose to run
your app in a window. To do this, before building and running your app, find
the drop-down menu in Visual C++'s toolbar that says, "Local Machine". Expand
this by clicking on the arrow on the right side of the list, then click on
Simulator. Once you do that, any time you build and run the app, the app will
Your app project should now be setup, and you should be ready to build your app.
To run it on the local machine, open the Debug menu and choose "Start
Debugging". This will build your app, then run your app full-screen. To switch
out of your app, press the Windows key. Alternatively, you can choose to run
your app in a window. To do this, before building and running your app, find
the drop-down menu in Visual C++'s toolbar that says, "Local Machine". Expand
this by clicking on the arrow on the right side of the list, then click on
Simulator. Once you do that, any time you build and run the app, the app will
launch in window, rather than full-screen.
@@ -437,37 +406,37 @@ Windows 8.x that ran primarily on ARM-based tablet computers.
To build and run the app on ARM-based, "Windows RT" devices, you'll need to:
- install Microsoft's "Remote Debugger" on the device. Visual C++ installs and
- install Microsoft's "Remote Debugger" on the device. Visual C++ installs and
debugs ARM-based apps via IP networks.
- change a few options on the development machine, both to make sure it builds
for ARM (rather than x86 or x64), and to make sure it knows how to find the
- change a few options on the development machine, both to make sure it builds
for ARM (rather than x86 or x64), and to make sure it knows how to find the
Windows RT device (on the network).
Microsoft's Remote Debugger can be found at
<https://msdn.microsoft.com/en-us/library/hh441469.aspx>. Please note
that separate versions of this debugger exist for different versions of Visual
Microsoft's Remote Debugger can be found at
<https://msdn.microsoft.com/en-us/library/hh441469.aspx>. Please note
that separate versions of this debugger exist for different versions of Visual
C++, one each for MSVC 2015, 2013, and 2012.
To setup Visual C++ to launch your app on an ARM device:
1. make sure the Remote Debugger is running on your ARM device, and that it's on
1. make sure the Remote Debugger is running on your ARM device, and that it's on
the same IP network as your development machine.
2. from Visual C++'s toolbar, find a drop-down menu that says, "Win32". Click
2. from Visual C++'s toolbar, find a drop-down menu that says, "Win32". Click
it, then change the value to "ARM".
3. make sure Visual C++ knows the hostname or IP address of the ARM device. To
3. make sure Visual C++ knows the hostname or IP address of the ARM device. To
do this:
1. open the app project's properties
2. select "Debugging"
3. next to "Machine Name", enter the hostname or IP address of the ARM
3. next to "Machine Name", enter the hostname or IP address of the ARM
device
4. if, and only if, you've turned off authentication in the Remote Debugger,
then change the setting for "Require Authentication" to No
5. click "OK"
4. build and run the app (from Visual C++). The first time you do this, a
prompt will show up on the ARM device, asking for a Microsoft Account. You
do, unfortunately, need to log in here, and will need to follow the
subsequent registration steps in order to launch the app. After you do so,
if the app didn't already launch, try relaunching it again from within Visual
4. build and run the app (from Visual C++). The first time you do this, a
prompt will show up on the ARM device, asking for a Microsoft Account. You
do, unfortunately, need to log in here, and will need to follow the
subsequent registration steps in order to launch the app. After you do so,
if the app didn't already launch, try relaunching it again from within Visual
C++.
+6 -8
View File
@@ -1,12 +1,6 @@
Simple DirectMedia Layer {#mainpage}
========================
# Simple DirectMedia Layer
(SDL)
Version 2.0
---
http://www.libsdl.org/
https://www.libsdl.org/
Simple DirectMedia Layer is a cross-platform development library designed
to provide low level access to audio, keyboard, mouse, joystick, and graphics
@@ -34,6 +28,7 @@ More documentation and FAQs are available online at [the wiki](http://wiki.libsd
- [DirectFB](README-directfb.md)
- [DynAPI](README-dynapi.md)
- [Emscripten](README-emscripten.md)
- [GDK](README-gdk.md)
- [Gesture](README-gesture.md)
- [Git](README-git.md)
- [iOS](README-ios.md)
@@ -45,12 +40,15 @@ More documentation and FAQs are available online at [the wiki](http://wiki.libsd
- [Supported Platforms](README-platforms.md)
- [Porting information](README-porting.md)
- [PSP](README-psp.md)
- [PS2](README-ps2.md)
- [Raspberry Pi](README-raspberrypi.md)
- [Touch](README-touch.md)
- [Versions](README-versions.md)
- [WinCE](README-wince.md)
- [Windows](README-windows.md)
- [WinRT](README-winrt.md)
- [PSVita](README-vita.md)
- [Nokia N-Gage](README-ngage.md)
If you need help with the library, or just want to discuss SDL related
issues, you can join the [SDL Discourse](https://discourse.libsdl.org/),
+1
View File
@@ -640,6 +640,7 @@ EXCLUDE = ../include/SDL_opengles2_gl2ext.h \
../include/SDL_opengles.h \
../include/SDL_opengl.h \
../include/SDL_egl.h \
./release_checklist.md \
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+49
View File
@@ -0,0 +1,49 @@
# Release checklist
When changing the version, run `build-scripts/update-version.sh X Y Z`,
where `X Y Z` are the major version, minor version, and patch level. So
`2 28 1` means "change the version to 2.28.1". This script does much of the
mechanical work.
## New feature release
* Update `WhatsNew.txt`
* Bump version number to 2.EVEN.0:
* `./build-scripts/update-version.sh 2 EVEN 0`
* Do the release
* Update the website file include/header.inc.php to reflect the new version
## New bugfix release
* Check that no new API/ABI was added
* If it was, do a new feature release (see above) instead
* Bump version number from 2.Y.Z to 2.Y.(Z+1) (Y is even)
* `./build-scripts/update-version.sh 2 Y Z+1`
* Do the release
* Update the website file include/header.inc.php to reflect the new version
## After a feature release
* Create a branch like `release-2.24.x`
* Bump version number to 2.ODD.0 for next development branch
* `./build-scripts/update-version.sh 2 ODD 0`
## New development prerelease
* Bump version number from 2.Y.Z to 2.Y.(Z+1) (Y is odd)
* `./build-scripts/update-version.sh 2 Y Z+1`
* Do the release
Binary file not shown.
@@ -1,60 +0,0 @@
#!/bin/sh
prefix=/opt/local/i686-w64-mingw32
exec_prefix=${prefix}
exec_prefix_set=no
libdir=${exec_prefix}/lib
#usage="\
#Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
usage="\
Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
if test $# -eq 0; then
echo "${usage}" 1>&2
exit 1
fi
while test $# -gt 0; do
case "$1" in
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
*) optarg= ;;
esac
case $1 in
--prefix=*)
prefix=$optarg
if test $exec_prefix_set = no ; then
exec_prefix=$optarg
fi
;;
--prefix)
echo $prefix
;;
--exec-prefix=*)
exec_prefix=$optarg
exec_prefix_set=yes
;;
--exec-prefix)
echo $exec_prefix
;;
--version)
echo 2.0.22
;;
--cflags)
echo -I${prefix}/include/SDL2 -Dmain=SDL_main
;;
--libs)
echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows
;;
--static-libs)
# --libs|--static-libs)
echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid
;;
*)
echo "${usage}" 1>&2
exit 1
;;
esac
shift
done
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -41,6 +41,7 @@
#include "SDL_events.h"
#include "SDL_filesystem.h"
#include "SDL_gamecontroller.h"
#include "SDL_guid.h"
#include "SDL_haptic.h"
#include "SDL_hidapi.h"
#include "SDL_hints.h"
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -22,7 +22,7 @@
#ifndef SDL_assert_h_
#define SDL_assert_h_
#include "SDL_config.h"
#include "SDL_stdinc.h"
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
@@ -51,8 +51,12 @@ assert can have unique static variables associated with it.
/* Don't include intrin.h here because it contains C++ code */
extern void __cdecl __debugbreak(void);
#define SDL_TriggerBreakpoint() __debugbreak()
#elif _SDL_HAS_BUILTIN(__builtin_debugtrap)
#define SDL_TriggerBreakpoint() __builtin_debugtrap()
#elif ( (!defined(__NACL__)) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))) )
#define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" )
#elif (defined(__GNUC__) || defined(__clang__)) && defined(__riscv)
#define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "ebreak\n\t" )
#elif ( defined(__APPLE__) && (defined(__arm64__) || defined(__aarch64__)) ) /* this might work on other ARM targets, but this is a known quantity... */
#define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "brk #22\n\t" )
#elif defined(__APPLE__) && defined(__arm__)
@@ -69,7 +73,7 @@ assert can have unique static variables associated with it.
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 supports __func__ as a standard. */
# define SDL_FUNCTION __func__
#elif ((__GNUC__ >= 2) || defined(_MSC_VER) || defined (__WATCOMC__))
#elif ((defined(__GNUC__) && (__GNUC__ >= 2)) || defined(_MSC_VER) || defined (__WATCOMC__))
# define SDL_FUNCTION __FUNCTION__
#else
# define SDL_FUNCTION "???"
@@ -123,12 +127,10 @@ typedef struct SDL_AssertData
const struct SDL_AssertData *next;
} SDL_AssertData;
#if (SDL_ASSERT_LEVEL > 0)
/* Never call this directly. Use the SDL_assert* macros. */
extern DECLSPEC SDL_AssertState SDLCALL SDL_ReportAssertion(SDL_AssertData *,
const char *,
const char *, int)
const char *,
const char *, int)
#if defined(__clang__)
#if __has_feature(attribute_analyzer_noreturn)
/* this tells Clang's static analysis that we're a custom assert function,
@@ -149,9 +151,7 @@ extern DECLSPEC SDL_AssertState SDLCALL SDL_ReportAssertion(SDL_AssertData *,
#define SDL_enabled_assert(condition) \
do { \
while ( !(condition) ) { \
static struct SDL_AssertData sdl_assert_data = { \
0, 0, #condition, 0, 0, 0, 0 \
}; \
static struct SDL_AssertData sdl_assert_data = { 0, 0, #condition, 0, 0, 0, 0 }; \
const SDL_AssertState sdl_assert_state = SDL_ReportAssertion(&sdl_assert_data, SDL_FUNCTION, SDL_FILE, SDL_LINE); \
if (sdl_assert_state == SDL_ASSERTION_RETRY) { \
continue; /* go again. */ \
@@ -162,8 +162,6 @@ extern DECLSPEC SDL_AssertState SDLCALL SDL_ReportAssertion(SDL_AssertData *,
} \
} while (SDL_NULL_WHILE_LOOP_CONDITION)
#endif /* enabled assertions support code */
/* Enable various levels of assertions. */
#if SDL_ASSERT_LEVEL == 0 /* assertions disabled */
# define SDL_assert(condition) SDL_disabled_assert(condition)
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -209,7 +209,7 @@ typedef void (*SDL_KernelMemoryBarrierFunc)();
#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) || defined(__ARM_ARCH_8A__)
#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("dmb ish" : : : "memory")
#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("dmb ish" : : : "memory")
#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_5TE__)
#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__)
#ifdef __thumb__
/* The mcr instruction isn't available in thumb mode, use real functions */
#define SDL_MEMORY_BARRIER_USES_FUNCTION
@@ -237,6 +237,25 @@ typedef void (*SDL_KernelMemoryBarrierFunc)();
#endif
#endif
/* "REP NOP" is PAUSE, coded for tools that don't know it by that name. */
#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))
#define SDL_CPUPauseInstruction() __asm__ __volatile__("pause\n") /* Some assemblers can't do REP NOP, so go with PAUSE. */
#elif (defined(__arm__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7) || defined(__aarch64__)
#define SDL_CPUPauseInstruction() __asm__ __volatile__("yield" ::: "memory")
#elif (defined(__powerpc__) || defined(__powerpc64__))
#define SDL_CPUPauseInstruction() __asm__ __volatile__("or 27,27,27");
#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
#define SDL_CPUPauseInstruction() _mm_pause() /* this is actually "rep nop" and not a SIMD instruction. No inline asm in MSVC x86-64! */
#elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_ARM64))
#define SDL_CPUPauseInstruction() __yield()
#elif defined(__WATCOMC__) && defined(__386__)
extern __inline void SDL_CPUPauseInstruction(void);
#pragma aux SDL_CPUPauseInstruction = ".686p" ".xmm2" "pause"
#else
#define SDL_CPUPauseInstruction()
#endif
/**
* \brief A type representing an atomic integer value. It is a struct
* so people don't accidentally use numeric operations on it.
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -169,13 +169,13 @@ typedef void (SDLCALL * SDL_AudioCallback) (void *userdata, Uint8 * stream,
* The calculated values in this structure are calculated by SDL_OpenAudio().
*
* For multi-channel audio, the default SDL channel mapping is:
* 2: FL FR (stereo)
* 3: FL FR LFE (2.1 surround)
* 4: FL FR BL BR (quad)
* 5: FL FR FC BL BR (quad + center)
* 6: FL FR FC LFE SL SR (5.1 surround - last two can also be BL BR)
* 7: FL FR FC LFE BC SL SR (6.1 surround)
* 8: FL FR FC LFE BL BR SL SR (7.1 surround)
* 2: FL FR (stereo)
* 3: FL FR LFE (2.1 surround)
* 4: FL FR BL BR (quad)
* 5: FL FR LFE BL BR (4.1 surround)
* 6: FL FR FC LFE SL SR (5.1 surround - last two can also be BL BR)
* 7: FL FR FC LFE BC SL SR (6.1 surround)
* 8: FL FR FC LFE BL BR SL SR (7.1 surround)
*/
typedef struct SDL_AudioSpec
{
@@ -487,6 +487,7 @@ extern DECLSPEC int SDLCALL SDL_GetNumAudioDevices(int iscapture);
* \since This function is available since SDL 2.0.0.
*
* \sa SDL_GetNumAudioDevices
* \sa SDL_GetDefaultAudioInfo
*/
extern DECLSPEC const char *SDLCALL SDL_GetAudioDeviceName(int index,
int iscapture);
@@ -512,12 +513,48 @@ extern DECLSPEC const char *SDLCALL SDL_GetAudioDeviceName(int index,
* \since This function is available since SDL 2.0.16.
*
* \sa SDL_GetNumAudioDevices
* \sa SDL_GetDefaultAudioInfo
*/
extern DECLSPEC int SDLCALL SDL_GetAudioDeviceSpec(int index,
int iscapture,
SDL_AudioSpec *spec);
/**
* Get the name and preferred format of the default audio device.
*
* Some (but not all!) platforms have an isolated mechanism to get information
* about the "default" device. This can actually be a completely different
* device that's not in the list you get from SDL_GetAudioDeviceSpec(). It can
* even be a network address! (This is discussed in SDL_OpenAudioDevice().)
*
* As a result, this call is not guaranteed to be performant, as it can query
* the sound server directly every time, unlike the other query functions. You
* should call this function sparingly!
*
* `spec` will be filled with the sample rate, sample format, and channel
* count, if a default device exists on the system. If `name` is provided,
* will be filled with either a dynamically-allocated UTF-8 string or NULL.
*
* \param name A pointer to be filled with the name of the default device (can
* be NULL). Please call SDL_free() when you are done with this
* pointer!
* \param spec The SDL_AudioSpec to be initialized by this function.
* \param iscapture non-zero to query the default recording device, zero to
* query the default output device.
* \returns 0 on success, nonzero on error
*
* \since This function is available since SDL 2.24.0.
*
* \sa SDL_GetAudioDeviceName
* \sa SDL_GetAudioDeviceSpec
* \sa SDL_OpenAudioDevice
*/
extern DECLSPEC int SDLCALL SDL_GetDefaultAudioInfo(char **name,
SDL_AudioSpec *spec,
int iscapture);
/**
* Open a specific audio device.
*
@@ -584,6 +621,7 @@ extern DECLSPEC int SDLCALL SDL_GetAudioDeviceSpec(int index,
* - `SDL_AUDIO_ALLOW_FREQUENCY_CHANGE`
* - `SDL_AUDIO_ALLOW_FORMAT_CHANGE`
* - `SDL_AUDIO_ALLOW_CHANNELS_CHANGE`
* - `SDL_AUDIO_ALLOW_SAMPLES_CHANGE`
* - `SDL_AUDIO_ALLOW_ANY_CHANGE`
*
* These flags specify how SDL should behave when a device cannot offer a
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -52,7 +52,7 @@ typedef enum
dstA = dstA */
SDL_BLENDMODE_MUL = 0x00000008, /**< color multiply
dstRGB = (srcRGB * dstRGB) + (dstRGB * (1-srcA))
dstA = (srcA * dstA) + (dstA * (1-srcA)) */
dstA = dstA */
SDL_BLENDMODE_INVALID = 0x7FFFFFFF
/* Additional custom blend modes can be returned by SDL_ComposeCustomBlendMode() */
@@ -65,8 +65,8 @@ typedef enum
typedef enum
{
SDL_BLENDOPERATION_ADD = 0x1, /**< dst + src: supported by all renderers */
SDL_BLENDOPERATION_SUBTRACT = 0x2, /**< dst - src : supported by D3D9, D3D11, OpenGL, OpenGLES */
SDL_BLENDOPERATION_REV_SUBTRACT = 0x3, /**< src - dst : supported by D3D9, D3D11, OpenGL, OpenGLES */
SDL_BLENDOPERATION_SUBTRACT = 0x2, /**< src - dst : supported by D3D9, D3D11, OpenGL, OpenGLES */
SDL_BLENDOPERATION_REV_SUBTRACT = 0x3, /**< dst - src : supported by D3D9, D3D11, OpenGL, OpenGLES */
SDL_BLENDOPERATION_MINIMUM = 0x4, /**< min(dst, src) : supported by D3D9, D3D11 */
SDL_BLENDOPERATION_MAXIMUM = 0x5 /**< max(dst, src) : supported by D3D9, D3D11 */
} SDL_BlendOperation;
Loaded 100 of 1624 files, more files were not shown because too many files have changed in this diff. Show more