James Miller
							
						 | 
						
							
							
							
							
								
							
								5d1db999ac
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'patch-1' into 'master'
							
							
							
							
							
							
							
							Add identical names formatting
See merge request jrmiller82/pathfinder-2-sqlite!33 
							
						 | 
						
							2019-08-15 03:56:01 +00:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								0521551d84
								
							
								
							
						 | 
						
							
							
								
								identicle -> identical
							
							
							
							
							
						 | 
						
							2019-08-14 22:55:38 -05:00 | 
						
					
				
					
						
							
							
								 
								Brian
							
						 | 
						
							
							
							
							
								
							
								4747f84f28
								
							
								
							
						 | 
						
							
							
								
								Add identical names formatting
							
							
							
							
							
						 | 
						
							2019-08-14 22:54:03 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								34f7a670a2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'gear'
							
							
							
							
							
						 | 
						
							2019-08-14 22:51:58 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								85a3f371f8
								
							
								
							
						 | 
						
							
							
								
								got rid of superfluous traits column
							
							
							
							
							
						 | 
						
							2019-08-14 22:50:52 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								94d1273265
								
							
								
							
						 | 
						
							
							
								
								working on gear import from CSV need to get rid of a column
							
							
							
							
							
						 | 
						
							2019-08-14 22:48:06 -05:00 | 
						
					
				
					
						
							
							
								
								 James R Miller
							
						 | 
						
							
							
							
							
								
							
								5d578c5b79
								
							
								
							
						 | 
						
							
							
								
								added sqlite pragmas to speed up spells.py
							
							
							
							
							
						 | 
						
							2019-08-14 17:55:06 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								b1884f25b8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'scrape_gear' into 'master'
							
							
							
							
							
							
							
							Equipment - Gear
See merge request jrmiller82/pathfinder-2-sqlite!31 
							
						 | 
						
							2019-08-14 04:14:56 +00:00 | 
						
					
				
					
						
							
							
								 
								Brian Haley
							
						 | 
						
							
							
							
							
								
							
								ec2e63b286
								
							
								
							
						 | 
						
							
							
								
								Final
							
							
							
							
							
						 | 
						
							2019-08-14 04:14:49 +00:00 | 
						
					
				
					
						
							
							
								 
								Brian Haley
							
						 | 
						
							
							
							
							
								
							
								bb5d781aaa
								
							
								
							
						 | 
						
							
							
								
								Final executable
							
							
							
							
							
						 | 
						
							2019-08-14 04:14:49 +00:00 | 
						
					
				
					
						
							
							
								 
								Brian Haley
							
						 | 
						
							
							
							
							
								
							
								dfbf07e6d9
								
							
								
							
						 | 
						
							
							
								
								Include descriptions
							
							
							
							
							
						 | 
						
							2019-08-14 04:14:49 +00:00 | 
						
					
				
					
						
							
							
								 
								Brian Haley
							
						 | 
						
							
							
							
							
								
							
								4cc58e35d4
								
							
								
							
						 | 
						
							
							
								
								Copied from aon
							
							
							
							
							
						 | 
						
							2019-08-14 04:14:49 +00:00 | 
						
					
				
					
						
							
							
								 
								Brian Haley
							
						 | 
						
							
							
							
							
								
							
								2481dcd413
								
							
								
							
						 | 
						
							
							
								
								Copy weapons files
							
							
							
							
							
						 | 
						
							2019-08-14 04:14:49 +00:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								7a08cd30af
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'cond_short_desc' into 'master'
							
							
							
							
							
							
							
							short descriptions added
See merge request jrmiller82/pathfinder-2-sqlite!32 
							
						 | 
						
							2019-08-14 04:13:19 +00:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								7d8ed6a3df
								
							
								
							
						 | 
						
							
							
								
								fix typo on data/conditions.sql
							
							
							
							
							
						 | 
						
							2019-08-13 23:12:43 -05:00 | 
						
					
				
					
						
							
							
								 
								James DeVore
							
						 | 
						
							
							
							
							
								
							
								cfecb22fef
								
							
								
							
						 | 
						
							
							
								
								short descriptions added
							
							
							
							
							
						 | 
						
							2019-08-13 22:48:12 -04:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								bba2573af9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'weapons_update' into 'master'
							
							
							
							
							
							
							
							Weapons update
See merge request jrmiller82/pathfinder-2-sqlite!30 
							
						 | 
						
							2019-08-13 21:28:38 +00:00 | 
						
					
				
					
						
							
							
								 
								Brian Haley
							
						 | 
						
							
							
							
							
								
							
								57aa8769de
								
							
								
							
						 | 
						
							
							
								
								Fix ammunition_id
							
							
							
							
							
						 | 
						
							2019-08-13 17:22:44 -04:00 | 
						
					
				
					
						
							
							
								 
								Brian Haley
							
						 | 
						
							
							
							
							
								
							
								47257a3dd6
								
							
								
							
						 | 
						
							
							
								
								Clean data
							
							
							
							
							
						 | 
						
							2019-08-13 17:21:07 -04:00 | 
						
					
				
					
						
							
							
								 
								Brian Haley
							
						 | 
						
							
							
							
							
								
							
								d7be691ddc
								
							
								
							
						 | 
						
							
							
								
								Remove ammunition and clean data
							
							
							
							
							
						 | 
						
							2019-08-13 17:21:01 -04:00 | 
						
					
				
					
						
							
							
								 
								Brian Haley
							
						 | 
						
							
							
							
							
								
							
								5bfe90c8c4
								
							
								
							
						 | 
						
							
							
								
								Separate ammunition from ranged.csv
							
							
							
							
							
						 | 
						
							2019-08-13 17:20:36 -04:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								5bef761453
								
							
								
							
						 | 
						
							
							
								
								remove a TODO from conditions.sql
							
							
							
							
							
						 | 
						
							2019-08-12 23:47:29 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								424d608096
								
							
								
							
						 | 
						
							
							
								
								added in long descr on conditions
							
							
							
							
							
						 | 
						
							2019-08-12 23:47:01 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								f36c4856f9
								
							
								
							
						 | 
						
							
							
								
								fix spells and actions to link up with a actioncosts_id FK in spells
							
							
							
							
							
						 | 
						
							2019-08-12 22:41:25 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								dbffbcabf0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'actions'
							
							
							
							
							
						 | 
						
							2019-08-12 22:01:55 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								f8e1027861
								
							
								
							
						 | 
						
							
							
								
								update gendb.sh to do actions
							
							
							
							
							
						 | 
						
							2019-08-12 22:01:33 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								0070577e2c
								
							
								
							
						 | 
						
							
							
								
								add in basic actions and special basic actions
							
							
							
							
							
						 | 
						
							2019-08-12 22:01:22 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								56c2a0fa5c
								
							
								
							
						 | 
						
							
							
								
								init commit on actions branch
							
							
							
							
							
						 | 
						
							2019-08-12 17:09:01 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								6381633c8f
								
							
								
							
						 | 
						
							
							
								
								tweak to acknowledgements.md
							
							
							
							
							
						 | 
						
							2019-08-12 12:12:05 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								f698fe4d06
								
							
								
							
						 | 
						
							
							
								
								new file: ACKNOWLEDGEMENTS.md
							
							
							
							
							
						 | 
						
							2019-08-12 12:10:46 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								a638dd27ff
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feat_traits' into 'master'
							
							
							
							
							
							
							
							Feat traits
See merge request jrmiller82/pathfinder-2-sqlite!29 
							
						 | 
						
							2019-08-12 16:56:46 +00:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								1bf9f1476f
								
							
								
							
						 | 
						
							
							
								
								minor tweaks, Null -> NULL and added a TODO on commenting
							
							
							
							
							
						 | 
						
							2019-08-12 11:55:40 -05:00 | 
						
					
				
					
						
							
							
								 
								Wesley Webb
							
						 | 
						
							
							
							
							
								
							
								440c2557a8
								
							
								
							
						 | 
						
							
							
								
								All prerequisites finished
							
							
							
							
							
						 | 
						
							2019-08-12 06:03:15 -04:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								28347cf272
								
							
								
							
						 | 
						
							
							
								
								fix issue #32, fill in spell-school descriptions
							
							
							
							
							
						 | 
						
							2019-08-11 13:55:19 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								0240b34b23
								
							
								
							
						 | 
						
							
							
								
								fix issue #28; add extra weapon traits like thrown 10 ft.
							
							
							
							
							
						 | 
						
							2019-08-11 13:47:32 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								08b3c87ccd
								
							
								
							
						 | 
						
							
							
								
								update readme to add GF-flavored markdown as a convention
							
							
							
							
							
						 | 
						
							2019-08-11 13:29:47 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								93caeeb09d
								
							
								
							
						 | 
						
							
							
								
								fix issue #23; add additive 1,2,and3 to traits
							
							
							
							
							
						 | 
						
							2019-08-11 13:27:10 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								dabb5146f4
								
							
								
							
						 | 
						
							
							
								
								fix issue 19: heritages
							
							
							
							
							
						 | 
						
							2019-08-11 13:21:47 -05:00 | 
						
					
				
					
						
							
							
								 
								Wesley Webb
							
						 | 
						
							
							
							
							
								
							
								95da0a3cf1
								
							
								
							
						 | 
						
							
							
								
								Feat Prereqs data for all ancestries, Alchemist, Barbarian, Bard, Champion, and a part of Cleric.
							
							
							
							
							
						 | 
						
							2019-08-10 21:25:31 -04:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								bc1dc03bdb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'json-spells'
							
							
							
							
							
						 | 
						
							2019-08-10 16:17:45 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								c40afb2c76
								
							
								
							
						 | 
						
							
							
								
								update gendb.sh to generate spell data with spells.py
							
							
							
							
							
						 | 
						
							2019-08-10 16:17:26 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								b0eb30ab25
								
							
								
							
						 | 
						
							
							
								
								remove todo on spells.py
							
							
							
							
							
						 | 
						
							2019-08-10 16:12:03 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								6fa96a8013
								
							
								
							
						 | 
						
							
							
								
								spelltargets_id on spells now populating
							
							
							
							
							
						 | 
						
							2019-08-10 16:06:38 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								b2df5a9ae3
								
							
								
							
						 | 
						
							
							
								
								spelltargets table populating, but not linked to FK on spells yet
							
							
							
							
							
						 | 
						
							2019-08-10 15:57:48 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								cfdef83cb2
								
							
								
							
						 | 
						
							
							
								
								spells: have components working too
							
							
							
							
							
						 | 
						
							2019-08-10 15:44:39 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								a57b6577f8
								
							
								
							
						 | 
						
							
							
								
								got area working in a flat text field; TODO make area table and refactor
							
							
							
							
							
						 | 
						
							2019-08-10 15:27:00 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								83f140d3a6
								
							
								
							
						 | 
						
							
							
								
								spells now have triggers working in them
							
							
							
							
							
						 | 
						
							2019-08-10 15:13:24 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								b0b6a20b83
								
							
								
							
						 | 
						
							
							
								
								spells.py got spell types working
							
							
							
							
							
						 | 
						
							2019-08-10 14:42:36 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								e8ab1860d3
								
							
								
							
						 | 
						
							
							
								
								got spell traits inserting based on github data
							
							
							
							
							
						 | 
						
							2019-08-10 14:42:36 -05:00 | 
						
					
				
					
						
							
							
								
								 James Miller
							
						 | 
						
							
							
							
							
								
							
								a2690994ae
								
							
								
							
						 | 
						
							
							
								
								remove debug statement
							
							
							
							
							
						 | 
						
							2019-08-10 14:42:36 -05:00 |