forked from wheybags/freeablo
-
Notifications
You must be signed in to change notification settings - Fork 0
WIP - Put all textures into an atlas, render whole level in one batch #1
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.
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
Open
grantramsay
wants to merge
325
commits into
master
Choose a base branch
from
test/textureAtlasBatchRender
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fad9e90 to
be4f0b1
Compare
c70fa72 to
8d5c74f
Compare
I am an idiot...
Also don't allow closing doors remotely, player will now walk to the door before opening it.
fix some bugs in mp
symlinks are dodgy on windows...
Clicking a button would change its color.
Vanilla actually colors items that you don't have stats to use.
Add constructor to MenuEntry.
getItemAt should receive a copy of item.
Fix bug where player moves with shift key and mouse down drag Change shift key to have higher priority then target actor/item click Remove getTypeId from abstract BaseAttackState Move spell type enum to diabloexe
Missiles that don't move shouldn't be concerned with range
…ations Add animations for casting spells and fire arrows for ranged weapons
- Force passing player class to constructor of player. This fixes a bug where we would calculate stats before the class had been set. - Pass around PlayerClass enum instead of string.
Make freeablo work from an installed dir
Update changelog Any player can use town portal Change mMissileGraphics to std::unordered_set Add comment on not using mMissileGraphics for game logic Add TODO for removing "additionalConstraints" after GameObject refactor Use std::numeric_limits<int32_t>::max() over INT32_MAX
…omposition Feat/missile class composition
…ctness Fix/save const correctness
In mp, another player could pick up the item before you got to it, in which case you would have a dangling pointer
gcc 9 emits a "sequence-point" warning for the original code
Various small fixes
…tchRender # Conflicts: # apps/freeablo/engine/threadmanager.cpp # apps/freeablo/faworld/playerbehaviour.cpp # components/render/nuklear_sdl_gl3.h # components/render/sdl2backend.cpp # components/render/sdl_gl_funcs.cpp
# Conflicts: # apps/freeablo/farender/renderer.cpp # apps/freeablo/faworld/actoranimationmanager.cpp
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.