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

Commit Graph

  • 20b656b16d - Fixed a bug in new customize dialog. - Chat should work correctly when pressing enter now. Alistair McIntyre 2017-09-12 17:26:52 +12:00
  • 90a54beb8d Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge Alistair McIntyre 2017-09-12 17:19:29 +12:00
  • e375efb8e9 - Added documentation to controllers - Moved Customization Dialog logic into LobbyController Alistair McIntyre 2017-09-12 17:19:18 +12:00
  • 06e9c55d2c Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge Michael Rausch 2017-09-12 17:17:46 +12:00
  • 9cba76f979 Fixed maven source encoding Michael Rausch 2017-09-12 17:17:16 +12:00
  • d5ce61a0ff Merge branch 'NewUI_merge' into story1266_3d_model_factory Calum 2017-09-12 17:09:47 +12:00
  • 634322de3f Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge Alistair McIntyre 2017-09-12 17:08:22 +12:00
  • 6f534a430d Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge Calum 2017-09-12 17:04:37 +12:00
  • 17b0864815 Moved transformation of boat icon view from controller class to model factory class. Calum 2017-09-12 17:03:50 +12:00
  • 3455321f01 Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge Alistair McIntyre 2017-09-12 16:54:55 +12:00
  • 7e9e96c091 - Added documentation to controllers Alistair McIntyre 2017-09-12 16:54:40 +12:00
  • b25c3367a9 Reimplemented wind. Wind arrow will rotate based on wind direction. Added labels for wind direction and wind speed. Zhi You Tan 2017-09-12 16:52:44 +12:00
  • ec7ee34305 Fixed tests. Kusal Ekanayake 2017-09-12 16:52:26 +12:00
  • 9dad88e56a Fixed bug where server creation dialog validation was not working William Muir 2017-09-12 16:45:52 +12:00
  • 6a4547f3f9 Minor fix so no lag when token is picked up William Muir 2017-09-12 16:37:29 +12:00
  • 71f626f57e fixed sail rotation broken from port to 3d #story[1266] Peter Galloway 2017-09-12 16:30:20 +12:00
  • 1c343ec02d Changed the lobby map view to the 2D race rather than the 3D one. William Muir 2017-09-12 16:13:14 +12:00
  • 5046ca6ffa Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge William Muir 2017-09-12 16:08:39 +12:00
  • bd31bae586 Changed the lobby map view to the 2D race rather than the 3D one. William Muir 2017-09-12 16:08:29 +12:00
  • 2f973deacc Merge branch 'NewUI_merge' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into NewUI_merge Michael Rausch 2017-09-12 15:56:31 +12:00
  • f4c5e483ce Merge remote-tracking branch 'origin/3D_view_working_with_maven' into NewUI_merge Michael Rausch 2017-09-12 15:56:17 +12:00
  • bb3ee424cc Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge Haoming Yin 2017-09-12 15:52:34 +12:00
  • 99f38fa05f [WIP] Added wind image to the bottom left of the race view. Haoming Yin 2017-09-12 15:52:22 +12:00
  • 6a8c77c670 Made the project successfully build and deploy using new libraries on a local maven repo. Removed old unused libraries. Kusal Ekanayake 2017-09-12 15:11:27 +12:00
  • 659a521cc9 Started making a cucumber test for allchat. Kusal Ekanayake 2017-09-12 14:55:49 +12:00
  • da3613fe36 Split off marker classes. Calum 2017-09-12 14:48:30 +12:00
  • 8dc3e54186 Merge remote-tracking branch 'origin/story1266_3d_model_factory' into story1266_3d_model_factory Calum 2017-09-12 14:11:11 +12:00
  • 8fd35392b0 Added experimental assets for water. Calum 2017-09-12 14:11:00 +12:00
  • bc9f0ea924 Injected a simple toggle into the decorator for the window for the sound. Unsure if this is the best way to do it but not a bad thing to try for now. Alistair McIntyre 2017-09-12 13:53:24 +12:00
  • 6d9864e677 Fixed chat history text line spacing to a smaller amount. Haoming Yin 2017-09-12 11:12:35 +12:00
  • 8c2125276e Polished race view text area and send button UI style to make them pretty Haoming Yin 2017-09-12 10:59:07 +12:00
  • 235d6c9cef Added 3D element to lobby screen to show the player their boat before the race. tags: #story[1245] alistairjmcintyre 2017-09-12 03:57:29 +12:00
  • 5dd936f8f1 Added chat functionality & timer back into the game + bug fixes Michael Rausch 2017-09-12 01:31:38 +12:00
  • d223d393fa Merge branch 'story1266_3d_model_factory' into NewUI_merge Michael Rausch 2017-09-11 23:45:31 +12:00
  • aa098569f3 Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge Haoming Yin 2017-09-11 23:43:46 +12:00
  • d49e84e6d2 Fixed a bug that race view doesn't fit in decorator. Haoming Yin 2017-09-11 23:42:08 +12:00
  • 75bf92a67f Added map image to lobby screen Michael Rausch 2017-09-11 23:24:21 +12:00
  • 0d7201e235 Race view is default to be full screen now and minor bug fixes. Haoming Yin 2017-09-11 23:04:41 +12:00
  • 0197de6fe3 Drawing player icon assets but line segment was not added to repo some app crashes. cir27 2017-09-11 22:19:08 +12:00
  • d79ff0f1cf Merge remote-tracking branch 'origin/story1266_3d_model_factory' into story1266_3d_model_factory cir27 2017-09-11 22:03:52 +12:00
  • 18f36d7ea4 Added assets to identify the player. Needs to merge with 3d player specification for code side to be implemented. cir27 2017-09-11 22:02:21 +12:00
  • 131cd80e02 Added button sounds on hover, click and in the lobby Michael Rausch 2017-09-11 19:50:17 +12:00
  • 3d0209300e - Validation completely done - Some documentation added. Alistair McIntyre 2017-09-11 19:36:16 +12:00
  • 6b4f7eb42b Merge develop into NewUI, and 3D hyi25 2017-09-11 18:56:26 +12:00
  • 8b9b3a31bd Trying to start getting the 3D branch to successfully build and run on git and on computers. Kusal Ekanayake 2017-09-11 18:50:01 +12:00
  • 0bf83aa858 Merge remote-tracking branch 'origin/develop' into NewUI_merge Haoming Yin 2017-09-11 18:15:08 +12:00
  • dff261cf41 Added 3D assets for a trail and generated them at regular intervals. Calum 2017-09-11 17:16:13 +12:00
  • 83ee217cef Merge branch 'Story1248_Game_App_Scaling' into 'develop' William Muir 2017-09-11 17:11:27 +12:00
  • d4826739e3 Merge branch 'develop' into Story1248_Game_App_Scaling William Muir 2017-09-11 16:56:49 +12:00
  • fdfb5959fa Minor change so that boats still are checked for collision after passing the finish line #story[1250] William Muir 2017-09-11 16:53:12 +12:00
  • 878c0e0f43 Added ocean asset. Moved camera to center of race. Calum 2017-09-11 16:24:21 +12:00
  • 1ce8df976c changed name: contentanchorpane to contentgridpane Zhi You Tan 2017-09-11 16:08:24 +12:00
  • 6fcd4ae4cc updated raceview javafx after develop merge to bring in text chat pane. Zhi You Tan 2017-09-11 16:01:07 +12:00
  • 534eaee8ce Merge remote-tracking branch 'origin/develop' into develop William Muir 2017-09-11 15:54:30 +12:00
  • ab35e3506d fixed bug William Muir 2017-09-11 15:54:16 +12:00
  • 1fec620427 Merged 3d branch into new UI Michael Rausch 2017-09-11 15:50:22 +12:00
  • 00100eb991 Merge remote-tracking branch 'origin/develop' into Story1248_Game_App_Scaling Zhi You Tan 2017-09-11 15:47:47 +12:00
  • 58512fdbdf Replaced hover sound to work in .jar. #story[1249] Kusal Ekanayake 2017-09-11 15:40:13 +12:00
  • 76a1a3c7a0 Merge remote-tracking branch 'origin/story1266_3d_model_factory' into NewUI_merge Michael Rausch 2017-09-11 15:29:33 +12:00
  • 1b8c503712 fixed bug William Muir 2017-09-11 15:29:08 +12:00
  • 334e13295f fixed bug William Muir 2017-09-11 15:24:42 +12:00
  • 0c4d001510 Merge remote-tracking branch 'origin/develop' into develop William Muir 2017-09-11 15:11:49 +12:00
  • 24a3a54ccb Added sounds to coin pick up William Muir 2017-09-11 15:11:11 +12:00
  • 40408cff27 -Validation on server list screen and server creation dialog done. tags : #story[1245] Alistair McIntyre 2017-09-11 15:08:34 +12:00
  • 9fcb8915c2 Added sounds to coin pick up William Muir 2017-09-11 14:45:04 +12:00
  • caf910c4c5 Adjusted volume to make more balanced. Kusal Ekanayake 2017-09-11 14:39:40 +12:00
  • 4f07786449 Changed the hover noise from a mediaplayer to an audio clip. Kusal Ekanayake 2017-09-11 14:21:47 +12:00
  • 2b53e0d5b4 Validation fixed on server list screen. Server List Screen done. tags : #story[1245] Alistair McIntyre 2017-09-11 13:51:29 +12:00
  • 1210f9342b Removed rounding in GameView that caused objects to be rendered at incorrect positions. Calum 2017-09-11 11:37:50 +12:00
  • f136a970db Added placeholder assets for velocity pickups. cir27 2017-09-11 03:11:42 +12:00
  • 800ae2864f - Fixed a missing validation call. alistairjmcintyre 2017-09-11 02:55:47 +12:00
  • e764caee60 - Learned how JFX Validators work and implemented them for direct connection. - Aside from the error message when a server cannot be found (which is the default javafx one) I think the serverlist is pretty much done. alistairjmcintyre 2017-09-11 02:53:41 +12:00
  • 78b4786482 Added assets for the border and for gates. Drew them in correct locations. cir27 2017-09-11 02:50:31 +12:00
  • e3ccb570ed Merge remote-tracking branch 'origin/story1266_3d_model_factory' into story1266_3d_model_factory cir27 2017-09-10 22:54:49 +12:00
  • 470bf121a5 Added assets for borders. cir27 2017-09-10 22:54:40 +12:00
  • f077486e22 - Added methods for validating direct connection, Port Number Complete, Host Name not Complete. - Added No Servers found Message - Found a potential bug with windows machines not running the correct service to handle Bonjour Service Addresses. alistairjmcintyre 2017-09-10 18:24:15 +12:00
  • 717f7558d9 Fixed issue that when go back to start screen, start view doesn't fit in to the decorator properly. Haoming Yin 2017-09-10 12:43:17 +12:00
  • 05236337ba Fixed horizontal and vertical resizing not to draw larger than scene. Zhi You Tan 2017-09-10 03:17:26 +12:00
  • 1b76d59acb Removed drawGoogleMap() Zhi You Tan 2017-09-10 02:21:30 +12:00
  • 02e6d2a98b Fixed Client connection delegate bug William Muir 2017-09-09 18:26:22 +12:00
  • 06a4dde216 Ported game rendering to 3d environment for boats and markers. Calum 2017-09-09 17:34:18 +12:00
  • 1516e817b7 Fixed some UI bugs, and redesigned some UI elements. Haoming Yin 2017-09-09 15:00:32 +12:00
  • bd7ea920b6 Fixed Client connection delegate bug William Muir 2017-09-09 14:46:42 +12:00
  • 4a170f8179 Merged new develop on William Muir 2017-09-09 14:13:50 +12:00
  • 1f9e6154ae Merge branch 'develop' into 1250_SendingGameObjects William Muir 2017-09-09 14:02:12 +12:00
  • 5595e0439b Merge branch 'Story1249_SoundsAndMusic' into 'develop' William Muir 2017-09-09 13:17:12 +12:00
  • 08f7127b69 Altered test to hopefully fix occasional indeterministic bug that occurred. Calum 2017-09-09 13:13:45 +12:00
  • 8ba28ffda0 Minor refactor moving Spawning and token creation to game state William Muir 2017-09-09 13:11:44 +12:00
  • edd52a07a7 Added logger to HeartBeatThread. Calum 2017-09-09 13:07:04 +12:00
  • 875a6b4e98 Merge remote-tracking branch 'origin/Story1249_SoundsAndMusic' into Story1249_SoundsAndMusic Calum 2017-09-09 13:04:00 +12:00
  • faefcc7938 Fixed bug with initializing race view elements. Made chat box unselectable. Only manually tested. Calum 2017-09-09 13:03:55 +12:00
  • 0c956f93c8 Merge request fixes. minor refactor William Muir 2017-09-09 12:37:31 +12:00
  • 0e2946f20b Added ocean object Calum 2017-09-09 12:34:08 +12:00
  • f66ef3c208 [WIP] - Horizontal and vertical resizing works fine now. - Issue: Have to implement maximum horizontal and vertical scaling. Zhi You Tan 2017-09-09 03:14:10 +12:00
  • cf4f8813d2 re-implemented existing functionality in UI Michael Rausch 2017-09-08 18:00:09 +12:00
  • e2bc613c9d Merge request fixes William Muir 2017-09-08 15:52:01 +12:00
  • c2c3c9eb53 Experimented with parallel camera in 3d gameview. Works ok for rendering boats in isometric view. cir27 2017-09-08 14:05:52 +12:00
  • cadf995bf7 Added area rounding area to mark assets. cir27 2017-09-08 13:32:17 +12:00
  • 62f139c604 Added 3D window to GameView3D to begin adding assets to. Used it to refine all 3D assets implemented by ModelFactory and manually test that they work. cir27 2017-09-08 01:51:31 +12:00
  • 0bf6dd9e6b Added 3D window to GameView3D to begin adding assets to. Used it to refine all 3D assets implemented by ModelFactory and manually test that they work. cir27 2017-09-08 01:50:56 +12:00