| 
						
					 | 
					
						
						
							
						
						7129f0f3ab
					 | 
					
						
						
							
							fix: removed Req from EventTypes as it's now a request, not an event
						
						
						
						
						
						
					 | 
					
						2021-05-11 04:25:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1a98f25139
					 | 
					
						
						
							
							feat: add handling and checking for UseInfinityStoneRequest, fix: use proper distance calculations for some checks
						
						
						
						
						
						
					 | 
					
						2021-05-11 03:50:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4203092f9a
					 | 
					
						
						
							
							fix: fixed building gamestate events (and the tests relating to that)
						
						
						
						
						
						
					 | 
					
						2021-05-11 03:20:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c2d1c2cc98
					 | 
					
						
						
							
							feat: handle Req request and remove handling of lobby events
						
						
						
						
						
						
					 | 
					
						2021-05-05 18:59:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a9c80cb19b
					 | 
					
						
						
							
							fix: add new event properties to builder
						
						
						
						
						
						
					 | 
					
						2021-05-05 18:58:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						56a90f6bdf
					 | 
					
						
						
							
							feat: added new request types
						
						
						
						
						
						
					 | 
					
						2021-05-05 17:49:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3038368ad8
					 | 
					
						
						
							
							feat: reworked GamestateEvent according to new standard
						
						
						
						
						
						
					 | 
					
						2021-05-05 17:32:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9405b89fb3
					 | 
					
						
						
							
							fix: resolve event emitter not emitting because of missing call to setChanged
						
						
						
						
						
						
					 | 
					
						2021-05-03 20:19:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a5ccba0326
					 | 
					
						
						
							
							refactor: switch to EventBuilder
						
						
						
						
						
						
					 | 
					
						2021-05-03 19:36:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						80c77b7956
					 | 
					
						
						
							
							refactor: move event checks from builder to their respective classes
						
						
						
						
						
						
					 | 
					
						2021-05-03 19:25:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d36466a5a0
					 | 
					
						
						
							
							refactor: make GameLogic.checkRequest use error pattern and simple check methods
						
						
						
						
						
						
					 | 
					
						2021-05-02 15:34:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						05f4751a2c
					 | 
					
						
						
							
							feat: properly handle movement requests
						
						
						
						
						
						
					 | 
					
						2021-05-02 14:38:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d06ac91ef8
					 | 
					
						
						
							
							refactor: clean up code and improve event builder
						
						
						
						
						
						
					 | 
					
						2021-05-02 14:28:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						45ac7d6a62
					 | 
					
						
						
							
							fix: properly add new pause events
						
						
						
						
						
						
					 | 
					
						2021-05-02 13:24:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3e36947d3e
					 | 
					
						
						
							
							feat: partially finished test for EventBuilder
						
						
						
						
						
						
					 | 
					
						2021-05-02 04:14:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c190111de1
					 | 
					
						
						
							
							feat: completed EventBuilder with complete exception-based event checking for all events
						
						
						
						
						
						
					 | 
					
						2021-05-02 04:14:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1bd3cdf63f
					 | 
					
						
						
							
							fix: rewrote CharacterEvent equals for nullability compatibility
						
						
						
						
						
						
					 | 
					
						2021-05-02 03:19:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						326c469e55
					 | 
					
						
						
							
							fix: changed event types to non-primitives for nullability
						
						
						
						
						
						
					 | 
					
						2021-05-02 03:15:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e6cc61a272
					 | 
					
						
						
							
							feat: rewrote EntityBuilder to check for entity correctness when building entities
						
						
						
						
						
						
					 | 
					
						2021-05-02 02:58:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						091e6eb688
					 | 
					
						
						
							
							fix: added entity to entityEvents as this is required for the SpawnEntityEvent
						
						
						
						
						
						
					 | 
					
						2021-05-02 02:58:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						06af6b37f3
					 | 
					
						
						
							
							feat: added pause event types to eventType enum
						
						
						
						
						
						
					 | 
					
						2021-05-02 02:15:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3b286c3cad
					 | 
					
						
						
							
							merge: merged comment in EventBuilder for better formating
						
						
						
						
						
						
						
						Conflicts:
	src/main/java/uulm/teamname/marvelous/gamelibrary/events/EventBuilder.java 
						
						
					 | 
					
						2021-05-02 02:04:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						608cd829c4
					 | 
					
						
						
							
							temp: half finished but ineffective EventBuilder, to be reworked
						
						
						
						
						
						
						
						fix: deleted duplicate equals
fix: changed language level
temp: half finished but ineffective EventBuilder, to be reworked 
						
						
					 | 
					
						2021-05-02 02:02:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						21fccee0df
					 | 
					
						
						
							
							fix: fix formatting
						
						
						
						
						
						
					 | 
					
						2021-05-02 00:19:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						abd70a0d05
					 | 
					
						
						
							
							fix: deleted duplicate equals
						
						
						
						
						
						
					 | 
					
						2021-05-02 00:05:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						82fa54bd2d
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/gamelib' into gamelib
						
						
						
						
						
						
					 | 
					
						2021-05-02 00:03:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						be88744bc9
					 | 
					
						
						
							
							fix: generated equals and hashCode for events, entities and entityIDs
						
						
						
						
						
						
					 | 
					
						2021-05-02 00:03:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b5a66dcdc6
					 | 
					
						
						
							
							wip: start implementing GameLogic.checkRequest
						
						
						
						
						
						
					 | 
					
						2021-05-02 00:03:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						889e4cf233
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/gamelib' into gamelib
						
						
						
						
						
						
					 | 
					
						2021-05-01 23:54:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1a33a8cb7e
					 | 
					
						
						
							
							fix: fixed comments to properly display as a list
						
						
						
						
						
						
					 | 
					
						2021-05-01 23:54:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9220b6cc1b
					 | 
					
						
						
							
							fix: add todo comment
						
						
						
						
						
						
					 | 
					
						2021-05-01 23:51:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1cb86f6be8
					 | 
					
						
						
							
							feat: added EventBuilder for building Events with more convenience and nicer code
						
						
						
						
						
						
					 | 
					
						2021-05-01 23:36:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d00c18c9d3
					 | 
					
						
						
							
							fix: changed gamestate event to new format
						
						
						
						
						
						
						
						BREAKING-CHANGE: GamestateEvent parameter type changes 
						
						
					 | 
					
						2021-05-01 23:19:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cdf9c342ef
					 | 
					
						
						
							
							fix: changed custom content type to HashMap<String, Object>
						
						
						
						
						
						
					 | 
					
						2021-05-01 23:18:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a667ea860
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/gamelib' into gamelib
						
						
						
						
						
						
					 | 
					
						2021-05-01 23:08:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bdc434ecc3
					 | 
					
						
						
							
							refactor: added comments and rearranged EventTypes
						
						
						
						
						
						
					 | 
					
						2021-05-01 23:07:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bebe721788
					 | 
					
						
						
							
							feat: implement GameLogic.executeRequest
						
						
						
						
						
						
					 | 
					
						2021-05-01 23:06:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3b286b4667
					 | 
					
						
						
							
							feat: data classes for all events and requests
						
						
						
						
						
						
					 | 
					
						2021-05-01 22:30:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						43cf4c6c1b
					 | 
					
						
						
							
							fix: swap EntityID constructor parameters
						
						
						
						
						
						
					 | 
					
						2021-05-01 22:24:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b5614d3d37
					 | 
					
						
						
							
							fix: its movement point, not mana point
						
						
						
						
						
						
					 | 
					
						2021-05-01 21:53:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2783173898
					 | 
					
						
						
							
							ix: move manager classes to game logic
						
						
						
						
						
						
					 | 
					
						2021-05-01 21:40:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fe249f39ea
					 | 
					
						
						
							
							refactor: improve stone cooldown storing and implement better cloning
						
						
						
						
						
						
					 | 
					
						2021-05-01 19:47:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						01ee534a56
					 | 
					
						
						
							
							refactor: changed tuple test variable name to t for readability
						
						
						
						
						
						
					 | 
					
						2021-04-30 23:47:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e062de635d
					 | 
					
						
						
							
							fix: change last comments to new format
						
						
						
						
						
						
					 | 
					
						2021-04-30 23:19:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fc1382b343
					 | 
					
						
						
							
							wip: add basic test for GameState.snapshot
						
						
						
						
						
						
					 | 
					
						2021-04-30 21:49:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fcd2338b11
					 | 
					
						
						
							
							feat: implement all getters in GameStateView
						
						
						
						
						
						
					 | 
					
						2021-04-30 21:48:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eccac70656
					 | 
					
						
						
							
							feat: implement GameState.snapshot and make entities cloneable
						
						
						
						
						
						
					 | 
					
						2021-04-30 21:48:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7f225b850c
					 | 
					
						
						
							
							feat: add arbitrary test as base
						
						
						
						
						
						
					 | 
					
						2021-04-30 20:56:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3f7d393d5d
					 | 
					
						
						
							
							refactor: unify comment styles
						
						
						
						
						
						
						
						feat: add entity list class 
						
						
					 | 
					
						2021-04-30 20:54:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						78b5d9d4cf
					 | 
					
						
						
							
							feat: created RoleEnum according to standard
						
						
						
						
						
						
					 | 
					
						2021-04-30 19:40:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |