| 
						
					 | 
					
						
						
							
						
						ad9d314b6b
					 | 
					
						
						
							
							refactor: removed unused imports in JSON
						
						
						
						
						
						
					 | 
					
						2021-06-01 00:42:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						23777bad33
					 | 
					
						
						
							
							refactor: extracted SerializedEntityType enum
						
						
						
						
						
						
					 | 
					
						2021-06-01 00:33:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						20f014209a
					 | 
					
						
						
							
							feat: added inventory method to get inventory as array
						
						
						
						
						
						
					 | 
					
						2021-06-01 00:33:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bccffad8f0
					 | 
					
						
						
							
							fix: more code is apparently better
						
						
						
						
						
						
					 | 
					
						2021-06-01 00:32:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3238f45836
					 | 
					
						
						
							
							refactor: matched test packages to previous refactor
						
						
						
						
						
						
					 | 
					
						2021-05-31 23:41:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d080fff5d3
					 | 
					
						
						
							
							refactor: arranged de/serializers into packages
						
						
						
						
						
						
					 | 
					
						2021-05-31 23:38:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						852c85df08
					 | 
					
						
						
							
							feat: partial rewrite of JSON wit support for CharacterConfig
						
						
						
						
						
						
					 | 
					
						2021-05-31 23:25:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c8d34fcc97
					 | 
					
						
						
							
							feat: implemented config-based character deserialization
						
						
						
						
						
						
					 | 
					
						2021-05-31 23:25:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa6207e47d
					 | 
					
						
						
							
							feat: characterConfig now has a HashMap for values
						
						
						
						
						
						
					 | 
					
						2021-05-31 23:25:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9a9fe4ae97
					 | 
					
						
						
							
							feat: add thanos into the handling
						
						
						
						
						
						
					 | 
					
						2021-05-31 22:54:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1ba5410fd6
					 | 
					
						
						
							
							fix: improve the terrible rasterization code
						
						
						
						
						
						
					 | 
					
						2021-05-31 22:50:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4b794e99e9
					 | 
					
						
						
							
							feat: add proper game initialization
						
						
						
						
						
						
					 | 
					
						2021-05-31 21:37:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						184c839c3a
					 | 
					
						
						
							
							fix: utilize config in GameLogic
						
						
						
						
						
						
					 | 
					
						2021-05-31 18:30:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c0b8108c76
					 | 
					
						
						
							
							fix: added jqwik database to gitignore
						
						
						
						
						
						
					 | 
					
						2021-05-31 18:25:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						483c273c30
					 | 
					
						
						
							
							fix: added jqwik Databse file to git
						
						
						
						
						
						
					 | 
					
						2021-05-31 18:21:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7c36ea5c5c
					 | 
					
						
						
							
							fix: add configs to GameInstance and fix GameState snapshots
						
						
						
						
						
						
					 | 
					
						2021-05-31 18:07:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ab011e54da
					 | 
					
						
						
							
							test: partial test for EventDeserializer
						
						
						
						
						
						
					 | 
					
						2021-05-31 17:57:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						488b18b40c
					 | 
					
						
						
							
							fix: make configuration class names consistent
						
						
						
						
						
						
					 | 
					
						2021-05-31 17:51:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d09a733f2a
					 | 
					
						
						
							
							feat: add CharacterConfig
						
						
						
						
						
						
					 | 
					
						2021-05-31 17:50:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						213955bc37
					 | 
					
						
						
							
							fix: reset turnCount at the beginning of a new round
						
						
						
						
						
						
					 | 
					
						2021-05-31 17:37:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a69d8b916f
					 | 
					
						
						
							
							refactor: improved information hiding in RequestDeserializerTest
						
						
						
						
						
						
					 | 
					
						2021-05-31 15:03:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bf574cec1e
					 | 
					
						
						
							
							Update RequestBuilderTest.java
						
						
						
						
						
						
					 | 
					
						2021-05-30 18:51:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1e47a63cb7
					 | 
					
						
						
							
							Merge branch 'gamelib' of https://gitlab.informatik.uni-ulm.de/sopra/ws20-marvelous-mashup/teams/team25 into gamelib
						
						
						
						
						
						
					 | 
					
						2021-05-30 18:50:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						75e9ee07a5
					 | 
					
						
						
							
							testing: RequestBuilder testing
						
						
						
						
						
						
					 | 
					
						2021-05-30 18:50:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e6dc10e3f5
					 | 
					
						
						
							
							feat: implemented proper Request serialization
						
						
						
						
						
						
					 | 
					
						2021-05-30 18:07:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6a6669ae5d
					 | 
					
						
						
							
							refactor: re-formatted JSONTest
						
						
						
						
						
						
					 | 
					
						2021-05-30 18:07:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2ff309500e
					 | 
					
						
						
							
							feat: implemented proper stringify in the JSON class, and changed ObjectMapper to static
						
						
						
						
						
						
					 | 
					
						2021-05-30 18:06:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d2216f190a
					 | 
					
						
						
							
							feat: removed ObjectMapper in deserializers, and replaced it with context-based mapping
						
						
						
						
						
						
					 | 
					
						2021-05-30 17:22:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9192677ca1
					 | 
					
						
						
							
							fix: corrected JSON property order of CharacterRequest
						
						
						
						
						
						
					 | 
					
						2021-05-30 17:03:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						27c3d6554a
					 | 
					
						
						
							
							fix: fixed JSON mapping of requestTypes
						
						
						
						
						
						
					 | 
					
						2021-05-30 17:01:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb0f2cae13
					 | 
					
						
						
							
							feat: optimized IntVector2Deserializer
						
						
						
						
						
						
					 | 
					
						2021-05-30 17:01:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d0829f3948
					 | 
					
						
						
							
							feat: implemented proper deserialization for EntityID and IntVector2
						
						
						
						
						
						
					 | 
					
						2021-05-30 17:00:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						42e57daa54
					 | 
					
						
						
							
							test: started writing GameLogic test, and added providers for several types
						
						
						
						
						
						
					 | 
					
						2021-05-28 17:25:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a25231fb3e
					 | 
					
						
						
							
							fix: fixed bugs in RequestDeserializer, and wrote Proptests for it
						
						
						
						
						
						
					 | 
					
						2021-05-28 16:20:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						da1d72d61a
					 | 
					
						
						
							
							refactor: nicer enum arrangement of RequestTypes
						
						
						
						
						
						
					 | 
					
						2021-05-28 16:20:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b871b4d3a4
					 | 
					
						
						
							
							refactor: split MessageStructure into multiple messages, as a starting point for proper implementation of the login standard
						
						
						
						
						
						
					 | 
					
						2021-05-28 14:51:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a92f437412
					 | 
					
						
						
							
							feat: completed RequestDeserializer
						
						
						
						
						
						
					 | 
					
						2021-05-28 14:50:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b2b963579e
					 | 
					
						
						
							
							test: wrote proptest for IntVector to practise proptesting
						
						
						
						
						
						
					 | 
					
						2021-05-28 14:47:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						745bea58b8
					 | 
					
						
						
							
							feat: added jqwik to gradle test task
						
						
						
						
						
						
					 | 
					
						2021-05-28 14:46:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						560c57cbfa
					 | 
					
						
						
							
							feat: added .jqwik-database to gitignore
						
						
						
						
						
						
					 | 
					
						2021-05-28 14:45:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b1e7518e74
					 | 
					
						
						
							
							merge: merging remote changes into local gamelib
						
						
						
						
						
						
					 | 
					
						2021-05-28 13:50:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d272ca98a6
					 | 
					
						
						
							
							feat: added the proptesting test engine jqwik to the build.gradle
						
						
						
						
						
						
					 | 
					
						2021-05-28 13:42:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0ba55f4922
					 | 
					
						
						
							
							Merge branch 'gamelib' of https://gitlab.informatik.uni-ulm.de/sopra/ws20-marvelous-mashup/teams/team25 into gamelib
						
						
						
						
						
						
					 | 
					
						2021-05-28 13:40:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d2cb873c89
					 | 
					
						
						
							
							Merge branch 'gamelib' of https://gitlab.informatik.uni-ulm.de/sopra/ws20-marvelous-mashup/teams/team25 into gamelib
						
						
						
						
						
						
					 | 
					
						2021-05-28 13:18:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						940d8a8d97
					 | 
					
						
						
							
							EventBuilder Tests
						
						
						
						
						
						
					 | 
					
						2021-05-28 13:18:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0696176609
					 | 
					
						
						
							
							fix: allow EndRoundRequest event
						
						
						
						
						
						
					 | 
					
						2021-05-27 18:02:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						830ef22997
					 | 
					
						
						
							
							feat/refactor: actually track win conditions
						
						
						
						
						
						
					 | 
					
						2021-05-27 17:58:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7f7459e7a7
					 | 
					
						
						
							
							fix: make movement events pick up infinity stones
						
						
						
						
						
						
					 | 
					
						2021-05-27 17:30:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3522cee9a4
					 | 
					
						
						
							
							feat: add stone cooldown handling
						
						
						
						
						
						
					 | 
					
						2021-05-27 17:26:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0f50efa121
					 | 
					
						
						
							
							feat: add handling for overtime victories
						
						
						
						
						
						
					 | 
					
						2021-05-27 17:18:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |