Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pixellight #559

Closed
wants to merge 103 commits into from
Closed

Pixellight #559

wants to merge 103 commits into from

Commits on Jan 27, 2020

  1. blendtry1

    @qndel
    qndel committed Jan 27, 2020
    Configuration menu
    Copy the full SHA
    155b5b7 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2020

  1. static lights attempt1

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    9058f22 View commit details
    Browse the repository at this point in the history

  2. static lights attempt1

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    05c79f6 View commit details
    Browse the repository at this point in the history

  3. before trying to use textures

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    fe456a7 View commit details
    Browse the repository at this point in the history

  4. light PR

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    38a3651 View commit details
    Browse the repository at this point in the history

  5. code cleanup

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    c026c81 View commit details
    Browse the repository at this point in the history

  6. code cleanup

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    be9629d View commit details
    Browse the repository at this point in the history

  7. code cleanup

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    3fd803e View commit details
    Browse the repository at this point in the history

  8. code cleanup

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    971c589 View commit details
    Browse the repository at this point in the history

  9. code cleanup

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    e971145 View commit details
    Browse the repository at this point in the history

  10. code cleanup

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    e58085a View commit details
    Browse the repository at this point in the history

  11. fixed memory leak

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    8ae7504 View commit details
    Browse the repository at this point in the history

  12. cut fps hole only if fps displayed

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    8a3c04b View commit details
    Browse the repository at this point in the history

  13. static lights

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    93a3838 View commit details
    Browse the repository at this point in the history

  14. fix travis error

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    c5dcad8 View commit details
    Browse the repository at this point in the history

  15. fix SDL1 build

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    44f4e0e View commit details
    Browse the repository at this point in the history

  16. fix static light jumping

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    be6af23 View commit details
    Browse the repository at this point in the history

  17. separate ui test

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    ac2459c View commit details
    Browse the repository at this point in the history

  18. separate ui test

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    03cdc9f View commit details
    Browse the repository at this point in the history

  19. separate ui test

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    bb78514 View commit details
    Browse the repository at this point in the history

  20. ui work in progress

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    33ee6f7 View commit details
    Browse the repository at this point in the history

  21. still doesnt work

    @qndel
    qndel committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    a744ccb View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2020

  1. almost works

    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    b3ae81e View commit details
    Browse the repository at this point in the history

  2. everything works except missiles

    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    b7a2c9d View commit details
    Browse the repository at this point in the history

  3. fix shadows

    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    8ae1a05 View commit details
    Browse the repository at this point in the history

  4. fix missiles jumping around

    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    f1071ff View commit details
    Browse the repository at this point in the history

  5. fix light affecting black ui elements

    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    94e715f View commit details
    Browse the repository at this point in the history

  6. add some spell colors

    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    eff2605 View commit details
    Browse the repository at this point in the history

  7. use TILE_SIZE

    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    25074a6 View commit details
    Browse the repository at this point in the history

  8. fixed light being cut off

    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    e54348f View commit details
    Browse the repository at this point in the history

  9. improve light formula

    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    ac38cf9 View commit details
    Browse the repository at this point in the history

  10. blue color tweak

    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    b4efd54 View commit details
    Browse the repository at this point in the history

  11. partially fix ui and stuff staying in main menu

    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    5e5950c View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' of https://github.com/diasurgical/devilutionX i… 

    …nto pixellight
    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    8512ece View commit details
    Browse the repository at this point in the history

  13. get rid of the fps stuff

    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    0463732 View commit details
    Browse the repository at this point in the history

  14. some cleanup

    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    ecec16a View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' of https://github.com/diasurgical/devilutionX i… 

    …nto pixellight
    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    3453733 View commit details
    Browse the repository at this point in the history

  16. Hackity hack hack

    @glebm
    glebm committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    9e5e19c View commit details
    Browse the repository at this point in the history

  17. Merge pull request #1 from glebm/pixellight 

    Hackity hack hack
    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    9ec77c1 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'pixellight' of https://github.com/qndel/devilutionX int… 

    …o pixellight
    @qndel
    qndel committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    1bb6082 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2020

  1. some code cleanup, fix compiling

    @qndel
    qndel committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    fe6d0a0 View commit details
    Browse the repository at this point in the history

  2. fix static lights on first load

    @qndel
    qndel committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    5304c54 View commit details
    Browse the repository at this point in the history

  3. remove SDL_Logs

    @qndel
    qndel committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    ab91502 View commit details
    Browse the repository at this point in the history

  4. crappy fix, cant do better

    @qndel
    qndel committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    bb09beb View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2020

  1. everything fully works! - except cursor

    @qndel
    qndel committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    986c2b1 View commit details
    Browse the repository at this point in the history

  2. use unused variable to avoid modifying saves

    @qndel
    qndel committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    04499d6 View commit details
    Browse the repository at this point in the history

  3. small fix

    @qndel
    qndel committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    9eae567 View commit details
    Browse the repository at this point in the history

  4. remove unused extern

    @qndel
    qndel committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    1db3a59 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/diasurgical/devilutionX i… 

    …nto pixellight
    @qndel
    qndel committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    9171d12 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2020

  1. merge

    @qndel
    qndel committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    1b79376 View commit details
    Browse the repository at this point in the history

  2. working shitcode

    @qndel
    qndel committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    596036d View commit details
    Browse the repository at this point in the history

  3. working shitcode

    @qndel
    qndel committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    afec01d View commit details
    Browse the repository at this point in the history

  4. everything works again

    @qndel
    qndel committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    a9c3c3d View commit details
    Browse the repository at this point in the history

  5. fix conflicts

    @qndel
    qndel committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    8e1fb0f View commit details
    Browse the repository at this point in the history

  6. fix build - define POINT

    @qndel
    qndel committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    8df54cc View commit details
    Browse the repository at this point in the history

  7. cursor fully works

    @qndel
    qndel committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    974bb74 View commit details
    Browse the repository at this point in the history

  8. rewrite red on pause/death

    @qndel
    qndel committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    055d40b View commit details
    Browse the repository at this point in the history

  9. fix light on lags

    @qndel
    qndel committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    bb9b998 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2020

  1. rewrite light color map, apply to all missiles

    @qndel
    qndel committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    bb54e16 View commit details
    Browse the repository at this point in the history

  2. handle different arrows properly

    @qndel
    qndel committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    b6a0067 View commit details
    Browse the repository at this point in the history

  3. staticLights into vector

    @qndel
    qndel committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    a5af9d4 View commit details
    Browse the repository at this point in the history

  4. fix some warnings

    @qndel
    qndel committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    f17ba0e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/diasurgical/devilutionX i… 

    …nto pixellight
    @qndel
    qndel committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    e797a45 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2020

  1. revert at, doesnt work lol

    @qndel
    qndel committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    b9ad301 View commit details
    Browse the repository at this point in the history

  2. saving to character - careful, might break char

    @qndel
    qndel committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    927c569 View commit details
    Browse the repository at this point in the history

  3. restore formatting

    @qndel
    qndel committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    ca62251 View commit details
    Browse the repository at this point in the history

  4. restore formatting

    @qndel
    qndel committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    3388741 View commit details
    Browse the repository at this point in the history

  5. minor tweaks

    @qndel
    qndel committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    82353d0 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2020

  1. im done with this shit

    @qndel
    qndel committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    c7402b9 View commit details
    Browse the repository at this point in the history

  2. build fix

    @qndel
    qndel committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    25b9ab3 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2020

  1. fix monster light

    @qndel
    qndel committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    64ee8cf View commit details
    Browse the repository at this point in the history

  2. small tweaks

    @qndel
    qndel committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    e9f789a View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2020

  1. Merge branch 'master' of https://github.com/diasurgical/devilutionX i… 

    …nto pixellight
    @qndel
    qndel committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    be17cdd View commit details
    Browse the repository at this point in the history

  2. memory optimizations

    @qndel
    qndel committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    f6a442e View commit details
    Browse the repository at this point in the history

  3. formatting

    @qndel
    qndel committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    721d2b6 View commit details
    Browse the repository at this point in the history

  4. adjust light position

    @qndel
    qndel committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    3a37c18 View commit details
    Browse the repository at this point in the history

  5. even less memory

    @qndel
    qndel committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    27928c6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/diasurgical/devilutionX i… 

    …nto pixellight
    @qndel
    qndel committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    8e52b39 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2020

  1. Merge branch 'master' of https://github.com/diasurgical/devilutionX i… 

    …nto pixellight
    @qndel
    qndel committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    7dbec08 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/diasurgical/devilutionX i… 

    …nto pixellight
    @qndel
    qndel committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    f2920ca View commit details
    Browse the repository at this point in the history

  3. fix merge conflict

    @qndel
    qndel committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    0750dda View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2020

  1. Merge branch 'master' of https://github.com/diasurgical/devilutionX i… 

    …nto pixellight
    @qndel
    qndel committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    bfd7770 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2020

  1. fix conflict

    @qndel
    qndel committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    8663102 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2020

  1. everything broke

    @qndel
    qndel committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    8c1e6d5 View commit details
    Browse the repository at this point in the history

  2. restoring includes

    @qndel
    qndel committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    d9a17ec View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pixellight' of https://github.com/qndel/devilutionX int… 

    …o pixellight
    @qndel
    qndel committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    534cb50 View commit details
    Browse the repository at this point in the history

  4. disable light if upscale 0

    @qndel
    qndel committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    1092c01 View commit details
    Browse the repository at this point in the history

  5. disable light during screenshots

    @qndel
    qndel committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    e7bef88 View commit details
    Browse the repository at this point in the history

  6. minor cleanup

    @qndel
    qndel committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    353e705 View commit details
    Browse the repository at this point in the history

  7. poisoned water color / change light to lighten_only

    @qndel
    qndel committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    83c5dff View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2020

  1. enable light in town (WIP)

    @qndel
    qndel committed Feb 22, 2020
    Configuration menu
    Copy the full SHA
    e93f166 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/diasurgical/devilutionX i… 

    …nto pixellight
    @qndel
    qndel committed Feb 22, 2020
    Configuration menu
    Copy the full SHA
    dd32574 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2020

  1. light in town

    @qndel
    qndel committed Feb 23, 2020
    Configuration menu
    Copy the full SHA
    8be4d0c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/diasurgical/devilutionX i… 

    …nto pixellight
    @qndel
    qndel committed Feb 23, 2020
    Configuration menu
    Copy the full SHA
    ead0adc View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2020

  1. Merge branch 'master' of https://github.com/diasurgical/devilutionX i… 

    …nto pixellight
    @qndel
    qndel committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    5b68cbf View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2020

  1. fix conflict

    @qndel
    qndel committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    fee9c54 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2020

  1. fixed conflicts

    @qndel
    qndel committed Apr 11, 2020
    Configuration menu
    Copy the full SHA
    28fa025 View commit details
    Browse the repository at this point in the history

  2. fixed conflicts2

    @qndel
    qndel committed Apr 11, 2020
    Configuration menu
    Copy the full SHA
    83650e9 View commit details
    Browse the repository at this point in the history

  3. update enums

    @qndel
    qndel committed Apr 11, 2020
    Configuration menu
    Copy the full SHA
    a572009 View commit details
    Browse the repository at this point in the history

  4. fix light

    @qndel
    qndel committed Apr 11, 2020
    Configuration menu
    Copy the full SHA
    d43a212 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2020

  1. fix space

    @qndel
    qndel committed Apr 12, 2020
    Configuration menu
    Copy the full SHA
    ccecde6 View commit details
    Browse the repository at this point in the history

  2. move town light to new mpq in save

    @qndel
    qndel committed Apr 12, 2020
    Configuration menu
    Copy the full SHA
    a25689c View commit details
    Browse the repository at this point in the history

  3. fix size

    @qndel
    qndel committed Apr 12, 2020
    Configuration menu
    Copy the full SHA
    939c049 View commit details
    Browse the repository at this point in the history