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

Some enhancements and fixes #239

Open
wants to merge 73 commits into
base: master
Choose a base branch
from
Open

Some enhancements and fixes #239

wants to merge 73 commits into from

Conversation

vagojolu7
Copy link

We made some fixes to the issues that include:

  • Save time of day so it is not reset when game is opened again Save time of day in db #121
  • Add a compass [enhancement] Add compas #119
  • Add text under image of current block to explain what the material is
  • Material renaming
  • Upper text box gets cut off, should show full text by continuing line of text below Having the text scroll/loop sideways

Thank you for your consideration

kwinthrop and others added 30 commits October 8, 2019 13:29
@kwinthrop
Add team names and initials to HUD
0421916
@kwinthrop
further edit to team name in HUD
55b4659
@kwinthrop
increase max text length so team name can be added
a34e471
@kwinthrop
reverse incorrect changes
830e894
@kwinthrop
add team info in HUD
7a16292
@kwinthrop
team name edits
5916d22
@kwinthrop
revert changes that weren't working - add team name to text prompt
e8d9692
@kwinthrop
revert changes, add team name to welcome message upon joining server
ecce457
@kwinthrop
put welcome message on one line
8864472
@kwinthrop
replace welcome with team
f66b8d3
@vagojolu7
Update main.c
df33c9b 
toBeChanged. Sorry if I mispelled
@juss2017
fixed names
7d2073b
@juss2017
indentation on text
f73f120
@juss2017
text test
8c054a0
@juss2017
text test part 2
d85a39e
@juss2017
text test part 3
60fa736
@kwinthrop
Printing on screen test
b2f15ea
@kwinthrop
test 2 of printing item text
1ec437c
@kwinthrop
Merge branch 'master' of https://github.com/kwinthrop/not2bad-Craft
8bc7999
@kwinthrop
Testing item name in top text box
7e44a38
@kwinthrop
Testing item name in top text box
0692036
@kwinthrop
Merge branch 'master' of https://github.com/kwinthrop/not2bad-Craft
0c97835 
# Conflicts:
#	src/main.c
@kwinthrop
commenting out previous code
cf99f03
@kwinthrop
fixing segfault
33626fd
@kwinthrop
.
ff900eb
@kwinthrop
..
233cc9c
@kwinthrop
fixed strcpy
0751786
@kwinthrop
checking for segfault
032229a
@kwinthrop
fixing item_index crash
f814232
@kwinthrop
Added string enum for item names
9876472
juss2017 and others added 30 commits December 7, 2019 17:36
@juss2017
Merge branch 'master' of https://github.com/kwinthrop/not2bad-Craft
7ba0ccb
@kwinthrop
Fixing color names
4a72051
@kwinthrop
Merge branch 'master' of https://github.com/kwinthrop/not2bad-Craft
aeaa44f
@juss2017
new line test part 3
eee3ec7
@juss2017
Revert "new line test part 2"
b961930 
This reverts commit 99aa453.
@juss2017
Merge branch 'master' of https://github.com/kwinthrop/not2bad-Craft
dbafa32
@juss2017
testing to see if text can be alignned to the right
e652c64
@juss2017
gave line more char space to see if that will resolve the issue
1afd655
@juss2017
forgot to give the actual string the space
7ae93c1
@juss2017
fitting text and giving labels
d07e740
@juss2017
swapping coordiantes and misc line for aesthetic reasons
27b37be
@juss2017
doing what i said before but hopefully actually doing it this time
61ceb10
Add existing file
e7f28f8
time of day update / resolved merge conflict
65f399f
@kwinthrop
Fix seg fault when cycling through items by adding missing commas
93fcd59
@vagojolu7
commit modified: src/item.c
60f491a 
commit	modified:   src/item.h
commit	modified:   src/main.c
@vagojolu7
Merge branch 'master' of https://github.com/kwinthrop/not2bad-Craft
a6ae45a 
commit	modified:   src/main.c
@vagojolu7
Unnecessary file
a3c95fa 
causes compiling issues
@vagojolu7
Unnecessary file
ee684f2
@vagojolu7
Unnecessary file
e7291bc
@vagojolu7
Cleaning Duty
d68e016
@vagojolu7
Cleaning Duty
69d9800
@vagojolu7
Cleaning Duty
ba7e6c1
@vagojolu7
Merge https://github.com/kwinthrop/not2bad-Craft
231c326 
commit	deleted:    deps/glfw/src/glfw3Config.cmake
@kwinthrop
format item names
df4c188 
names previously added were overwritten by a merge, so I added them again
@juss2017
re-adding my changes
8d38380
@juss2017
adding compass back in *my bad*
25e555a
@juss2017
adding compass again and comments to code edited
7506f78
@juss2017
trying this again
e6f3cf5
@juss2017
trying again
897ab39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vagojolu7 @kwinthrop @juss2017