michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,322 Commits 17 Branches 21 Tags
d436d2a6e4bb3436a16638749e02da308aea4ba3
Commit Graph

1322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhi You Tan d436d2a6e4 Wind arrow now follows on every camera 
Follows correctly

#story[1276] #pair[zyt10, ajm412]
 2017-09-28 16:31:10 +13:00
Zhi You Tan 51078c82a0 Merge remote-tracking branch 'origin/develop' into wind_arrow 
# Conflicts:
#	src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java
 2017-09-28 14:38:31 +13:00
Zhi You Tan 22fbb529ef Wind arrow follows wind data 
#story[1276]
 2017-09-28 14:37:46 +13:00
Calum 597fbe935f Merge remote-tracking branch 'origin/develop' into develop 2017-09-28 14:28:16 +13:00
Calum 7cfad28d6b Fixed parrot 2017-09-28 14:28:07 +13:00
Michael Rausch 3345734efd Fixed memory leak by forcing garbage collection 2017-09-28 14:22:33 +13:00
Haoming Yin 9795083d4d Added confirm button in keybinding dialog. 
-  clicking confirm button will exit the dialog
- [WIP] exit without clicking confirm button will still save changes, which should be fixed in the future

tags: #story[1273]
 2017-09-28 13:58:25 +13:00
Kusal Ekanayake f02208ba3a Loopty loop map added 2017-09-28 13:33:09 +13:00
Zhi You Tan d3e8a21d2f Made the windView observer the gameView camera 
#story[1276] #pair[ajm412, zyt10]
 2017-09-28 13:18:19 +13:00
Calum 8d74c3b756 Merge remote-tracking branch 'origin/develop' into develop 2017-09-28 12:44:33 +13:00
Calum 3f666fa092 Made waka larger. 2017-09-28 12:44:24 +13:00
Haoming Yin 55d82298b6 Beautified the loading splash screen 
- added 7-color rainbow spinners
- added background image
- added subtitle
- changed font size and color

tags: #story[1273]
 2017-09-28 12:42:46 +13:00
William Muir 909407fe63 Merge branch '1293_PowerUps_TokenInfo' into develop 2017-09-28 12:31:14 +13:00
William Muir cb4e47f71a Fixed icon backgrounds to be white 
#story[1293]
 2017-09-28 12:31:00 +13:00
William Muir 499acb9733 Merge branch '1293_PowerUps_TokenInfo' into develop 2017-09-28 12:21:12 +13:00
William Muir 5688e10e6f Tokens now display on the right and are clickable for further information 
#story[1293]
 2017-09-28 12:20:16 +13:00
William Muir 5cbd729214 Tokens now display on the right and are clickable for further information 
#story[1293]
 2017-09-28 12:08:14 +13:00
Calum ddf5a96e0f Merge branch '1276_Next_Mark_Indicator' into develop 2017-09-28 12:03:30 +13:00
Calum 81b2d285e9 Changed arrow colour. 
#fix
 2017-09-28 12:02:24 +13:00
Calum 5d7f307260 Changed arrow colour. 
#fix
 2017-09-28 12:02:09 +13:00
Zhi You Tan 852575c9e7 Merge remote-tracking branch 'origin/develop' into wind_arrow 
# Conflicts:
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java
#	src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java
#	src/main/resources/views/RaceView.fxml
 2017-09-28 11:57:12 +13:00
Kusal Ekanayake 4ec23a1785 Fixed race fxml not showing other elements 2017-09-28 11:30:09 +13:00
Haoming Yin 37e4fe4ce7 Issue #83: Server creation dialog need to be polished 
- rearranged the layout of all the nodes
- set CSS files for the dialog
- added close button

tags: #story[1273]
 2017-09-28 11:13:02 +13:00
Zhi You Tan 567e351c7f Updated wind arrow 3D model 
#story[1276]
 2017-09-28 11:02:47 +13:00
Calum 705669ad07 centered icons #fix 2017-09-28 07:23:25 +13:00
Calum 71f6b9accb Fixed duplicate waka files. 
#fix
 2017-09-28 06:59:44 +13:00
Calum caf04e1e99 Added a waka model. 
#implement #story[1274]
 2017-09-28 06:54:20 +13:00
Calum b9cb6fa5b4 Added token information to the lobby screen. 
#implement #story[1293]
 2017-09-28 05:09:54 +13:00
Zhi You Tan 72fe8c4881 - Removed 2D wind and replaced with 3D wind arrow. 
#story[1276]
 2017-09-28 04:13:44 +13:00
alistairjmcintyre 00e2af9c14 - Fixed Merge Errors and some broken lighting AGAIN 
#tags [1276]
 2017-09-28 02:20:34 +13:00
William Muir ba768deabc Initial commit for The Token info panel in the lobby controller 
- Having some mad issues with front end formatting with JFX.
- Icons are put in boxes

#story[1293]
 2017-09-28 02:17:39 +13:00
alistairjmcintyre 73861b2ef3 Merge branch 'develop' into 1276_Next_Mark_Indicator 2017-09-28 02:06:18 +13:00
alistairjmcintyre 4018dd783e - Fixed Merge Errors and some broken lighting 
#tags [1276]
 2017-09-28 02:05:47 +13:00
Michael Rausch 8b7407bf89 Various bug fixes 
- Closed socket when discovery server crashes, so it can be restarted
- Flattened water on terrain mesh
- Added checks to ensure server is started before connecting
- Added a check to ensure client has started  before connecting to the server
- Fixed concurrency issue in server-> client thread list

Tags: #story[1281]
 2017-09-28 01:58:49 +13:00
Calum 00ddf117b2 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java
#	src/main/resources/images/wind-180.png
 2017-09-28 00:26:09 +13:00
Calum a266779709 Added new Wind Waker mesh 
#implement #story[1293]
 2017-09-28 00:24:34 +13:00
Haoming Yin df24fe072a Added animation for wind turning. 
- enlarged the wind image size to centre the compass
- added animation to smooth the turning
 2017-09-28 00:13:45 +13:00
Calum a1a34b9bd7 Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop 2017-09-27 23:36:14 +13:00
Calum 42d490d6fd Added new Wind Waker mesh 
#implement #story[1293]
 2017-09-27 23:35:51 +13:00
Haoming Yin cd4a2f8da3 Merge remote-tracking branch 'origin/develop' into develop 2017-09-27 22:47:08 +13:00
Haoming Yin 287cfd77d0 Fix: smoothing wind rotation 
- added animation for wind rotation
- enlarged wind image's background to centre the compass

#story[1273]
 2017-09-27 22:45:56 +13:00
alistairjmcintyre a08a38c985 - Fixed Merge Errors 
#tags [1276]
 2017-09-27 22:25:32 +13:00
alistairjmcintyre 810dde6a21 Merge branch 'develop' into 1276_Next_Mark_Indicator 
# Conflicts:
#	src/main/java/seng302/visualiser/GameView3D.java
#	src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java
 2017-09-27 22:15:02 +13:00
alistairjmcintyre 7a76efa2ce - Added ability to color the indicators. 
#tags [1276]
 2017-09-27 22:07:24 +13:00
William Muir ff4c2cd5b6 Merge branch '1273_Skybox' into 'develop' 
1273 skybox

Server Discovery:
 - Created server discovery server.
 - Implemented protocols to support matchmaking & room code connection
 - Improved error handling for server disconnections

Skybox:
 - Added a skybox
 - Added a terrain mesh

See merge request !79
 2017-09-27 21:52:34 +13:00
alistairjmcintyre c5e6302f86 - Added circle to boat to indicate which boat is the players and to show where the arrow is pointing. 
#tags [1276]
 2017-09-27 21:31:02 +13:00
Peter Galloway cd199767ae created new models for all pickups #story[1293] 2017-09-27 20:40:40 +13:00
Michael Rausch 5cc4898ab5 Fixed failing tests & other bug fixes 
- Fixed server capacity in server list
- Fixed failing unit tests for chat

Tags: #story[1281] #pair[mra106, cir27]
 2017-09-27 20:37:29 +13:00
Haoming Yin 22e1e57c24 Issue #73: If you change controls to 'Continuously turning' before moving into game, it is not applied 
- always send turning mode packet when race starts to sync the steering mode

#story[1278]
 2017-09-27 20:18:06 +13:00
Haoming Yin c5d2016733 Merge branch 'issue_#67_early_start' into 'develop' 
added a check in the start logic to make sure a boat can't cross the start line early



See merge request !74
 2017-09-27 19:42:05 +13:00