Skip to content
Snippets Groups Projects
  1. Jan 14, 2016
    • Inuyasha's avatar
      Merge branch 'monster's-miscellaneous-meddling' into 'master' · ef4aad36
      Inuyasha authored
      Monster's miscellaneous meddling
      
      A miscellaneous assortment of code-cleanup and other changes, plus fixing up SRB2's tangent array so it behaves more as expected (especially on the Lua side).
      
      More specific details of the changes:
      
      (MUST-HAVE CHANGES)
      * `finetangent[]` has been entirely redone in the same manner as finesine/finecosine.
      * Lua's tan() function shifts `finetangent[]` results by `ANGLE_90` to get what you EXPECT it to return (e.g. `tan(0)` actually returns 0 now). This means finetangent itself doesn't need to change its general arrangment, this only affects Lua specifically.
      * Lua's tan() function now also doesn't go out of `finetangent[]`'s bounds at all. Before, `tan(ANGLE_180)` through `tan(ANGLE_MAX)` and such would just give you values unrelated to the array in question, which was clearly a bad thing.
      
      (CAN PROBABLY LIVE WITHOUT?)
      * `finecosine`'s definition moved from r_main.c to tables.c.
      * Created `P_CheckTimeLimit` for `cv_timelimit`, much like `cv_pointlimit` has `P_CheckPointLimit`. It cleans up `P_UpdateSpecials` a bit at least.
      * Some code cleanup relating to translucency maps - these are kind of unimportant, I was about to stop `FF_TRANSMASK` being used everywhere, but this was apparently a bad idea so I backtracked a bit.
      * Re-added `_MSC_VER` check around MSVC-specific code in doomtype.h, in case it wasn't defined (and `__OS2__` was). Also left a comment there regarding `__BYTEBOOL__`.
      * Fixed an apparent copy+paste goofup in `joyaxis_cons_t[]` for the Wii-specific code.
      
      See merge request !10
      ef4aad36
    • Inuyasha's avatar
      Merge branch 'reduced_palette' into 'master' · 437b0ac6
      Inuyasha authored
      Reduced palette
      
      You guys should know what this is by now. If you don't, you really need to catch up. =P
      
      We should check with toaster and others involved to check this thing is actually ready to go though, the number of changes to the palette itself over the last year has been absurd.
      
      See also http://git.magicalgirl.moe/STJr/SRB2Internal/issues/8
      
      See merge request !13
      437b0ac6
  2. Jan 13, 2016
    • Inuyasha's avatar
      Merge branch 'inu-misc' into 'master' · 08cb91d5
      Inuyasha authored
      Yeah, whatever, this is changing stuff that was already all my own
      anyway, and I already extensively tested it in the *first* place
      when I was measuring the amount of time it took.
      
      Honestly this could be merged into public master, but pfft...
      
      See merge request !19
      08cb91d5
  3. Jan 08, 2016
  4. Jan 04, 2016
  5. Jan 03, 2016
  6. Dec 30, 2015
    • colette's avatar
      Merge branch 'actions-tweaks' into 'next' · 0a0f16a0
      colette authored
      Actions tweaks
      
      This just rewrites the action A_SetTargetsTarget currently, dunno if I'll bother to tweak any more actions in the near future \*shrugs\*
      
      That said, PLEASE check whether the action works properly before accepting the merge. It's been a while since I last did anything with this branch, so I forget entirely whether I tested it or not.
      
      See merge request !27
      0a0f16a0
  7. Dec 01, 2015
  8. Nov 23, 2015
  9. Nov 09, 2015
  10. Nov 08, 2015
  11. Nov 07, 2015
  12. Nov 06, 2015
  13. Oct 21, 2015
  14. Oct 12, 2015
  15. Oct 11, 2015
  16. Oct 10, 2015
  17. Sep 27, 2015
  18. Sep 26, 2015
  19. Sep 24, 2015
  20. Sep 03, 2015
    • Alam Ed Arias's avatar
      Merge branch 'public_next' into master · 6ad10861
      Alam Ed Arias authored
      6ad10861
    • Alam Ed Arias's avatar
      Merge branch 'angles' into 'next' · 3917b021
      Alam Ed Arias authored
      Slopes and stuff
      
      Adds support for slopes, slopes on FOFs, slopes on translucent FOFs, slopes on FOFs with holes in the flat, slope physics, dynamic slopes, vertex slopes, dynamic vertex slopes, and a ham sandwich to the game. Only for software mode right now, though. (OGL still gets the physics and the sandwich.) Some things still need to be done, but for now this can be merged in to be finished later.
      
      Please make sure nothing in the vanilla game breaks before giving the thumbs up for this merge.
      
      Since this doesn't merge automatically, if the code review turns out positive and nobody else has done it, I'll handle the merging.
      
      See merge request !22
      3917b021
    • Alam Ed Arias's avatar
      Merge branch 'public_next' into master · eb4de823
      Alam Ed Arias authored
      eb4de823
Loading