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

rebase readme #177

Merged
merged 182 commits into from
Dec 4, 2023
Merged

rebase readme #177

merged 182 commits into from
Dec 4, 2023

Conversation

xspanger3770
Copy link
Owner

No description provided.

@xspanger3770
change minimum window size for better scaling
602139a
@xspanger3770
setting for display alert box
a9208d8
@xspanger3770
setting for display time
481330f
@xspanger3770
version 0.9.9_pre1
515b832
@xspanger3770
5 custom sounds added
e7b753b
@xspanger3770
pre2
3dfb0d9
@xspanger3770
ignore too deep quakes, version pre_2
4a36a21
@xspanger3770
playing with h3 library
9d9bf46
@xspanger3770
implement hexagonal shakemap generation
827030b
@xspanger3770
hexagonal shakemap render
87598df
@xspanger3770
version pre_3
937811f
@xspanger3770
shakemap render update
3384363
@xspanger3770
fix warnings
8377106
@xspanger3770
max intensity now determined by strongest hexagon
8977a63
@xspanger3770
further intensity hexagons improvements
51faf39
@xspanger3770
fix quake shakemap not updating
511bd4e
@xspanger3770
fix other problems with shakemaps
c236600
@xspanger3770
optimize
e83b55e
@xspanger3770
further optimise
5a4992d
@xspanger3770
sync info box with cinema mode
8deaa55
@xspanger3770
version pre4
018e112
@xspanger3770
sync quake no. with cinema mode
4aa6e22
@xspanger3770
fix shakemap
b632d2d
@xspanger3770
2,2 sec instead of 22 sec
def452b
@xspanger3770
Merge pull request #155 from xspanger3770/readme
d80460b 
Readme updates
@xspanger3770
Merge pull request #156 from xspanger3770/readme
a31de80 
fix link
@xspanger3770
Merge branch 'feat_custom_sounds' into develop
c7a57ba 
# Conflicts:
#	src/main/java/globalquake/core/earthquake/EarthquakeAnalysis.java
#	src/main/java/globalquake/main/Main.java
@xspanger3770
update some sounds
2babda1
@xspanger3770
fix merge
f3c0b2f
@xspanger3770
replace some new threads with singleThreadExecutors
c1820d0
xspanger3770 and others added 29 commits November 8, 2023 00:03
@xspanger3770
increase threshold for the closest confidence polygon
a94b487
@xspanger3770
set default port to 38000 and auto-save it in server
913fe7c
@xspanger3770
client: display connection status
c65ee71
@xspanger3770
red color of time when client disconnected
1dec290
@xspanger3770
reset stations when indexing change (server restart)
937b635
@xspanger3770
fix NullPointerException in GlobalStationManagerClient
52af9ab
@xspanger3770
client: send new stations request when indexing change
9bb2563
@xspanger3770
fix render features order
c78f5bd
@xspanger3770
redesign client quake archiving
bf7c2f3
@xspanger3770
redesign client quake archiving step 2
1267d3d
@xspanger3770
cluster analysis and earthquake analysis now run serially
7fffb5f
@xspanger3770
hide station if delay > 5 min in client
25b361b
@xspanger3770
fix NullPointerException in CinemaHandler
2efe148
@xspanger3770
unify service terminations
5e62652
@xspanger3770
big cleanup part 1
f7d5b0f
@xspanger3770
extract common classes to GQ core
5b028c5
@xspanger3770
extract common classes to GQ core part 2
2743989
@xspanger3770
extract common classes to GQ core part 3
889ceb5
@xspanger3770
extract common classes to GQ core part 4
be04609
@xspanger3770
buttons logic
0124e8d
@xspanger3770
finally all warnings resolved
33d917b
@xspanger3770
fix last error, version 0.10.0_pre4
d31871c
@xspanger3770
unify server version with client version to avoid confusion - 0.10.4_…
e745622 
…pre4
@xspanger3770
little v in version name
4e9f402
@xspanger3770
Merge pull request #166 from xspanger3770/develop
f3c2db1 
All new stuff in 0.10.x & 0.9.9 pre-releases
@dependabot
Bump org.json:json from 20230227 to 20231013 in /GlobalQuakeCore
60f2e7c 
Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@xspanger3770
Merge pull request #170 from xspanger3770/dependabot/maven/GlobalQuak…
9c520f2 
…eCore/org.json-json-20231013

Bump org.json:json from 20230227 to 20231013 in /GlobalQuakeCore
@hbkb001
Update README.md
e176090 
added some examples of the CMD or Terminal lines to the RUN section. (May need fact checking although it is correct to my knowledge) - Bryce From NZ (discord)
@xspanger3770
Merge pull request #175 from hbkb001/patch-1
0dccaa1 
Update README.md
@xspanger3770 xspanger3770 merged commit a446804 into readme Dec 4, 2023
1 check passed
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.

None yet
2 participants
@xspanger3770 @hbkb001