ca320f7fb8
Merge remote-tracking branch 'origin/1273_Changing_Cameras' into 1281_Server_Discovery_Internet
2017-09-25 00:18:35 +13:00
5e3ae40d03
Made discovery more reliable & added docs/tests
...
- Added unit tests
- Added documentation for discovery classes
- Improved error handling
Tags: #story[1281]
2017-09-22 00:01:13 +12:00
95ad7a4840
Finished implementing room codes.
...
- Fixed bug where room code wasn't parsed correctly
- Added room code selection to server list screen.
- Added room code to hosts lobby.
- Implemented communication protocols on the game client.
Tags: #story[1281]
2017-09-21 22:48:33 +12:00
6ff309a40c
- Perspective Camera Works
...
- Top Down Camera Works
- Started on chase cam but the math is a bit tricky.
tags : #story[1273]
2017-09-21 14:40:35 +12:00
e17e9749d8
Implemented server to manage a list of available servers on the internet.
...
- Implemented a server manager that keeps track of servers & room codes, and removes old servers
- Implemented queries to find a server with a specific room code
- Implemented protocol to register servers
#story[1281]
2017-09-20 20:26:14 +12:00
034e4c252a
Icons now display, blink when they are about to run off, and turn off after their time out
...
TokenType Enum now also has a timeout construction field
#story[1245]
2017-09-20 13:09:09 +12:00
6cde016401
Fixed random token assigning and realisation
...
Token class now has two functions: assignRandomType and realiseRandomType
The former can be used to assign any random type to the token including the random type
The latter can be used to assign a concrete random type to the token (not the random type)
#story[1245]
2017-09-20 12:02:12 +12:00
52d3cea592
Added preliminary icons for pickups
...
RaceView now has a grid pane to contain some icons to display power ups. These are just preliminary
ClientYacht now has a power up field that is set from recieveing messages in the Game Client, as well as observed by the RaceViewController to display the relevant icon when the powerup field is changed
#story[1245]
2017-09-19 23:04:17 +12:00
78596ea111
Initial commit for Power Up story
...
Made new preliminary models for each power up. Currently just different colour balls
Added new YachtEventTypes in the enum for each pick up to be sent out to clients
Tokens now not only randomise location but also randomise which type of token will be sent out
Added new methods to the MessageFactory class - Make collision and Make pickup Message
Game Client now checks what type of Yacht Event code has come in to respond appropriately rather than just generic collision / token.. although this has not been implemented yet
Game View loads appropriate token models depending on what is in XML
#story[1245]
2017-09-19 17:47:05 +12:00
ebecd25ed2
Merge remote-tracking branch 'origin/develop' into develop
2017-09-19 14:54:15 +12:00
0f5137c2b6
Fixed the orientation of .stl files.
...
#fix
2017-09-19 14:52:02 +12:00
edfeb2b287
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-14 15:40:26 +12:00
0355784000
Broadcast messages when boats pass legs or a token is picked up or expired.
...
tags: #story[1250] #pair[hyi25, zyt10]
2017-09-14 15:40:12 +12:00
02df69b7b4
- Merged Dev into branch
...
Tags: #story[1245]
2017-09-14 15:27:10 +12:00
242132b800
Merge remote-tracking branch 'origin/develop' into NewUI_merge
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-09-14 15:26:57 +12:00
3a671d4ed0
- Added Values to Finish Dialog.
...
Tags: #story[1245]
2017-09-14 15:24:58 +12:00
482d987839
- Fixed Null Pointer
...
- Build Should pass
Tags: #story[1245]
2017-09-14 15:10:48 +12:00
cc124b2d19
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
2017-09-14 14:50:49 +12:00
b3320ad805
Fixed server message sender
...
tags: #story[1246]
2017-09-14 14:49:25 +12:00
33779ad5c1
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-09-14 14:42:57 +12:00
3a41c27d8d
- Race Finish Dialog showing up, unsure if its actually showing the correct ordering or not.
...
tags : #story[1245]
2017-09-14 14:42:25 +12:00
e24203904b
Removed print statements.
...
#chore
2017-09-14 14:37:22 +12:00
eb188495ce
Fixed position issues on exit arrows.
...
#implement #story[1266] #fix
2017-09-14 14:32:45 +12:00
62a7e2b8fa
Fixed position issues on entry arrows.
...
#implement #story[1266] #fix
2017-09-14 14:21:04 +12:00
acd0e790fe
Added method to send server debug messages to players
...
Tags: #story[1246]
2017-09-14 14:14:21 +12:00
bf427f24d3
- Created a Race Finish Dialog.
...
tags : #story[1245]
2017-09-14 13:34:48 +12:00
7d0a47446d
- Fixed bug in customize dialog.
...
tags : #story[1245]
2017-09-14 13:02:31 +12:00
889098bb50
- Commented out broken test (non-deterministic thing)
...
- Merged 3d factory branch in
tags : #story[1245]
2017-09-14 12:46:17 +12:00
6223a8fc0b
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into NewUI_merge
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
2017-09-14 12:40:20 +12:00
391bd33548
Fixed position issues on first 2 mark arrows.
...
#implement #story[1266]
2017-09-14 12:38:36 +12:00
7e0c2abbfd
- Fixed a shutdown bug that left the game process running long after the window shut
...
- Changed SVG Icon for volume toggle to something a bit nicer
tags : #story[1245]
2017-09-14 12:31:49 +12:00
42a5e86bf8
Merge remote-tracking branch 'origin/NewUI_merge' into story1266_3d_model_factory
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
2017-09-14 12:06:19 +12:00
20d73d8f2f
Removed dead code from fxObjects and GameView 3D
...
#chore
2017-09-14 12:05:20 +12:00
0a62c538ca
Added 3D mark arrows and cleaned up other classes.
2017-09-14 11:28:50 +12:00
7ee6a09626
Fixed that wind speed did not updated frequently and UI polishing.
...
- added shadow for raceview boxes
- split up message history and input text block
- changed timer font
#story[1245]
2017-09-13 21:11:40 +12:00
47798b19fe
Added player position, boat speed, boat heading to race view.
...
#story[1245]
2017-09-13 11:22:05 +12:00
d9247eb031
Added player position, boat speed, boat heading to race view.
...
#story[1245]
2017-09-13 11:21:33 +12:00
7b0d31438e
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge_ryan
2017-09-13 09:44:17 +12:00
1e74321aab
- Lobby Disconnection works.
...
tags : #story[1245]
2017-09-12 18:26:25 +12:00
f0fc75feec
[WIP] Adding player position, boat speed, boat heading
...
#story[1245]
2017-09-12 18:25:46 +12:00
c8dc448a52
Added tests for sounds and modified the transparency for the chat history window.
...
#story[1245]
2017-09-12 18:11:32 +12:00
e518d13fd5
Fixed bug where number of players was off by 1
...
#story[1247]
2017-09-12 17:47:02 +12:00
167545cbef
- Deleted old controllers that didn't do anything anymore.
...
tags : #story[1245]
2017-09-12 17:45:39 +12:00
20b656b16d
- Fixed a bug in new customize dialog.
...
- Chat should work correctly when pressing enter now.
tags : #story[1245]
2017-09-12 17:26:52 +12:00
e375efb8e9
- Added documentation to controllers
...
- Moved Customization Dialog logic into LobbyController
tags : #story[1245]
2017-09-12 17:19:18 +12:00
d5ce61a0ff
Merge branch 'NewUI_merge' into story1266_3d_model_factory
...
# Conflicts:
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-09-12 17:09:47 +12:00
634322de3f
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-12 17:08:22 +12:00
6f534a430d
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
...
# Conflicts:
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
2017-09-12 17:04:37 +12:00
17b0864815
Moved transformation of boat icon view from controller class to model factory class.
...
#implement #story[1266] #refactor
2017-09-12 17:03:50 +12:00
3455321f01
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-12 16:54:55 +12:00
Michael Rausch
Alistair McIntyre
William Muir
Calum
Haoming Yin
Zhi You Tan
Zhi You Tan
Kusal Ekanayake